2024-2-20 设备模块列宽调整+工艺模块线体设备选择调整

src/views/device/sparePartsApplicationRecord/index.vue

@@ -173,7 +173,7 @@
         label="申领单号"
         align="center"
         prop="applyCode"
-        width="200"
+        width="250"
       />
       <el-table-column
         label="关联工单号"

src/views/technology/process/single.vue

@@ -8,13 +8,20 @@
     :before-close="cancelEquipmentForm"
   >
     <el-row :gutter="20">
-      <!--分类数据-->
       <el-col :span="5" :xs="24">
-        <el-card >
+        <div class="head-container">
-          <span>请选择设备类型：</span>
+          <el-input
+            v-model="typeName"
+            placeholder="请输入设备类型名称"
+            clearable
+            size="small"
+            prefix-icon="el-icon-search"
+            style="margin-bottom: 20px"
+          />
+        </div>
         <div class="head-container" style="text-align: center">
           <el-tree
-                :data="treeData1"
+            :data="treeData"
             :props = "{id:'equipmentTypeCode',label:'equipmentTypeName'}"
             node-key="id"
             :expand-on-click-node="false"
@@ -24,7 +31,6 @@
             @node-click="handleNodeClick"
           />
         </div>
-        </el-card>
       </el-col>
 
       <!--设备数据-->
@@ -96,7 +102,9 @@ export default {
   // components: { Treeselect },
   data() {
     return {
-      treeData1:[],
+      //类型名称
+      typeName: undefined,
+      treeData:[],
       showFlag:false,
       // 选中数组
       selectedItemId: undefined,
@@ -138,6 +146,14 @@ export default {
     this.getEquipmentType();
   },
 
+  watch: {
+    // 根据名称筛选部门树
+    typeName(val) {
+      console.log(val);
+      this.$refs.tree.filter(val);
+    },
+  },
+
   methods: {
     // 表单重置
     reset() {
@@ -157,7 +173,6 @@ export default {
     indexMethod(index){
       return index+1 ;
     },
-    //
 
     /** 查询设备编码列表*/
     getList() {
@@ -173,17 +188,17 @@ export default {
     /** 查询分类下拉树结构 */
     getEquipmentType() {
       getEquipmentTypeList().then(response => {
-        console.log(response.rows);
+        this.treeData = response.data;
-        this.treeData1 = response.rows;
-        console.log(this.treeData1);
       });
     },
 
     // 筛选节点
     filterNode(value, data) {
-      console.log(value, data);
+      console.log("value:",value,"data:",data);
       if (!value) return true;
-      return data.label.indexOf(value) !== -1;
+      if(data.equipmentTypeName != null){
+        return data.equipmentTypeName.indexOf(value) !== -1;
+      }
     },
 
     // 节点单击事件
@@ -253,10 +268,7 @@ export default {
     //
     submitEquipmentForm() {
       const data = this.ids;
-      console.log("数据",data);
       const equipmentCode = data.toString();
-      console.log("拆分数据",equipmentCode);
-      console.log("原来的数据",this.queryParams.itemCodeGet);
       if(this.queryParams.itemCodeGet == ""){
         this.queryParams.itemCodeGet = equipmentCode;
       }else{
@@ -264,16 +276,14 @@ export default {
       }
      this.selectedRows = this.queryParams.itemCodeGet;
      this.$emit('onSelected', this.selectedRows);
-     this.queryParams.equipmentTypeCode = null;
+     this.cancelEquipmentForm();
-     this.getList();
-     console.log('111111',this.queryParams.equipmentTypeCode);
-     this.showFlag = false;
      this.queryParams.itemCodeGet = "";
     },
+
     cancelEquipmentForm(){
       this.queryParams.equipmentTypeCode = null;
+      this.typeName = null;
       this.getList();
-         console.log('111111',this.queryParams.equipmentTypeCode);
       this.showFlag = false;
     }
   }

src/views/technology/recipe/single.vue

@@ -8,13 +8,20 @@
     :before-close="cancelEquipmentForm"
   >
     <el-row :gutter="20">
-      <!--分类数据-->
       <el-col :span="5" :xs="24">
-        <el-card >
+        <div class="head-container">
-          <span>请选择设备类型：</span>
+          <el-input
+            v-model="typeName"
+            placeholder="请输入设备类型名称"
+            clearable
+            size="small"
+            prefix-icon="el-icon-search"
+            style="margin-bottom: 20px"
+          />
+        </div>
         <div class="head-container" style="text-align: center">
           <el-tree
-                :data="treeData1"
+            :data="treeData"
             :props = "{id:'equipmentTypeCode',label:'equipmentTypeName'}"
             node-key="id"
             :expand-on-click-node="false"
@@ -24,7 +31,6 @@
             @node-click="handleNodeClick"
           />
         </div>
-        </el-card>
       </el-col>
 
       <!--设备数据-->
@@ -96,7 +102,9 @@ export default {
   // components: { Treeselect },
   data() {
     return {
-      treeData1:[],
+      //类型名称
+      typeName: undefined,
+      treeData:[],
       showFlag:false,
       // 选中数组
       selectedItemId: undefined,
@@ -138,6 +146,14 @@ export default {
     this.getEquipmentType();
   },
 
+  watch: {
+    // 根据名称筛选部门树
+    typeName(val) {
+      console.log(val);
+      this.$refs.tree.filter(val);
+    },
+  },
+
   methods: {
     // 表单重置
     reset() {
@@ -157,7 +173,6 @@ export default {
     indexMethod(index){
       return index+1 ;
     },
-    //
 
     /** 查询设备编码列表*/
     getList() {
@@ -173,17 +188,17 @@ export default {
     /** 查询分类下拉树结构 */
     getEquipmentType() {
       getEquipmentTypeList().then(response => {
-        console.log(response.rows);
+        this.treeData = response.data;
-        this.treeData1 = response.rows;
-        console.log(this.treeData1);
       });
     },
 
     // 筛选节点
     filterNode(value, data) {
-      console.log(value, data);
+      console.log("value:",value,"data:",data);
       if (!value) return true;
-      return data.label.indexOf(value) !== -1;
+      if(data.equipmentTypeName != null){
+        return data.equipmentTypeName.indexOf(value) !== -1;
+      }
     },
 
     // 节点单击事件
@@ -253,10 +268,7 @@ export default {
     //
     submitEquipmentForm() {
       const data = this.ids;
-      console.log("数据",data);
       const equipmentCode = data.toString();
-      console.log("拆分数据",equipmentCode);
-      console.log("原来的数据",this.queryParams.itemCodeGet);
       if(this.queryParams.itemCodeGet == ""){
         this.queryParams.itemCodeGet = equipmentCode;
       }else{
@@ -264,16 +276,14 @@ export default {
       }
      this.selectedRows = this.queryParams.itemCodeGet;
      this.$emit('onSelected', this.selectedRows);
-     this.queryParams.equipmentTypeCode = null;
+     this.cancelEquipmentForm();
-     this.getList();
-     console.log('111111',this.queryParams.equipmentTypeCode);
-     this.showFlag = false;
      this.queryParams.itemCodeGet = "";
     },
+
     cancelEquipmentForm(){
       this.queryParams.equipmentTypeCode = null;
+      this.typeName = null;
       this.getList();
-         console.log('111111',this.queryParams.equipmentTypeCode);
       this.showFlag = false;
     }
   }