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
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/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: {},
 			// 琛ㄥ崟鏍￠獙
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;
-      
+
           }
       }
       );
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..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>
@@ -85,7 +88,8 @@
               width="90"
               align="center"
               :index="indexMethod"
-              label="搴忓彿">
+              label="搴忓彿"
+              >
             </el-table-column>
 			<el-table-column label="璁惧缂栫爜" align="center" prop="equipmentCode">
 			<template slot-scope="scope">
@@ -96,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"/>
@@ -113,7 +117,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"
@@ -390,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,
@@ -465,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: {},
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"