From ab8d0add7ba60a0348dcdbd11ee4c5080a7f2b3d Mon Sep 17 00:00:00 2001
From: wws <18630710203@163.com>
Date: Thu, 3 Aug 2023 16:35:08 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=AE=A1=E7=90=86=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97(=E8=AE=A2=E5=8D=95=E5=AF=BC=E5=87=BA-=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=90=8D=E7=A7=B0)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/plan/order/index.vue     |  6 +++---
 src/views/plan/plan/index.vue      | 23 +++++++++++++++++++----
 src/views/plan/workorder/index.vue | 10 +++++++---
 3 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/src/views/plan/order/index.vue b/src/views/plan/order/index.vue
index 829d599..6f96e7f 100644
--- a/src/views/plan/order/index.vue
+++ b/src/views/plan/order/index.vue
@@ -571,13 +571,13 @@ export default {
   methods: {
     /** 导入按钮操作 */
     handleImport() {
-      this.upload.title = "订单信息导入"; // todo
+      this.upload.title = "订单信息导入";
       this.upload.open = true;
     },
     /** 下载模板操作 */
     importTemplate() {
       this.download('/plan/order/importTemplate', {
-      }, `stu_base_template_${new Date().getTime()}.xlsx`)  // todo
+      }, `order_example_template_${new Date().getTime()}.xlsx`)
     },
     // 文件上传中处理
     handleFileUploadProgress(event, file, fileList) {
@@ -599,7 +599,7 @@ export default {
     handleExport() {
       this.download('/plan/order/export', {
         ...this.queryParams
-      }, `user_${new Date().getTime()}.xlsx`)
+      }, `order_${new Date().getTime()}.xlsx`)
     },
     /** 拆分按钮操作 */
     splitBtn(row) {
diff --git a/src/views/plan/plan/index.vue b/src/views/plan/plan/index.vue
index 0ca5a40..d24b596 100644
--- a/src/views/plan/plan/index.vue
+++ b/src/views/plan/plan/index.vue
@@ -12,10 +12,20 @@
         >
         </el-date-picker>
       </el-form-item>
+<!--      <el-form-item label="同步状态">-->
+<!--        <el-select v-model="queryParams.syncFlag" placeholder="请选择同步状态">-->
+<!--          <el-option label="已同步" value="Y"></el-option>-->
+<!--          <el-option label="未同步" value="N"></el-option>-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
       <el-form-item label="同步状态">
-        <el-select v-model="queryParams.syncFlag" placeholder="请选择同步状态">
-          <el-option label="已同步" value="1"></el-option>
-          <el-option label="未同步" value="0"></el-option>
+        <el-select v-model="queryParams.syncFlag" placeholder="请选择同步状态" clearable>
+          <el-option
+            v-for="dict in dict.type.sys_yes_no"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -82,7 +92,11 @@
           <span>{{ parseTime(scope.row.planTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="已同步" align="center" prop="syncFlag"/>
+      <el-table-column label="已同步" align="center" prop="syncFlag">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.syncFlag"/>
+        </template>
+      </el-table-column>
       <el-table-column label="创建人" align="center" prop="createBy"/>
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">
         <template slot-scope="scope">
@@ -358,6 +372,7 @@ import moment from 'moment'
 
 export default {
   name: 'Plan',
+  dicts: ['sys_yes_no'],
   data() {
     return {
       // 湿料计划详情list
diff --git a/src/views/plan/workorder/index.vue b/src/views/plan/workorder/index.vue
index 7657440..6eec0da 100644
--- a/src/views/plan/workorder/index.vue
+++ b/src/views/plan/workorder/index.vue
@@ -168,8 +168,12 @@
 					<dict-tag :options="dict.type.workorder_type" :value="scope.row.status"/>
 				</template>
 			</el-table-column>
-			<el-table-column label="备注" align="center" prop="remark" />
-			<el-table-column label="产品类型" align="center" prop="prodType" />
+<!--			<el-table-column label="备注" align="center" prop="remark" />-->
+			<el-table-column label="产品类型" align="center" prop="prodType" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.product_type" :value="scope.row.prodType"/>
+        </template>
+      </el-table-column>
 		</el-table>
 
 		<pagination
@@ -321,7 +325,7 @@ import moment from 'moment';
 import { getprodLineShift } from '@/api/plan/order'
 export default {
 	name: "Workorder",
-	dicts: ['workorder_type'],
+	dicts: ['product_type','workorder_type'],
 	data() {
 		return {
       // 工单修改form