From 64abd179773e59fa3f13cd0d28460bc9d7deede1 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期五, 08 十二月 2023 17:29:06 +0800
Subject: [PATCH] 修改
---
web/src/views/modules/sys/task/stay-task.vue | 11 ++++++++---
web/src/views/modules/configItemChange/ConfigItemChange-AddOrUpdate.vue | 16 ++++++++--------
modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseConfigItemDao.xml | 2 +-
3 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseConfigItemDao.xml b/modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseConfigItemDao.xml
index 7cfbb64..8fd3706 100644
--- a/modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseConfigItemDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseConfigItemDao.xml
@@ -48,7 +48,7 @@
from config_item_warehouse_detail a
WHERE a.is_delete = 0
and a.project_id = ${projectId}
- <if test="ids!=null">
+ <if test="ids!=null and ids!=''">
AND id not in (${ids})
</if>
</select>
diff --git a/web/src/views/modules/configItemChange/ConfigItemChange-AddOrUpdate.vue b/web/src/views/modules/configItemChange/ConfigItemChange-AddOrUpdate.vue
index 6bf292f..eeb60d3 100644
--- a/web/src/views/modules/configItemChange/ConfigItemChange-AddOrUpdate.vue
+++ b/web/src/views/modules/configItemChange/ConfigItemChange-AddOrUpdate.vue
@@ -106,7 +106,7 @@
</div>
<div class="el-border-left acceptDate" style="width: 90%;">
<el-form-item style="width: 100%;padding-left:20px;margin:0;">
- <el-input v-model="dataForm.configItemChange.changeReason" placeholder="鍙樻洿鍘熷洜..."></el-input>
+ <el-input :disabled="stepMarker!=='pzxbg_first'" v-model="dataForm.configItemChange.changeReason" placeholder="鍙樻洿鍘熷洜..."></el-input>
</el-form-item>
</div>
</div>
@@ -116,7 +116,7 @@
</div>
<div class="el-border-left acceptDate" style="width: 90%;">
<el-form-item style="width: 100%;padding-left:20px;margin:0;">
- <el-input v-model="dataForm.configItemChange.changeAnalysis" placeholder="鍙樻洿褰卞搷鍒嗘瀽..."></el-input>
+ <el-input :disabled="stepMarker!=='pzxbg_first'" v-model="dataForm.configItemChange.changeAnalysis" placeholder="鍙樻洿褰卞搷鍒嗘瀽..."></el-input>
</el-form-item>
</div>
</div>
@@ -126,7 +126,7 @@
</div>
<div style="width: calc(100% - 120px)" class="el-border-left">
<el-form-item class="el-CMTextarea" style="width: 100%;padding: 5px">
- <el-input v-if="stepMarker=='pzxbg_cmcz'" type="textarea" :rows="2" placeholder="璇疯緭鍏ュ唴瀹�"
+ <el-input v-if="stepMarker=='pzxbg_first'" type="textarea" :rows="2" placeholder="璇疯緭鍏ュ唴瀹�"
v-model="dataForm.configItemChange.changeContent"></el-input>
<span v-else>{{dataForm.configItemChange.changeContent}}</span>
</el-form-item>
@@ -259,7 +259,7 @@
</div>
<div style="width: calc(100% - 120px)" class="el-border-left">
<el-form-item class="el-CMTextarea" style="width: 100%;padding: 5px">
- <el-input v-if="stepMarker=='pzxbg_cmcz'" type="textarea" :rows="2" placeholder="璇疯緭鍏ュ唴瀹�"
+ <el-input v-if="stepMarker=='pzxbg_cmrk'" type="textarea" :rows="2" placeholder="璇疯緭鍏ュ唴瀹�"
v-model="dataForm.configItemChange.warehouseCmOperations"></el-input>
<span v-else>{{dataForm.configItemChange.warehouseCmOperations}}</span>
</el-form-item>
@@ -299,6 +299,7 @@
disabled: true,
stepMarker: '',
title: '鏌ョ湅',
+ ids:'',
showColumn: false,
showAddAndEdit:false,
menuOptions: [
@@ -400,9 +401,7 @@
handleCommand() {
this.$nextTick(()=>{
console.log(this.dataForm.projectId,'this.dataForm.projectId')
- let ids = '1733024946927554561,1733024946600398850'
- this.$refs.configItemList.$refs.dialog.init(this.dataForm.projectId,ids)
-
+ this.$refs.configItemList.$refs.dialog.init(this.dataForm.projectId,this.ids)
})
// this.dataForm.configItemList.push({})
// this.$nextTick(() => {
@@ -415,7 +414,8 @@
if(data.configChangeList){
this.dataForm.configChangeList=this.dataForm.configChangeList.concat(data.configChangeList)
}
- console.log(this.dataForm.configChangeList,'this.dataForm.configChangeList')
+ this.ids = this.dataForm.configChangeList.map(item=>item.selectId).join(',')
+ console.log(this.dataForm.configChangeList,ids,'this.dataForm.configChangeList')
},
openCheckOrderWin(row) {
console.log(row, "openCheckOrderWin(row)")
diff --git a/web/src/views/modules/sys/task/stay-task.vue b/web/src/views/modules/sys/task/stay-task.vue
index d20ab58..9bf70ea 100644
--- a/web/src/views/modules/sys/task/stay-task.vue
+++ b/web/src/views/modules/sys/task/stay-task.vue
@@ -57,6 +57,7 @@
<!-- 寰呭姙浠诲姟寮圭獥寮圭獥, 鏂板 / 淇敼 -->
<ItemCirculatOrder ref="itemCirculatOrder" @refreshDataList="getQuery()"></ItemCirculatOrder>
<ConfigItemWarehouse ref="configItemWarehouse" @refreshDataList="getQuery()"></ConfigItemWarehouse>
+ <ConfigItemChange ref="configItemChange" @refreshDataList="getQuery()"></ConfigItemChange>
<TestCheckOrder ref="testCheckOrder" @refreshDataList="getQuery()"></TestCheckOrder>
<!-- </zt-table-wraper>-->
</div>
@@ -68,6 +69,7 @@
import ItemCirculatOrder from '@/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate'
import ConfigItemWarehouse from '@/views/modules/configItemWarehouse/ConfigItemWarehouse-AddOrUpdate'
import TestCheckOrder from '@/views/modules/testCheckOrder/TestCheckOrder-AddOrUpdate'
+ import ConfigItemChange from '@/views/modules/configItemChange/ConfigItemChange-AddOrUpdate'
export default {
data() {
@@ -108,7 +110,8 @@
InfiniteLoading,
ItemCirculatOrder,
ConfigItemWarehouse,
- TestCheckOrder
+ TestCheckOrder,
+ ConfigItemChange
},
created() {
if (this.$route.path.indexOf('taskCenter') > 0 || this.system == 'smj') {
@@ -219,10 +222,12 @@
if (row.flowCode === 'wplz') {
this.$refs.itemCirculatOrder.$refs.dialog.init(row.bizId, row)
} else if (row.flowCode === 'pzxrk') {
- this.$refs.configItemChange.$refs.dialog.init(row.bizId, row)
+ this.$refs.ConfigItemWarehouse.$refs.dialog.init(row.bizId, row)
}else if (row.flowCode === 'csjcd') {
this.$refs.testCheckOrder.$refs.dialog.init(row.bizId, row)
- } else {
+ } else if (row.flowCode === 'pzxbg') {
+ this.$refs.configItemChange.$refs.dialog.init(row.bizId, row)
+ }else {
if (row.stepRouterId === null) {
this.$tip.alert("娌℃湁閰嶇疆鑿滃崟id")
return;
--
Gitblit v1.9.1