diff --git a/src/main.js b/src/main.js
index e5eff9089..eff6b79a4 100644
--- a/src/main.js
+++ b/src/main.js
@@ -192,6 +192,15 @@ router.beforeEach(function (to, from, next) {
if (prcType === '1') {
// 标准入库流程数据
extracted("bzrkStep5");
+ } else if (prcType === 'buss1') {
+ //标准清单发布流程数据
+ extracted("bussLibraryDetail");
+ } else if (prcType === 'buss2') {
+ //标准清单发布流程数据
+ extracted("bussLibraryProductDetail");
+ } else if (prcType === 'buss3') {
+ //标准清单发布流程数据
+ extracted("bussFsDetail");
} else if (prcType === '4') {
//标准清单发布流程数据
extracted("bzqdfbStep1-4");
diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index a1849a6c3..6965de85b 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -461,7 +461,7 @@
diff --git a/src/pages/home2/components/solicitopinions/index.vue b/src/pages/home2/components/solicitopinions/index.vue
index 882219024..0ed6e33f3 100644
--- a/src/pages/home2/components/solicitopinions/index.vue
+++ b/src/pages/home2/components/solicitopinions/index.vue
@@ -83,11 +83,11 @@ export default {
});
},
standForComments(item) {
- this.$store.commit("setDetailMap", this.$router.path);
+ this.$store.commit("setDetailMap", this.$router.path);
this.$router.push({
name: "consultationDetails",
query: {
- item: item
+ item: JSON.stringify(item)
}
});
}
diff --git a/src/pages/home2/components/todoList/index.vue b/src/pages/home2/components/todoList/index.vue
index 688bac9c7..6f2346510 100644
--- a/src/pages/home2/components/todoList/index.vue
+++ b/src/pages/home2/components/todoList/index.vue
@@ -970,6 +970,18 @@ export default {
prcType: row.prcType
}
})
+ }else if (row.taskInfo === '重新起草') {
+ this.$router.push({
+ name: 'wfhxzgStep1',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ taskAssignee: row.taskAssignee,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
}else {
this.$router.push({
name: 'wfhxzgStep5',
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue
index f5791462e..1f8aea227 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue
@@ -329,12 +329,11 @@ export default {
reason: "修改理由",
department: "提出部门",
responUserName: "提出人",
+ stateText: "处理意见",
+ cause: "原因",
},
dataList: []
};
- if (title === '上报意见.xls') {
- params.columnName.stateText = "处理意见"
- }
params.dataList = JSON.parse(JSON.stringify(row));
params.dataList.forEach(item => {
if (item.state === "1") {
diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/stepDetail.vue b/src/pages/processCenter/pages/creatProcess/qbfs/stepDetail.vue
new file mode 100644
index 000000000..7d792b56c
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/qbfs/stepDetail.vue
@@ -0,0 +1,897 @@
+
+
+
+ 企标复审流程
+ 企标复审流程详情
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}
+
+
+
+
+ {{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}
+
+
+
+
+ {{ scope.row.commentText }}
+
+
+
+
+ {{ scope.row.endTime ? "已完成" : "未完成" }}
+
+
+
+ 流程列表加载中
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
正在加载数据
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue
index 1538497b8..0c138219e 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue
@@ -2751,7 +2751,7 @@
_formData.append('prcType', 'buss2')
_formData.append('prcName', '企标制修订-产品标准')
_formData.append('json', JSON.stringify({
- taskInfo: '发起企标制修订流程',
+ taskInfo: '起草',
form: this.form,
roleForm: this.roleForm,
commentText: this.commentText
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue
index 37bac75f2..5206ca14c 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue
@@ -660,7 +660,7 @@
}
}]
},
- taskInfo:'总院标准法规部产品标准工程师发布',
+ taskInfo:'发布',
loading: false,
disabledState: true,
userId:this.$store.getters.userInfo.userId,
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue
index 62ee2a02a..892fc0864 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue
@@ -704,7 +704,7 @@
}
}]
},
- taskInfo:'企标编写汇总修订',
+ taskInfo:'企标编写汇总',
loading: false,
disabledState: false,
userId:this.$store.getters.userInfo.userId,
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue
index fce646c29..9077d0faa 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue
@@ -826,7 +826,7 @@
editableTabsValue:"",
showDrawerTitle:"",
showDrawer:false,
- taskInfo: '会签征求意见',
+ taskInfo: '征求意见',
loading: false,
disabledState: true,
userId:this.$store.getters.userInfo.userId,
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue
index 70214b014..87870c844 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue
@@ -774,7 +774,7 @@
}
}]
},
- taskInfo:'意见汇总及标准修改',
+ taskInfo:'意见汇总修订',
loading: false,
disabledState: false,
userId:this.$store.getters.userInfo.userId,
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue
index 750ac8708..6b3216c5e 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue
@@ -667,7 +667,7 @@
},
loading: false,
disabledState: true,
- taskInfo:'标准法规工程师复审',
+ taskInfo:'标准化复审',
userId:this.$store.getters.userInfo.userId,
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId,
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue
index 648a1be81..aabcea5bf 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue
@@ -704,7 +704,7 @@
}
}]
},
- taskInfo:'企标编写汇总修订',
+ taskInfo:'重新企标编写汇总',
loading: false,
disabledState: false,
userId:this.$store.getters.userInfo.userId,
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue
index 4328a5282..f953e1939 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue
@@ -774,7 +774,7 @@
}
}]
},
- taskInfo:'意见汇总及标准修改',
+ taskInfo:'重新意见汇总修订',
loading: false,
disabledState: false,
userId:this.$store.getters.userInfo.userId,
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
index 3bd9a2108..b8c2b4c57 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
@@ -2734,7 +2734,7 @@
_formData.append('prcType', 'buss1')
_formData.append('prcName', '企标制修订-技术标准')
_formData.append('json', JSON.stringify({
- taskInfo: '发起企标制修订流程',
+ taskInfo: '起草',
form: this.form,
roleForm: this.roleForm,
commentText: this.commentText
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue
index ecfa8e994..e5ef41fd8 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue
@@ -2214,7 +2214,7 @@
_formData.append('prcName', '企标制修订-技术标准')
_formData.append('json', JSON.stringify({
prcNum:this.prcNum,
- taskInfo: '标准法规部标准化工程师发布',
+ taskInfo: '发布',
form: this.form,
roleForm: this.roleForm,
commentText: this.formTongGuo.commentText
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue
index a3148c492..67dc458c5 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue
@@ -701,7 +701,7 @@
}
}]
},
- taskInfo:'企标编写汇总修订',
+ taskInfo:'企标编写汇总',
loading: false,
disabledState: false,
userId:this.$store.getters.userInfo.userId,
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue
index 817e57427..c57c079ea 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue
@@ -995,7 +995,7 @@
editableTabsValue:"",
showDrawerTitle:"",
showDrawer:false,
- taskInfo: '会签征求意见',
+ taskInfo: '征求意见',
loading: false,
disabledState: true,
userId:this.$store.getters.userInfo.userId,
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue
index 926b23b9c..8a4be4f8b 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue
@@ -933,7 +933,7 @@
}
}]
},
- taskInfo:'技术委员会评审/评审意见修改评审',
+ taskInfo:'技术委员会评审、评审意见修改',
loading: false,
disabledState: false,
userId:this.$store.getters.userInfo.userId,
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue
index 2902ac631..7cfe64762 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue
@@ -768,7 +768,7 @@
},
loading: false,
disabledState: true,
- taskInfo:'标准法规部标准化工程师复审',
+ taskInfo:'标准化复审',
userId:this.$store.getters.userInfo.userId,
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId,
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue
index 687fea355..8a12da907 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue
@@ -1210,11 +1210,11 @@
},
calScope(){
if(this.evaluationMap){
- const hqSum = this.evaluationMap["会签征求意见"]
- const jsWySum = this.evaluationMap["技术委员会评审/评审意见修改评审"]
- const fsSum = this.evaluationMap["复审"]
+ const hqSum = this.evaluationMap["征求意见"]
+ const jsWySum = this.evaluationMap["技术委员会评审、评审意见修改"]
+ const fsSum = this.evaluationMap["标准化复审"]
const shSum = this.form.evaluationData && this.form.evaluationData.length > 0 ? this.form.evaluationData[0].sum : 0
- const aveCount = (hqSum ? hqSum * 0.3 : 0) + (jsWySum ? jsWySum * 0.4 : 0) + (fsSum ? fsSum * 0.3 : 0) + (shSum ? shSum * 0.3 : 0)
+ const aveCount = (hqSum ? hqSum * 0.3 : 0) + (jsWySum ? jsWySum * 0.4 : 0) + ((fsSum ? fsSum : 0) + (shSum ? shSum: 0)) / 2 * 0.3
return parseFloat(aveCount).toFixed(1)
}
return 0
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue
index 545fb0606..cf2fafb62 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue
@@ -1212,11 +1212,11 @@
},
calScope(){
if(this.evaluationMap){
- const hqSum = this.evaluationMap["会签征求意见"]
- const jsWySum = this.evaluationMap["技术委员会评审/评审意见修改评审"]
- const fsSum = this.evaluationMap["复审"]
+ const hqSum = this.evaluationMap["征求意见"]
+ const jsWySum = this.evaluationMap["技术委员会评审、评审意见修改"]
+ const fsSum = this.evaluationMap["标准化复审"]
const shSum = this.evaluationMap["标准法规部高级经理审核"]
- const aveCount = (hqSum ? hqSum * 0.3 : 0) + (jsWySum ? jsWySum * 0.4 : 0) + (fsSum ? fsSum * 0.3 : 0) + (shSum ? shSum * 0.3 : 0)
+ const aveCount = (hqSum ? hqSum * 0.3 : 0) + (jsWySum ? jsWySum * 0.4 : 0) + ((fsSum ? fsSum : 0) + (shSum ? shSum: 0)) / 2 * 0.3
return parseFloat(aveCount).toFixed(1)
}
return 0
@@ -2458,7 +2458,7 @@
_formData.append('prcName', '企标制修订-技术标准')
_formData.append('json', JSON.stringify({
prcNum:this.prcNum,
- taskInfo: '标准法规部标准化工程师发布',
+ taskInfo: '重新起草',
form: this.form,
roleForm: this.roleForm,
commentText: this.formTongGuo.commentText
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue
index 319541f1c..0ffc566b1 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue
@@ -701,7 +701,7 @@
}
}]
},
- taskInfo:'企标编写汇总修订',
+ taskInfo:'重新企标编写汇总',
loading: false,
disabledState: false,
userId:this.$store.getters.userInfo.userId,
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue
index 502860387..9c2daeb3e 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue
@@ -933,7 +933,7 @@
}
}]
},
- taskInfo:'技术委员会评审/评审意见修改评审',
+ taskInfo:'重新技术委员会评审、评审意见修改',
loading: false,
disabledState: false,
userId:this.$store.getters.userInfo.userId,
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue
index 4d36599a6..99b7c7447 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue
@@ -380,7 +380,7 @@ export default {
}
},
mounted(){
- if(!this.qbfsForm.passFlag){
+ if(this.qbfsForm.passFlag){
this.qbfsForm = {}
}
//查询下拉框数据
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue
index 1c0d82db3..2ff528932 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue
@@ -401,7 +401,7 @@ export default {
}
},
mounted(){
- if(!this.qbfsForm.passFlag){
+ if(this.qbfsForm.passFlag){
this.qbfsForm = {}
}
//查询下拉框数据
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
index 5f9daec62..a533ba2a2 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
@@ -550,7 +550,7 @@ export default {
},
mounted(){
this.getWorkData()
- if(!this.qbfsForm.passFlag){
+ if(this.qbfsForm.passFlag){
this.qbfsForm = {}
}
//查询下拉框数据
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
index 3f0280a71..8fb2b872e 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
@@ -712,7 +712,7 @@ export default {
}
},
mounted() {
- if(!this.qbfsForm.passFlag){
+ if(this.qbfsForm.passFlag){
this.qbfsForm = {}
}
//查询下拉框数据
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue
index c93a389fb..3950f1b63 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue
@@ -389,7 +389,7 @@ export default {
}
},
mounted(){
- if(!this.qbfsForm.passFlag){
+ if(this.qbfsForm.passFlag){
this.qbfsForm = {}
}
this.$http.get('sys/dictype/getDicTypeListCode', '',{
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue
index 24c4bc1c9..ed5506ad4 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue
@@ -128,11 +128,11 @@
:color="roleForm.approver ? '#66b1ff' : ''">
- 标准法规部高级经理
+ 总院技术委员会覆盖领域企业标准:专委会主任/总院技术委员会未覆盖领域企业标准:总院院长或总院主管副院长
-
+
@@ -321,7 +321,7 @@ export default {
{required: true, message:'请选择标准体系工作组组长', trigger: "change" }
],
approverName:[
- {required: true, message:'请选择标准法规部高级经理', trigger: "change" }
+ {required: true, message:'请选择总院技术委员会覆盖领域企业标准:专委会主任/总院技术委员会未覆盖领域企业标准:总院院长或总院主管副院长', trigger: "change" }
],
engineerName:[
{required: true, message:'请选择相关单位、工程研究总院标准法规部', trigger: "change" }
@@ -333,7 +333,7 @@ export default {
this.taskId = this.$route.query.taskIds
this.bpnId = this.$route.query.bpnId
if (this.bpnId !== undefined) {
- this.getDatas()
+ this.getData()
}
if(this.taskId){
this.approvalFlag = true
@@ -368,25 +368,20 @@ export default {
getData() {
this.formLoading = true
this.showFlag = false
- return new Promise((resolve, reject) => {
- inboundLiaisonDetail({
- taskIds: this.$route.query.taskIds,
- pId: this.$route.query.prcId
- }).then(res => {
- if (res) {
- const processForm = JSON.parse(res.mesg);
- this.getFormFieldList(processForm);
- }
- }).catch(e => {
- });
+ queryTaskFirst({
+ bpnId: this.$route.query.bpnId
+ }).then(res => {
+ let mes = JSON.parse(res.mes)
+ this.getFormFieldList(mes);
});
},
/**
* @description: 动态表单读取
*/
getFormFieldList(item) {
+ let type = item.qbfsForm.type
this.$nextTick(() => {
- switch (item.type){
+ switch (type){
case '1':
this.comName = "merge"
break
@@ -403,18 +398,18 @@ export default {
this.comName = "establish"
break
}
- this.qbfsForm = item;
+ this.qbfsForm = item.qbfsForm;
this.formLoading = false;
- this.roleForm.dockUser = item.dockUser;
- this.roleForm.dockUserName = item.dockUserName;
- this.roleForm.countersigner = item.countersigner;
- this.roleForm.countersignerName = item.countersignerName;
- this.roleForm.approver = item.approver;
- this.roleForm.approverName = item.approverName;
- this.roleForm.engineer = item.engineer;
- this.roleForm.engineerName = item.engineerName;
- this.roleForm.examine = item.examine;
- this.roleForm.examineName = item.examineName;
+ this.roleForm.dockUser = item.roleForm.dockUser;
+ this.roleForm.dockUserName = item.roleForm.dockUserName;
+ this.roleForm.countersigner = item.roleForm.countersigner;
+ this.roleForm.countersignerName = item.roleForm.countersignerName;
+ this.roleForm.approver = item.roleForm.approver;
+ this.roleForm.approverName = item.roleForm.approverName;
+ this.roleForm.engineer = item.roleForm.engineer;
+ this.roleForm.engineerName = item.roleForm.engineerName;
+ this.roleForm.examine = item.roleForm.examine;
+ this.roleForm.examineName = item.roleForm.examineName;
});
},
handleTabs(name) {
@@ -437,6 +432,7 @@ export default {
//流程保存
handleSave() {
let qbzxdFrom = this.$refs["childForm"].qbfsForm;
+ qbzxdFrom.type = this.toggleType
this.saveLoading = true
let _formData = new FormData()
_formData.append('id', this.bpnId || '')
@@ -471,7 +467,7 @@ export default {
this.$refs["roleForm"].validate((valid) => {
if (valid) {
this.isSubmit = true;
- this.listForm.commentText = this.commentText;
+ qbzxdFrom.commentText = this.commentText;
let json = Object.assign(qbzxdFrom, this.roleForm);
this.$http.post("lawss/activiti/startProcessRollBack", {
createUser: this.$store.getters.userInfo.userId,
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
index 315f128cc..04fa73d4e 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
@@ -324,7 +324,15 @@
import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle'
-import {startProcess, completeTask, saveTaskFirst, queryTaskFirst, taskDel, processBack} from '@/api/process.js'
+import {
+ startProcess,
+ completeTask,
+ saveTaskFirst,
+ queryTaskFirst,
+ taskDel,
+ processBack,
+ inboundLiaisonDetail
+} from "@/api/process.js";
import {standUnqualified, dicTypeData} from '@/api/unqualProcess.js'
export default {
@@ -332,6 +340,7 @@ export default {
data() {
return {
loading: false,
+ submitFlag: '', //是否是修改节点
commentText: '', // 意见
title: '', // 新增编辑抽屉标题
ListModel: false, // 新增编辑抽屉开关
@@ -367,6 +376,7 @@ export default {
dockUserName: [{required: true, message: "请选择标准法规工程师", trigger: ['blur', 'change']}]
},
nodeList: [],
+ hisListForm:{},
drawerTitle: '', //drawer标题
modalshowflag: false, // drawer开关
treeData: [], // 人员数据
@@ -388,8 +398,39 @@ export default {
if (this.bpnId !== undefined) {
this.getData()
}
+ if(this.$route.query.taskIds){
+ //被驳回时调用
+ this.getHistoryData()
+ }
},
methods: {
+ getHistoryData() {
+ return new Promise((resolve, reject) => {
+ inboundLiaisonDetail({
+ taskIds: this.$route.query.taskIds,
+ pId: this.$route.query.prcId,
+ }).then(res => {
+ if (res) {
+ const processForm = JSON.parse(res.mesg)
+ this.getFormFieldList(processForm)
+ }
+ }).catch(e => {
+ })
+ })
+ },
+ /**
+ * @description: 动态表单读取
+ */
+ getFormFieldList (item) {
+ item.commentText = ''
+ this.$nextTick(() => {
+ this.hisListForm = JSON.parse(JSON.stringify(item))
+ this.submitFlag = '修改节点'
+ this.dataList = item.dockUserList[0].standardInfoList
+ this.roleForm.dockUserName = this.dataList[0].engineer
+ this.roleForm.dockUser = this.dataList[0].engineerId
+ })
+ },
getData() {
queryTaskFirst({
bpnId: this.$route.query.bpnId
@@ -557,6 +598,7 @@ export default {
prcCreateUser: this.$store.getters.userInfo.userId,
prcCreateUserName: this.$store.getters.userInfo.userName,
engineer: this.roleForm.dockUser,
+ engineerName: this.roleForm.dockUserName,
standardInfoList: this.dataList,
commentText: this.commentText
}
@@ -566,43 +608,86 @@ export default {
if (this.roleForm.dockUserName === '') {
this.$message.warning('请完善人员信息')
} else {
- this.$refs['roleForm'].validate((valid) => {
- if (valid) {
- this.isSubmit = true
- let paramsInfo = new FormData()
- // paramsInfo.append('id', this.bpnId || '')
- paramsInfo.append('createUser', this.$store.getters.userInfo.userId)
- paramsInfo.append('createUserName', this.$store.getters.userInfo.userName)
- paramsInfo.append('type', '8')
- paramsInfo.append('json', JSON.stringify({
- roleForm: this.roleForm,
- dataList: this.dataList,
- commentText: this.commentText
- }))
- processBack(paramsInfo).then(res => {
- this.taskID = res.data
- const params = new FormData();
- params.set('json', JSON.stringify(json))
- params.set('userId', this.$store.getters.userInfo.userId)
- params.set('taskIds', this.taskID)
- completeTask(params).then(res => {
- if (res.success === true) {
- this.$message.success('提交成功')
- if (this.bpnId !== '') {
+ if(!this.submitFlag){
+ this.$refs['roleForm'].validate((valid) => {
+ if (valid) {
+ this.isSubmit = true
+ let paramsInfo = new FormData()
+ // paramsInfo.append('id', this.bpnId || '')
+ paramsInfo.append('createUser', this.$store.getters.userInfo.userId)
+ paramsInfo.append('createUserName', this.$store.getters.userInfo.userName)
+ paramsInfo.append('type', '8')
+ paramsInfo.append('json', JSON.stringify({
+ roleForm: this.roleForm,
+ dataList: this.dataList,
+ commentText: this.commentText
+ }))
+ processBack(paramsInfo).then(res => {
+ this.taskID = res.data
+ const params = new FormData();
+ params.set('json', JSON.stringify(json))
+ params.set('userId', this.$store.getters.userInfo.userId)
+ params.set('taskIds', this.taskID)
+ completeTask(params).then(res => {
+ if (res.success === true) {
+ this.$message.success('提交成功')
+ if (this.bpnId !== '') {
+ let taskId = {
+ id: this.bpnId
+ }
+ taskDel(taskId).then(res => {
+ return res
+ })
+ }
+ this.$router.push("/processCenter");
+ }
+ this.isSubmit = false
+ })
+ })
+ }
+ })
+ }else{
+ this.$refs["roleForm"].validate((valid) => {
+ if (valid) {
+ let specialJson = {
+ createUser: this.$store.getters.userInfo.userId,
+ createUserName: this.$store.getters.userInfo.userName,
+ type: "8",
+ json: {
+ standardInfoList: this.dataList,
+ roleForm: this.roleForm,
+ commentText: this.commentText
+ }
+ };
+ this.$http.post("lawss/activiti/completeTaskNew", {
+ taskIds: this.$route.query.taskIds,
+ userId: this.$store.getters.userInfo.userId,
+ json: JSON.stringify(json),
+ specialJson: JSON.stringify(specialJson)
+ }, {
+ _this: this
+ }, res => {
+ if (res.success) {
+ this.$message.success(res.message);
+ if (this.bpnId !== "") {
let taskId = {
id: this.bpnId
- }
+ };
taskDel(taskId).then(res => {
- return res
- })
+ return res;
+ });
}
this.$router.push("/processCenter");
}
- this.isSubmit = false
- })
- })
- }
- })
+ this.isSubmit = false;
+ });
+ } else {
+ this.isSubmit = false;
+ return this.$message.warning("请完善人员信息");
+ }
+ });
+ }
+
}
}
},
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue
index 17b5d11e6..afef73ef0 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue
@@ -150,9 +150,11 @@
show-save
show-submit
show-transfer
+ show-back
:submitLoading="isSubmit"
:saveLoading="saveLoading"
:transferLoading="turnLoading"
+ @back="beforeBack"
@transfer="handleTurnTo"
@save="handleSave"
@submit="handleSubmit"
@@ -277,6 +279,7 @@ export default {
})
},
getFormFieldList (item) {
+ console.log(item);
this.$nextTick(() => {
if (item.passInfo !== undefined) {
this.passInfo = JSON.parse(JSON.stringify(item)).passInfo
@@ -336,6 +339,50 @@ export default {
this.saveLoading = false
})
},
+ //驳回按钮
+ beforeBack(){
+ if(!this.commentInfo){
+ this.$message.warning('请填写审批意见')
+ }else{
+ let zqa = new Map();
+ for (let lastDataListElement of this.dataList) {
+ let a = zqa.get(lastDataListElement.dutyPeopleInfoId)
+ if( a == null){
+ a = {
+ id: lastDataListElement.dutyPeopleInfoId,
+ name: lastDataListElement.dutyPeopleInfo,
+ standardInfoList: []
+ }
+ }
+ a.standardInfoList.push(lastDataListElement);
+ zqa.set(a.id, a);
+ }
+ let list = [];
+ for(let item of zqa) {
+ list.push(item[1])
+ }
+ let json = {
+ dockUserList: list,
+ passInfo: this.passInfo,
+ passFlag: '1',
+ commentText: this.commentInfo
+ }
+ const params = new FormData();
+ params.set('json', JSON.stringify(json))
+ params.set('userId', this.$store.getters.userInfo.userId)
+ params.set('taskIds', this.taskIds)
+ completeTask(params).then(res => {
+ if(res.success === true) {
+ this.$message.success('提交成功')
+ this.$router.push("/processCenter");
+ }
+ this.isSubmit = false
+ }).catch(e => {
+ this.isSubmit = false
+ })
+ }
+
+ },
// 提交按钮
handleSubmit() {
this.isSubmit = true
@@ -359,6 +406,7 @@ export default {
let json = {
dockUserList: list,
passInfo: this.passInfo,
+ passFlag: '0',
commentText: this.commentInfo
}
let flag=false
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue
index 3b6e54bf1..9b7eaca53 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue
@@ -152,7 +152,6 @@
-
+
diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue
index a5865d561..3df4d87dd 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue
@@ -190,7 +190,7 @@
label="标准名称">
diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
index 10773727f..aff54465f 100644
--- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
+++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
@@ -170,18 +170,6 @@
width="100"
label="责任工程师">
-
-
-
-
{{ historySeeForm.dutyEngineerName }}
-
- {{ historySeeForm.authEngineer }}
-
-
- {{ historySeeForm.qaEngineer }}
-
{{ historySeeForm.planCloseTime ? historySeeForm.planCloseTime.substring(0, 11) : "-" }}
@@ -514,22 +496,6 @@
@click.native="choiceZRR"
/>
-
-
-
-
-
-
import('@/pages/processCenter/pages/creatProcess/qbfs/stepDetail.vue'),
+ meta: {
+ requireAuth: true,
+ title: '企标复审流程'
+ }
+ },
{
path: '/bussFs3',
name: 'bussFs3',