优化

mes/qd/src/views/wms/pub/DeviceDialog.vue

@@ -19,22 +19,22 @@
           prefix-icon="el-icon-search"
           class="filter-item"
         /> </el-col>
-      <el-col :span="6" >
-          <el-select
-            v-model="query.workprocedure_id"
-            clearable
-            size="mini"
-            placeholder="全部"
-            class="filter-item"
-            style="width: 200px;"
-            v-show="disablePro"
-          >
-            <el-option
-              v-for="item in workProcedureList"
-              :label="item.workprocedure_name"
-              :value="item.workprocedure_id"
-            />
-          </el-select>
+      <el-col :span="6">
+        <el-select
+          v-show="disablePro"
+          v-model="query.workprocedure_id"
+          clearable
+          size="mini"
+          placeholder="全部"
+          class="filter-item"
+          style="width: 200px;"
+        >
+          <el-option
+            v-for="item in workProcedureList"
+            :label="item.workprocedure_name"
+            :value="item.workprocedure_id"
+          />
+        </el-select>
       </el-col>
       <el-col :span="6">
         <rrOperation />
@@ -79,7 +79,7 @@ import CRUD, { header, presenter } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import pagination from '@crud/Pagination'
 import crudDeviceinfo from '@/api/wms/basedata/em/deviceinfo'
-import crudWorkProcedure from "@/api/wms/basedata/pdm/workProcedure";
+import crudWorkProcedure from '@/api/wms/basedata/pdm/workProcedure'
 
 export default {
   name: 'DeviceDialog',
@@ -91,7 +91,7 @@ export default {
       url: 'api/deviceinfo',
       idField: 'device_id',
       sort: '',
-      query: { device_code: '', workprocedure_id: '' }
+      query: { device_code: '', workprocedure_id: '', is_produceuse: '' }
     })
   },
   dicts: ['IS_OR_NOT'],
@@ -132,9 +132,10 @@ export default {
      * 接受父组件传值
      * @param msg
      */
-    getMsg(msg) {
+    getMsg(msg, msg2) {
       this.disablePro = false
       this.crud.query.workprocedure_id = msg
+      this.crud.query.is_produceuse = msg2
       this.crud.toQuery()
     },
     formatProduceuserName(row, column) {