Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx

sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml

@@ -483,7 +483,7 @@
       tt.*, su.phonenumber AS phoneNumber, sd.dept_name as deptName,su.nick_name as nickName,
       bpl.lot_id as proId,bpl.lot_name as proName,
       bui.unit_id as unitId,bui.unit_name as unitName,
-      lai.lease_person as leasePerson, lai.phone as leasePhone, tt.create_by as applyFor,d.`name` as taskName,lai.lease_type as leaseType,lai.estimate_lease_time as estimateLeaseTime,
+      lai.lease_person as leasePerson, lai.phone as leasePhone, su.user_name as applyFor,d.`name` as taskName,lai.lease_type as leaseType,lai.estimate_lease_time as estimateLeaseTime,
       case when d.id = '31' then lai.company_audit_remark
       when d.id = '32' then lai.dept_audit_remark
       when d.id = '33' then lai.direct_audit_remark
@@ -496,7 +496,7 @@
       tt.create_time as createTimes, tt.update_time as updateTimes
       FROM
       tm_task tt
-      LEFT JOIN sys_user su ON tt.create_by = su.user_name
+      LEFT JOIN sys_user su ON tt.create_by = su.user_id
       LEFT JOIN sys_dept sd ON su.dept_id = sd.dept_id
       LEFT JOIN tm_task_agreement tta ON tt.task_id = tta.task_id
       LEFT JOIN bm_agreement_info bai ON bai.agreement_id = tta.agreement_id

sgzb-ui/src/components/FormModel/index.vue

@@ -44,6 +44,7 @@
                     :show-all-levels="false"
                     @change="casCadeChange"
                     clearable
+                    filterable
                     style="width: 240px"
                 />
                 <el-date-picker

sgzb-ui/src/views/claimAndRefund/return/returnApplyByCq.vue

@@ -61,8 +61,9 @@
                         value: 'typeId',
                         checkStrictly: true,
                     }"
+                    filterable
                     @change="handleNodeClick"
-                    aria-placeholder="请选择极具类型"
+                    aria-placeholder="请选择机具类型"
                 ></el-cascader>
             </el-form-item>
             <el-form-item label="退料申请时间" prop="time">

sgzb-ui/src/views/claimAndRefund/return/tree.vue

@@ -19,6 +19,7 @@
           highlight-current
           @node-click="handleNodeClick"
           :props="defaultProps"
+          :filter-node-method="filterNode"
         >
         </el-tree>
       </div>
@@ -47,7 +48,9 @@ export default {
     }
   },
   watch: {
-
+    inputValue(val) {
+      this.$refs.tree.filter(val);
+    }
   },
   data() {
     return {
@@ -85,6 +88,10 @@ export default {
       this.inputValue = e.label
       this.$emit('changeId', e.id)
       this.ishowTree = false
+    },
+    filterNode(value, data) {
+      if (!value) return true;
+      return data.label.indexOf(value) !== -1;
     }
   }
 

sgzb-ui/src/views/claimAndRefund/secondStore/outStoreBook.vue

@@ -235,6 +235,8 @@ export default {
                 typeId: undefined,
                 keyword: '',
             },
+            typeList: [],
+            equipmentTypeList: [],
         }
     },
     created() {

sgzb-ui/src/views/cost/csotSettlement/costApplyList.vue

@@ -202,7 +202,6 @@ export default {
             // 工程数据
             projectList: [],
             statusList: [
-                { id: '0', name: '请选择' },
                 { id: '1', name: '未结算' },
                 { id: '2', name: '已结算' },
                 { id: '3', name: '待审核' },
@@ -220,7 +219,7 @@ export default {
                 pageNum: 1,
                 pageSize: 10,
                 keyWord: undefined,
-                sltStatus: '0',
+                sltStatus: '',
                 unitId: '',
                 projectId: '',
             },

sgzb-ui/src/views/cost/csotSettlement/costList.vue

@@ -196,7 +196,6 @@ export default {
             // 工程数据
             projectList: [],
             statusList: [
-                { id: '', name: '请选择' },
                 { id: '0', name: '待审核' },
                 { id: '1', name: '审核通过' },
                 { id: '2', name: '审核驳回' },

sgzb-ui/src/views/repairTest/repair/tree.vue

@@ -19,6 +19,7 @@
           highlight-current
           @node-click="handleNodeClick"
           :props="defaultProps"
+          :filter-node-method="filterNode"
         >
         </el-tree>
       </div>
@@ -63,11 +64,14 @@ export default {
   },
   mounted() {
   },
-  // watch: {
+  watch: {
     // name: function () {
     //   this.inputValue = this.name
     // }
-  // },
+    inputValue(val) {
+      this.$refs.tree.filter(val);
+    }
+  },
   methods: {
     inputFocus() {
       if (this.ishowTree == true) {
@@ -85,6 +89,10 @@ export default {
       this.inputValue = e.label
       this.$emit('changeId', e.id)
       this.ishowTree = false
+    },
+    filterNode(value, data) {
+      if (!value) return true;
+      return data.label.indexOf(value) !== -1;
     }
   }
 

sgzb-ui/src/views/store/tools/accessory.vue

@@ -61,7 +61,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="上级" prop="currentId">
-              <el-cascader v-model="form.currentId" :options="deptOptions" :disabled="isEdit"
+              <el-cascader v-model="form.currentId" :options="deptOptions" :disabled="isEdit" filterable
                 :props="{ expandTrigger: 'hover', label: 'label', value: 'id', checkStrictly: true }"
                 @change="handleNodeClick"> </el-cascader>
             </el-form-item>

sgzb-ui/src/views/warehouseManage/machinery/coding/index.vue

@@ -44,6 +44,7 @@
                     clearable
                     filterable
                     style="width: 240px"
+                    :disabled="!queryParams.itemId" 
                     @change="selectDevice"
                 >
                     <el-option
@@ -60,6 +61,7 @@
                     placeholder="请选择规格型号"
                     clearable
                     filterable
+                    :disabled="!queryParams.deviceId"
                     style="width: 240px"
                 >
                     <el-option
@@ -638,6 +640,8 @@ export default {
         //选择物品种类
         selectItem(id) {
             console.log(id)
+            this.queryParams.deviceId = ''
+            this.queryParams.typeId = ''
             getListByMaType({ typeId: id }).then((response) => {
                 this.typeList = response.data
             })
@@ -645,6 +649,7 @@ export default {
         //选择设备类型
         selectDevice(id) {
             console.log(id)
+            this.queryParams.typeId = ''
             getListByMaType({ typeId: id }).then((response) => {
                 this.modelList = response.data
             })

sgzb-ui/src/views/warehouseManage/machinery/parts/index.vue

@@ -156,6 +156,7 @@
                                 v-model="form.currentId"
                                 :options="deptOptions"
                                 :disabled="isEdit"
+                                filterable
                                 :props="{
                                     expandTrigger: 'hover',
                                     label: 'label',