From d7fe8ae3888c8e2b1eea3c1e3769be0d42a21cc9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 16 十月 2023 09:03:47 +0800
Subject: [PATCH] Merge branch '1.0.3' of http://139.186.142.91:10010/r/productDev/dmMes into 1.0.3
---
web_standard/src/views/ext/plansExt.vue | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/web_standard/src/views/ext/plansExt.vue b/web_standard/src/views/ext/plansExt.vue
index 6fdcdb1..fb49b20 100644
--- a/web_standard/src/views/ext/plansExt.vue
+++ b/web_standard/src/views/ext/plansExt.vue
@@ -3,8 +3,8 @@
<keep-alive><TableLayout v-permissions="['ext:plansext:query']">
<!-- 鎼滅储琛ㄥ崟 -->
<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 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>
@@ -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> -->
@@ -150,12 +150,12 @@
</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>
@@ -175,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>
@@ -524,7 +524,6 @@
showPlan (id) {
planDetailById(id)
.then(res => {
- // console.log(res)
this.$refs.operaPlansDetailExtWindow.open('璇︽儏', res)
})
.catch(err => {
--
Gitblit v1.9.3