工序维护、工单管理、区域管理、点位管理、任务管理等bug修复与添加生产区域判断

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

@@ -10,6 +10,23 @@
           label-width="90px"
           label-suffix=":"
         >
+          <el-form-item label="生产区域">
+            <el-select
+              v-model="query.product_area"
+              clearable
+              filterable
+              size="mini"
+              placeholder="区域类型"
+              class="filter-item"
+              @change="crud.toQuery()"
+            >
+              <el-option
+                v-for="item in dict.product_area"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
           <!-- 搜索 -->
           <el-form-item label="工单编号">
             <el-input
@@ -180,6 +197,20 @@
         width="1200px"
       >
         <el-form ref="form" :inline="true" :model="form" :rules="rules" size="mini" label-width="160px">
+          <el-form-item label="生产区域" prop="product_area">
+            <el-select
+              v-model="form.product_area"
+              placeholder=""
+              style="width: 200px"
+            >
+              <el-option
+                v-for="item in dict.product_area"
+                :key="item.id"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
           <el-form-item label="所属工序" prop="workprocedure_id">
             <el-select
               v-model="form.workprocedure_id"
@@ -324,7 +355,7 @@
             <el-link type="warning" @click="toView(scope.row)">{{ scope.row.workorder_code }}</el-link>
           </template>
         </el-table-column>
-        <el-table-column prop="shift_type_scode" label="班次类型" >
+        <el-table-column prop="shift_type_scode" label="班次类型">
           <template slot-scope="scope">
             {{ dict.label.PDM_BI_SHIFTTYPE[scope.row.shift_type_scode] }}
           </template>
@@ -334,16 +365,16 @@
         <el-table-column prop="plan_qty" label="计划数量" />
         <el-table-column prop="real_qty" label="实际数量" />
         <el-table-column prop="person_name" label="操作员" />
-        <el-table-column prop="person_real_qty" label="人员实际数量" width="100" show-overflow-tooltip/>
-        <el-table-column prop="dq_real_qty" label="电气实际数量"  width="100" show-overflow-tooltip/>
-        <el-table-column prop="material_name" label="物料名称" width="120" show-overflow-tooltip/>
-        <el-table-column prop="workprocedure_name" label="工序名称" width="120" show-overflow-tooltip/>
-        <el-table-column prop="material_weight" label="物料单重" width="100"/>
-        <el-table-column prop="planproducestart_date" label="计划开始时间" width="100" show-overflow-tooltip/>
-        <el-table-column prop="planproduceend_date" label="计划结束时间" width="100" show-overflow-tooltip/>
-        <el-table-column prop="realproducestart_date" label="实际开始时间" width="100" show-overflow-tooltip/>
-        <el-table-column prop="realproduceend_date" label="实际结束时间" width="100" show-overflow-tooltip/>
-        <el-table-column prop="current_device_code" label="当前设备编码" width="100" show-overflow-tooltip/>
+        <el-table-column prop="person_real_qty" label="人员实际数量" width="100" show-overflow-tooltip />
+        <el-table-column prop="dq_real_qty" label="电气实际数量" width="100" show-overflow-tooltip />
+        <el-table-column prop="material_name" label="物料名称" width="120" show-overflow-tooltip />
+        <el-table-column prop="workprocedure_name" label="工序名称" width="120" show-overflow-tooltip />
+        <el-table-column prop="material_weight" label="物料单重" width="100" />
+        <el-table-column prop="planproducestart_date" label="计划开始时间" width="100" show-overflow-tooltip />
+        <el-table-column prop="planproduceend_date" label="计划结束时间" width="100" show-overflow-tooltip />
+        <el-table-column prop="realproducestart_date" label="实际开始时间" width="100" show-overflow-tooltip />
+        <el-table-column prop="realproduceend_date" label="实际结束时间" width="100" show-overflow-tooltip />
+        <el-table-column prop="current_device_code" label="当前设备编码" width="100" show-overflow-tooltip />
         <el-table-column prop="is_canupdate_update" label="操作工是否允许修改报工数量" width="200" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ dict.label.IS_OR_NOT[scope.row.is_canupdate_update] }}
@@ -354,7 +385,7 @@
             {{ dict.label.MPS_BD_ORDERSTATUS[scope.row.workorder_status] }}
           </template>
         </el-table-column>
-        <el-table-column prop="is_needmove" label="是否搬运" >
+        <el-table-column prop="is_needmove" label="是否搬运">
           <template slot-scope="scope">
             {{ dict.label.IS_OR_NOT[scope.row.is_needmove] }}
           </template>
@@ -364,17 +395,17 @@
             {{ dict.label.WORKORDER_CREATE_TYPE[scope.row.create_type] }}
           </template>
         </el-table-column>
-        <el-table-column prop="is_error" 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 prop="error_info" label="异常信息" show-overflow-tooltip />
         <el-table-column prop="remark" label="备注" />
-        <el-table-column prop="create_name" label="创建人" show-overflow-tooltip/>
+        <el-table-column prop="create_name" label="创建人" show-overflow-tooltip />
         <el-table-column prop="create_time" label="创建时间" show-overflow-tooltip />
-        <el-table-column prop="update_name" label="修改人" show-overflow-tooltip/>
-        <el-table-column prop="update_time" label="修改时间" show-overflow-tooltip/>
+        <el-table-column prop="update_name" label="修改人" show-overflow-tooltip />
+        <el-table-column prop="update_time" label="修改时间" show-overflow-tooltip />
         <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
           <template slot-scope="scope">
             <udOperation
@@ -422,7 +453,7 @@ const defaultForm = {
   workorder_code: null,
   shift_type_scode: null,
   workprocedure_id: null,
-  product_area: null,
+  product_area: 'A1',
   plan_qty: null,
   real_qty: null,
   person_real_qty: null,
@@ -455,10 +486,10 @@ export default {
   name: 'Produceshiftorder',
   components: { AddDialog, pagination, crudOperation, rrOperation, udOperation, MaterDtl, Treeselect, ViewDialog, UploadDialog, ReplaceDeviceDialog },
   mixins: [presenter(), header(), form(defaultForm), crud()],
-  dicts: ['PDM_BI_SHIFTTYPE', 'MPS_BD_ORDERSTATUS', 'WORKORDER_CREATE_TYPE', 'is_used', 'PDM_BI_ORDERTYPE', 'IS_OR_NOT'],
+  dicts: ['PDM_BI_SHIFTTYPE', 'MPS_BD_ORDERSTATUS', 'WORKORDER_CREATE_TYPE', 'is_used', 'PDM_BI_ORDERTYPE', 'IS_OR_NOT', 'product_area'],
   cruds() {
     return CRUD({
-      title: '工单', url: 'api/produceWorkorder', idField: 'produceorder_id', sort: 'produceorder_id,desc',
+      title: '工单', url: 'api/produceWorkorder', idField: 'workorder_id', sort: 'workorder_id,desc',
       optShow: {
         add: true,
         edit: false,
@@ -468,6 +499,7 @@ export default {
       },
       query: {
         order_status: '-1',
+        product_area: 'A1',
         is_error: '0'
       },
       crudMethod: { ...crudProduceshiftorder }
@@ -739,7 +771,7 @@ export default {
     },
     [CRUD.HOOK.beforeToAdd]() {
       this.initDataPlan()
-    },
+    }
     // [CRUD.HOOK.afterToEdit]() {
     //   const editForm1 = JSON.parse(JSON.stringify(this.form))
     //   this.getNotWorkDeviceByWorkproceduceId(editForm1.workprocedure_id)