From 16583e7f757027571917fc8b624d42421816ddbb Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Mon, 25 Sep 2023 13:58:57 +0800
Subject: [PATCH] =?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: {},
 			// 表单校验