From 88064b64893c5ff6f6f8161105b0d60954943b17 Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Tue, 26 Sep 2023 15:32:57 +0800
Subject: [PATCH 1/8] =?UTF-8?q?=E7=99=BD=E5=9D=AF=E8=AE=A2=E5=8D=95=20?=
 =?UTF-8?q?=E5=8D=95=E4=BD=8D=E5=8F=AF=E9=80=89=20=E9=BB=98=E8=AE=A4PC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/plan/whiteOrder/index.vue | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/views/plan/whiteOrder/index.vue b/src/views/plan/whiteOrder/index.vue
index 24a58e3..a9cd6ac 100644
--- a/src/views/plan/whiteOrder/index.vue
+++ b/src/views/plan/whiteOrder/index.vue
@@ -323,7 +323,14 @@
           <el-col :offset="1" :span="9">
 
             <el-form-item label-width="100px" label="单位" prop="unit">
-              <el-input v-model="form.unit" placeholder="请输入单位"/>
+ 							<el-select v-model="form.unit" placeholder="请输入单位" style="width:220px">
+                 <el-option
+                   v-for="dict in dict.type.bp"
+                   :key="dict.value"
+                   :label="dict.label"
+                   :value="dict.value"
+                 ></el-option>
+               </el-select>
             </el-form-item>
 
             <el-form-item v-if="false" label-width="100px" label="订单车数" prop="carNum">
@@ -608,7 +615,7 @@ import {getProEquipment, selectMaterielList, subSplitOrder} from "@/api/plan/ord
 
 export default {
   name: "WhiteOrder",
-  dicts: ['product_type', 'order_status'],
+  dicts: ['product_type', 'order_status','bp'],
   components: {
     Treeselect
   },
@@ -1280,6 +1287,7 @@ export default {
       this.reset();
       // 设置白坯
       this.form.prodType = 'white'
+      this.form.unit = 'PC';
       // 初始化设置计划生产日期
       this.form.planProDate = moment(new Date()).format('YYYY-MM-DD')
       // 初始化设置计划完成日期
@@ -1333,6 +1341,7 @@ export default {
       //   })
       //   return
       // }
+      this.form.unit = 'PC';
       if (this.form.unit == null) {
         this.$message({
           message: '请输入单位！',
@@ -1345,7 +1354,7 @@ export default {
       addWhiteOrder(this.form).then(response => {
         this.$modal.msgSuccess('新增成功')
         this.dialogVisible = false
-        this.reset()
+        this.reset();
         this.getList()
       });
     },

From e8e6b806b2feb7cd346fde7a1f7081d9272ed6d1 Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Tue, 26 Sep 2023 15:37:16 +0800
Subject: [PATCH 2/8] =?UTF-8?q?plan=E7=99=BD=E5=9D=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/plan/whiteOrder/index.vue | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/views/plan/whiteOrder/index.vue b/src/views/plan/whiteOrder/index.vue
index a9cd6ac..f507a5e 100644
--- a/src/views/plan/whiteOrder/index.vue
+++ b/src/views/plan/whiteOrder/index.vue
@@ -446,7 +446,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>  
+        <el-row>
           <el-col :span="9">
               <el-form-item label="选择设备:">
                 <div style="height: 130px;overflow-y: auto;">
@@ -456,7 +456,7 @@
                     :props="eRouteProps"
                     v-model="splitForm.prodLineCodeArray"
                     clearable></el-cascader>
-                </div> 
+                </div>
               </el-form-item>
           </el-col>
         </el-row>
@@ -1341,7 +1341,6 @@ export default {
       //   })
       //   return
       // }
-      this.form.unit = 'PC';
       if (this.form.unit == null) {
         this.$message({
           message: '请输入单位！',

From 87fc6dad9f4cafe81470b5875184ed51aeca5ca1 Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Tue, 26 Sep 2023 16:15:38 +0800
Subject: [PATCH 3/8] =?UTF-8?q?=E7=99=BD=E5=9D=AF=20=E7=89=A9=E6=96=99=20?=
 =?UTF-8?q?=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2+=E9=87=8D=E7=BD=AE?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98+=E5=BA=95=E9=83=A8=E9=A1=B5=E7=A0=81?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/plan/whiteOrder/index.vue | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/views/plan/whiteOrder/index.vue b/src/views/plan/whiteOrder/index.vue
index f507a5e..f62dadd 100644
--- a/src/views/plan/whiteOrder/index.vue
+++ b/src/views/plan/whiteOrder/index.vue
@@ -220,7 +220,7 @@
           </el-form-item>
           <el-form-item>
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleMaterielQuery">搜索</el-button>
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetProductQuery">重置</el-button>
           </el-form-item>
         </el-form>
 
@@ -1224,6 +1224,7 @@ export default {
     // 新增-物料搜索按钮
     handleMaterielQuery() {
       this.materielQueryParams.pageNum = 1;
+      this.materielQueryParams.pageSize = 10;
       this.getMaterielList();
     },
     // 拆分-车数数量校验
@@ -1270,6 +1271,8 @@ export default {
       this.materielQueryParams = {
         productCode: undefined,
         productDescZh: '白坯',
+        pageNum: 1,
+        pageSize: 10,
       }
       // 打开选择物料弹窗
       this.innerVisible = true;
@@ -1429,6 +1432,11 @@ export default {
       this.queryParams.planDateEnd = moment(this.queryParams.planDateArray[1]).format('YYYY-MM-DD')
       this.getList();
     },
+    // 物料选择页面重置
+    resetProductQuery(){
+      this.materielQueryParams.productCode = null;
+      this.getMaterielList();
+    },
     // 首-重置按钮操作
     resetQuery() {
       this.resetForm("queryForm");

From 4551b6bd8170002138a6215a779468cc9579f0ea Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Tue, 26 Sep 2023 22:36:18 +0800
Subject: [PATCH 4/8] =?UTF-8?q?MES=E6=8A=A5=E5=B7=A5=E4=BC=98=E5=8C=961?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/reportWork/index.vue             | 8 ++++----
 src/views/mes/reportWork/reportWorkConsume.vue | 1 -
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/views/mes/reportWork/index.vue b/src/views/mes/reportWork/index.vue
index bd2b6f2..b30c04a 100644
--- a/src/views/mes/reportWork/index.vue
+++ b/src/views/mes/reportWork/index.vue
@@ -48,7 +48,7 @@
 		</el-form>
 
 		<el-row :gutter="10" class="mb8">
-			<!-- <el-col :span="1.5">
+			<el-col :span="1.5">
 				<el-button
 					type="primary"
 					plain
@@ -79,7 +79,7 @@
 					@click="handleDelete"
 					v-hasPermi="['mes:reportWork:remove']"
 				>删除</el-button>
-			</el-col> -->
+			</el-col>
 			<el-col :span="1.5">
 				<el-button
 					type="warning"
@@ -95,7 +95,7 @@
 
 		<el-table v-loading="loading" :data="reportWorkList" @selection-change="handleSelectionChange">
 			<el-table-column type="selection"  align="center" />
-			<el-table-column label="报工单编号" align="center" prop="reportCode" width="100">
+			<el-table-column label="报工单编号" align="center" prop="reportCode" width="120">
 			  <template slot-scope="scope">
           <el-button
             type="text"
@@ -303,7 +303,7 @@
       <ReportWorkConsume v-if="form.reportCode !=null" :optType="optType" :reportCode="form.reportCode"></ReportWorkConsume>
 			<div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="cancel" v-if="optType =='view'">返回</el-button>
-        <el-button type="primary" @click="submitForm" v-else>确 定</el-button>
+        <el-button type="primary" @click="submitForm" v-else>确定</el-button>
         <el-button @click="cancel">取 消</el-button>
 			</div>
 		</el-dialog>
diff --git a/src/views/mes/reportWork/reportWorkConsume.vue b/src/views/mes/reportWork/reportWorkConsume.vue
index 1c123ac..7365a4f 100644
--- a/src/views/mes/reportWork/reportWorkConsume.vue
+++ b/src/views/mes/reportWork/reportWorkConsume.vue
@@ -48,7 +48,6 @@
 
 		<el-table v-loading="loading" :data="reportWorkConsumeList" @selection-change="handleSelectionChange">
 			<el-table-column type="selection" width="55" align="center" />
-			<el-table-column label="id" align="center" prop="recordId" />
 			<el-table-column label="工单编码" align="center" prop="workorderCode" width="200"/>
 			<el-table-column label="物料编号" align="center" prop="materialCode" width="200"/>
 			<el-table-column label="物料名称" align="center" prop="materialName" width="200"/>

From 59c38114de9e09a20d09e03f2af66b89f9109cbf Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Wed, 27 Sep 2023 11:40:37 +0800
Subject: [PATCH 5/8] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=8A=A5=E5=B7=A5?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/reportWork/index.vue | 170 ++++++++++++++++-------------
 1 file changed, 92 insertions(+), 78 deletions(-)

diff --git a/src/views/mes/reportWork/index.vue b/src/views/mes/reportWork/index.vue
index b30c04a..022181a 100644
--- a/src/views/mes/reportWork/index.vue
+++ b/src/views/mes/reportWork/index.vue
@@ -140,7 +140,7 @@
 			<el-table-column label="线体名称" align="center" prop="machineName" />
 			<el-table-column label="班组编码" align="center" prop="teamCode" />
 			<el-table-column label="班次编码" align="center" prop="shiftCode" />
-			<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+			<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
 				<template slot-scope="scope">
 					<el-button
 						size="mini"
@@ -157,7 +157,7 @@
 						v-hasPermi="['mes:reportWork:remove']"
 					>删除</el-button>
 				</template>
-			</el-table-column>
+			</el-table-column> -->
 		</el-table>
 
 		<pagination
@@ -170,117 +170,147 @@
 
 		<!-- 添加或修改报工报表对话框 -->
 		<el-dialog :title="title" :visible.sync="open" width="1200px" append-to-body>
-			<el-form ref="form" :model="form" :rules="rules" label-width="80px">
-				<el-row>
-          			<el-col :span="6">
+			<el-form ref="form" :model="form" :rules="rules" label-width="110px">
+          <el-row>
+          	<el-col :span="6">
 						<el-form-item label="报工单编号" prop="reportCode">
 							<el-input v-model="form.reportCode" placeholder="请输入报工单编号" />
 						</el-form-item>
 					</el-col>
 					<el-col :span="6">
 						<el-form-item label="报工类型" prop="reportType">
-        					<el-select v-model="form.reportType" placeholder="请选择报工类型"  @change="$forceUpdate()" clearable>
-            					<el-option v-for="item in reportTypeOptions" :key="item.reportType" :label="item.label" :value="item.reportType"></el-option>
-          					</el-select>
-        				</el-form-item>
+							<el-select v-model="form.reportType" placeholder="请选择报工类型" style="width:180px">
+                <el-option
+                  v-for="dict in dict.type.report_work_type"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+						</el-form-item>
 					</el-col>
 					<el-col :span="6">
-						<el-form-item label="生产工单编码" prop="workorderCode">
-							<el-input v-model="form.workorderCode" placeholder="请输入生产工单编码" />
+						<el-form-item label="报工人员" prop="userName">
+							<el-input v-model="form.userName" placeholder="请输入报工人员" />
 						</el-form-item>
 					</el-col>
 					<el-col :span="6">
-						<el-form-item label="产品编码" prop="productCode">
-							<el-input v-model="form.productCode" placeholder="请输入产品编码" />
+						<el-form-item label="报工途径" prop="feedbackChannel">
+							<el-select v-model="form.feedbackChannel" placeholder="请选择报工途径" style="width:180px">
+                <el-option
+                  v-for="dict in dict.type.report_work_channel"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
 						</el-form-item>
 					</el-col>
 				</el-row>
 				<el-row>
 					<el-col :span="6">
-						<el-form-item label="产品名称" prop="productName">
-							<el-input v-model="form.productName" placeholder="请输入产品名称" />
+						<el-form-item label="生产工单编码" prop="workorderCode">
+							<el-input v-model="form.workorderCode" placeholder="请输入生产工单编码" />
 						</el-form-item>
 					</el-col>
 					<el-col :span="6">
-						<el-form-item label="规格型号" prop="spec">
-							<el-input v-model="form.spec" type="textarea" placeholder="请输入内容" />
+						<el-form-item label="产品编码" prop="productCode">
+							<el-input v-model="form.productCode" placeholder="请输入产品编码" />
 						</el-form-item>
 					</el-col>
 					<el-col :span="6">
-						<el-form-item label="单位" prop="unit">
-							<el-input v-model="form.unit" placeholder="请输入单位" />
+						<el-form-item label="产品名称" prop="productName">
+							<el-input v-model="form.productName" placeholder="请输入产品名称" />
 						</el-form-item>
 					</el-col>
 					<el-col :span="6">
-						<el-form-item label="排产数量" prop="quantity">
-							<el-input v-model="form.quantity" placeholder="请输入排产数量" />
+						<el-form-item label="规格型号" prop="spec">
+							<el-input v-model="form.spec" placeholder="请输入内容" />
 						</el-form-item>
 					</el-col>
-
 				</el-row>
 				<el-row>
 					<el-col :span="6">
-						<el-form-item label="本次报工数量" prop="quantityFeedback">
-							<el-input v-model="form.quantityFeedback" placeholder="请输入本次报工数量" />
-						</el-form-item>
-					</el-col>
-          			<el-col :span="6">
-						<el-form-item label="合格数量" prop="quantityQualified">
-							<el-input v-model="form.quantityQualified" placeholder="请输入合格数量" />
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="不合格数量" prop="quantityUnqualified">
-							<el-input v-model="form.quantityUnqualified" placeholder="请输入不合格数量" />
+						<el-form-item label="单位" prop="unit">
+							<el-input v-model="form.unit" placeholder="请输入单位" />
 						</el-form-item>
 					</el-col>
 					<el-col :span="6">
-						<el-form-item label="报工人员" prop="userName">
-							<el-input v-model="form.userName" placeholder="请输入报工人员" />
+						<el-form-item label="线体编码" prop="machineCode">
+							<el-input v-model="form.machineCode" placeholder="请输入线体编码" />
 						</el-form-item>
 					</el-col>
-				</el-row>
-				<el-row>
 					<el-col :span="6">
-						<el-form-item label="人员名称" prop="nickName">
-							<el-input v-model="form.nickName" placeholder="请输入人员名称" />
+						<el-form-item label="线体名称" prop="machineName">
+							<el-input v-model="form.machineName" placeholder="请输入线体名称" />
 						</el-form-item>
 					</el-col>
-					<el-col :span="6">
-						<el-form-item label="报工途径" prop="feedbackChannel">
-        					<el-select v-model="form.feedbackChannel" placeholder="请选择报工类型"  @change="$forceUpdate()" clearable>
-            					<el-option v-for="item in feedbackChannelOptions" :key="item.feedbackChannel" :label="item.label" :value="item.feedbackChannel"></el-option>
-          					</el-select>
-        				</el-form-item>
-					</el-col>
 					<el-col :span="6">
 						<el-form-item label="报工时间" prop="feedbackTime">
 						<el-date-picker clearable
 							v-model="form.feedbackTime"
 							type="date"
 							value-format="yyyy-MM-dd"
+							style="width: 180px"
 							placeholder="请选择报工时间">
 						</el-date-picker>
 						</el-form-item>
 					</el-col>
+				</el-row>
+				<el-row>
 					<el-col :span="6">
-						<el-form-item label="录入人员" prop="recordUser">
-							<el-input v-model="form.recordUser" placeholder="请输入录入人员" />
-						</el-form-item>
+            <el-form-item label="排产数量" prop="quantity">
+              <el-input-number
+                :min="0"
+                :step="1"
+                v-model="form.quantity"
+                style="width: 180px"
+              />
+            </el-form-item>
+					</el-col>
+					<el-col :span="6">
+            <el-form-item label="本次报工数量" prop="quantityFeedback">
+              <el-input-number
+                :min="0"
+                :step="1"
+                v-model="form.quantityFeedback"
+                style="width: 180px"
+              />
+            </el-form-item>
+					</el-col>
+          <el-col :span="6">
+            <el-form-item label="合格数量" prop="quantityQualified">
+              <el-input-number
+                :min="0"
+                :step="1"
+                v-model="form.quantityQualified"
+                style="width: 180px"
+              />
+            </el-form-item>
+					</el-col>
+					<el-col :span="6">
+            <el-form-item label="不合格数量" prop="quantityUnqualified">
+              <el-input-number
+                :min="0"
+                :step="1"
+                v-model="form.quantityUnqualified"
+                style="width: 180px"
+              />
+            </el-form-item>
 					</el-col>
 				</el-row>
 				<el-row>
 					<el-col :span="6">
-						<el-form-item label="线体编码" prop="machineCode">
-							<el-input v-model="form.machineCode" placeholder="请输入线体编码" />
+						<el-form-item label="人员名称" prop="nickName">
+							<el-input v-model="form.nickName" placeholder="请输入人员名称" />
 						</el-form-item>
 					</el-col>
 					<el-col :span="6">
-						<el-form-item label="线体名称" prop="machineName">
-							<el-input v-model="form.machineName" placeholder="请输入线体名称" />
+						<el-form-item label="录入人员" prop="recordUser">
+							<el-input v-model="form.recordUser" placeholder="请输入录入人员" />
 						</el-form-item>
 					</el-col>
-          			<el-col :span="6">
+          <el-col :span="6">
 						<el-form-item label="班组编码" prop="teamCode">
 							<el-input v-model="form.teamCode" placeholder="请输入班组编码" />
 						</el-form-item>
@@ -294,24 +324,24 @@
 				<el-row>
 					<el-col :span="24">
 						<el-form-item label="备注" prop="remark">
-							<el-input v-model="form.remark"placeholder="请输入内容" />
+							<el-input v-model="form.remark" placeholder="请输入内容" type="textarea"/>
 						</el-form-item>
 					</el-col>
 					</el-row>
 			</el-form>
 			<el-divider content-position="center" v-if="form.reportCode !=null">物料消耗明细</el-divider>
-      <ReportWorkConsume v-if="form.reportCode !=null" :optType="optType" :reportCode="form.reportCode"></ReportWorkConsume>
+        	<ReportWorkConsume v-if="form.reportCode !=null" :optType="optType" :reportCode="form.reportCode"></ReportWorkConsume>
 			<div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="cancel" v-if="optType =='view'">返回</el-button>
-        <el-button type="primary" @click="submitForm" v-else>确定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        		<el-button type="primary" @click="cancel" v-if="optType =='view'">返回</el-button>
+        		<el-button type="primary" @click="submitForm" v-else>确定</el-button>
+        		<el-button @click="cancel">取 消</el-button>
 			</div>
 		</el-dialog>
 
 <!-- 添加或修改生产报工物料消耗对话框 -->
 		<el-dialog :title="title" :visible.sync="reportWorkConsunmOpen" width="1200px" append-to-body>
 					<el-table v-loading="loading" :data="reportWorkConsumeList">
-          			<el-table-column type="selection" width="55" align="center" />
+          			<el-table-column type="selection" width="100" align="center" />
           			<el-table-column label="报工编码" align="center" prop="reportCode" />
           			<el-table-column label="工单编码" align="center" prop="workorderCode" />
           			<el-table-column label="物料编号" align="center" prop="materialCode" />
@@ -345,26 +375,10 @@ import ReportWorkConsume from "./reportWorkConsume.vue";
 
 export default {
 	name: "ReportWork",
+	dicts: ['report_work_type','report_work_channel'],
 	components: {ReportWorkConsume},
 	data() {
 		return {
-		  reportTypeOptions: [{
-              reportType: 'SELF自行报工',
-              label: 'SELF自行报工'
-            }, {
-              reportType: 'UNI统一报工',
-              label: 'UNI统一报工'
-            }],
-      feedbackChannelOptions: [{
-              feedbackChannel: 'PAD',
-              label: 'PAD'
-            }, {
-              feedbackChannel: 'MOBILE',
-              label: 'MOBILE'
-            }, {
-              feedbackChannel: 'PC',
-              label: 'PC'
-            }],
       optType: undefined,
 			// 遮罩层
 			loading: true,

From b4cc9e9057de229921f2fe45db7a55519650ac6f Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Wed, 27 Sep 2023 14:55:54 +0800
Subject: [PATCH 6/8] mes rfid

---
 src/views/mes/rfidProcess/index.vue | 30 ++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/views/mes/rfidProcess/index.vue b/src/views/mes/rfidProcess/index.vue
index f8cdcc1..1b84dc2 100644
--- a/src/views/mes/rfidProcess/index.vue
+++ b/src/views/mes/rfidProcess/index.vue
@@ -80,32 +80,40 @@
 		<el-table v-loading="loading" :data="rfidProcessList" @selection-change="handleSelectionChange">
 			<el-table-column type="selection" width="55" align="center" />
 			<!-- 序号 -->
-      <el-table-column type="index" align="center" :index="indexMethod" label="序号"/>
+      <el-table-column type="index" align="center" :index="indexMethod" label="序号" fixed/>
 			<!-- <el-table-column label="工单ID" align="center" prop="workorderId" width="180"/> -->
-			<el-table-column label="工单编号" align="center" prop="workorderCode" width="200"/>
+			<el-table-column label="工单编号" align="center" prop="workorderCode" width="200" fixed/>
 			<!-- <el-table-column label="工单名称" align="center" prop="workorderName"/> -->
 			<!-- <el-table-column label="订单ID" align="center" prop="orderId" width="180"/> -->
-      <el-table-column label="订单编号" align="center" prop="orderCode" width="180"/>
-			<el-table-column label="rfid号" align="center" prop="rfid" />
+      <el-table-column label="订单编号" align="center" prop="orderCode" width="200"/>
+			<el-table-column label="rfid号" align="center" prop="rfid" width="180"/>
 			<el-table-column label="工厂编码" align="center" prop="factoryCode" />
 			<el-table-column label="机台编码" align="center" prop="machineCode" />
-			<el-table-column label="当前步" align="center" prop="nowProcessId" />
-			<el-table-column label="下一步" align="center" prop="nextProcessId" />
+			<el-table-column label="当前步工序编码" align="center" prop="nowProcessCode" width="150"/>
+			<el-table-column label="当前步工序名称" align="center" prop="nowProcessName" width="150"/>
+			<el-table-column label="下一步工序编码" align="center" prop="nextProcessCode" width="150"/>
+			<el-table-column label="下一步工序名称" align="center" prop="nextProcessName" width="150"/>
 			<el-table-column label="工序步骤" align="center" prop="orderNum" />
 			<el-table-column label="入时间" align="center" prop="inTime" width="180">
 				<template slot-scope="scope">
-					<span>{{ parseTime(scope.row.inTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.inTime, '{y}-{m}-{d}') }}</span>
+          {{ parseTime(scope.row.inTime, '{h}:{m}:{s}') }}
 				</template>
 			</el-table-column>
 			<el-table-column label="出时间" align="center" prop="outTime" width="180">
 				<template slot-scope="scope">
-					<span>{{ parseTime(scope.row.outTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.outTime, '{y}-{m}-{d}') }}</span>
+          {{ parseTime(scope.row.outTime, '{h}:{m}:{s}') }}
 				</template>
 			</el-table-column>
-			<el-table-column label="状态" align="center" prop="status" />
+			<el-table-column label="状态" align="center" prop="status">
+			  <template slot-scope="scope">
+          {{ scope.row.status == "0" ? "待办" : "完成" }}
+        </template>
+			</el-table-column>
 			<el-table-column label="备注" align="center" prop="remark" />
-			<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-				<!-- <template slot-scope="scope">
+			<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+				<template slot-scope="scope">
 					<el-button
 						size="mini"
 						type="text"

From a538a0aab75aeb922b008157b3b7adabe4c4d913 Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Wed, 27 Sep 2023 15:19:30 +0800
Subject: [PATCH 7/8] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/supplier/index.vue | 76 +++++++++++++-------------------
 1 file changed, 31 insertions(+), 45 deletions(-)

diff --git a/src/views/wms/supplier/index.vue b/src/views/wms/supplier/index.vue
index 5b975ec..342d476 100644
--- a/src/views/wms/supplier/index.vue
+++ b/src/views/wms/supplier/index.vue
@@ -73,10 +73,10 @@
 					@keyup.enter.native="handleQuery"
 				/>
 			</el-form-item> -->
-			<el-form-item label="联系人" prop="contact">
+			<el-form-item label="联系人电话" prop="contactPhone">
 				<el-input
-					v-model="queryParams.contact"
-					placeholder="请输入联系人"
+					v-model="queryParams.contactPhone"
+					placeholder="请输入联系人电话"
 					clearable
 					@keyup.enter.native="handleQuery"
 				/>
@@ -195,8 +195,8 @@
 			<!-- 序号 -->
 			<el-table-column type="index" width="90" align="center" :index="indexMethod" label="序号" ></el-table-column>
 			<el-table-column label="供应商编码" align="center" prop="supplierCode" width="100" />
-			<el-table-column label="供应商名字" align="center" prop="zhDesc" width="100" />
-			<el-table-column label="英文描述" align="center" prop="enDesc" />
+			<el-table-column label="供应商名字" align="center" prop="zhDesc" width="350" />
+			<!-- <el-table-column label="英文描述" align="center" prop="enDesc" />
 			<el-table-column label="供应商类型" align="center" prop="supplierType" width="100"/>
 			<el-table-column label="账号" align="center" prop="accountNumber" width="100"/>
 			<el-table-column label="证照编码" align="center" prop="licenceNumber" width="200"/>
@@ -204,19 +204,19 @@
 			<el-table-column label="国家" align="center" prop="userDefined1" />
 			<el-table-column label="省" align="center" prop="province" />
 			<el-table-column label="市" align="center" prop="city" />
-			<el-table-column label="区" align="center" prop="area" />
+			<el-table-column label="区" align="center" prop="area" /> -->
 			<el-table-column label="详细地址" align="center" prop="address" width="300"/>
-			<el-table-column label="邮编" align="center" prop="postcode" />
-			<el-table-column label="联系人" align="center" prop="contact" />
-			<el-table-column label="联系人电话" align="center" prop="contactPhone" width="120"/>
-			<el-table-column label="联系人职务" align="center" prop="contactPosition" width="100"/>
-			<el-table-column label="联系人电子邮件" align="center" prop="contactEmail" width="200"/>
+			<!-- <el-table-column label="邮编" align="center" prop="postcode" /> -->
+			<!-- <el-table-column label="联系人" align="center" prop="contact" />-->
+			<el-table-column label="联系人电话" align="center" prop="contactPhone" width="150"/>
+			<!-- <el-table-column label="联系人职务" align="center" prop="contactPosition" width="100"/>
+			<el-table-column label="联系人电子邮件" align="center" prop="contactEmail" width="200"/> -->
 			<el-table-column label="是否启用" align="center" prop="activeFlag">
 			<template slot-scope="scope">
               {{ scope.row.activeFlag == 1 ? "是" : "否" }}
             </template>
 		    </el-table-column>
-			<el-table-column label="税号" align="center" prop="userDefined2" width="200"/>
+			<!-- <el-table-column label="税号" align="center" prop="userDefined2" width="200"/> -->
 			<!-- <el-table-column label="用户自定义3" align="center" prop="userDefined3" />
 			<el-table-column label="备注" align="center" prop="remark" /> -->
 			<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
@@ -248,21 +248,15 @@
 		/>
 
 		<!-- 添加或修改供应商管理对话框 -->
-		<el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
+		<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
 			<el-form ref="form" :model="form" :rules="rules" label-width="110px">
-				<el-row :gutter="10" class="mb8">
-                    <el-col :span="12">
 						<el-form-item label="供应商代码" prop="supplierCode">
-							<el-input v-model="form.supplierCode" placeholder="请输入供应商代码" />
+							<el-input v-model="form.supplierCode" placeholder="请输入供应商代码" style="width:320px"/>
 						</el-form-item>
-                    </el-col>
-                    <el-col :span="12">
 						<el-form-item label="供应商名字" prop="zhDesc">
-							<el-input v-model="form.zhDesc" placeholder="请输入供应商名字" />
+							<el-input v-model="form.zhDesc" placeholder="请输入供应商名字" style="width:320px"/>
 						</el-form-item>
-                    </el-col>
-                </el-row>
-				<el-row :gutter="10" class="mb8">
+				<!-- <el-row :gutter="10" class="mb8">
                   	<el-col :span="12">
 						<el-form-item label="英文描述" prop="enDesc">
 							<el-input v-model="form.enDesc" placeholder="请输入英文描述" />
@@ -321,20 +315,21 @@
 							<el-input v-model="form.postcode" placeholder="请输入邮编" />
 						</el-form-item>
                     </el-col>
-                </el-row>
-				<el-row :gutter="10" class="mb8">
-                  	<el-col :span="12">
-						<el-form-item label="联系人" prop="contact">
+                </el-row> -->
+                  	<!-- <el-col :span="12"> -->
+						<!-- <el-form-item label="联系人" prop="contact">
 							<el-input v-model="form.contact" placeholder="请输入联系人" />
 						</el-form-item>
-                    </el-col>
-                    <el-col :span="12">
+                    </el-col> -->
+  						<el-form-item label="是否启用" prop="activeFlag">
+                  			<el-select v-model="form.activeFlag" placeholder="请选择是否启用"  @change="$forceUpdate()" clearable style="width:320px">
+             						<el-option v-for="item in options" :key="item.activeFlag" :label="item.label" :value="item.activeFlag"></el-option>
+            					</el-select>
+          				</el-form-item>
 						<el-form-item label="联系人电话" prop="contactPhone">
-							<el-input v-model="form.contactPhone" placeholder="请输入联系人电话" />
+							<el-input v-model="form.contactPhone" placeholder="请输入联系人电话" style="width:320px"/>
 						</el-form-item>
-                    </el-col>
-                </el-row>
-				<el-row :gutter="10" class="mb8">
+				<!-- <el-row :gutter="10" class="mb8">
                   	<el-col :span="12">
 						<el-form-item label="联系人职务" prop="contactPosition">
 							<el-input v-model="form.contactPosition" placeholder="请输入联系人职务" />
@@ -345,16 +340,8 @@
 							<el-input v-model="form.contactEmail" placeholder="请输入联系人电子邮件" />
 						</el-form-item>
                     </el-col>
-                </el-row>
-				<el-row :gutter="10" class="mb8">
-                  	<el-col :span="12">
-						<el-form-item label="是否启用" prop="activeFlag">
-                			<el-select v-model="form.activeFlag" placeholder="请选择是否启用"  @change="$forceUpdate()" clearable style="width:365px">
-           						<el-option v-for="item in options" :key="item.activeFlag" :label="item.label" :value="item.activeFlag"></el-option>
-          					</el-select>
-        				</el-form-item>
-                    </el-col>
-                    <el-col :span="12">
+                </el-row> -->
+                    <!-- <el-col :span="12">
 						<el-form-item label="经营范围" prop="businessScope">
             				<el-input v-model="form.businessScope" type="textarea" placeholder="请输入内容" />
             			</el-form-item>
@@ -366,15 +353,14 @@
 					<el-input v-model="form.userDefined2" placeholder="请输入税号" />
 				</el-form-item>
                     </el-col>
-                    <el-col :span="12">
+                    <el-col :span="12"> -->
 						<!-- <el-form-item label="用户自定义3" prop="userDefined3">
 					<el-input v-model="form.userDefined3" placeholder="请输入用户自定义3" />
 				</el-form-item>
 				<el-form-item label="备注" prop="remark">
 					<el-input v-model="form.remark" placeholder="请输入备注" />
 				</el-form-item> -->
-                    </el-col>
-                </el-row>
+                    <!-- </el-col>-->
 			</el-form>
 			<div slot="footer" class="dialog-footer">
 				<el-button type="primary" @click="submitForm">确 定</el-button>

From 9f75f980ac049d579af7578494880cc1a99e73a9 Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Wed, 27 Sep 2023 18:03:20 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86+=E5=AE=A2=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/customer/index.vue | 17 +++++++++--------
 src/views/wms/supplier/index.vue |  2 ++
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/views/wms/customer/index.vue b/src/views/wms/customer/index.vue
index cfb3309..c2f4e94 100644
--- a/src/views/wms/customer/index.vue
+++ b/src/views/wms/customer/index.vue
@@ -73,12 +73,12 @@
 			<el-table-column type="selection" width="55" align="center" />
 			<!-- 序号 -->
 			<el-table-column type="index" width="90" align="center" :index="indexMethod" label="序号" />
-			<el-table-column label="客户编码" align="center" prop="clientCode" />
-			<el-table-column label="客户名称" align="center" prop="clientName" />
-			<el-table-column label="客户简介" align="center" prop="clientDes" />
-			<el-table-column label="客户类型" align="center" prop="clientType" />
-			<el-table-column label="客户地址" align="center" prop="address" width="200"/>
-			<el-table-column label="客户官网地址" align="center" prop="website" width="200"/>
+			<el-table-column label="客户编码" align="center" prop="clientCode" width="150"/>
+			<el-table-column label="客户名称" align="center" prop="clientName" width="270"/>
+			<!-- <el-table-column label="客户简介" align="center" prop="clientDes" /> -->
+			<!-- <el-table-column label="客户类型" align="center" prop="clientType" /> -->
+			<el-table-column label="客户地址" align="center" prop="address" width="300"/>
+			<!-- <el-table-column label="客户官网地址" align="center" prop="website" width="200"/>
 			<el-table-column label="客户邮箱地址" align="center" prop="email" width="200"/>
 			<el-table-column label="客户电话" align="center" prop="tel" width="150"/>
 			<el-table-column label="联系人1" align="center" prop="contact1" />
@@ -87,7 +87,9 @@
 			<el-table-column label="联系人2" align="center" prop="contact2" />
 			<el-table-column label="联系人2-电话" align="center" prop="contact2Tel" width="150"/>
 			<el-table-column label="联系人2-邮箱" align="center" prop="contact2Email" width="150"/>
-			<el-table-column label="统一社会信用代码" align="center" prop="creditCode" width="200" />
+			<el-table-column label="统一社会信用代码" align="center" prop="creditCode" width="200" /> -->
+			<el-table-column label="创建人" align="center" prop="createBy" width="200"/>
+			<el-table-column label="创建时间" align="center" prop="createTime" width="200"/>
 			<el-table-column label="是否启用" align="center" prop="enableFlag">
 			  <template slot-scope="scope">
           {{ scope.row.enableFlag == 1 ? "是" : "否" }}
@@ -240,7 +242,6 @@
 
 <script>
 import { listCustomer, getCustomer, delCustomer, addCustomer, updateCustomer } from "@/api/wms/customer";
-
 export default {
 	name: "Customer",
 	data() {
diff --git a/src/views/wms/supplier/index.vue b/src/views/wms/supplier/index.vue
index 342d476..d838b39 100644
--- a/src/views/wms/supplier/index.vue
+++ b/src/views/wms/supplier/index.vue
@@ -209,6 +209,8 @@
 			<!-- <el-table-column label="邮编" align="center" prop="postcode" /> -->
 			<!-- <el-table-column label="联系人" align="center" prop="contact" />-->
 			<el-table-column label="联系人电话" align="center" prop="contactPhone" width="150"/>
+			<el-table-column label="创建人" align="center" prop="createBy" width="150"/>
+			<el-table-column label="创建时间" align="center" prop="createTime" width="150"/>
 			<!-- <el-table-column label="联系人职务" align="center" prop="contactPosition" width="100"/>
 			<el-table-column label="联系人电子邮件" align="center" prop="contactEmail" width="200"/> -->
 			<el-table-column label="是否启用" align="center" prop="activeFlag">