虚拟大屏数据

mes/qd/src/views/wms/mps/produce/AddDialog.vue

@@ -184,7 +184,7 @@ import crudProduceshiftorder from '@/api/wms/mps/produceshiftorder'
 
 export default {
   name: 'AddDtl',
-  components: {MaterDtl},
+  components: { MaterDtl },
   dicts: ['PDM_BI_SHIFTTYPE', 'MPS_BD_ORDERSTATUS', 'is_used', 'PDM_BI_ORDERTYPE', 'IS_OR_NOT'],
   mixins: [presenter(), header(), crud()],
   props: {

mes/qd/src/views/wms/mps/produce/index.vue

@@ -119,6 +119,23 @@
               class="filter-item"
             />
           </el-form-item>
+          <el-form-item label="是否异常">
+            <el-select
+              v-model="query.is_error"
+              style="width: 200px"
+              clearable
+              filterable
+              placeholder="请选择"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in dict.IS_OR_NOT"
+                :key="item.id"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
           <rrOperation :crud="crud" />
         </el-form>
       </div>
@@ -204,6 +221,7 @@
               size="mini"
               class="filter-item"
               style="width: 200px;"
+              @change="getNotWorkDeviceByWorkproceduceId(form.workprocedure_id)"
             >
               <el-option
                 v-for="item in workprocedureList"
@@ -329,6 +347,22 @@
               />
             </el-select>
           </el-form-item>
+          <el-form-item v-if="crud.status.add" label="生产设备" prop="device_id">
+            <el-select
+              v-model="form.device_id"
+              clearable
+              size="mini"
+              class="filter-item"
+              style="width: 200px;"
+            >
+              <el-option
+                v-for="item in deviceList"
+                :key="item.device_id"
+                :label="item.device_name"
+                :value="item.device_id"
+              />
+            </el-select>
+          </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button type="text" @click="crud.cancelCU">取消</el-button>
@@ -370,6 +404,12 @@
         <el-table-column prop="plan_qty" label="计划数量" />
         <el-table-column prop="real_qty" label="实际数量" />
         <el-table-column prop="report_qty" label="报工数量" />
+        <el-table-column prop="is_error" label="是否异常">
+          <template slot-scope="scope">
+            {{ dict.label.IS_OR_NOT[scope.row.is_error] }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="error_info" label="异常信息" show-overflow-tooltip />
         <el-table-column v-if="false" prop="material_id" label="物料标识" />
         <el-table-column prop="material_code" label="物料编码" width="100" show-overflow-tooltip />
         <el-table-column prop="material_name" label="物料名称" width="100" show-overflow-tooltip />
@@ -500,6 +540,7 @@ export default {
   },
   data() {
     return {
+      deviceList: [],
       classes3: [],
       materType: '01',
       materialShow: false,
@@ -549,6 +590,9 @@ export default {
         ],
         is_canupdate_update: [
           { required: true, message: '不能为空', trigger: 'blur' }
+        ],
+        device_id: [
+          { required: true, message: '不能为空', trigger: 'blur' }
         ]
       }
     }
@@ -562,6 +606,11 @@ export default {
     tableChanged3() {
       this.crud.toQuery()
     },
+    getNotWorkDeviceByWorkproceduceId(workproceduce_id) {
+      crudProduceshiftorder.getNotWorkDeviceByWorkproceduceId({ workproceduce_id: workproceduce_id }).then(res => {
+        this.deviceList = res
+      })
+    },
     getUser() {
       crudProduceshiftorder.getUser().then(res => {
         this.userList = res
@@ -770,7 +819,11 @@ export default {
     },
     [CRUD.HOOK.beforeToAdd]() {
       this.initDataPlan()
-    }
+    },
+    // [CRUD.HOOK.afterToEdit]() {
+    //   const editForm1 = JSON.parse(JSON.stringify(this.form))
+    //   this.getNotWorkDeviceByWorkproceduceId(editForm1.workprocedure_id)
+    // }
   }
 }
 </script>