From 7740e8d2fbfc70608575b22d6eded9a439ab4750 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期一, 18 十二月 2023 09:17:57 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/resources/mapper/project/ProjectDao.xml | 8 ++++++--
web/src/views/modules/testCheckOrder/TestCheckOrder-AddOrUpdate.vue | 17 +++++++----------
modules/mainPart/src/main/java/com/zt/life/modules/project/controller/ProjectController.java | 3 ++-
web/src/views/modules/project/Project-select.vue | 27 +++++++++++++++------------
4 files changed, 30 insertions(+), 25 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/ProjectController.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/ProjectController.java
index 3ebe39f..7eab97e 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/ProjectController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/ProjectController.java
@@ -63,7 +63,8 @@
@ApiImplicitParam(name = "criticalLevel", value = "鍏抽敭绛夌骇", dataType = Constant.QT.STRING, format = "critical_level^EQ"),
@ApiImplicitParam(name = "softwareType", value = "杞欢绫诲瀷", dataType = Constant.QT.STRING, format = "software_type^EQ"),
@ApiImplicitParam(name = "isContract", value = "鏄惁绛剧讲鍚堝悓", dataType = Constant.QT.STRING, format = "is_contract^EQ"),
- @ApiImplicitParam(name = "tableName", value = "鍔熻兘琛�", dataType = Constant.QT.STRING)
+ @ApiImplicitParam(name = "tableName", value = "鍔熻兘琛�", dataType = Constant.QT.STRING),
+ @ApiImplicitParam(name = "pageCode", value = "椤甸潰鏍囪瘑", dataType = Constant.QT.STRING),
})
public PageResult<Project> page(@ApiIgnore @QueryParam QueryFilter queryFilter) {
List<Project> Project =projectService.page(queryFilter);
diff --git a/modules/mainPart/src/main/resources/mapper/project/ProjectDao.xml b/modules/mainPart/src/main/resources/mapper/project/ProjectDao.xml
index 154daf9..cadfde9 100644
--- a/modules/mainPart/src/main/resources/mapper/project/ProjectDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/project/ProjectDao.xml
@@ -12,9 +12,13 @@
and ${whereSql}
</if>
<if test="tableName!=null">
- and id not in (select project_id from ${tableName} where is_delete = 0)
+ and id not in (select project_id from ${tableName} where is_delete = 0
+ <if test="pageCode !=null and pageCode !='' ">
+ and page_code = '${pageCode}'
+ </if>
+ )
</if>
- <if test="tableName =='contract_review'">
+ <if test="tableName =='contract_review' or pageCode =='contract'">
and is_contract =1
</if>
</where>
diff --git a/web/src/views/modules/project/Project-select.vue b/web/src/views/modules/project/Project-select.vue
index 06023dd..8916936 100644
--- a/web/src/views/modules/project/Project-select.vue
+++ b/web/src/views/modules/project/Project-select.vue
@@ -2,7 +2,8 @@
<zt-dialog ref="dialog" column="2" title="閫夋嫨椤圭洰" :editAble="false" :hasConfirm="false">
<el-card shadow="never" class="aui-card--fill">
<div class="mod-project-project}">
- <zt-table-wraper ref="tableObj" query-url="/project/Project/page" delete-url="/project/Project" v-slot="{ table }">
+ <zt-table-wraper ref="tableObj" query-url="/project/Project/page" delete-url="/project/Project"
+ v-slot="{ table }">
<el-form :inline="true" style="padding: 0" :model="dataForm" @keyup.enter.native="table.query()">
<el-form-item style="width:12%">
<el-input v-model="dataForm.softwareName" placeholder="璇疯緭鍏ヨ蒋浠跺悕绉�" clearable></el-input>
@@ -13,16 +14,16 @@
<el-form-item style="width:12%">
<zt-dict v-model="dataForm.criticalLevel" placeholder="鍏抽敭绛夌骇" dict="critical_level" clearable></zt-dict>
</el-form-item>
- <!-- <el-form-item style="width:12%">
- <zt-dict v-model="dataForm.testLevel" placeholder="娴嬭瘯绾у埆" dict="test_level" clearable></zt-dict>
- </el-form-item>-->
+ <!-- <el-form-item style="width:12%">
+ <zt-dict v-model="dataForm.testLevel" placeholder="娴嬭瘯绾у埆" dict="test_level" clearable></zt-dict>
+ </el-form-item>-->
<el-form-item style="width:12%">
<zt-dict v-model="dataForm.softwareType" placeholder="杞欢绫诲瀷" dict="software_type" clearable></zt-dict>
</el-form-item>
<el-form-item style="width:12%">
<zt-dict v-model="dataForm.isContract" placeholder="鏄惁绛剧讲鍚堝悓" dict="is_or_not" clearable></zt-dict>
</el-form-item>
- <el-form-item style="float: right;width:12%">
+ <el-form-item style="float: right;width:12%">
<zt-button type="query" @click="table.query()"/>
</el-form-item>
</el-form>
@@ -55,7 +56,7 @@
name: 'Project-select',
data() {
return {
- pageCode:'',
+ pageCode: '',
dataForm: {
softwareName: '',
secretClass: '',
@@ -63,19 +64,21 @@
testLevel: '',
softwareType: '',
isContract: '',
- tableName: null
+ tableName: null,
+ pageCode: null,
}
}
},
methods: {
- init(tableName,row) {
+ init(tableName, row) {
this.dataForm.tableName = tableName
- if(row){
- if(row.pageCode!=null){
+ if (row) {
+ if (row.pageCode != null) {
this.pageCode = row.pageCode
+ this.dataForm.pageCode = row.pageCode
}
}
- this.$nextTick(()=>{
+ this.$nextTick(() => {
this.$refs.tableObj.query()
})
},
@@ -83,7 +86,7 @@
console.log(row, 'row')
await this.$tip.success()
this.$refs.dialog.close()
- this.$emit('setProjectInfo', row,this.pageCode)
+ this.$emit('setProjectInfo', row, this.pageCode)
}
},
}
diff --git a/web/src/views/modules/testCheckOrder/TestCheckOrder-AddOrUpdate.vue b/web/src/views/modules/testCheckOrder/TestCheckOrder-AddOrUpdate.vue
index b9f2344..f16a699 100644
--- a/web/src/views/modules/testCheckOrder/TestCheckOrder-AddOrUpdate.vue
+++ b/web/src/views/modules/testCheckOrder/TestCheckOrder-AddOrUpdate.vue
@@ -49,7 +49,8 @@
</el-table-column>
<el-table-column prop="checkResult" align="center" width="180" label="妫�鏌ョ粨鏋�">
<template v-slot="{ row }">
- <zt-dict :disabled="stepMarker!=='csjcd_first'" v-model="row.checkResult" dict="tristate1" :radio="true"></zt-dict>
+ <zt-dict :disabled="stepMarker!=='csjcd_first'" v-model="row.checkResult" dict="tristate1"
+ :radio="true"></zt-dict>
</template>
</el-table-column>
<el-table-column prop="remark" label="澶囨敞" width="100" align="center">
@@ -136,7 +137,8 @@
stepMarker: '',
configDetailRow: null,
subtitle: '',
- pageName: {plan: '杞欢娴嬭瘯璁″垝', explain: '杞欢娴嬭瘯璇存槑', record: '杞欢娴嬭瘯璁板綍', report: '杞欢娴嬭瘯鎶ュ憡'},
+ pageName: {plan: '杞欢娴嬭瘯璁″垝', explain: '杞欢娴嬭瘯璇存槑', record: '杞欢娴嬭瘯璁板綍', report: '杞欢娴嬭瘯鎶ュ憡',
+ contract: '鍚堝悓璇勫闃舵', require:'娴嬭瘯闇�姹傚垎鏋愪笌绛栧垝'},
dataForm: {
id: '',
projectId: '',
@@ -159,19 +161,15 @@
},
methods: {
init(id, row) {
- console.log(row,'TestCheckOrder-AddOrUpdate.vue init row')
this.configDetailRow = row
if (row.checkId) {
console.log('閰嶇疆椤瑰叆搴撳鏍歌繘鏉ョ殑 TestCheckOrder-AddOrUpdate.vue init row.checkId')
if (row.checkId != -1) {
- console.log('TestCheckOrder-AddOrUpdate.vue init row.checkId!=-1')
this.dataForm.id = row.checkId
}
} else if (id) {
- console.log(this.dataForm,'浠庢鏌ュ崟杩涙潵鐨� TestCheckOrder-AddOrUpdate.vue init this.dataForm')
this.dataForm.id = id
} else {
- console.log(this.dataForm,'浠庢鏌ュ崟杩涙潵鐨� TestCheckOrder-AddOrUpdate.vue init this.dataForm')
this.dataForm.id = row.id
}
this.pageCode = row.pageCode
@@ -180,7 +178,6 @@
if (row.projectId) {
this.dataForm.projectId = row.projectId
}
- console.log(id, row, this.subtitle, '杞欢娴嬭瘯璁″垝妫�鏌ュ崟')
if (this.configDetailRow) {
if (!row.stepMarker) {
this.stepMarker = 'csjcd_first'
@@ -211,12 +208,12 @@
...this.dataForm,
...res.data
}
- console.log(this.dataForm,'this.dataForm this.dataForm')
+ console.log(this.dataForm, 'this.dataForm this.dataForm')
},
- async print(){
+ async print() {
var params = qs.stringify({
token: Cookies.get('token'),
- id:this.dataForm.id,
+ id: this.dataForm.id,
pageCode: this.pageCode
})
let apiURL = `/testCheckOrder/TestCheckOrder/exportCheckOrder`
--
Gitblit v1.9.1