diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index e64ea2464..60bd786bf 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -2760,6 +2760,7 @@
},
popoverHideModel (checkedIds, checkedData,isShow,isLoadChild,topId) {
if(checkedData && checkedData.length != 0) {
+ console.log(checkedData)
if(checkedData.length > 0){
this.form.dybxh = checkedData.map(item => item.model).join(",")
this.form.dymc = checkedData.map(item => item.name).join(",")
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
index 6323a4b0f..470c43081 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
@@ -1111,7 +1111,6 @@
if (res) {
const processForm = JSON.parse(res.mesg)
- console.log("processFrom",processForm)
this.xgdFileId = processForm.xgd
this.fbgbjbdFileId = processForm.fbgbjbd
this.bpgFileId = processForm.bpg
@@ -1217,6 +1216,28 @@
this.isSubmit = true
this.form.commentText = this.formTongGuo.commentText
this.form.approvalOpinion = this.formTongGuo.approvalOpinion
+ console.log(this.form)
+ if (this.form.syrz.length === 0) {
+ this.form.syrz = ''
+ }
+ if (this.form.nylx.length === 0) {
+ this.form.nylx = ''
+ }
+ if (this.form.zrbm.length === 0) {
+ this.form.zrbm = ''
+ }
+ if (this.form.qcdw.length === 0) {
+ this.form.qcdw = ''
+ }
+ if (this.form.cllx.length === 0) {
+ this.form.cllx = ''
+ }
+ if (this.form.sycpx.length === 0) {
+ this.form.sycpx = ''
+ }
+ if (this.form.zrgcs.length === 0) {
+ this.form.zrgcs = ''
+ }
const json = JSON.stringify(this.form);
this.$http.post('lawss/activiti/completeTask', {
taskIds: this.taskIds,
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue
new file mode 100644
index 000000000..96bc0ab91
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue
@@ -0,0 +1,637 @@
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue
new file mode 100644
index 000000000..216c24567
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue
@@ -0,0 +1,391 @@
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
index 1d1d40c96..cc416a6fa 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
@@ -42,22 +42,22 @@
clearable
>
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
@@ -86,20 +86,13 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
@@ -143,6 +143,7 @@
{{'手动查找'}}
@@ -477,107 +478,107 @@
其他起草人
-
+
-
+
- 主起草人汇总修订人
+ 企标编写汇总修订人
-
+
-
+
- 标准化员
+ 总院各中心兼职标准化员/各事业部标准化员
-
+
-
+
- 会签人员
+ 会签征求意见人员
-
+
-
+
- 主起草人修订并线上填写评审人
+ 技术委员会评审/评审意见修改人员
-
+
-
+
- 标准法规工程师
+ 标准法规部标准化工程师
-
+
-
+
- 技术委员会负责人/起草中心主任
+ 起草单位高级经理
-
+
-
+
- 标准法规部部长
+ 标准法规部高级经理审核
-
+
-
+
- 专委会副主任/起草单位中心主任
+ 起草单位中心主任
-
+
-
+
- 专委会主任/总院院长或主管副院长
+ 总院院长或总院主管副院长
-
+
-
+
- 主起草人培训
+ 标准法规部标准化工程师发布人员
-
+
@@ -991,9 +992,9 @@
// callback()
};
const validateFBGBUSS = (rule, value, callback) => {
- if(this.FBGBUSSFileList.length === 0){
- callback(new Error('请上传发布稿文件!'))
- }
+ // if(this.FBGBUSSFileList.length === 0){
+ // callback(new Error('请上传发布稿文件!'))
+ // }
callback()
};
const validateBZSMBUSS = (rule, value, callback) => {
@@ -1031,7 +1032,6 @@
}]
},
fileList: [],
- footFileList: [],
FBGBUSSFileList: [],
BZSMBUSSFileList: [],
LSBBBUSSFileList: [],
@@ -1170,8 +1170,6 @@
modelData:[],
modelDataNameVerify:[],
modelDataZrUserVerify:[],
- footFile:'',
- footFileName:'',
// 基础信息
country:[],
// 基础信息
@@ -1221,8 +1219,8 @@
hzUserName: this.$store.getters.userInfo.userName,
xdUserId: this.$store.getters.userInfo.userId,
xdUserName: this.$store.getters.userInfo.userName,
- pxUserId: this.$store.getters.userInfo.userId,
- pxUserName: this.$store.getters.userInfo.userName,
+ pxUserId: '',
+ pxUserName: '',
qcUserId: '', // 多实例
qcUserName:'', // 多实例
bzhUserId:'',
@@ -1250,7 +1248,7 @@
},
modelRules:{
zrUserIdName: [
- { required: true, message: '请选择会签责任人', trigger: 'blur' },
+ { required: true, message: '选择会签征求意见人员', trigger: 'blur' },
],
modelName: [
{ required: true, message: '选择维护模块名称', trigger: 'blur' },
@@ -1261,25 +1259,28 @@
{ required: true, message: '选择其他起草人', trigger: 'blur' },
],
bzhUserName: [
- { required: true, message: '选择标准化员', trigger: 'blur' },
+ { required: true, message: '选择总院各中心兼职标准化员/各事业部标准化员', trigger: 'blur' },
],
hqUserName: [
- { required: true, message: '请选择会签责任人', trigger: 'blur' },
+ { required: true, message: '选择会签征求意见人员', trigger: 'blur' },
],
fggcsUserName: [
- { required: true, message: '选择标准法规工程师', trigger: 'blur' },
+ { required: true, message: '选择起草单位高级经理', trigger: 'blur' },
],
jsfzrUserName: [
- { required: true, message: '选择技术委员会负责人/起草中心主任', trigger: 'blur' },
+ { required: true, message: '选择起草单位高级经理', trigger: 'blur' },
],
bzUserName: [
- { required: true, message: '选择标准法规部部长', trigger: 'blur' },
+ { required: true, message: '选择标准法规部高级经理审核', trigger: 'blur' },
],
fzrUserName: [
- { required: true, message: '选择专委会副主任/起草单位中心主任', trigger: 'blur' },
+ { required: true, message: '选择起草单位中心主任', trigger: 'blur' },
],
zhrUserName: [
- { required: true, message: '选择专委会主任/总院院长或主管副院长', trigger: 'blur' },
+ { required: true, message: '选择总院院长或总院主管副院长', trigger: 'blur' },
+ ],
+ pxUserName: [
+ { required: true, message: '选择标准法规部标准化工程师发布人员', trigger: 'blur' },
],
},
rules:{
@@ -1317,7 +1318,7 @@
{ required: false, message: '请选择企标发布日期', trigger: 'change' }
],
FBGBUSSName: [
- { required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' }
+ { required: false, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' }
],
BZSMBUSSName: [
{ required: true, message: '请上传编制说明',validator: validateBZSMBUSS, trigger: 'blur' }
@@ -1597,6 +1598,9 @@
}else if(this.userType === 'qcUserId'){
this.roleForm.qcUserId = data[0].id
this.roleForm.qcUserName = data[0].name
+ }else if(this.userType === 'pxUserId'){
+ this.roleForm.pxUserId = data[0].id
+ this.roleForm.pxUserName = data[0].name
}
this.modalShowFlag = false
},
@@ -1614,7 +1618,6 @@
let mes = JSON.parse(res.mes)
mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
this.form = mes.form
- this.footFileList=this.assemble(this.form.footFile,this.form.footFileName);
this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
@@ -2016,12 +2019,6 @@
},
// 代替政策号 请求数据
getReplaceLawsNumRowFirst () {
- if (this.sarBussionessLawsEO.replaceLawsNum !== null && this.sarBussionessLawsEO.replaceLawsNum !== '') {
- this.replaceLawsNumForm.quoteIdList = this.quoteIdList1.toString() === '' ? '' : this.quoteIdList1
- } else {
- this.quoteIdList1 = []
- this.replaceLawsNumForm.quoteIdList = ''
- }
this.replaceLawsNumForm.page = 1
this.replacePage = 1
this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage', this.replaceLawsNumForm, {
@@ -2109,8 +2106,8 @@
})
// this.SarLawsInfoEO.replaceLawsNum = textArr.join(',')
// 解决 标准入库流程--圈住的字段,先手动输入,然后再手动查找,点提交就会把手动输入的标准号覆盖
- if(this.replaceLawType === 'dtbjh'){
- this.form.dtbjh = this.form.dtbjh ? this.form.dtbjh + ',' + textArr.join(',') : textArr.join(',')
+ if(this.replaceLawType === 'DTQBBHBUSS'){
+ this.form.DTQBBHBUSS = this.form.DTQBBHBUSS ? this.form.DTQBBHBUSS + ',' + textArr.join(',') : textArr.join(',')
}else if(this.replaceLawType === 'yybj'){
this.form.yybj = this.form.yybj ? this.form.yybj + ',' +textArr.join(',') : textArr.join(',')
}else if(this.replaceLawType === 'cbbh'){
@@ -2258,9 +2255,6 @@
case 'GLWJBUSS':
this.GLWJBUSSFileList = fileList
break;
- case 'footFile':
- this.footFileList = fileList
- break;
default : ;
}
this.$message({
@@ -2292,9 +2286,6 @@
case 'GLWJBUSS':
this.fileList=this.GLWJBUSSFileList
break;
- case 'footFile':
- this.fileList=this.footFileList
- break;
default : ;
}
this.fileMadel = true;
@@ -2318,9 +2309,6 @@
case 'GLWJBUSS':
this.GLWJBUSSFileList = fileList
break;
- case 'footFile':
- this.footFileList = fileList
- break;
default : ;
}
},
@@ -2442,6 +2430,7 @@
this.saveLoading = true
let _formData = new FormData()
+ this.fileInfoHandle()
// _formData.append('id', this.bpnId)
_formData.append('createUser', this.$store.getters.userInfo.userId)
_formData.append('createUserName', this.$store.getters.userInfo.uName)
@@ -2464,9 +2453,6 @@
fileInfoHandle(){
//拼接文件名和id 提交到流程Activity
- this.form.footFile=this.footFileList.map(item => item.response.data.id).join(",")
- this.form.footFileName=this.footFileList.map(item => item.name).join(",")
-
this.form.FBGBUSS=this.FBGBUSSFileList.map(item => item.response.data.id).join(",")
this.form.FBGBUSSName=this.FBGBUSSFileList.map(item => item.name).join(",")
@@ -2552,6 +2538,7 @@
// this.form.country=this.countryArr;
// test
this.isSubmit = false
+ this.saveLoading = false
// this.changeTree(this.form.modelData)
this.$refs['form'].validate((valid) => {
if (valid) {
@@ -2567,6 +2554,7 @@
if (valid) {
this.fileInfoHandle()
this.isSubmit = true
+ this.saveLoading = true
this.form.country=this.countryArr;
this.form.standCode = this.form.standSort + ' ' + this.form.standNumber + ( this.form.standYear === '' ? '' : '-' + this.form.standYear) +' X'
var json = Object.assign(this.form, this.roleForm)
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue
index dbcdd14fd..21b88d8df 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue
@@ -1177,7 +1177,7 @@
{ required: true, message: '请选择文本状态', trigger: 'change' }
],
issueTime: [
- { required: true, message: '请选择企标发布日期', trigger: 'change' }
+ { required: false, message: '请选择企标发布日期', trigger: 'change'}
],
FBGBUSSName: [
{ required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' }
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue
index 71e3abe32..d671f19d5 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue
@@ -1176,7 +1176,7 @@
{ required: true, message: '请选择文本状态', trigger: 'change' }
],
issueTime: [
- { required: true, message: '请选择企标发布日期', trigger: 'change' }
+ { required: false, message: '请选择企标发布日期', trigger: 'change'}
],
FBGBUSSName: [
{ required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' }
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue
index 326c204df..2fb55e6a8 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue
@@ -1171,7 +1171,7 @@
{ required: true, message: '请选择文本状态', trigger: 'change' }
],
issueTime: [
- { required: true, message: '请选择企标发布日期', trigger: 'change' }
+ { required: false, message: '请选择企标发布日期', trigger: 'change'}
],
FBGBUSSName: [
{ required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' }
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue
index bf89dfc00..87062603d 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue
@@ -18,241 +18,15 @@
label-width="210px"
>
-
- 基础信息
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 过程稿件
-
-
-
-
-
-
-
- {{value.name}}
-
-
- - -
-
-
-
-
-
- {{value.name}}
-
-
- - -
-
-
-
-
-
-
-
- {{value.name}}
-
-
- - -
-
-
-
-
-
- {{value.name}}
-
-
- - -
-
-
-
-
-
-
- 适用范围
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 关联信息
-
-
-
-
-
-
-
-
-
-
- {{value.name}}
-
-
- - -
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -793,6 +567,7 @@