From 6365ab0a976afdd247742c9b3dca15deb3a7a7a1 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 17 八月 2023 17:21:40 +0800
Subject: [PATCH] 初始化1.0.1
---
web_standard/src/views/business/workPlans.vue | 41 +++++++++++------------------------------
1 files changed, 11 insertions(+), 30 deletions(-)
diff --git a/web_standard/src/views/business/workPlans.vue b/web_standard/src/views/business/workPlans.vue
index 360a5f5..d272873 100644
--- a/web_standard/src/views/business/workPlans.vue
+++ b/web_standard/src/views/business/workPlans.vue
@@ -26,9 +26,6 @@
<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="缁撴潫鏃ユ湡">
@@ -48,7 +45,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"
/>
@@ -58,20 +55,18 @@
<!-- deleteByIdInBatch -->
<li><el-button type="danger" @click="deleteByIds" icon="el-icon-delete" v-permissions="['ext:workplans:delete']">鎵归噺鍒犻櫎</el-button></li>
</ul>
- <el-table v-loading="isWorking.search" :data="tableData.list" border stripe @selection-change="handleSelectionChange">
+ <el-table v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55"></el-table-column>
- <el-table-column prop="planCode" label="鎴愬搧璁″垝缂栫爜" min-width="190px">
+ <el-table-column prop="planCode" label="鎴愬搧璁″垝缂栫爜" min-width="150px">
<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>
<el-table-column prop="materialCode" label="鐗╂枡缂栫爜" min-width="100px"></el-table-column>
- <el-table-column prop="startDate" label="璁″垝寮�濮嬫棩鏈�" min-width="100px"></el-table-column>
- <el-table-column prop="planDate" label="璁″垝瀹屾垚鏃ユ湡" min-width="100px"></el-table-column>
+ <el-table-column prop="planDate" label="璁″垝鏃ユ湡" min-width="100px"></el-table-column>
<el-table-column prop="factoryName" label="宸ュ巶" min-width="100px"></el-table-column>
<el-table-column prop="batch" label="鐢熶骇鎵规鍙�" min-width="100px"></el-table-column>
<el-table-column prop="num" label="璁″垝鏁伴噺" min-width="100px"></el-table-column>
@@ -86,6 +81,12 @@
<span v-else-if="row.status == 6">宸插畬宸�</span>
<!-- <span v-else-if="row.status == 7">宸插叆搴�</span> -->
<span v-else-if="row.status == 8">宸插叧闂�</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="鏆傚仠" min-width="100px">
+ <template slot-scope="{row}">
+ <span v-if="row.paused == 1">鏄�</span>
+ <span v-else>鍚�</span>
</template>
</el-table-column>
<el-table-column label="瀹屽伐鏁�" min-width="100px">
@@ -106,26 +107,7 @@
<span v-else>-</span>
</template>
</el-table-column>
-
- <el-table-column label="閿�鍞鍗�" min-width="100px">
- <template slot-scope="{row}">
- <span v-if="row.salesorder">{{ row.salesorder }}</span>
- <span v-else>-</span>
- </template>
- </el-table-column>
- <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> -->
- </el-table-column>
- <el-table-column label="鏆傚仠" min-width="80px">
- <template slot-scope="{row}">
- {{ row.paused==0?'鍚�':'鏄�' }}
- </template>
- </el-table-column>
-
- <el-table-column label="鍙戝竷鏃ユ湡" min-width="100px">
+ <el-table-column label="鍙戝竷鏃堕棿" min-width="100px">
<template slot-scope="{row}">
<span v-if="row.publishDate">{{ row.publishDate }}</span>
<span v-else>-</span>
@@ -188,7 +170,6 @@
factoryId: '',
materialId: '',
batch: '',
- salesorder: '',
planStatus: '',
planCode: ''
},
--
Gitblit v1.9.3