From b0b8f5bfd5932faad3b44b5d986241a5c89f9d6a Mon Sep 17 00:00:00 2001
From: "ZHOUZ\\Noble'lift" <1014987728@qq.com>
Date: Tue, 2 Aug 2022 13:21:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/wms/mps/produce/AddDialog.vue   |  35 +++---
 mes/qd/src/views/wms/mps/produce/index.vue    | 110 +++++++++---------
 mes/qd/src/views/wms/pdm/device/index.vue     |   6 +-
 3 files changed, 77 insertions(+), 74 deletions(-)

diff --git a/mes/qd/src/views/wms/mps/produce/AddDialog.vue b/mes/qd/src/views/wms/mps/produce/AddDialog.vue
index 22f0f465..16caca29 100644
--- a/mes/qd/src/views/wms/mps/produce/AddDialog.vue
+++ b/mes/qd/src/views/wms/mps/produce/AddDialog.vue
@@ -12,7 +12,7 @@
     <div class="crud-opts2" style="margin-bottom: 5px;">
       <span class="crud-opts-right2">
         <!--左侧插槽-->
-        <slot name="left"/>
+        <slot name="left" />
         <el-button type="primary" @click="insertDtl">新增一行</el-button>
       </span>
     </div>
@@ -23,7 +23,7 @@
       border
       :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
     >
-      <el-table-column type="index" label="序号" width="50" align="center"/>
+      <el-table-column type="index" label="序号" width="50" align="center" />
       <el-table-column align="center" label="操作" width="100" fixed="right">
         <template scope="scope">
           <el-button
@@ -70,22 +70,22 @@
 
       <el-table-column prop="produce_date" label="生产日期" align="center" width="250px">
         <template slot-scope="scope">
-          <el-date-picker v-model="scope.row.produce_date" type="date" value-format="yyyy-MM-dd"/>
+          <el-date-picker v-model="scope.row.produce_date" type="date" value-format="yyyy-MM-dd" />
         </template>
       </el-table-column>
-      <el-table-column v-if="false" prop="material_id" label="物料标识" align="center"/>
+      <el-table-column v-if="false" prop="material_id" label="物料标识" align="center" />
       <el-table-column prop="material_code" label="物料编码" align="center" width="190px">
         <template scope="scope">
           <el-input v-model="scope.row.material_code" disabled class="input-with-select">
-            <el-button slot="append" icon="el-icon-plus" @click="queryMater(scope.$index, scope.row)"/>
+            <el-button slot="append" icon="el-icon-plus" @click="queryMater(scope.$index, scope.row)" />
           </el-input>
         </template>
       </el-table-column>
-      <el-table-column prop="material_name" label="物料名称" align="center" width="250px"/>
-      <el-table-column prop="material_spec" label="物料规格" align="center" width="150px"/>
+      <el-table-column prop="material_name" label="物料名称" align="center" width="250px" />
+      <el-table-column prop="material_spec" label="物料规格" align="center" width="150px" />
       <el-table-column show-overflow-tooltip prop="plan_qty" label="计划数量" align="center" width="100px">
         <template scope="scope">
-          <el-input v-show="!scope.row.edit" v-model="scope.row.plan_qty" size="mini"/>
+          <el-input v-show="!scope.row.edit" v-model="scope.row.plan_qty" size="mini" />
           <span v-show="scope.row.edit">{{ scope.row.plan_qty }}</span>
         </template>
       </el-table-column>
@@ -117,7 +117,7 @@
       </el-table-column>
       <el-table-column show-overflow-tooltip prop="sale_id" label="销售单标识" align="center" width="150px">
         <template scope="scope">
-          <el-input v-model="scope.row.sale_id"/>
+          <el-input v-model="scope.row.sale_id" />
         </template>
       </el-table-column>
       <el-table-column show-overflow-tooltip prop="is_needmove" label="是否搬运" align="center" width="150px">
@@ -147,21 +147,25 @@
       <el-button type="text" @click="crud.cancelCU">取消</el-button>
       <el-button :loading="crud.cu === 2" type="primary" @click="submit">确认</el-button>
     </div>
-    <MaterDtl :dialog-show.sync="materialShow" :is-single="true" :mater-opt-code="materType"
-              @setMaterValue="setMaterValue"/>
+    <MaterDtl
+      :dialog-show.sync="materialShow"
+      :is-single="true"
+      :mater-opt-code="materType"
+      @setMaterValue="setMaterValue"
+    />
   </el-dialog>
 </template>
 
 <script>
 
-import CRUD, {crud, header, presenter} from '@crud/crud'
+import CRUD, { crud, header, presenter } from '@crud/crud'
 import MaterDtl from '@/views/wms/pub/MaterDialog'
-import crudWorkProcedure from "@/api/wms/basedata/pdm/workProcedure"
+import crudWorkProcedure from '@/api/wms/basedata/pdm/workProcedure'
 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: {
@@ -252,8 +256,7 @@ export default {
     },
     deleteRow(index, rows) {
       rows.splice(index, 1)
-    }
-    ,
+    },
     submit() {
       for (let i = 0; i < this.tableData.length; i++) {
         const row = this.tableData[i]
diff --git a/mes/qd/src/views/wms/mps/produce/index.vue b/mes/qd/src/views/wms/mps/produce/index.vue
index 39a5445f..e33742a6 100644
--- a/mes/qd/src/views/wms/mps/produce/index.vue
+++ b/mes/qd/src/views/wms/mps/produce/index.vue
@@ -118,7 +118,7 @@
               class="filter-item"
             />
           </el-form-item>
-          <rrOperation :crud="crud"/>
+          <rrOperation :crud="crud" />
         </el-form>
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
@@ -192,10 +192,10 @@
             </el-select>
           </el-form-item>
           <el-form-item label="生产日期" prop="produce_date">
-            <el-date-picker v-model="form.produce_date" type="date" value-format="yyyy-MM-dd" style="width: 200px;"/>
+            <el-date-picker v-model="form.produce_date" type="date" value-format="yyyy-MM-dd" style="width: 200px;" />
           </el-form-item>
           <el-form-item v-if="false" label="物料标识" prop="material_id">
-            <el-input v-model="form.material_id" style="width: 200px;"/>
+            <el-input v-model="form.material_id" style="width: 200px;" />
           </el-form-item>
           <el-form-item label="物料编码" prop="material_code">
             <el-input
@@ -221,10 +221,10 @@
             />
           </el-form-item>
           <el-form-item label="物料单重" prop="material_weight">
-            <el-input v-model="form.material_weight" style="width: 200px;"/>
+            <el-input v-model="form.material_weight" style="width: 200px;" />
           </el-form-item>
           <el-form-item label="计划数量" prop="plan_qty">
-            <el-input v-model="form.plan_qty" style="width: 200px;"/>
+            <el-input v-model="form.plan_qty" style="width: 200px;" />
           </el-form-item>
           <el-form-item label="计划开始时间" prop="planproducestart_date">
             <el-date-picker
@@ -243,10 +243,10 @@
             />
           </el-form-item>
           <el-form-item v-if="crud.status.edit" label="报工数量" prop="report_qty">
-            <el-input v-model="form.report_qty" style="width: 200px;"/>
+            <el-input v-model="form.report_qty" style="width: 200px;" />
           </el-form-item>
           <el-form-item v-if="crud.status.edit" label="实际数量" prop="report_qty">
-            <el-input v-model="form.real_qty" style="width: 200px;"/>
+            <el-input v-model="form.real_qty" style="width: 200px;" />
           </el-form-item>
           <el-form-item label="班次类型" prop="shift_type_scode">
             <el-select
@@ -265,7 +265,7 @@
             </el-select>
           </el-form-item>
           <el-form-item label="销售单标识">
-            <el-input v-model="form.sale_id" style="width: 200px;"/>
+            <el-input v-model="form.sale_id" style="width: 200px;" />
           </el-form-item>
           <el-form-item label="是否搬运" prop="is_needmove">
             <el-radio
@@ -301,14 +301,14 @@
         style="width: 100%;"
         @selection-change="crud.selectionChangeHandler"
       >
-        <el-table-column type="selection" width="55"/>
-        <el-table-column v-if="false" prop="produceorder_id" label="生产班次工单标识"/>
+        <el-table-column type="selection" width="55" />
+        <el-table-column v-if="false" prop="produceorder_id" label="生产班次工单标识" />
         <el-table-column prop="produceorder_code" label="工单编号" width="140px">
           <template slot-scope="scope">
             <el-link type="warning" @click="toView(scope.row)">{{ scope.row.produceorder_code }}</el-link>
           </template>
         </el-table-column>
-        <el-table-column prop="producedeviceorder_code" label="机台工单号" width="100px"/>
+        <el-table-column prop="producedeviceorder_code" label="机台工单号" width="100px" />
         <el-table-column prop="order_status" label="工单状态">
           <template slot-scope="scope">
             {{ dict.label.MPS_BD_ORDERSTATUS[scope.row.order_status] }}
@@ -319,22 +319,22 @@
             {{ dict.label.PDM_BI_SHIFTTYPE[scope.row.shift_type_scode] }}
           </template>
         </el-table-column>
-        <el-table-column v-if="false" prop="workprocedure_id" label="工序标识"/>
-        <el-table-column prop="produce_date" label="生产日期" width="100px"/>
-        <el-table-column prop="plan_qty" label="计划数量"/>
-        <el-table-column prop="real_qty" label="实际数量"/>
-        <el-table-column prop="report_qty" label="报工数量"/>
-        <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/>
-        <el-table-column prop="material_spec" label="物料规格" width="100" show-overflow-tooltip/>
-        <el-table-column prop="sale_id" label="销售单标识" width="100" show-overflow-tooltip/>
-        <el-table-column prop="class_name" label="产品系列" width="100" show-overflow-tooltip/>
-        <el-table-column prop="material_weight" label="物料单重" :formatter="rounding"/>
-        <el-table-column prop="planproducestart_date" label="计划生产开始时间" width="150"/>
-        <el-table-column prop="planproduceend_date" label="计划生产结束时间" width="150"/>
-        <el-table-column prop="realproducestart_date" label="实际生产开始时间" width="150"/>
-        <el-table-column prop="realproduceend_date" label="实际生产结束时间" width="150"/>
+        <el-table-column v-if="false" prop="workprocedure_id" label="工序标识" />
+        <el-table-column prop="produce_date" label="生产日期" width="100px" />
+        <el-table-column prop="plan_qty" label="计划数量" />
+        <el-table-column prop="real_qty" label="实际数量" />
+        <el-table-column prop="report_qty" label="报工数量" />
+        <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 />
+        <el-table-column prop="material_spec" label="物料规格" width="100" show-overflow-tooltip />
+        <el-table-column prop="sale_id" label="销售单标识" width="100" show-overflow-tooltip />
+        <el-table-column prop="class_name" label="产品系列" width="100" show-overflow-tooltip />
+        <el-table-column prop="material_weight" label="物料单重" :formatter="rounding" />
+        <el-table-column prop="planproducestart_date" label="计划生产开始时间" width="150" />
+        <el-table-column prop="planproduceend_date" label="计划生产结束时间" width="150" />
+        <el-table-column prop="realproducestart_date" label="实际生产开始时间" width="150" />
+        <el-table-column prop="realproduceend_date" label="实际生产结束时间" width="150" />
         <el-table-column prop="is_needmove" label="是否搬运">
           <template slot-scope="scope">
             {{ dict.label.IS_OR_NOT[scope.row.is_needmove] }}
@@ -345,10 +345,10 @@
             {{ dict.label.PDM_BI_ORDERTYPE[scope.row.order_type_scode] }}
           </template>
         </el-table-column>
-        <el-table-column prop="create_name" label="创建人"/>
-        <el-table-column prop="create_time" label="创建时间" width="150"/>
-        <el-table-column prop="update_optname" label="修改人"/>
-        <el-table-column prop="update_time" label="修改时间" width="150"/>
+        <el-table-column prop="create_name" label="创建人" />
+        <el-table-column prop="create_time" label="创建时间" width="150" />
+        <el-table-column prop="update_optname" label="修改人" />
+        <el-table-column prop="update_time" label="修改时间" width="150" />
         <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
           <template slot-scope="scope">
             <udOperation
@@ -359,7 +359,7 @@
         </el-table-column>
       </el-table>
       <!--分页组件-->
-      <pagination/>
+      <pagination />
     </div>
     <MaterDtl
       :dialog-show.sync="materialShow"
@@ -367,21 +367,21 @@
       :mater-opt-code="materType"
       @setMaterValue="setMaterValue"
     />
-    <ViewDialog ref="child3"/>
-    <AddDialog :dialog-show.sync="addShow" @AddChanged="querytable"/>
+    <ViewDialog ref="child3" />
+    <AddDialog :dialog-show.sync="addShow" @AddChanged="querytable" />
   </div>
 </template>
 
 <script>
 import crudProduceshiftorder from '@/api/wms/mps/produceshiftorder'
-import CRUD, {presenter, header, form, crud} from '@crud/crud'
+import CRUD, { presenter, header, form, crud } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
 import crudWorkProcedure from '@/api/wms/basedata/pdm/workProcedure'
 import MaterDtl from '@/views/wms/pub/MaterDialog'
-import Treeselect, {LOAD_CHILDREN_OPTIONS} from '@riophae/vue-treeselect'
+import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 import ViewDialog from '@/views/wms/mps/produce/ViewDialog'
 import crudClassstandard from '@/api/wms/basedata/master/classstandard'
@@ -424,7 +424,7 @@ const defaultForm = {
 }
 export default {
   name: 'Produceshiftorder',
-  components: {AddDialog, pagination, crudOperation, rrOperation, udOperation, MaterDtl, Treeselect, ViewDialog},
+  components: { AddDialog, pagination, crudOperation, rrOperation, udOperation, MaterDtl, Treeselect, ViewDialog },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   dicts: ['PDM_BI_SHIFTTYPE', 'MPS_BD_ORDERSTATUS', 'is_used', 'PDM_BI_ORDERTYPE', 'IS_OR_NOT'],
   cruds() {
@@ -440,7 +440,7 @@ export default {
       query: {
         order_status: '-1'
       },
-      crudMethod: {...crudProduceshiftorder}
+      crudMethod: { ...crudProduceshiftorder }
     })
   },
   data() {
@@ -454,40 +454,40 @@ export default {
       permission: {},
       rules: {
         produceorder_code: [
-          {required: true, message: '生产班次工单编号不能为空', trigger: 'blur'}
+          { required: true, message: '生产班次工单编号不能为空', trigger: 'blur' }
         ],
         producedeviceorder_code: [
-          {required: true, message: '机台工单号不能为空', trigger: 'blur'}
+          { required: true, message: '机台工单号不能为空', trigger: 'blur' }
         ],
         shift_type_scode: [
-          {required: true, message: '班次类型不能为空', trigger: 'blur'}
+          { required: true, message: '班次类型不能为空', trigger: 'blur' }
         ],
         workprocedure_id: [
-          {required: true, message: '工序标识不能为空', trigger: 'blur'}
+          { required: true, message: '工序标识不能为空', trigger: 'blur' }
         ],
         produce_date: [
-          {required: true, message: '生产日期不能为空', trigger: 'blur'}
+          { required: true, message: '生产日期不能为空', trigger: 'blur' }
         ],
         plan_qty: [
-          {required: true, message: '计划数量不能为空', trigger: 'blur'}
+          { required: true, message: '计划数量不能为空', trigger: 'blur' }
         ],
         material_code: [
-          {required: true, message: '物料编码不能为空', trigger: 'change'}
+          { required: true, message: '物料编码不能为空', trigger: 'change' }
         ],
         planproducestart_date: [
-          {required: true, message: '计划生产开始时间不能为空', trigger: 'blur'}
+          { required: true, message: '计划生产开始时间不能为空', trigger: 'blur' }
         ],
         order_status: [
-          {required: true, message: '工单状态不能为空', trigger: 'blur'}
+          { required: true, message: '工单状态不能为空', trigger: 'blur' }
         ],
         is_needmove: [
-          {required: true, message: '是否搬运不能为空', trigger: 'blur'}
+          { required: true, message: '是否搬运不能为空', trigger: 'blur' }
         ],
         order_type_scode: [
-          {required: true, message: '工单类型不能为空', trigger: 'blur'}
+          { required: true, message: '工单类型不能为空', trigger: 'blur' }
         ],
         is_canupdate_update: [
-          {required: true, message: '不能为空', trigger: 'blur'}
+          { required: true, message: '不能为空', trigger: 'blur' }
         ]
       }
     }
@@ -521,10 +521,10 @@ export default {
       })
     },
     // 获取子节点数据
-    loadChildNodes({action, parentNode, callback}) {
+    loadChildNodes({ action, parentNode, callback }) {
       if (action === LOAD_CHILDREN_OPTIONS) {
-        crudClassstandard.getClass({pid: parentNode.id}).then(res => {
-          parentNode.children = res.content.map(function (obj) {
+        crudClassstandard.getClass({ pid: parentNode.id }).then(res => {
+          parentNode.children = res.content.map(function(obj) {
             if (obj.hasChildren) {
               obj.children = null
             }
@@ -567,7 +567,7 @@ export default {
     },
     // 强制完成
     forceFinish(data) {
-      crudProduceshiftorder.forceFinish({row: data}).then(res => {
+      crudProduceshiftorder.forceFinish({ row: data }).then(res => {
         this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
         this.crud.toQuery()
       })
@@ -599,7 +599,7 @@ export default {
     },
     // 下发
     submits(row) {
-      crudProduceshiftorder.submits({produceorder_id: row.produceorder_id}).then(res => {
+      crudProduceshiftorder.submits({ produceorder_id: row.produceorder_id }).then(res => {
         this.crud.notify('下发成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
         this.crud.toQuery()
       })
diff --git a/mes/qd/src/views/wms/pdm/device/index.vue b/mes/qd/src/views/wms/pdm/device/index.vue
index f5b8fe62..18c07e80 100644
--- a/mes/qd/src/views/wms/pdm/device/index.vue
+++ b/mes/qd/src/views/wms/pdm/device/index.vue
@@ -14,7 +14,7 @@
           class="filter-item"
         />
         <label class="el-form-item-label">所属工序</label>
-        <el-select v-model="query.workprocedure_id" filterable clearable  size="small" placeholder="所属工序" class="filter-item" style="width: 220px" @change="changeHeader(query.search, query.workprocedure_id)">
+        <el-select v-model="query.workprocedure_id" filterable clearable size="small" placeholder="所属工序" class="filter-item" style="width: 220px" @change="changeHeader(query.search, query.workprocedure_id)">
           <el-option
             v-for="item in workList"
             :key="item.workprocedure_id"
@@ -73,7 +73,7 @@
             <el-input v-model="form.device_model" style="width: 370px;" />
           </el-form-item>
           <el-form-item label="设备产能">
-            <el-input type="number" oninput="value = value.replace(/[^\d]/g, '')" v-model="form.productivity" style="width: 370px;" />
+            <el-input v-model="form.productivity" type="number" oninput="value = value.replace(/[^\d]/g, '')" style="width: 370px;" />
           </el-form-item>
           <el-form-item label="所属工序">
             <el-select v-model="form.workprocedure_id" filterable clearable class="filter-item" style="width: 370px">
@@ -157,7 +157,7 @@ import pagination from '@crud/Pagination'
 import DeviceItemDialog from '@/views/wms/pdm/device/DeviceItemDialog'
 import DeviceInfoDialog from '@/views/wms/pdm/device/DeviceInfoDialog'
 import CopyDialog from '@/views/wms/pdm/device/CopyDialog'
-import crudSectattr from "@/api/wms/basedata/st/sectattr";
+import crudSectattr from '@/api/wms/basedata/st/sectattr'
 
 const defaultForm = { device_id: null, device_code: null, device_name: null, device_model: null, workprocedure_id: null, extend_code: null, devicebill_id: null, remark: null, is_active: null, create_id: null, create_name: null, create_time: null, is_delete: null, productivity: null }
 export default {