diff --git a/src/components/CustomFormComponents/InputForStandards.vue b/src/components/CustomFormComponents/InputForStandards.vue
index 946f39711..39274d02a 100644
--- a/src/components/CustomFormComponents/InputForStandards.vue
+++ b/src/components/CustomFormComponents/InputForStandards.vue
@@ -106,9 +106,12 @@
{{ ['已发布', 'TBD', ''].includes(scope.row.issueTime) ? scope.row.issueTime : $moment(scope.row.issueTime).format('YYYY-MM-DD') }}
+
+ {{ textStatusMap[scope.row.textStatus] }}
+
{{$t('m.dataAcquisition')}}
@@ -168,6 +171,8 @@ export default {
},
data () {
return {
+ textStatus:'',//文本状态
+ textStatusMap: {}, // 文本状态id与name对应
replaceLawsNumModel: false,
sarBussionessLawsEO: {
replaceLawsNum: ''
@@ -203,7 +208,22 @@ export default {
return !!this.config.isMust
}
},
+ mounted() {
+ //从数据库中查询下拉框数据
+ this.$http.get("sys/dictype/getDicTypeListCode", {}, {
+ _this: this
+ }, res => {
+ this.standStateOptions = res.data.WBZTCLASS; // 文本状态
+ this.setMap(this.standStateOptions);
+ });
+ },
methods: {
+ // 将文本状态的id与name对应
+ setMap(data) {
+ data.forEach(item => {
+ this.$set(this.textStatusMap, item.value, item.label)
+ })
+ },
handleChange (event) {
// const value = event.target.value
const value = event
diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue
new file mode 100644
index 000000000..0a35e1982
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue
@@ -0,0 +1,781 @@
+
+
+
+
+ 项目清单确认流程
+ 申请人发起流程
+
+
+
+
+
+
+ 基础信息
+
+
+
+
+
+ 选择项目
+
+
+
+
+
+
+
+
+
+ 选择清单
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 流程发起人
+
+
+
+
+
+
+
+
+
+
+ 确认人
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+
+ 清空
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+
+ 清空
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 未发布
+ 已发布
+ 审核中
+
+
+
+
+ {{ scope.row.detailedListVision
+ }}
+
+
+
+
+
+ {{ scope.row.updateTime ? $moment(scope.row.updateTime).format("YYYY-MM-DD") : scope.row.updateTime
+ }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-2.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-2.vue
new file mode 100644
index 000000000..4529bca2e
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-2.vue
@@ -0,0 +1,575 @@
+
+
+
+ 项目清单确认流程
+ 确认人确认
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}
+
+
+
+
+ {{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}
+
+
+
+
+ {{ scope.row.commentText }}
+
+
+
+
+ {{ scope.row.endTime ? "已完成" : "未完成" }}
+
+
+
+ 流程列表加载中
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue
index 628214c8b..2b8fd94e8 100644
--- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue
@@ -232,11 +232,20 @@
-
-
+
+ placeholder="请选择"
+ filterable
+ size="small"
+ >
+
+
{
this.ProjectDatas = res.data.total.records;
this.total = res.data.total.total;
+ this.page = 1;
}, e => {
});
@@ -530,6 +540,7 @@ export default {
} else {
this.qdform.detailedListName = this.selectedList[0].detailedListName;
this.qdform.detailedListId = this.selectedList[0].id;
+ this.qdform.detailedListVision = this.selectedList[0].detailedListVision;
this.detailedListModel = false;
}
},
@@ -578,14 +589,14 @@ export default {
},
//提交事件
handleSubmit() {
- this.qdform.commentText = this.commentText
+ this.qdform.commentText = this.commentText;
var json = Object.assign(this.qdform, this.roleForm);
this.$refs["qdqrForm"].validate((valid) => {
if (valid) {
this.$refs["Form"].validate((valid) => {
if (valid) {
- this.isSubmit = true
- this.$http.get("lawss/activiti/startProcess", {type: "10"}, {
+ this.isSubmit = true;
+ this.$http.get("lawss/activiti/startProcess", { type: "10" }, {
_this: this
}, res => {
if (res.ok) {
@@ -600,7 +611,7 @@ export default {
this.$message.success(res.message);
this.$router.push("/processCenter");
}
- this.isSubmit = false
+ this.isSubmit = false;
});
}
});
@@ -622,7 +633,7 @@ export default {
_formData.append("createUserName", this.$store.getters.userInfo.userName);
_formData.append("prcType", "10");
_formData.append("json", JSON.stringify({
- taskInfo: '确认人确认',
+ taskInfo: "确认人确认",
form: this.qdform,
roleForm: this.roleForm,
commentText: this.commentText
@@ -634,7 +645,7 @@ export default {
}).catch(e => {
this.saveLoading = false;
});
- },
+ }
},
mounted() {
// 查询各下拉框数据
diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue
index 6bbd2d579..c75b9ef5a 100644
--- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue
@@ -499,34 +499,34 @@ export default {
this.qdform.prcNum = this.prcNum;
this.qdform.prcName = this.prcName;
this.qdform["id"] = item.id;
- this.projectId = item.projectId;
+ // this.projectId = item.projectId;
this.detailedId = item.detailedListId;
- this.getStandData();
+ // this.getStandData();
this.getStand();
});
},
//查询清单下的标准
- getStandData() {
- this.$http.get("sarStandProjectLibrary/queryStandInfo", { id: this.projectId, cars: '1', }, {
- _this: this
- }, res => {
- this.dataList = res.data.records;
- this.dataList.forEach(item => {
- // 责任部门转换
- if (item.zrbm !== null || item.zrbm !== "") {
- let k = (item.zrbm || "").split(",");
- for (let i in this.zrbmOptions) {
- for (let m = 0; m < k.length; m++) {
- if (this.zrbmOptions[i].value === k[m]) {
- k[m] = this.zrbmOptions[i].label;
- }
- item.zrbm = k.join(",");
- }
- }
- }
- });
- });
- },
+ // getStandData() {
+ // this.$http.get("sarStandProjectLibrary/queryStandInfo", { id: this.projectId, cars: '1', }, {
+ // _this: this
+ // }, res => {
+ // this.dataList = res.data.records;
+ // this.dataList.forEach(item => {
+ // // 责任部门转换
+ // if (item.zrbm !== null || item.zrbm !== "") {
+ // let k = (item.zrbm || "").split(",");
+ // for (let i in this.zrbmOptions) {
+ // for (let m = 0; m < k.length; m++) {
+ // if (this.zrbmOptions[i].value === k[m]) {
+ // k[m] = this.zrbmOptions[i].label;
+ // }
+ // item.zrbm = k.join(",");
+ // }
+ // }
+ // }
+ // });
+ // });
+ // },
//提交事件
handleSubmit() {
this.isSubmit = true;
diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue
index 5dabf5193..f450ea977 100644
--- a/src/pages/processCenter/pages/processDetail/index.vue
+++ b/src/pages/processCenter/pages/processDetail/index.vue
@@ -228,6 +228,9 @@ export default {
}else if(prcType === '3'){
//标准征求意见
this.toProcessDetail('bzzqyjStep1-9',row)
+ }else if(prcType === '10'){
+ //项目清单确认
+ this.toProcessDetail('xmqdqrStep1-2',row)
}
} else {
this.$message.warning('当前流程未全部办理完成,无法查看')
diff --git a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
index 1826a1a9b..d549fffd8 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
@@ -345,6 +345,16 @@ export default {
}
})
break
+ case '10':
+ this.$router.push({
+ name: 'xmqdqrStep1-1',
+ query: {
+ type: '10',
+ processName: '项目清单确认流程',
+ bpnId: id
+ }
+ })
+ break
}
},
...mapMutations(['setProcess', 'setHandleInfo']),
diff --git a/src/router/index.js b/src/router/index.js
index c5f00b910..a5808bd79 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -547,6 +547,24 @@ const routes = [
title: '项目清单确认流程'
}
},
+ {
+ path: '/xmqdqrStep1-1',
+ name: 'xmqdqrStep1-1',
+ component: () => import('@/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue'),
+ meta: {
+ requireAuth: true,
+ title: '项目清单确认流程'
+ }
+ },
+ {
+ path: '/xmqdqrStep1-2',
+ name: 'xmqdqrStep1-2',
+ component: () => import('@/pages/processCenter/pages/creatProcess/xmqdqr/step1-2.vue'),
+ meta: {
+ requireAuth: true,
+ title: '项目清单确认流程'
+ }
+ },
{
path: '/wfhxzgStep1',
name: 'wfhxzgStep1',