From 1f4e7d0f73a73e7350cf5a1df279d5f30904c5d5 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 06 十二月 2023 08:41:32 +0800
Subject: [PATCH] bug
---
web_standard/src/views/ext/plansExt.vue | 85 +++++++++++++++++++++++++-----------------
1 files changed, 50 insertions(+), 35 deletions(-)
diff --git a/web_standard/src/views/ext/plansExt.vue b/web_standard/src/views/ext/plansExt.vue
index 53e384c..fb49b20 100644
--- a/web_standard/src/views/ext/plansExt.vue
+++ b/web_standard/src/views/ext/plansExt.vue
@@ -2,9 +2,9 @@
<!-- <TableLayout> -->
<keep-alive><TableLayout v-permissions="['ext:plansext:query']">
<!-- 鎼滅储琛ㄥ崟 -->
- <el-form slot="search-form" ref="searchForm" :model="searchForm" label-suffix="锛�" label-width="90px" inline>
- <el-form-item label="鎼滅储淇℃伅" prop="mixParam">
- <el-input v-model="searchForm.mixParam" placeholder="璇疯緭鍏ョ墿鏂欏悕绉�/缂栫爜/宸ュ簭鍚嶇О" @keypress.enter.native="search"></el-input>
+ <el-form slot="search-form" ref="searchForm" :model="searchForm" label-suffix="锛�" label-width="110px" inline>
+ <el-form-item label="鐗╂枡淇℃伅" prop="mixParam">
+ <el-input v-model="searchForm.mixParam" placeholder="璇疯緭鍏ョ墿鏂欏悕绉�/缂栫爜" @keypress.enter.native="search"></el-input>
</el-form-item>
<el-form-item label="鎴愬搧璁″垝" prop="workPlanCode">
<el-input v-model="searchForm.workPlanCode" placeholder="璇疯緭鍏ユ垚鍝佽鍒掔紪鐮�" @keypress.enter.native="search"></el-input>
@@ -52,7 +52,7 @@
<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="planDate">
+ <el-form-item label="璁″垝缁撴潫鏃ユ湡" prop="planDate">
<el-date-picker
value-format="yyyy-MM-dd"
v-model="time"
@@ -71,19 +71,19 @@
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
<ul class="toolbar">
- <!-- <li v-permissions="['ext:plansext:importExcel']">
+ <li v-permissions="['ext:plansext:distribute']"><el-button type="primary" @click="plansDistribute">鎵归噺鍒嗛厤</el-button></li>
+ <li v-permissions="['ext:plansext:importExcel']">
<ImportButton
text="瀵煎叆"
template-name="plans_import_template.xlsx"
- template-path="template/plans_import_template.xlsx"
+ template-path="/template/plans_import_template.xlsx"
action="/ext/plansExt/importBatch"
@success="search"
/>
- </li> -->
+ </li>
<!-- <li v-permissions="['ext:plansext:create']"><el-button type="primary" @click="$refs.operaPlansExtWindow.open('鏂板缓鐢熶骇璁″垝')" >鏂板缓</el-button></li> -->
<!-- <li v-permissions="['ext:plansext:publish']"><el-button type="primary" @click="planRelease" >鍙戝竷</el-button></li> -->
- <li v-permissions="['ext:plansext:distribute']"><el-button type="primary" @click="plansDistribute">鎵归噺鍒嗛厤</el-button></li>
- <li v-permissions="['ext:plansext:exportExcel']"><el-button type="primary" :loading="isWorking.export" @click="exportExcel">瀵煎嚭</el-button></li>
+ <!-- <li v-permissions="['ext:plansext:exportExcel']"><el-button type="primary" :loading="isWorking.export" @click="exportExcel">瀵煎嚭</el-button></li> -->
<!-- <li v-permissions="['ext:plansext:planpink']"><el-button type="primary" @click="$refs.operaWTransferExtWindow.open('璁″垝棰嗘枡')">璁″垝棰嗘枡</el-button></li> -->
<!-- <li v-permissions="['ext:plansext:stockpink']"><el-button type="primary" @click="$refs.operaPlanStaock.open('搴撳瓨棰嗘枡')">搴撳瓨棰嗘枡</el-button></li> -->
<!-- <li v-permissions="['ext:plansext:delete']"><el-button type="danger" plain @click="deleteByIdInBatch">鎵归噺鍒犻櫎</el-button></li> -->
@@ -100,7 +100,11 @@
@row-style="rowStyle"
>
<el-table-column type="selection" fixed="left" width="55"></el-table-column>
- <el-table-column prop="id" label="璁″垝搴忓彿" fixed="left" min-width="80px"></el-table-column>
+ <el-table-column prop="id" label="璁″垝搴忓彿" fixed="left" min-width="100px">
+ <template slot-scope="{row}">
+ <span>{{ row.id }}</span><el-tag type="danger" size="mini" v-if="row.hasExpire">寤舵湡</el-tag>
+ </template>
+ </el-table-column>
<el-table-column prop="mmodel.name" fixed="left" label="鐗╂枡鍚嶇О" show-overflow-tooltip min-width="140px">
<template slot-scope="{row}">
<el-button type="text" class="materail" @click="showPlan(row.id)">
@@ -110,36 +114,35 @@
</el-table-column>
<el-table-column prop="mmodel.code" label="鐗╂枡缂栫爜" min-width="160px">
</el-table-column>
- <el-table-column prop="planDate" label="璁″垝鏃ユ湡" min-width="100px"></el-table-column>
+
<el-table-column prop="fmodel.name" label="宸ュ巶" min-width="100px"></el-table-column>
<el-table-column prop="pmodel.name" label="宸ュ簭" show-overflow-tooltip min-width="100px">
<template slot-scope="{row}">
<span class="long-title-style">{{ row.pmodel ? row.pmodel.name : '-' }}</span>
</template>
</el-table-column>
+ <el-table-column prop="batch" label="鐢熶骇鎵规鍙�" show-overflow-tooltip min-width="140px"></el-table-column>
<el-table-column prop="num" label="璁″垝鏁伴噺" min-width="100px">
<template slot-scope="{row}">
<span>{{ row.num + (row.umodel ? row.umodel.name : '') }}</span>
</template>
</el-table-column>
- <el-table-column prop="batch" label="鐢熶骇鎵规鍙�" show-overflow-tooltip min-width="140px"></el-table-column>
- <el-table-column prop="urgent" label="浼樺厛绾�" min-width="60px"></el-table-column>
+ <el-table-column prop="workPlanStartDate" label="璁″垝寮�濮嬫棩鏈�" min-width="100px">
+ <!-- <template slot-scope="{row}">
+ {{ row.workPlanStartDate ? row.workPlanStartDate.substring(0, row.workPlanStartDate.length-9) : '-' }}
+ </template> -->
+ </el-table-column>
+ <el-table-column prop="workPlanEndDate" label="璁″垝缁撴潫鏃ユ湡" min-width="100px">
+ <!-- <template slot-scope="{row}">
+ {{ row.workPlanEndDate ? row.workPlanEndDate.substring(0, row.workPlanEndDate.length-9) : '-' }}
+ </template> -->
+ </el-table-column>
+
<el-table-column label="璁″垝鐘舵��" min-width="80px">
<template slot-scope="{row}">
{{ statusToStr(row.status) }}
</template>
</el-table-column>
- <el-table-column label="璁″垝绫诲瀷" min-width="80px">
- <template slot-scope="{row}">
- <span :style="typeColor(row.type)">{{ typeToStr(row.type) }}</span>
- </template>
- </el-table-column>
- <el-table-column label="鏆傚仠" min-width="60px">
- <template slot-scope="{row}">
- {{ row.paused == 0 ? '鍚�' : '鏄�' }}
- </template>
- </el-table-column>
- <el-table-column prop="workPlanCode" label="鎴愬搧璁″垝缂栫爜" min-width="140px"></el-table-column>
<el-table-column prop="distributNoDoneNum" label="宸插垎閰嶆湭鎶ュ伐鏁伴噺" min-width="140px">
<template slot-scope="{row}">
<span>{{row.distributNoDoneNum ? (row.distributNoDoneNum + (row.umodel ? row.umodel.name : '')) : '-' }}</span>
@@ -147,12 +150,24 @@
</el-table-column>
<el-table-column prop="qulifiedNum" label="鍚堟牸鏁伴噺" min-width="100px">
<template slot-scope="{row}">
- <span>{{row.qulifiedNum ? (row.qulifiedNum + (row.umodel ? row.umodel.name : '')) : '-' }}</span>
+ <span class="valid-style">{{row.qulifiedNum ? (row.qulifiedNum + (row.umodel ? row.umodel.name : '')) : '-' }}</span>
</template>
</el-table-column>
<el-table-column prop="unqulifiedNum" label="涓嶈壇鏁伴噺" min-width="100px">
<template slot-scope="{row}">
- <span>{{row.unqulifiedNum ? (row.unqulifiedNum + (row.umodel ? row.umodel.name : '')) : '-' }}</span>
+ <span class="unvalid-style">{{row.unqulifiedNum ? (row.unqulifiedNum + (row.umodel ? row.umodel.name : '')) : '-' }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="urgent" label="浼樺厛绾�" min-width="60px"></el-table-column>
+ <el-table-column label="鏆傚仠" min-width="60px">
+ <template slot-scope="{row}">
+ {{ row.paused == 0 ? '鍚�' : '鏄�' }}
+ </template>
+ </el-table-column>
+ <el-table-column prop="workPlanCode" label="涓昏鍒掔紪鐮�" min-width="140px"></el-table-column>
+ <el-table-column label="绫诲瀷" min-width="80px">
+ <template slot-scope="{row}">
+ <span :style="typeColor(row.type)">{{ typeToStr(row.type) }}</span>
</template>
</el-table-column>
<el-table-column prop="publishDate" label="鍙戝竷鏃ユ湡" min-width="100px">
@@ -160,7 +175,7 @@
<span>{{ row.publishDate || '-' }}</span>
</template>
</el-table-column>
- <el-table-column prop="userId" label="璁″垝鍛�" min-width="160px">
+ <el-table-column prop="usermodel.realname" label="璁″垝鍛�" min-width="160px">
<template slot-scope="{row}">
<span class="long-title-style"> {{ row.usermodel.realname + " " + row.usermodel.mobile }}</span>
</template>
@@ -280,8 +295,8 @@
factoryId: null,
status: null,
mixParam: null,
- endDate: null,
- startDate: null,
+ planDateStartDate: null,
+ planDateEndDate: null,
batch: null,
type: null,
workPlanCode: null
@@ -314,8 +329,9 @@
},
methods: {
selectDate (v) {
- this.searchForm.startDate = v[0]
- this.searchForm.endDate = v[1]
+ this.searchForm.planDateStartDate = v[0]
+ this.searchForm.planDateEndDate = v[1]
+ this.search()
},
selectFactroy (v) {
this.searchForm.procedureIdList = []
@@ -329,8 +345,8 @@
},
reset () {
this.$refs.searchForm.resetFields()
- this.searchForm.startDate = null
- this.searchForm.endDate = null
+ this.searchForm.planDateStartDate = null
+ this.searchForm.planDateEndDate = null
this.time = []
this.search()
},
@@ -508,7 +524,6 @@
showPlan (id) {
planDetailById(id)
.then(res => {
- // console.log(res)
this.$refs.operaPlansDetailExtWindow.open('璇︽儏', res)
})
.catch(err => {
@@ -559,7 +574,7 @@
if (index === 0) {
sums[index] = '鍚堣';
return;
- } else if (index === 1 || index === 8 || index === 9 || index === 16 || index === 17) {
+ } else if (index === 1 || index === 6 || index === 8 || index === 9 || index === 14 || index === 16 || index === 17) {
sums[index] = '-';
return;
} else if (index === 8 ) {
--
Gitblit v1.9.3