From 9106862f43973c85e4fec7f993da7f979cb09f2b Mon Sep 17 00:00:00 2001
From: ludj <ldj_willow@163.com>
Date: Wed, 28 Jun 2023 11:06:23 +0800
Subject: [PATCH] =?UTF-8?q?rev:=E7=95=8C=E9=9D=A2=E5=B8=83=E5=B1=80?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../master/material/index.vue                 |  2 +-
 .../product_manage/workorder/reportDialog.vue | 10 ++++----
 .../product/productIn/AddDialog.vue           |  1 +
 .../product/productIn/ViewDialog.vue          |  2 ++
 .../product/productIvt/index.vue              | 25 ++++++++-----------
 .../product/productOut/AddDialog.vue          |  1 +
 6 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/mes/qd/src/views/wms/masterdata_manage/master/material/index.vue b/mes/qd/src/views/wms/masterdata_manage/master/material/index.vue
index fff6b655..ac8b8c8b 100644
--- a/mes/qd/src/views/wms/masterdata_manage/master/material/index.vue
+++ b/mes/qd/src/views/wms/masterdata_manage/master/material/index.vue
@@ -155,7 +155,7 @@
           </template>
         </el-table-column>
         <el-table-column prop="update_optname" label="修改人" />
-        <el-table-column prop="update_time" label="修改时间" width="135" />
+        <el-table-column prop="update_time" label="修改时间" :min-width="flexWidth('update_time',crud.data,'修改时间')" />
         <el-table-column
           v-permission="['admin','Materialbase:edit','Materialbase:del']"
           fixed="right"
diff --git a/mes/qd/src/views/wms/product_manage/workorder/reportDialog.vue b/mes/qd/src/views/wms/product_manage/workorder/reportDialog.vue
index 2e8f9098..67fcd349 100644
--- a/mes/qd/src/views/wms/product_manage/workorder/reportDialog.vue
+++ b/mes/qd/src/views/wms/product_manage/workorder/reportDialog.vue
@@ -7,7 +7,7 @@
     @close="close"
   >
     <div>
-      <el-form ref="form" :inline="true"  :rules="rules" size="mini" label-width="180px">
+      <el-form ref="form" :inline="true"  :rules="rules" size="mini" label-width="180px" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;">
         <el-form-item label="工单编码">
           <el-input v-model="query.workorder_code" style="width: 200px;" clearable/>
         </el-form-item>
@@ -76,7 +76,7 @@
         </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',crud.data,'设备编码')"/>
       <el-table-column prop="needproduct_qty" label="待生产数" />
       <el-table-column prop="report_qty" label="报工数量" >
         <template slot-scope="scope">
@@ -94,8 +94,8 @@
 <!--        </template>-->
 <!--      </el-table-column>-->
 <!--      <el-table-column prop="person_finish_qty" label="人员期末数量" />-->
-      <el-table-column prop="operatetime_start" label="开工时间" />
-      <el-table-column prop="operatetime_end" label="完工时间" />
+      <el-table-column prop="operatetime_start" label="开工时间" :min-width="flexWidth('operatetime_start',crud.data,'开工时间')"/>
+      <el-table-column prop="operatetime_end" label="完工时间" :min-width="flexWidth('operatetime_end',crud.data,'完工时间')"/>
       <el-table-column prop="report_status" label="报工状态" >
         <template slot-scope="scope">
           {{ reportStatus[scope.row.report_status-1].label }}
@@ -103,7 +103,7 @@
       </el-table-column>
       <el-table-column prop="produce_person_name" label="操作人" align="center" />
       <el-table-column prop="confirm_name" label="审核人" align="center" />
-      <el-table-column prop="confirm_time" label="审核时间" align="center" />
+      <el-table-column prop="confirm_time" label="审核时间" align="center" :min-width="flexWidth('confirm_time',crud.data,'审核时间')" />
       <el-table-column label="操作" width="120px" align="center" fixed="right">
         <template slot-scope="scope">
           <el-button :disabled="scope.row.report_status =='3'" size="mini" style="margin-left: -1px;margin-right: 2px" type="text" @click="reportApprove(scope.row)">提交审核</el-button>
diff --git a/mes/qd/src/views/wms/storage_manage/product/productIn/AddDialog.vue b/mes/qd/src/views/wms/storage_manage/product/productIn/AddDialog.vue
index d5a099ed..91debae0 100644
--- a/mes/qd/src/views/wms/storage_manage/product/productIn/AddDialog.vue
+++ b/mes/qd/src/views/wms/storage_manage/product/productIn/AddDialog.vue
@@ -32,6 +32,7 @@
       <el-form-item label="业务类型" prop="bill_type">
         <el-select
           v-model="form.bill_type"
+          style="width: 210px"
           clearable
           size="mini"
           placeholder="业务类型"
diff --git a/mes/qd/src/views/wms/storage_manage/product/productIn/ViewDialog.vue b/mes/qd/src/views/wms/storage_manage/product/productIn/ViewDialog.vue
index a747989f..d647212d 100644
--- a/mes/qd/src/views/wms/storage_manage/product/productIn/ViewDialog.vue
+++ b/mes/qd/src/views/wms/storage_manage/product/productIn/ViewDialog.vue
@@ -16,6 +16,7 @@
       </el-form-item>
       <el-form-item label="仓  库">
         <el-select
+          style="width: 210px"
           v-model="form.product_code"
           clearable
           size="mini"
@@ -35,6 +36,7 @@
       <el-form-item label="业务类型">
         <el-select
           v-model="form.bill_type"
+          style="width: 210px"
           clearable
           filterable
           size="mini"
diff --git a/mes/qd/src/views/wms/storage_manage/product/productIvt/index.vue b/mes/qd/src/views/wms/storage_manage/product/productIvt/index.vue
index b6c02e42..54360580 100644
--- a/mes/qd/src/views/wms/storage_manage/product/productIvt/index.vue
+++ b/mes/qd/src/views/wms/storage_manage/product/productIvt/index.vue
@@ -28,19 +28,6 @@
               />
             </el-select>
           </el-form-item>
-
-          <el-form-item label="入库日期">
-            <el-date-picker
-              v-model="query.createTime"
-              type="daterange"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              :default-time="['00:00:00', '23:59:59']"
-              @change="crud.toQuery"
-            />
-          </el-form-item>
-
           <el-form-item label="仓位编码">
             <el-input
               v-model="query.struct_code"
@@ -80,7 +67,17 @@
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
-
+          <el-form-item label="入库日期">
+            <el-date-picker
+              v-model="query.createTime"
+              type="daterange"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              :default-time="['00:00:00', '23:59:59']"
+              @change="crud.toQuery"
+            />
+          </el-form-item>
           <rrOperation />
         </el-form>
       </div>
diff --git a/mes/qd/src/views/wms/storage_manage/product/productOut/AddDialog.vue b/mes/qd/src/views/wms/storage_manage/product/productOut/AddDialog.vue
index 1e9c9b07..1a94e9be 100644
--- a/mes/qd/src/views/wms/storage_manage/product/productOut/AddDialog.vue
+++ b/mes/qd/src/views/wms/storage_manage/product/productOut/AddDialog.vue
@@ -32,6 +32,7 @@
       <el-form-item label="业务类型" prop="bill_type">
         <el-select
           v-model="form.bill_type"
+          style="width: 210px"
           clearable
           size="mini"
           placeholder="业务类型"