diff --git a/src/pages/details/otherStandardDetails/components/RelatedTermsSelect.vue b/src/pages/details/otherStandardDetails/components/RelatedTermsSelect.vue
index d7ea0fe8e..4917b1547 100644
--- a/src/pages/details/otherStandardDetails/components/RelatedTermsSelect.vue
+++ b/src/pages/details/otherStandardDetails/components/RelatedTermsSelect.vue
@@ -48,6 +48,7 @@
tooltip-effect="dark"
style="width: 100%;"
height="100%"
+ @selection-change="handleSelectionChange"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
row-key="id"
@@ -115,6 +116,7 @@ export default {
return {
tableDataLoading: false,
total: 0,
+ handleList: [],
selectRoleId: '',
searchForm: {
standardKey: '',
@@ -170,6 +172,10 @@ export default {
// this.resetSearchForm()
this.queryTablePage()
},
+ handleSelectionChange(data){
+ this.handleList = data
+ this.$emit('func',this.handleList)
+ },
pageChange (page) {
this.pageNo = page
@@ -183,7 +189,6 @@ export default {
resetPageNo() {
this.pageNo = 1
},
-
// 查询、加载表格
queryTablePage () {
const formData = {
diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index 1fa58e39b..4ee244b6a 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -1734,6 +1734,7 @@
>
1) {
@@ -3647,17 +3652,22 @@ export default {
this.$refs['relatedTermsSelect'].handleCancel()
},
+ //关联成功的提示
handleRelatedTermsDrawerSubmit() {
-
this.btnLoading = true
- this.$refs['relatedTermsSelect'].handleSubmit(() => {
- this.selectSarStandItems()
+ if(this.handleList.length){
+ this.$refs['relatedTermsSelect'].handleSubmit(() => {
+ this.selectSarStandItems()
+ this.btnLoading = false
+ this.$message({
+ message: '关联成功',
+ type: 'success'
+ });
+ })
+ }else{
+ this.$message.warning('请至少勾选一条条款进行关联')
this.btnLoading = false
- this.$message({
- message: '关联成功',
- type: 'success'
- });
- })
+ }
},
closeRelatedTermsDrawer() {
this.$refs['relatedTermsDrawer'].closeDrawer()
diff --git a/src/pages/processCenter/pages/components/ProcessMixin.vue b/src/pages/processCenter/pages/components/ProcessMixin.vue
index e08585b67..8a5330dfe 100644
--- a/src/pages/processCenter/pages/components/ProcessMixin.vue
+++ b/src/pages/processCenter/pages/components/ProcessMixin.vue
@@ -101,17 +101,17 @@ export default {
value: "22"
},
{
- label: "企标复审流程",
- value: "23"
- },
- {
- label: '企标废止流程',
+ label: "企标废止流程",
value: "24"
},
{
- label: '企标制修订计划管控',
+ label: "企标制修订计划管控",
value: "25"
},
+ {
+ label: "企标制修订立项",
+ value: "26"
+ }
],
formDisableFlag: false,
pickerOptions: {
diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue
index a988ccfa7..9f23d54af 100644
--- a/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue
@@ -638,25 +638,36 @@ export default {
} else if(this.dataList.length > 5) {
this.$message.warning('您最多只能选择五条数据')
}else{
- this.listForm.dataList = this.dataList;
- this.listForm.breakdownList = this.breakdownList
- this.listForm.commentText = this.commentText;
- const json = JSON.stringify(this.listForm);
- this.isSubmit = true;
- this.$http.post("lawss/activiti/completeTask", {
- taskIds: this.taskIds,
- userId: this.userId,
- json: json
- }, {
- _this: this
- }, res => {
- if (res.success) {
- this.$message.success(res.message);
- this.$router.push("/processCenter");
+ let subFlag = true
+ this.dataList.forEach(item => {
+ if(!item.unameId){
+ subFlag = false
+ return
}
- this.isSubmit = false;
- }, e => {
- });
+ })
+ if(subFlag){
+ this.listForm.dataList = this.dataList;
+ this.listForm.breakdownList = this.breakdownList
+ this.listForm.commentText = this.commentText;
+ const json = JSON.stringify(this.listForm);
+ this.isSubmit = true;
+ this.$http.post("lawss/activiti/completeTask", {
+ taskIds: this.taskIds,
+ userId: this.userId,
+ json: json
+ }, {
+ _this: this
+ }, res => {
+ if (res.success) {
+ this.$message.success(res.message);
+ this.$router.push("/processCenter");
+ }
+ this.isSubmit = false;
+ }, e => {
+ });
+ }else{
+ this.$message.warning('请选择项目经理')
+ }
}
},
diff --git a/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue b/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue
index e272a696b..fdc50378b 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue
@@ -187,7 +187,7 @@ export default {
size: this.$store.getters.userInfo.configContent,
userId: this.$store.getters.userInfo.userId,
prcName: this.searchForm.prcName,
- prcType: parseInt(this.searchForm.prcType) || '',
+ prcType: parseInt(this.searchForm.prcType) || this.searchForm.prcType || '',
prcNum: this.searchForm.prcNum
}, {
loading: 'loading',
diff --git a/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue b/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue
index 978382242..9755777a1 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue
@@ -216,7 +216,7 @@ export default {
size: this.$store.getters.userInfo.configContent,
userId: this.$store.getters.userInfo.userId,
prcName: this.searchForm.prcName,
- prcType: parseInt(this.searchForm.prcType) || '',
+ prcType: parseInt(this.searchForm.prcType) || this.searchForm.prcType ||'',
prcNum: this.searchForm.prcNum
},
{
diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
index e5c5d3f4e..2a46e9847 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
@@ -254,7 +254,7 @@ export default {
size: parseInt(this.$store.getters.userInfo.configContent),
userId: this.$store.getters.userInfo.usid || this.$store.getters.userInfo.userId,
prcName: this.searchForm.prcName,
- prcType: parseInt(this.searchForm.prcType) || '',
+ prcType: parseInt(this.searchForm.prcType) || this.searchForm.prcType ||'',
prcNum: this.searchForm.prcNum
},
{