From f6ed37a6921e7cf21e506a28b0bc7b81e1c3ca07 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Sat, 25 Dec 2021 15:06:52 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=8F=82=E4=BC=9A=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E5=BF=85=E5=A1=AB=E9=A1=B9=EF=BC=8C=E6=9C=AA=E7=AC=A6=E5=90=88?= =?UTF-8?q?=E9=A1=B9=E5=AD=97=E6=AE=B5=EF=BC=8C=E6=A0=87=E5=87=86=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E6=89=8B=E6=9C=BA=E7=AB=AF=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzhHd-rh/step1.vue | 12 +- .../pages/creatProcess/bzhHy-ch/step1.vue | 34 +- .../pages/creatProcess/wfhxzg/step2.vue | 1 - .../pages/creatProcess/wfhxzg/step3.vue | 1 + .../pages/creatProcess/wfhxzg/step4.vue | 3 +- .../pages/creatProcess/wfhxzg/step5.vue | 2 +- .../processCenter/pages/phone/bzrk/step2.vue | 1111 +++++++++++++++++ .../components/DatePickerGroup.vue | 7 +- src/router/index.js | 10 + 9 files changed, 1157 insertions(+), 24 deletions(-) create mode 100644 src/pages/processCenter/pages/phone/bzrk/step2.vue diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue index af4ab5d56..1aa12e4be 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue @@ -344,10 +344,10 @@ -

技术委员会常务副主任/总院院长

+

业务主管副院长

- +
@@ -356,10 +356,10 @@ -

总院技术委员会主任

+

院长

- +
@@ -526,8 +526,8 @@ export default { startUserName: [{required: true, message: "请选择标准法规部人员", trigger: ['blur', 'change']}], leaderUser: [{required: true, message: "请选择标准法规部主管领导", trigger: ['blur', 'change']}], feeUser: [{required: true, message: "请选择费用管理部门人员", trigger: ['blur', 'change']}], - engineerUser: [{required: true, message: "请选择技术委员会常务副主任/总院院长", trigger: ['blur', 'change']}], - directorUserName: [{required: true, message: "请选择总院技术委员会主任", trigger: ['blur', 'change']}], + engineerUser: [{required: true, message: "请选择业务主管副院长 ", trigger: ['blur', 'change']}], + directorUserName: [{required: true, message: "请选择院长", trigger: ['blur', 'change']}], }, roleShowflag: false, roleShowflagOne: false, diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue index 15dcc3a27..77a5e0115 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue @@ -18,21 +18,21 @@ - + - + - + - + - + @@ -263,7 +263,7 @@ -

管理推荐部

+

管理推进部

@@ -275,10 +275,10 @@ -

技术委员会常务副主任/总院院长

+

业务主管副院长

- +
@@ -287,10 +287,10 @@ -

技术委员会主任

+

院长

- +
@@ -414,7 +414,13 @@ export default { // 上传所储存文件数组 newDataList: [], - ch_rules: {}, + ch_rules: { + meetingName: [{required: true, message: '请输入会议名称', trigger: 'change'}], + primaryUnit: [{required: true, message: '请输入主办单位', trigger: 'change'}], + associaName: [{required: true, message: '请选择协会名称', trigger: 'change'}], + meetingStartTime: [{required: true, message: '请选择会议时间', trigger: 'change'}], + meetingPlace: [{required: true, message: '请输入会议地点', trigger: 'change'}] + }, roleForm: { startUserName: this.$store.getters.userInfo.userName, startUser: this.$store.getters.userInfo.userId, @@ -433,9 +439,9 @@ export default { dockUserName: [{required: true, message: "请选择标准法规工程师", trigger: ['blur', 'change']}], startUserName: [{required: true, message: "请选择标准法规部人员", trigger: ['blur', 'change']}], leaderUser: [{required: true, message: "请选择标准法规部主管中心主任", trigger: ['blur', 'change']}], - feeUser: [{required: true, message: "请选择管理推荐部", trigger: ['blur', 'change']}], - engineerUser: [{required: true, message: "请选择技术委员会常务副主任/总院院长", trigger: ['blur', 'change']}], - directorUserName: [{required: true, message: "请选择技术委员会主任", trigger: ['blur', 'change']}], + feeUser: [{required: true, message: "请选择管理推进部", trigger: ['blur', 'change']}], + engineerUser: [{required: true, message: "请选择业务主管副院长 ", trigger: ['blur', 'change']}], + directorUserName: [{required: true, message: "请选择院长", trigger: ['blur', 'change']}], }, deleteDataList: [], diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue index c87d4a2c4..d06c3cdc8 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue @@ -282,7 +282,6 @@ export default { this.passInfo = JSON.parse(JSON.stringify(item)).passInfo } this.dataList = JSON.parse(JSON.stringify(item)).standardInfoList - this.commentText = JSON.parse(JSON.stringify(item)).commentText }) }, // 批量选择分发责任人 diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue index 36328073a..20206b405 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue @@ -411,6 +411,7 @@ export default { let json = { passInfo: this.passInfo, responUserList: list, + commentText: this.commentText, actionFlag: 0 } if(flag)return; diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue index dbaff522c..3cd838f65 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue @@ -473,7 +473,8 @@ export default { let fileDataList = this.dataList let json = { info: { fileDataList }, - username: this.$store.getters.userInfo.userName + username: this.$store.getters.userInfo.userName, + commentText: this.commentText, } const params = new FormData(); params.set('json', JSON.stringify(json)) diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue index ce4e10499..84878b786 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue @@ -50,7 +50,7 @@
- +
+
+ + + + + +
+
基础信息
+
审批历史
+
+
+
+ + + + +
+ + + + + 国内标准入库 + 海外标准入库 + + + + + + + + + + + + + + + + + + + + + + + + + + + 是 + 否 + + + + + + + + + + + + + + + + + + + + + + + + 是 + 否 + + + + + + + + + + +
+ + + +
+ + + + + + + + + +
+ + + +
+ + + + + +
+ + {{value.name}} +
+
+ - - +
+ + +
+ {{value.name}} +
+
+ - - +
+ + +
+ {{value.name}} +
+
+ - - +
+ + +
+ {{value.name}} +
+
+ - - +
+ + +
+ {{value.name}} +
+
+ - - +
+ + + + +
+ {{value.name}} +
+
+ - - +
+ + + + +
+ {{value.name}} +
+
+ - - +
+ + +
+ {{value.name}} +
+
+ - - +
+ + +
+ {{value.name}} +
+
+ - - +
+ + + +
+ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{form.wssmr}} + + + + + + + + + + + + + + + + + +
+ + + +
+ + + + + + + + + + + +
+ {{value.name}} +
+
+ - - +
+ + + + + + + + + + + + + + +
+ +
+
+ + +
+ + + + + + + + + + + + + + +
+ + +
+
+
+
+ +
+
+ + + + + + +
+ + + + + diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/components/DatePickerGroup.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/components/DatePickerGroup.vue index 6eb2d192b..3c3d49c6a 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/components/DatePickerGroup.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/components/DatePickerGroup.vue @@ -122,7 +122,12 @@ export default { }, watch: { value (val) { - this.tagList = val !== '' && val !== null ? val.split(',') : [] + if(val !== '' && val !== null) { + this.tagList = [] + } else { + this.tagList = val.split(',') + } + // this.tagList = val !== '' && val !== null ? val.split(',') : [] }, tagList: { handler (val) { diff --git a/src/router/index.js b/src/router/index.js index 674d19bd8..1fd281938 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -2559,6 +2559,16 @@ const routes = [ title: '政策征求意见流程' } }, + { + path: '/phoneBzrkStep2', + name: 'phoneBzrkStep2', + component: () => import('@/pages/processCenter/pages/phone/bzrk/step2.vue'), + meta: { + isBoolean: true, + requireAuth: true, + title: '标准入库流程' + } + }, ] }, From 32cac7e9c1763144ac6a0fd1832897d7c7cc6826 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Sat, 25 Dec 2021 16:08:15 +0800 Subject: [PATCH 2/4] commit --- .../domesticStandardsAndRegulations/index.vue | 2 ++ .../components/EnterpriseStandardDatabase.vue | 1 + 2 files changed, 3 insertions(+) diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index d639842ef..257249ee6 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -163,10 +163,12 @@ v-btn-permission="'5aedea192a77b14c364f19bdcee3513a'">移除标准 OCR 拆分 diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index a01cb630d..d7726bbd4 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -4567,6 +4567,7 @@ export default { this.standNatureOptions = res.data.SARPROPERTY // 标准性质 this.standStateOptions = res.data.TEXTSTATUSBUSS // 文本状态 this.standSystemOptions = res.data.TXLBBUSS // 标准体系 + console.log(this.standSystemOptions); this.applyArcticOptions.options = res.data.ENERGYTYPES // 适用车型 this.categoryOptions.options = res.data.NYLXCLASS // 能源类型 this.applyAuthOptions.options = res.data.SYRZCLASS // 适用认证 From 1604b047f960d586e36fa79f47261e0ce70eaef6 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Sat, 25 Dec 2021 16:42:49 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=85=A5=E5=BA=93=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98=E3=80=81?= =?UTF-8?q?=E9=AB=98=E7=BA=A7=E6=A3=80=E7=B4=A2=E6=8A=BD=E5=B1=89=E5=8F=96?= =?UTF-8?q?=E6=B6=88=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzrk/step1.vue | 1 + .../pages/creatProcess/bzrk/step2.vue | 23 ++++++++++++++++++- .../components/EnterpriseStandardDatabase.vue | 8 +++---- .../searchCenter/pages/advancedSearch.vue | 2 ++ 4 files changed, 29 insertions(+), 5 deletions(-) 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/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index d7726bbd4..e1053c5d7 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -1173,9 +1173,9 @@ - + --> - +
diff --git a/src/pages/searchCenter/pages/advancedSearch.vue b/src/pages/searchCenter/pages/advancedSearch.vue index b9c174ee1..b84453434 100644 --- a/src/pages/searchCenter/pages/advancedSearch.vue +++ b/src/pages/searchCenter/pages/advancedSearch.vue @@ -317,6 +317,7 @@ :show-checkBox="showCheckBox" :url="url" :urlChild="urlChild" + @popoverHideCancel = "modalShowFlag2 = false" :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1" :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"> @@ -342,6 +343,7 @@ :drawerTitle="drawerTitle" :show-checkBox="showCheckBox" :url="url" + @popoverHideCancel = "modalShowFlag3 = false" :urlChild="urlChild" :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2" :nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs"> From 1878966693a8416b9c85ec33bcfc6c6c088c997d Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Sun, 26 Dec 2021 18:13:55 +0800 Subject: [PATCH 4/4] feat: There is no way the,buss hh process --- .../creatProcess/qbrk/common/formEditList.vue | 637 ++++++++++++++++++ .../creatProcess/qbrk/common/formList.vue | 391 +++++++++++ .../pages/creatProcess/qbrk/step1.vue | 218 +++--- .../pages/creatProcess/qbrk/step10.vue | 2 +- .../pages/creatProcess/qbrk/step11.vue | 2 +- .../pages/creatProcess/qbrk/step12.vue | 2 +- .../pages/creatProcess/qbrk/step2.vue | 271 +------- .../pages/creatProcess/qbrk/step3.vue | 590 +++++++--------- .../pages/creatProcess/qbrk/step4.vue | 2 +- .../pages/creatProcess/qbrk/step5.vue | 2 +- .../pages/creatProcess/qbrk/step6.vue | 2 +- .../pages/creatProcess/qbrk/step7.vue | 2 +- .../pages/creatProcess/qbrk/step8.vue | 2 +- .../pages/creatProcess/qbrk/step9.vue | 2 +- .../pages/creatProcess/qbrk/stepC3.vue | 2 +- .../pages/creatProcess/qbrk/stepC6.vue | 2 +- .../pages/creatProcess/qbrk/stepDetail.vue | 2 +- .../tabComponents/processCenter/index.vue | 16 +- 18 files changed, 1439 insertions(+), 708 deletions(-) create mode 100644 src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue create mode 100644 src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue 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 @@