Merge remote-tracking branch 'origin/master'

src/views/repair/application-form/RepairApplicationForm.vue

@@ -120,7 +120,7 @@ export default {
         {
           title: '报修人',
           checked: true,
-          dataIndex: 'userName'
+          dataIndex: 'actualUser'
         },
         {
           title: '维修人',

src/views/repair/application-form/modules/BaseForm.vue

@@ -117,6 +117,16 @@
             </a-select>
           </a-form-item>
         </row-item>
+        <row-item>
+          <a-form-item
+            label="报修人"
+            :labelCol="BaseTool.Constant.labelCol"
+            :wrapperCol="BaseTool.Constant.wrapperCol"
+          >
+            <a-input
+              v-decorator="['actualUser', {initialValue: userInfo.realName, rules: [{required: false, message: '报修人不能为空'}]}]"/>
+          </a-form-item>
+        </row-item>
         <row-item>
           <a-form-item
             label="紧急等级"
@@ -254,6 +264,7 @@ export default {
       treeData: [],
       needStopMap: {},
       statusMap: {},
+      userInfo: this.$store.getters.userInfo,
       userList: [],
       uploadUrl: uploadUrl,
       defaultRepairFileList: [],
@@ -377,7 +388,7 @@ export default {
       }
     },
     handleSbSelect () {
-      this.$refs.sbInfoSelectModal.base({}, { filter: 0, status: 2 })
+      this.$refs.sbInfoSelectModal.base({}, { filter: -1, status: 2 })
     },
     handleSbSelectd (keys, rows) {
       const [ key ] = keys