部门

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

@@ -6,14 +6,14 @@
           <a-row :gutter="48">
             <a-col :md="6" :sm="24">
               <a-form-item label="关键字">
-                <a-input v-model.trim="queryParam.keyword" placeholder="请输入设备名称/设备编号"/>
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="设备自编号">
-                <a-input v-model="queryParam.zbh" placeholder="请输入设备自编号"/>
+                <a-input v-model.trim="queryParam.keyword" placeholder="请输入设备名称/故障描述"/>
               </a-form-item>
             </a-col>
+            <!--            <a-col :md="6" :sm="24">-->
+            <!--              <a-form-item label="设备自编号">-->
+            <!--                <a-input v-model="queryParam.zbh" placeholder="请输入设备自编号"/>-->
+            <!--              </a-form-item>-->
+            <!--            </a-col>-->
             <a-col :md="6" :sm="24">
               <a-form-item label="报修人">
                 <a-input v-model="queryParam.actualUser" placeholder="请输入报修人"/>
@@ -24,11 +24,11 @@
                 <a-input v-model="queryParam.repairUserName" placeholder="请输入维修人"/>
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="问题描述">
-                <a-input v-model="queryParam.content" placeholder="问题描述模糊查询"/>
-              </a-form-item>
-            </a-col>
+            <!--            <a-col :md="6" :sm="24">-->
+            <!--              <a-form-item label="问题描述">-->
+            <!--                <a-input v-model="queryParam.content" placeholder="问题描述模糊查询"/>-->
+            <!--              </a-form-item>-->
+            <!--            </a-col>-->
             <a-col :md="6" :sm="24">
               <a-form-item label="状态">
                 <a-select v-model="queryParam.status" placeholder="请选择">
@@ -72,10 +72,30 @@
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="维修专业">
-                <a-select v-model="queryParam.repairProfessor" placeholder="请选择">
+              <a-form-item
+                label="维修部门"
+                :labelCol="BaseTool.Constant.labelCol"
+                :wrapperCol="BaseTool.Constant.wrapperCol"
+              >
+                <a-select v-model="queryParam.repairDeptId" placeholder="请选择" >
                   <a-select-option
-                    v-for="(label,value) in professorMap"
+                    v-for="(label,value) in repairDeptMap"
+                    :key="value"
+                    :label="label"
+                    :value="value">{{ label }}
+                  </a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item
+                label="报修类型"
+                :labelCol="BaseTool.Constant.labelCol"
+                :wrapperCol="BaseTool.Constant.wrapperCol"
+              >
+                <a-select v-model="queryParam.repairFormType" placeholder="请选择">
+                  <a-select-option
+                    v-for="(label,value) in repairFormTypeMap"
                     :key="value"
                     :label="label"
                     :value="parseInt(value)">{{ label }}
@@ -232,6 +252,8 @@ export default {
   },
   data () {
     return {
+      repairFormTypeMap: {},
+      repairDeptMap: {},
       // 查询参数
       queryParam: {
         filter: this.filter,
@@ -386,7 +408,7 @@ export default {
       categoryMap: {},
       needStopMap: {},
       planFlagMap: {},
-      professorMap:{},
+      professorMap: {},
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         parameter = {
@@ -398,6 +420,8 @@ export default {
             sortName: 'status, apply_time'
           }
         }
+        console.log(11)
+        console.log(parameter)
         return getRepairApplicationFormPage(Object.assign(parameter, this.queryParam))
           .then(res => {
             console.log(res.data.model)
@@ -423,6 +447,8 @@ export default {
     this.allocatedFlag = false
     this.editFlag = false
     // const repairModel = this.DictCache.getConfigValueByType(this.DictCache.TYPE.REPAIR_STRATEGY_MODEL)
+    this.repairDeptMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REPAIR_DEPT_CATEGORY)
+
     if (this.searchType === 3) {
       this.allocatedFlag = true
     }
@@ -442,6 +468,7 @@ export default {
     this.needStopMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.YES_NO)
     this.planFlagMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REPAIR_APPLICATION_FORM_CATEGORY)
     this.professorMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REPAIR_APPLICATION_PROFESSOR)
+    this.repairFormTypeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REPAIR_FORM_TYPE)
 
     // 获取浏览器的请求参数：报修单编号：no
     const no = this.$route.query.no

src/views/sb/info/SbInfoC.vue

@@ -584,14 +584,14 @@ export default {
             }
           }
         }, */
-        {
-          title: '状态',
-          checked: true,
-          dataIndex: 'status',
-          fixed: 'right',
-          width: 100,
-          scopedSlots: { customRender: 'status' }
-        },
+        // {
+        //   title: '状态',
+        //   checked: true,
+        //   dataIndex: 'status',
+        //   fixed: 'right',
+        //   width: 100,
+        //   scopedSlots: { customRender: 'status' }
+        // },
         // {
         //   title: '检定状态',
         //   checked: true,