From 16583e7f757027571917fc8b624d42421816ddbb Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Mon, 25 Sep 2023 13:58:57 +0800
Subject: [PATCH 1/5] =?UTF-8?q?mes=E9=A2=86=E6=96=99=E5=8D=95=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/prepare/index.vue | 51 +++++++++++++++++++++------------
 1 file changed, 33 insertions(+), 18 deletions(-)

diff --git a/src/views/mes/prepare/index.vue b/src/views/mes/prepare/index.vue
index d5321b5..fef9d83 100644
--- a/src/views/mes/prepare/index.vue
+++ b/src/views/mes/prepare/index.vue
@@ -1,6 +1,6 @@
 <template>
 	<div class="app-container">
-		<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="98px">
+		<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px" class="edit-el-form">
 			<el-form-item label="工单编码" prop="workorderCode">
 				<el-input
 					v-model="queryParams.workorderCode"
@@ -9,14 +9,6 @@
 					@keyup.enter.native="handleQuery"
 				/>
 			</el-form-item>
-			<el-form-item label="工单名称" prop="workorderName">
-				<el-input
-					v-model="queryParams.workorderName"
-					placeholder="请输入工单名称"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
 			<el-form-item label="订单编码" prop="orderCode">
 				<el-input
 					v-model="queryParams.orderCode"
@@ -49,16 +41,29 @@
 					@keyup.enter.native="handleQuery"
 				/>
 			</el-form-item> -->
-			<!-- <el-form-item label="工单生产日期" prop="productDate">
+			<el-form-item label="工单生产日期" prop="productDate">
 				<el-date-picker clearable
 					v-model="queryParams.productDate"
 					type="date"
 					value-format="yyyy-MM-dd"
-					placeholder="请选择工单生产日期">
+					placeholder="请选择工单生产日期"
+					style="width:205px"
+					>
 				</el-date-picker>
-			</el-form-item> -->
+			</el-form-item>
+			<el-form-item label="单据状态" prop="status">
+        <el-select
+          v-model="queryParams.status"
+          placeholder="请选择单据状态"
+          @change="$forceUpdate()"
+          clearable
+          style="width:205px"
+          @keyup.enter.native="handleQuery">
+          <el-option v-for="item in options" :key="item.status" :label="item.label" :value="item.status"></el-option>
+          </el-select>
+			</el-form-item>
 			<el-form-item>
-				<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+				<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery" >搜索</el-button>
 				<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
 			</el-form-item>
 		</el-form>
@@ -123,11 +128,10 @@
 		<el-table v-loading="loading" :data="prepareList" @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 label="工单编码" align="center" prop="workorderCode" width="180"/>
-			<el-table-column label="工单名称" align="center" prop="workorderName" width="180"/>
+      <el-table-column type="index" align="center" :index="indexMethod" label="序号" fixed/>
+			<el-table-column label="工单编码" align="center" prop="workorderCode" width="220" fixed/>
 			<!-- <el-table-column label="父工单" align="center" prop="parentOrder" /> -->
-			<el-table-column label="订单编码" align="center" prop="orderCode" width="180"/>
+			<el-table-column label="订单编码" align="center" prop="orderCode" width="220"/>
 			<el-table-column label="产品编号" align="center" prop="productCode" width="180"/>
 			<!-- <el-table-column label="产品类型" align="center" prop="prodType" /> -->
 			<el-table-column label="产品名称" align="center" prop="productName" width="180"/>
@@ -138,7 +142,11 @@
 				</template>
 			</el-table-column>
 			<!-- <el-table-column label="班次" align="center" prop="shiftId" /> -->
-			<el-table-column label="单据状态" align="center" prop="status" />
+			<el-table-column label="单据状态" align="center" prop="status">
+			  <template slot-scope="scope">
+          {{ scope.row.status == "L0" ? "待确认" : "已确认" }}
+        </template>
+      </el-table-column>
 			<el-table-column label="物料编号" align="center" prop="materialCode"  width="180"/>
 			<el-table-column label="物料名称" align="center" prop="materialName"  width="250"/>
 			<el-table-column label="物料规格型号" align="center" prop="materialSpc" />
@@ -384,6 +392,13 @@ export default {
 				attr4: null,
 				factoryCode: null
 			},
+				options: [{
+          status: "L0",
+          label: '待确认'
+        }, {
+          status: "L1",
+          label: '已确认'
+        }],
 			// 表单参数
 			form: {},
 			// 表单校验

From ecad7353d9543fe7f3731868130b2313021c0d44 Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Mon, 25 Sep 2023 14:16:13 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E8=AE=A1=E5=88=92=E6=88=90=E5=93=81?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=AE=A1=E7=90=86+=E7=94=9F=E4=BA=A7?=
 =?UTF-8?q?=E5=B7=A5=E5=8D=95=E7=AE=A1=E7=90=86=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=AE=BD=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/plan/order/index.vue     | 4 ++--
 src/views/plan/workorder/index.vue | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/plan/order/index.vue b/src/views/plan/order/index.vue
index af4a942..3422b20 100644
--- a/src/views/plan/order/index.vue
+++ b/src/views/plan/order/index.vue
@@ -134,7 +134,7 @@
       <el-table-column width="200" label="物料名称" align="center" prop="prodDesc"/>
       <el-table-column width="90" label="订单数量" align="center" prop="quantity"/>
       <el-table-column width="70" label="单位" align="center" prop="unit"/>
-      <el-table-column label="任务清单" align="center" prop="workerOrder"/>
+      <el-table-column label="任务清单" align="center" prop="workerOrder" width="100"/>
       <el-table-column width="120" label="计划生产日期" align="center" prop="planProDate">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.planProDate, '{y}-{m}-{d}') }}</span>
@@ -1249,7 +1249,7 @@ export default {
               _this.loading = false;
           } else if(e == 'close') {
               _this.loading = false;
-      
+
           }
       }
       )
diff --git a/src/views/plan/workorder/index.vue b/src/views/plan/workorder/index.vue
index 7d5154a..8dd34b1 100644
--- a/src/views/plan/workorder/index.vue
+++ b/src/views/plan/workorder/index.vue
@@ -170,7 +170,7 @@
       <el-table-column width="120" label="已生产数量" align="center" prop="quantityProduced"/>
       <el-table-column width="120" label="派工数量" align="center" prop="quantitySplit"/>
       <el-table-column width="150" label="工艺编码" align="center" prop="routeCode"/>
-      <el-table-column width="150" label="工艺名称" align="center" prop="routeName"/>
+      <el-table-column width="200" label="工艺名称" align="center" prop="routeName" />
       <!-- show-overflow-tooltip -->
       <el-table-column width="300" label="产线设备"  align="center" >
         <template slot-scope="scope">
@@ -762,7 +762,7 @@ export default {
               _this.loading = false;
           } else if(e == 'close') {
               _this.loading = false;
-      
+
           }
       }
       );

From 0f4f8ec39488bc62b8c57608352091753b2c957d Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Mon, 25 Sep 2023 16:42:17 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/bom/index.vue       | 8 +++++++-
 src/views/wms/customer/index.vue  | 2 +-
 src/views/wms/equipment/index.vue | 5 +++--
 src/views/wms/supplier/index.vue  | 8 ++++----
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/views/wms/bom/index.vue b/src/views/wms/bom/index.vue
index e892c61..3482c4a 100644
--- a/src/views/wms/bom/index.vue
+++ b/src/views/wms/bom/index.vue
@@ -63,7 +63,9 @@
 
 		<el-table v-loading="loading" :data="bomList" @selection-change="handleSelectionChange">
 			<el-table-column type="selection" width="55" align="center"/>
-			<el-table-column label="BOM单号" align="center" prop="bomCode" width="120"/>
+			<!-- 序号 -->
+      <el-table-column type="index" width="90" align="center" :index="indexMethod" label="序号" fixed/>
+			<el-table-column label="BOM单号" align="center" prop="bomCode" width="120" fixed/>
 			<el-table-column label="产品号" align="center" prop="productCode" width="120"/>
 			<el-table-column label="产品名称" align="center" prop="productDescZh" width="350"/>
 			<el-table-column label="组件编码" align="center" prop="component" width="120"/>
@@ -263,6 +265,10 @@ export default {
 		this.getList();
 	},
 	methods: {
+    // 生成表头序号
+      indexMethod(index){
+      return index+1 ;
+    },
 		/** 查询BOM管理 列表 */
 		getList() {
 			this.loading = true;
diff --git a/src/views/wms/customer/index.vue b/src/views/wms/customer/index.vue
index 2cab135..cfb3309 100644
--- a/src/views/wms/customer/index.vue
+++ b/src/views/wms/customer/index.vue
@@ -72,7 +72,7 @@
 		<el-table v-loading="loading" :data="customerList" @selection-change="handleSelectionChange">
 			<el-table-column type="selection" width="55" align="center" />
 			<!-- 序号 -->
-			<el-table-column type="index" width="90" align="center" :index="indexMethod" label="序号"></el-table-column>
+			<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" />
diff --git a/src/views/wms/equipment/index.vue b/src/views/wms/equipment/index.vue
index fa9849b..2ad62fb 100644
--- a/src/views/wms/equipment/index.vue
+++ b/src/views/wms/equipment/index.vue
@@ -85,7 +85,8 @@
               width="90"
               align="center"
               :index="indexMethod"
-              label="序号">
+              label="序号"
+              >
             </el-table-column>
 			<el-table-column label="设备编码" align="center" prop="equipmentCode">
 			<template slot-scope="scope">
@@ -113,7 +114,7 @@
 			<el-table-column label="工段" align="center" prop="workshopSection" />
 			<el-table-column label="设备位置" align="center" prop="equipmentLocation" />
 			<el-table-column label="工时单价" align="center" prop="hourlyUnitPrice" />
-			<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+			<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
 				<template slot-scope="scope">
 					<el-button
 						size="mini"
diff --git a/src/views/wms/supplier/index.vue b/src/views/wms/supplier/index.vue
index 4f97454..5b975ec 100644
--- a/src/views/wms/supplier/index.vue
+++ b/src/views/wms/supplier/index.vue
@@ -193,9 +193,9 @@
 			<el-table-column type="selection" width="55" align="center" />
 			<!-- <el-table-column label="主键uuid" align="center" prop="supplierId" /> -->
 			<!-- 序号 -->
-			<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 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="supplierType" width="100"/>
 			<el-table-column label="账号" align="center" prop="accountNumber" width="100"/>
@@ -219,7 +219,7 @@
 			<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">
+			<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
 				<template slot-scope="scope">
 					<el-button
 						size="mini"

From 13dd814849816653589393050f036577f9b7ccd8 Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Mon, 25 Sep 2023 17:29:01 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E5=B7=A5=E5=8E=82=E9=80=89=E6=8B=A9+?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/equipment.js          |  8 ++++++
 src/views/wms/equipment/index.vue | 41 ++++++++++++++++++++-----------
 src/views/wms/factory/index.vue   | 26 ++++++++++----------
 3 files changed, 48 insertions(+), 27 deletions(-)

diff --git a/src/api/wms/equipment.js b/src/api/wms/equipment.js
index c46a7ff..a7fb092 100644
--- a/src/api/wms/equipment.js
+++ b/src/api/wms/equipment.js
@@ -50,3 +50,11 @@ export function treeselect() {
     method: 'get'
   })
 }
+
+// 查询设备类型
+export function getEquipmentTypeList() {
+  return request({
+    url: '/wms/equipment/getEquipmentTypeList',
+    method: 'get'
+  });
+}
diff --git a/src/views/wms/equipment/index.vue b/src/views/wms/equipment/index.vue
index 2ad62fb..1af2eba 100644
--- a/src/views/wms/equipment/index.vue
+++ b/src/views/wms/equipment/index.vue
@@ -1,6 +1,6 @@
 <template>
 	<div class="app-container">
-		<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="108px">
+		<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="98px">
 			<el-form-item label="设备编码" prop="equipmentCode">
 				<el-input
 					v-model="queryParams.equipmentCode"
@@ -17,14 +17,17 @@
 					@keyup.enter.native="handleQuery"
 				/>
 			</el-form-item>
-				<el-form-item label="设备类型编码" prop="equipmentTypeCode">
-      		<el-input
-      			v-model="queryParams.equipmentTypeCode"
-      			placeholder="请输入设备类型编码"
-      			clearable
-      			@keyup.enter.native="handleQuery"
-      	/>
-      </el-form-item>
+			<el-form-item label="设备类型" prop="equipmentTypeCode">
+        <el-select
+          v-model="queryParams.equipmentTypeCode"
+          placeholder="请选择设备类型"
+          @change="$forceUpdate()"
+          clearable
+          style="width:205px"
+          @keyup.enter.native="handleQuery">
+          <el-option v-for="item in equipmentTypeOption" :key="item.equipmentTypeCode" :label="item.equipmentTypeName" :value="item.equipmentTypeCode"></el-option>
+          </el-select>
+			</el-form-item>
 			<el-form-item>
 				<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
 				<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -97,8 +100,8 @@
           >{{scope.row.equipmentCode}}</el-button>
         </template>
 		</el-table-column>
-			<el-table-column label="设备名称" align="center" prop="equipmentName" />
-			<el-table-column label="规格型号" align="center" prop="equipmentSpec" />
+			<el-table-column label="设备名称" align="center" prop="equipmentName" width="120"/>
+			<el-table-column label="规格型号" align="center" prop="equipmentSpec" width="120"/>
 			<el-table-column label="设备类型编码" align="center" prop="equipmentTypeCode" width="120" />
 			<el-table-column label="设备类型名称" align="center" prop="equipmentTypeName" width="120"/>
 			<el-table-column label="所属工作中心编码" align="center" prop="workshopCode" width="150"/>
@@ -391,15 +394,16 @@
 </template>
 
 <script>
-import { listEquipment, getEquipment, delEquipment, addEquipment, updateEquipment} from "@/api/wms/equipment";
+import { listEquipment, getEquipment, delEquipment, addEquipment, updateEquipment,getEquipmentTypeList} from "@/api/wms/equipment";
 import { getWorkCenterList,listFactory} from "@/api/wms/factory";
 export default {
 	name: "Equipment",
 	dicts: ['sys_normal_disable', 'equ_type'],
 	data() {
 		return {
-		workCenter:[],
-		options1: [],
+		  equipmentTypeOption:[],
+		  workCenter:[],
+		  options1: [],
       value: '',
 			// 遮罩层
 			loading: true,
@@ -466,8 +470,17 @@ export default {
 	},
 	created() {
 		this.getList();
+		this.getEquipmentType();
 	},
 	methods: {
+    /** 查询设备分类 */
+    getEquipmentType() {
+      getEquipmentTypeList().then(response => {
+        console.log(response.rows);
+        this.equipmentTypeOption = response.rows;
+        console.log(this.treeData1);
+      });
+    },
 	  selectWorkCenter(){
 	    this.form.workshopCode = this.form.workCenter;
 	  },
diff --git a/src/views/wms/factory/index.vue b/src/views/wms/factory/index.vue
index 996dc62..ae17367 100644
--- a/src/views/wms/factory/index.vue
+++ b/src/views/wms/factory/index.vue
@@ -18,16 +18,16 @@
       		/>
         </el-form-item>
 			<el-form-item label="启用状态" prop="status">
-				<el-input
-					v-model="queryParams.status"
-					placeholder="请输入启用状态(1/0)"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-          <!-- <el-select v-model="form.status" placeholder="请选择是否启用"  @change="$forceUpdate()" clearable>
-            <el-option v-for="item in options" :key="item.status" :label="item.label" :value="item.status"></el-option>
-          </el-select> -->
-      </el-form-item>
+        <el-select
+          v-model="queryParams.status"
+          placeholder="请选择启用状态"
+          @change="$forceUpdate()"
+          clearable
+          style="width:205px"
+          @keyup.enter.native="handleQuery">
+          <el-option v-for="item in options" :key="item.status" :label="item.label" :value="item.status"></el-option>
+          </el-select>
+			</el-form-item>
 			<el-form-item>
 			<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
 				<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -71,7 +71,7 @@
       		<el-table-column label="创建时间" align="center" prop="createTime" />
       		<el-table-column prop="status" label="是否启用" align="center" >
          		<template slot-scope="scope">
-            		{{ scope.row.status == 1 ? "是" : "否" }}
+            		{{ scope.row.status == 1 ? "启用" : "停用" }}
          		</template>
       		</el-table-column>
 			<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -177,10 +177,10 @@ export default {
 			},
 			 options: [{
                 status: "1",
-                label: '是'
+                label: '启用'
               }, {
                 status: "0",
-                label: '否'
+                label: '停用'
               }],
 			// 表单参数
 			form: {},

From d18c5d85e66f1af1f82e6d84aae72483e1106988 Mon Sep 17 00:00:00 2001
From: ShiChangzhou <shichangzhou@kehaida.com>
Date: Mon, 25 Sep 2023 17:50:54 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E5=8F=91=E7=89=88=E5=91=BD=E4=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile     |  2 +-
 push-op-ui.bat | 27 +++++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 push-op-ui.bat

diff --git a/Dockerfile b/Dockerfile
index 6dbf2b1..0025e9c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,3 +1,3 @@
-FROM nginx:1.20-alpine
+FROM 192.168.202.36:30002/library/nginx:1.20-alpine
 COPY default.conf /etc/nginx/conf.d/default.conf
 ADD dist /usr/share/nginx/html
diff --git a/push-op-ui.bat b/push-op-ui.bat
new file mode 100644
index 0000000..89edade
--- /dev/null
+++ b/push-op-ui.bat
@@ -0,0 +1,27 @@
+@echo off
+echo --------------------------------�Զ������������ǰ���޸�--------------------------------------
+set imageURI=192.168.202.36:30002/op-lanju/op-ui
+::echo ��ȡ��ǰ�����ַ���
+for /f "tokens=1,2,3 delims=/- " %%a in ("%date%") do @set D=%%a%%b%%c
+::echo ��ȡ��ǰʱ���ַ���
+for /f "tokens=1,2 delims=:." %%a in ("%time%") do @set T=%%a%%b
+::echo �統ǰСʱС��10�����ո��滻Ϊ0
+set T=%T: =0%
+::echo ��ʾ�������ʱ���ַ���
+set imageVersion=%D%%T%
+::���������Ϣ
+echo ������ַ:%imageURI% 
+echo ����汾:%imageVersion% 
+echo --------------------------------ִ�д��--------------------------------
+call npm run build:prod
+
+dir
+echo --------------------------------docker login...-------------------------------
+docker login 192.168.202.36:30002 -u deploy -p Deploy@2023
+echo --------------------------------docker build...-------------------------------
+docker build -t %imageURI%:%imageVersion% .
+echo --------------------------------docker push...--------------------------------
+docker push %imageURI%:%imageVersion%
+@pause
+
+::docker pull 192.168.3.157:8001/library/nginx:1.20-alpine
\ No newline at end of file