From 8543e7b152926540b02308cddf6de0f11652a883 Mon Sep 17 00:00:00 2001
From: ludj <ldj_willow@163.com>
Date: Mon, 26 Jun 2023 14:23:38 +0800
Subject: [PATCH] =?UTF-8?q?rev:=20=E5=B7=A5=E5=8D=95=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E3=80=81=E4=BB=BB=E5=8A=A1=E7=AE=A1=E7=95=8C=E9=9D=A2=E5=88=97?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mes/qd/src/main.js                            |   4 -
 .../product_manage/workorder/ViewDialog.vue   |   8 +-
 .../wms/product_manage/workorder/index.vue    | 138 ++++++++++--------
 .../views/wms/scheduler_manage/task/index.vue |   8 +-
 4 files changed, 88 insertions(+), 70 deletions(-)

diff --git a/mes/qd/src/main.js b/mes/qd/src/main.js
index ce679a61..9dc4b879 100644
--- a/mes/qd/src/main.js
+++ b/mes/qd/src/main.js
@@ -5,8 +5,6 @@ import Cookies from 'js-cookie'
 import 'normalize.css/normalize.css'
 
 import Element from 'element-ui'
-// 列自适应宽度:https://github.com/legendJaden/AFTableColumn
-import AFTableColumn from 'af-table-column'
 
 import 'font-awesome/css/font-awesome.css'
 
@@ -44,8 +42,6 @@ import 'jquery'
 import VueBus from 'vue-bus'
 Vue.use(scroll)
 
-Vue.use(AFTableColumn)
-
 Vue.use(VueHighlightJS)
 Vue.use(mavonEditor)
 Vue.use(permission)
diff --git a/mes/qd/src/views/wms/product_manage/workorder/ViewDialog.vue b/mes/qd/src/views/wms/product_manage/workorder/ViewDialog.vue
index 94965ce2..00d4faac 100644
--- a/mes/qd/src/views/wms/product_manage/workorder/ViewDialog.vue
+++ b/mes/qd/src/views/wms/product_manage/workorder/ViewDialog.vue
@@ -144,20 +144,20 @@
       :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
     >
       <el-table-column prop="workorder_code" label="工单编号" />
-      <el-table-column prop="seq_number" label="报工顺序号" />
+      <el-table-column prop="seq_number" label="报工顺序" :min-width="flexWidth('seq_number',tableData,'报工顺序')"/>
       <el-table-column prop="shift_type_scode" label="班次类型">
         <template slot-scope="scope">
           {{ dict.label.PDM_BI_SHIFTTYPE[scope.row.shift_type_scode] }}
         </template>
       </el-table-column>
       <el-table-column prop="product_area" label="生产车间" />
-      <el-table-column prop="device_code" label="设备编码" align="center" />
+      <el-table-column prop="device_code" label="设备编码" align="center" :min-width="flexWidth('device_code',tableData,'设备编码')"/>
       <el-table-column prop="needproduct_qty" label="待生产数" />
       <el-table-column prop="report_qty" label="报工数量" />
       <el-table-column prop="nok_qty" label="报废数量" />
       <el-table-column prop="repare_qty" label="报修数量" />
-      <el-table-column prop="person_finish_qty" label="人员期末数量" />
-      <el-table-column prop="operatetime_start" label="开工时间" />
+      <el-table-column prop="person_finish_qty" label="人员期末数量" :min-width="flexWidth('person_finish_qty',tableData,'人员期末数量')"/>
+      <el-table-column prop="operatetime_start" label="开工时间" :min-width="flexWidth('operatetime_start',tableData,'开工时间')"/>
       <el-table-column prop="operatetime_end" label="完工时间" />
       <el-table-column prop="report_status" label="报工状态" >
         <template slot-scope="scope">
diff --git a/mes/qd/src/views/wms/product_manage/workorder/index.vue b/mes/qd/src/views/wms/product_manage/workorder/index.vue
index 304161f1..99349977 100644
--- a/mes/qd/src/views/wms/product_manage/workorder/index.vue
+++ b/mes/qd/src/views/wms/product_manage/workorder/index.vue
@@ -80,17 +80,6 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="生产日期">
-            <el-date-picker
-              v-model="query.createTime"
-              type="daterange"
-              value-format="yyyy-MM-dd"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              :default-time="['00:00:00','23:59:59']"
-              @change="crud.toQuery"
-            />
-          </el-form-item>
           <el-form-item label="班次类型">
             <el-select
               v-model="query.shift_type_scode"
@@ -108,6 +97,17 @@
               />
             </el-select>
           </el-form-item>
+          <el-form-item label="生产日期">
+            <el-date-picker
+              v-model="query.createTime"
+              type="daterange"
+              value-format="yyyy-MM-dd"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              :default-time="['00:00:00','23:59:59']"
+              @change="crud.toQuery"
+            />
+          </el-form-item>
           <el-form-item label="物料系列" style="height: 20px;">
             <treeselect
               v-model="query.product_series"
@@ -138,7 +138,7 @@
               @change="crud.toQuery"
             />
           </el-form-item>
-          <rrOperation :crud="crud" />
+          <rrOperation :crud="crud"/>
         </el-form>
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
@@ -226,7 +226,7 @@
         :title="crud.status.title"
         width="1200px"
       >
-        <el-form ref="form" :inline="true" :model="form" :rules="rules" size="mini" label-width="160px">
+        <el-form ref="form" :inline="true" :model="form" :rules="rules" size="mini" label-width="160px" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;">
           <el-form-item label="生产车间" prop="product_area">
             <el-select
               v-model="form.product_area"
@@ -274,7 +274,7 @@
             </el-select>
           </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
@@ -300,10 +300,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
@@ -322,7 +322,7 @@
             />
           </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
@@ -342,7 +342,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
@@ -387,9 +387,9 @@
         style="width: 100%;"
         @selection-change="crud.selectionChangeHandler"
       >
-        <el-table-column type="selection" width="55" />
-        <el-table-column v-if="false" prop="workorder_id" label="生产班次工单标识" />
-        <el-table-column prop="workorder_code" label="工单编号" width="140px">
+        <el-table-column type="selection" width="55"/>
+        <el-table-column v-if="false" prop="workorder_id" label="生产班次工单标识"/>
+        <el-table-column prop="workorder_code" label="工单编号" :min-width="flexWidth('workorder_code',crud.data,'工单编号')">
           <template slot-scope="scope">
             <el-link type="warning" @click="toView(scope.row)">{{ scope.row.workorder_code }}</el-link>
           </template>
@@ -400,44 +400,51 @@
           </template>
         </el-table-column>
         <!--        <el-table-column prop="workprocedure_code" label="工序编码" />-->
-        <el-table-column prop="product_area" label="生产车间" />
-        <el-table-column prop="plan_qty" label="计划数量" />
-        <el-table-column prop="outupperlimit_qty" label="每筐数量" />
-        <el-table-column prop="dq_real_qty" label="电气实时数" width="100" show-overflow-tooltip />
-        <el-table-column prop="real_qty" label="报工总数" />
-        <el-table-column prop="material_spec" label="物料规格" width="120" show-overflow-tooltip />
-        <el-table-column prop="device_code" label="当前设备编码" width="100" show-overflow-tooltip />
-        <el-table-column prop="workprocedure_name" label="工序名称" width="120" show-overflow-tooltip />
-        <el-table-column prop="material_weight" label="物料单重" width="100" :formatter="crud.formatQlNum4" />
-        <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="is_canupdate_update" label="允许修改报工数" :formatter="formatBoolean" width="200" show-overflow-tooltip />
-        <el-table-column prop="is_needmove" label="是否搬运" :formatter="formatBoolean" />
+        <el-table-column prop="product_area" label="生产车间"/>
+        <el-table-column prop="plan_qty" label="计划数量"/>
+        <el-table-column prop="outupperlimit_qty" label="满筐数量"/>
+        <el-table-column prop="dq_real_qty" label="电气实时数" width="100" show-overflow-tooltip/>
+        <el-table-column prop="real_qty" label="报工总数"/>
+        <el-table-column prop="material_code" label="物料编码" :min-width="flexWidth('material_code',crud.data,'物料编码')"/>
+        <el-table-column prop="material_spec" label="物料规格" :min-width="flexWidth('material_spec',crud.data,'物料规格')"/>
+        <el-table-column prop="device_code" label="当前设备编码" :min-width="flexWidth('device_code',crud.data,'当前设备编码')"/>
+        <el-table-column prop="workprocedure_name" label="工序名称"
+                         :min-width="flexWidth('workprocedure_name',crud.data,'工序名称')"/>
+        <el-table-column prop="material_weight" label="物料单重" width="100" :formatter="crud.formatQlNum4"/>
+        <el-table-column prop="planproducestart_date" label="计划开始时间"
+                         :min-width="flexWidth('planproducestart_date',crud.data,'计划开始时间')"/>
+        <el-table-column prop="planproduceend_date" label="计划结束时间"
+                         :min-width="flexWidth('planproduceend_date',crud.data,'计划结束时间')"/>
+        <el-table-column prop="realproducestart_date" label="实际开始时间"
+                         :min-width="flexWidth('realproducestart_date',crud.data,'实际开始时间')"/>
+        <el-table-column prop="realproduceend_date" label="实际结束时间"
+                         :min-width="flexWidth('realproduceend_date',crud.data,'实际结束时间')"/>
+        <el-table-column prop="is_canupdate_update" label="允许修改报工数" :formatter="formatBoolean" width="200"
+                         show-overflow-tooltip/>
+        <el-table-column prop="is_needmove" label="是否搬运" :formatter="formatBoolean"/>
         <el-table-column prop="shift_type_scode" label="班次类型">
           <template slot-scope="scope">
             {{ dict.label.PDM_BI_SHIFTTYPE[scope.row.shift_type_scode] }}
           </template>
         </el-table-column>
-        <el-table-column prop="create_type" label="创建类型" show-overflow-tooltip>
+        <el-table-column prop="create_type" label="创建类型"  width="100">
           <template slot-scope="scope">
             {{ dict.label.WORKORDER_CREATE_TYPE[scope.row.create_type] }}
           </template>
         </el-table-column>
-        <el-table-column prop="is_error" :formatter="formatBoolean" label="是否异常" />
-        <el-table-column prop="error_info" label="异常信息" show-overflow-tooltip />
-        <el-table-column prop="remark" label="备注" />
-        <el-table-column prop="nok_qty" label="报废总数" />
-        <el-table-column prop="report_qty" label="报修总数" />
-        <el-table-column prop="person_real_qty" label="人员实际数量" width="100" show-overflow-tooltip />
-        <el-table-column prop="current_produce_person_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="down_name" label="下发人" show-overflow-tooltip />
-        <el-table-column prop="down_time" label="下发时间" show-overflow-tooltip />
-        <el-table-column prop="confirm_name" label="完工人" show-overflow-tooltip />
-        <el-table-column prop="confirm_time" label="完工时间" show-overflow-tooltip />
+        <el-table-column prop="is_error" :formatter="formatBoolean" label="是否异常"/>
+        <el-table-column prop="error_info" label="异常信息" show-overflow-tooltip/>
+        <el-table-column prop="remark" label="备注"/>
+        <el-table-column prop="nok_qty" label="报废总数"/>
+        <el-table-column prop="report_qty" label="报修总数"/>
+        <el-table-column prop="person_real_qty" label="人员实际数量" width="100" show-overflow-tooltip/>
+        <el-table-column prop="current_produce_person_name" label="操作工" show-overflow-tooltip/>
+        <el-table-column prop="create_name" label="创建人" :min-width="flexWidth('create_name',crud.data,'创建人')"/>
+        <el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')"/>
+        <el-table-column prop="down_name" label="下发人" :min-width="flexWidth('down_name',crud.data,'下发人')"/>
+        <el-table-column prop="down_time" label="下发时间" :min-width="flexWidth('down_time',crud.data,'下发时间')"/>
+        <el-table-column prop="confirm_name" label="完工人" :min-width="flexWidth('confirm_name',crud.data,'完工人')"/>
+        <el-table-column prop="confirm_time" label="完工时间" :min-width="flexWidth('confirm_time',crud.data,'完工时间')"/>
         <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
           <template slot-scope="scope">
             <udOperation
@@ -448,7 +455,7 @@
         </el-table-column>
       </el-table>
       <!--分页组件-->
-      <pagination />
+      <pagination/>
     </div>
     <MaterDtl
       :dialog-show.sync="materialShow"
@@ -456,11 +463,11 @@
       :mater-opt-code="materType"
       @setMaterValue="setMaterValue"
     />
-    <ViewDialog ref="child3" />
-    <reportDialog ref="report" @AddChanged="querytable" />
-    <UploadDialog :dialog-show.sync="uploadShow" @tableChanged3="tableChanged3" />
-    <AddDialog :dialog-show.sync="addShow" @AddChanged="querytable" />
-    <ReplaceDeviceDialog ref="child4" @AddChanged="querytable" />
+    <ViewDialog ref="child3"/>
+    <reportDialog ref="report" @AddChanged="querytable"/>
+    <UploadDialog :dialog-show.sync="uploadShow" @tableChanged3="tableChanged3"/>
+    <AddDialog :dialog-show.sync="addShow" @AddChanged="querytable"/>
+    <ReplaceDeviceDialog ref="child4" @AddChanged="querytable"/>
   </div>
 </template>
 
@@ -522,7 +529,19 @@ const defaultForm = {
 }
 export default {
   name: 'Produceshiftorder',
-  components: { AddDialog, pagination, crudOperation, rrOperation, udOperation, MaterDtl, Treeselect, ViewDialog, reportDialog, UploadDialog, ReplaceDeviceDialog },
+  components: {
+    AddDialog,
+    pagination,
+    crudOperation,
+    rrOperation,
+    udOperation,
+    MaterDtl,
+    Treeselect,
+    ViewDialog,
+    reportDialog,
+    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', 'product_area'],
   cruds() {
@@ -614,7 +633,10 @@ export default {
       this.crud.toQuery()
     },
     getNotWorkDeviceByWorkproceduceId(workprocedure_id) { // 根据工序标识获取设备列表
-      crudProduceshiftorder.getNotWorkDeviceByWorkproceduceId({ workprocedure_id: workprocedure_id,product_area:this.form.product_area }).then(res => {
+      crudProduceshiftorder.getNotWorkDeviceByWorkproceduceId({
+        workprocedure_id: workprocedure_id,
+        product_area: this.form.product_area
+      }).then(res => {
         this.deviceList = res.content
       })
     },
diff --git a/mes/qd/src/views/wms/scheduler_manage/task/index.vue b/mes/qd/src/views/wms/scheduler_manage/task/index.vue
index 805fc840..94a2e788 100644
--- a/mes/qd/src/views/wms/scheduler_manage/task/index.vue
+++ b/mes/qd/src/views/wms/scheduler_manage/task/index.vue
@@ -156,13 +156,13 @@
         <el-table-column v-if="true" prop="task_id" label="任务标识" min-width="150" show-overflow-tooltip />
         <el-table-column v-if="true" prop="material_id" label="物料标识" min-width="150" show-overflow-tooltip />
         <el-table-column v-if="true" prop="material_spec" label="物料标识" min-width="150" show-overflow-tooltip />
-        <el-table-column prop="task_name" label="任务类型" min-width="120" show-overflow-tooltip />
+        <el-table-column prop="task_name" label="任务类型" :min-width="flexWidth('task_name',crud.data,'任务类型')" />
         <el-table-column prop="acs_task_type" label="acs任务类型" min-width="120" show-overflow-tooltip :formatter="acsTypeName" />
         <el-table-column v-if="false" prop="task_status" label="任务状态" />
         <el-table-column prop="task_status_name" label="任务状态" width="120px" :formatter="formatTaskStatusName" />
-        <el-table-column prop="point_code1" label="起点" width="100" />
-        <el-table-column prop="point_code2" label="终点" min-width="100" show-overflow-tooltip />
-        <el-table-column prop="point_code3" label="返回点" min-width="100" show-overflow-tooltip />
+        <el-table-column prop="point_code1" label="起点" :min-width="flexWidth('point_code1',crud.data,'起点')" />
+        <el-table-column prop="point_code2" label="终点" :min-width="flexWidth('point_code2',crud.data,'终点')" />
+        <el-table-column prop="point_code3" label="返回点"  :min-width="flexWidth('point_code3',crud.data,'返回点')" />
         <el-table-column prop="product_area" label="生产车间" />
         <el-table-column prop="point1_region_name" label="起点区域" width="120" />
         <el-table-column prop="point2_region_name" label="终点区域" min-width="120" show-overflow-tooltip />