From fb65ffe3606482e15bcdf1fd5adfb1acb1b8e846 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 16 八月 2023 11:24:49 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmMes
---
web_standard/src/views/business/workPlans.vue | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/web_standard/src/views/business/workPlans.vue b/web_standard/src/views/business/workPlans.vue
index bbf64f7..360a5f5 100644
--- a/web_standard/src/views/business/workPlans.vue
+++ b/web_standard/src/views/business/workPlans.vue
@@ -26,6 +26,9 @@
<el-form-item label="鎵规鍙�" prop="batch">
<el-input v-model="searchForm.batch" placeholder="璇疯緭鍏�" @keypress.enter.native="search"></el-input>
</el-form-item>
+ <el-form-item label="閿�鍞崟鍙�" prop="salesorder">
+ <el-input v-model="searchForm.salesorder" placeholder="璇疯緭鍏�" @keypress.enter.native="search"></el-input>
+ </el-form-item>
<el-form-item label="璁″垝鏃ユ湡" prop="planDate">
<el-date-picker style="width: 300px;" @change="changeDate" v-model="searchForm.planDate" type="datetimerange"
value-format="yyyy-MM-dd" range-separator="鑷�" start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡">
@@ -45,7 +48,7 @@
<ImportButton
text="瀵煎叆"
template-name="workplans_import_template.xlsx"
- template-path="template/workplans_import_template.xlsx"
+ template-path="/template/workplans_import_template.xlsx"
action="/business/workPlans/importBatch"
@success="search"
/>
@@ -57,11 +60,12 @@
</ul>
<el-table v-loading="isWorking.search" :data="tableData.list" border stripe @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55"></el-table-column>
- <el-table-column prop="planCode" label="鎴愬搧璁″垝缂栫爜" min-width="150px">
+ <el-table-column prop="planCode" label="鎴愬搧璁″垝缂栫爜" min-width="190px">
<template slot-scope="{row}">
<el-button type="text" @click="$refs.plannedProgress.open('璁″垝鎵ц杩涘害', row)">
<span class="long-title-style">{{ row.planCode }}</span>
</el-button>
+ <el-tag type="danger" size="mini" v-if="row.hasExpire">寤舵湡</el-tag>
</template>
</el-table-column>
<el-table-column prop="materialName" label="鐗╂枡鍚嶇О" min-width="100px"></el-table-column>
@@ -109,16 +113,15 @@
<span v-else>-</span>
</template>
</el-table-column>
- <el-table-column label="浼樺厛绾�" min-width="80px">
- <template slot-scope="{row}">
+ <el-table-column prop="urgent" label="浼樺厛绾�" min-width="80px">
+ <!-- <template slot-scope="{row}">
<span v-if="row.urgent">{{ row.urgent }}</span>
<span v-else>-</span>
- </template>
+ </template> -->
</el-table-column>
<el-table-column label="鏆傚仠" min-width="80px">
<template slot-scope="{row}">
{{ row.paused==0?'鍚�':'鏄�' }}
-
</template>
</el-table-column>
@@ -185,6 +188,7 @@
factoryId: '',
materialId: '',
batch: '',
+ salesorder: '',
planStatus: '',
planCode: ''
},
--
Gitblit v1.9.3