diff --git a/src/components/CustomFormComponents/InputForStandards.vue b/src/components/CustomFormComponents/InputForStandards.vue index 0afef8433..3b9d5a974 100644 --- a/src/components/CustomFormComponents/InputForStandards.vue +++ b/src/components/CustomFormComponents/InputForStandards.vue @@ -361,7 +361,7 @@ export default { page: 1, pageSize: this.$store.getters.userInfo.configContent, total: 0, - standType: 'INLAND', + standType: 'ALL', quoteIdList: '', validFlag: '0' } diff --git a/src/components/CustomFormComponents/InputForStandardsForForeign.vue b/src/components/CustomFormComponents/InputForStandardsForForeign.vue index 08d4408ee..303fce717 100644 --- a/src/components/CustomFormComponents/InputForStandardsForForeign.vue +++ b/src/components/CustomFormComponents/InputForStandardsForForeign.vue @@ -329,7 +329,7 @@ export default { page: 1, pageSize: this.$store.getters.userInfo.configContent, total: 0, - standType: 'FOREIGN', + standType: 'ALL', quoteIdList: '', validFlag: '0' } diff --git a/src/components/treeSelect/treeSelectNew.vue b/src/components/treeSelect/treeSelectNew.vue index b8a892ea0..fcd07294a 100644 --- a/src/components/treeSelect/treeSelectNew.vue +++ b/src/components/treeSelect/treeSelectNew.vue @@ -6,6 +6,7 @@ :size="width" :append-to-body=true :before-close="cancelUserInfo" + :show-checkbox="showCheckBox" > + { + this.$http.delete('sarUrl/tsUrl/delete', { - id: row.id + id: row.id }, { - _this: this, - loading: 'Loading' + _this: this, + loading: 'Loading' }, res => { - if (res.ok) { - this.$message.success('删除成功') - let arr = [] - for (let a = 0; a < this.linkList.length; a++) { - if (this.linkList[a].id === row.id) { - this.linkList.splice(a, 1) - } - } - this.linkList.forEach((item, index) => { - let json = {} - json.id = item.id - json.orderBy = index + 1 - arr.push(json) - }) - this.$http.putData('sarUrl/tsUrl/updateOrder', JSON.stringify(arr), {}, res => { - this.getLink() - }) - }else { - this.$message.warning(res.message) + if (res.ok) { + this.$message.success('删除成功') + let arr = [] + for (let a = 0; a < this.linkList.length; a++) { + if (this.linkList[a].id === row.id) { + this.linkList.splice(a, 1) + } } + this.linkList.forEach((item, index) => { + let json = {} + json.id = item.id + json.orderBy = index + 1 + arr.push(json) + }) + this.$http.putData('sarUrl/tsUrl/updateOrder', JSON.stringify(arr), {}, res => { + this.getLink() + }) + }else { + this.$message.warning(res.message) + } }) + }).catch(() => { + this.$message({ + type: 'info', + message: '已取消删除' + }); + }); + }, //头部删除按钮 deleteAllLink() { @@ -196,28 +215,39 @@ this.$message.warning('请选择要删除的链接') } else { this.modalRole = true + this.$confirm('此操作将删除链接, 是否继续?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { this.$http.delete('sarUrl/tsUrl/deleteBatch', { - ids: this.ids + ids: this.ids }, {}, res => { - if (res.ok) { - this.$message.success('删除成功') - let arr = this.linkList.filter(items => { - if (!this.ids.includes(items.id)) return items; - }) - let newArr = [] - arr.forEach((item, index) => { - let json = {} - json.id = item.id - json.orderBy = index + 1 - newArr.push(json) - }) - this.$http.putData('sarUrl/tsUrl/updateOrder', JSON.stringify(newArr), {}, res => { - this.getLink() - }) - }else { - this.$message.warning(res.message) - } + if (res.ok) { + this.$message.success('删除成功') + let arr = this.linkList.filter(items => { + if (!this.ids.includes(items.id)) return items; + }) + let newArr = [] + arr.forEach((item, index) => { + let json = {} + json.id = item.id + json.orderBy = index + 1 + newArr.push(json) + }) + this.$http.putData('sarUrl/tsUrl/updateOrder', JSON.stringify(newArr), {}, res => { + this.getLink() + }) + }else { + this.$message.warning(res.message) + } }) + }).catch(() => { + this.$message({ + type: 'info', + message: '已取消删除' + }); + }); } }, //弹窗关闭操作 diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 0e9a838b7..4a5b94f9d 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -1267,6 +1267,9 @@ export default { }, watch: {}, methods: { + FormatDate(date){ + return moment(date).format('YYYY-MM-DD'); + }, // 将文本状态的id与name对应 setMap(data){ data.forEach(item => { @@ -2703,8 +2706,8 @@ export default { location.half = half location.showAll = false }) - this.$http.get('sarSarAccessInfo/sar-sar-access-info/selectProTimeInfoByStandId', { - standId: this.$route.params.id + this.$http.get('sarLawsAttrDetailedList/sar-laws-attr-detailed-list', { + id: this.$route.params.id }, { _this: this }, res => { @@ -2721,7 +2724,6 @@ export default { } }) this.dynamicFormField = displayLocation - console.log(this.dynamicFormField) }) sessionStorage.setItem('displayLocation', JSON.stringify(displayLocation)) this.loading = false diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue index bc2aba78e..6d6626e98 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue @@ -1,1456 +1,1431 @@ diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue index c274edff0..302272626 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -49,26 +49,25 @@ > -
-

{{listForm.fileName}} +

+

+ {{ listForm.fileName }} + + + 点击上传 + +

-
- - - 点击上传 - - -
@@ -741,17 +740,13 @@ export default { }, roleForm: { startUserName: this.$store.getters.userInfo.userName, - startUser: this.$store.getters.userInfo.id, + startUser: this.$store.getters.userInfo.userId, dockUser: "", - responUserList: "", ministerUser: "", directorUser: "", - presidentUser: "", dockUserName: "", - responUserListName: "", ministerUserName: "", directorUserName: "", - presidentUserName: "" }, formRules: { listType: [ @@ -806,7 +801,7 @@ export default { modelName: "", standId: "", //选择的清单的id signFlag: "1", //是否会签 1为会签 2为不会签 - inforlist: "", //用来存放标准列表的标准id + inforlist: " ", //用来存放标准列表的标准id dataList: [{ code: "", //标准号 standName: "", //标准名称 @@ -850,9 +845,6 @@ export default { } else if (this.type === "directorUser") { this.roleForm.directorUser = data[0].id; this.roleForm.directorUserName = data[0].name; - } else if (this.type === "presidentUser") { - this.roleForm.presidentUser = data[0].id; - this.roleForm.presidentUserName = data[0].name; } this.modalshowflag = false; }, @@ -1032,19 +1024,8 @@ export default { if (this.dataList.length < 1) { this.$message.warning("标准不能为空"); } else { - let json = this.listForm; - this.listForm.fileId = this.fileIds.join(","); - this.listForm.fileName = this.fileListName.join(","); - this.listForm.model = this.listForm.fileId; - this.listForm.modelName = this.listForm.fileName; - json.zrUserId = this.roleForm.dockUser; //会签人 - json.jlUserId = this.roleForm.directorUser; //业务经理 - json.applyUpdUserId = this.roleForm.ministerUser; // 修订人 - json.approvalOpinion = ""; - json.prcCreateUser = this.$store.getters.userInfo.userId; - json.prcCreateUserName = this.$store.getters.userInfo.uName; - json.standName = this.listForm.listName; - json.standId = this.listForm.standId; + var json = Object.assign(this.listForm, this.roleForm) + console.log(json); this.$refs["qdfbForm"].validate((valid) => { if (valid) { this.$refs["Form"].validate((valid) => { @@ -1100,6 +1081,12 @@ export default { }); this.fileListName = middle; this.fileIds.push(file.response.data.id); + if(this.listForm.fileName === null ){ + this.listForm.fileName = this.fileListName.join(',') + }else { + this.listForm.fileName = this.listForm.fileName + ',' + this.fileListName.join(','); + } + this.listForm.fileId = this.listForm.fileId + ',' + this.fileIds.join(',') this.$message.success("上传成功"); } else { this.$message.error(res.message); @@ -1202,6 +1189,7 @@ export default { if (this.standList.length < 1) { this.$message.warning("请选择需要添加进清单的数据"); } else { + let exits = [] this.standList.map(item => { let newStand = false; for (let itemKey of this.dataList) { @@ -1214,8 +1202,10 @@ export default { this.$message.warning("请勿重复添加数据"); } else { this.dataList.push(item); + exits.push(item.id) } }); + this.listForm.inforlist = this.listForm.inforlist + ',' + exits.join(',') this.standardData = []; this.standModel = false; } diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue index 976a14cda..617b6018c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue @@ -78,8 +78,13 @@ width="180px" label="标准号"> @@ -727,6 +733,13 @@ placeholder="请输入采标编号" clearable > + {{'手动查找'}} @@ -1235,6 +1248,7 @@ url:'', urlChild:'', drawerTitle: '', //drawer标题 + showCheckBox: true, // 树形控件是否展示多选框 nodeKey: 'id', defaultCheckedKeys: [], nodeKeyCode: 'code', @@ -1834,12 +1848,15 @@ this.replaceLawsNumModel = false }) // this.SarLawsInfoEO.replaceLawsNum = textArr.join(',') + // 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖 if(this.replaceLawType === 'dtbjh'){ - this.form.dtbjh = textArr.join(',') + this.form.dtbjh = this.form.dtbjh ? this.form.dtbjh + ',' + textArr.join(',') : textArr.join(',') }else if(this.replaceLawType === 'yybj'){ - this.form.yybj = textArr.join(',') + this.form.yybj = this.form.yybj ? this.form.yybj + ',' +textArr.join(',') : textArr.join(',') + }else if(this.replaceLawType === 'cbbh'){ + this.form.cbbh = this.form.cbbh ? this.form.cbbh + ',' +textArr.join(',') : textArr.join(',') }else { - this.form.byybj = textArr.join(',') + this.form.byybj = this.form.byybj ? this.form.byybj + ',' +textArr.join(',') : textArr.join(',') } // this.$emit('input', textArr.join(',')) this.$refs.selections.clearSelection() diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue index 1a4702620..6bbadff45 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue @@ -201,84 +201,84 @@
- - - -
- {{ form.xgdName }} -
-
- - - -
- - -
- {{ form.fbgbjbdName }} -
-
- - - -
- - -
- {{ form.zbjbdName }} -
-
- - - -
- - -
- {{ form.bpgName }} -
-
- - - -
- - -
- {{ form.ssgName }} -
-
- - - -
- - - - -
- {{ form.kwjName }} -
-
- - - -
- - -
- {{ form.zqyjgName }} -
-
- - - -
- - -
- {{ form.caName }} -
-
- - - -
- - -
- {{ form.jdwjName }} -
-
- - - -
- - - + + + +
+ {{ form.xgdName }} +
+
+ - - +
+ + +
+ {{ form.fbgbjbdName }} +
+
+ - - +
+ + +
+ {{ form.zbjbdName }} +
+
+ - - +
+ + +
+ {{ form.bpgName }} +
+
+ - - +
+ + +
+ {{ form.ssgName }} +
+
+ - - +
+ + + + +
+ {{ form.kwjName }} +
+
+ - - +
+ + +
+ {{ form.zqyjgName }} +
+
+ - - +
+ + +
+ {{ form.caName }} +
+
+ - - +
+ + +
+ {{ form.jdwjName }} +
+
+ - - +
+ + +
@@ -467,14 +467,14 @@ clearable > - -
- {{ form.glwjName }} -
-
- - - -
- + +
+ {{ form.glwjName }} +
+
+ - - +
+ @@ -685,6 +685,16 @@ name: "bzrkStep2", data () { return { + xgdFileId: '', + fbgbjbdFileId: '', + bpgFileId: '', + ssgFileId: '', + zqyjgFileId: '', + jdwjFileId: '', + kwjFileId: '', + glwjFileId: '', + caFileId: '', + zbjbdFileId:'', rules: { commentText: [{ required: true, message: '请输入意见', trigger: 'blur' }], approvalOpinion: [{ required: true, message: '请选择审批意见', trigger: 'change' }] @@ -844,6 +854,29 @@ }, }, methods: { + downloadFile (fileType) { + if(fileType === 'fbgbjbd'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId + }else if(fileType === 'xgd'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.xgdFileId + }else if(fileType === 'bpg'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.bpgFileId + }else if(fileType === 'ssg'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.ssgFileId + }else if(fileType === 'zqyjg'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zqyjgFileId + }else if(fileType === 'jdwj'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.jdwjFileId + }else if(fileType === 'kwj'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.kwjFileId + }else if(fileType === 'glwj'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.glwjFileId + }else if(fileType === 'ca'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.caFileId + }else if(fileType === 'zbjbd'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zbjbdFileId + } + }, getRule(){ if (this.formTongGuo.approvalOpinion !== '1') { this.$refs.formTongGuo.clearValidate('commentText') @@ -910,6 +943,16 @@ }).then(res => { if (res) { const processForm = JSON.parse(res.mesg) + this.xgdFileId = processForm.xgd + this.fbgbjbdFileId = processForm.fbgbjbd + this.bpgFileId = processForm.bpg + this.ssgFileId = processForm.ssg + this.zqyjgFileId = processForm.zqyjg + this.jdwjFileId = processForm.jdwj + this.kwjFileId = processForm.kwj + this.glwjFileId = processForm.glwj + this.caFileId = processForm.ca + this.zbjbdFileId = processForm.zbjbd this.getFormFieldList(processForm) } }).catch(e => { diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue index 254066498..599e5826a 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue @@ -197,7 +197,7 @@ -
+
{{ form.xgdName }}
@@ -205,7 +205,7 @@
-
+
{{ form.fbgbjbdName }}
@@ -213,7 +213,7 @@
-
+
{{ form.zbjbdName }}
@@ -221,7 +221,7 @@
-
+
{{ form.bpgName }}
@@ -229,7 +229,7 @@
-
+
{{ form.ssgName }}
@@ -239,7 +239,7 @@ -
+
{{ form.kwjName }}
@@ -247,7 +247,7 @@
-
+
{{ form.zqyjgName }}
@@ -255,7 +255,7 @@
-
+
{{ form.caName }}
@@ -263,7 +263,7 @@
-
+
{{ form.jdwjName }}
@@ -461,7 +461,7 @@ -
+
{{ form.glwjName }}
@@ -666,6 +666,16 @@ export default { name: "bzrkStep3", data () { return { + xgdFileId: '', + fbgbjbdFileId: '', + bpgFileId: '', + ssgFileId: '', + zqyjgFileId: '', + jdwjFileId: '', + kwjFileId: '', + glwjFileId: '', + caFileId: '', + zbjbdFileId:'', activeName:'1', // 当前流程类型(1待办/2已办) processType: 1, @@ -818,6 +828,29 @@ export default { }, }, methods: { + downloadFile (fileType) { + if(fileType === 'fbgbjbd'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId + }else if(fileType === 'xgd'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.xgdFileId + }else if(fileType === 'bpg'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.bpgFileId + }else if(fileType === 'ssg'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.ssgFileId + }else if(fileType === 'zqyjg'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zqyjgFileId + }else if(fileType === 'jdwj'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.jdwjFileId + }else if(fileType === 'kwj'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.kwjFileId + }else if(fileType === 'glwj'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.glwjFileId + }else if(fileType === 'ca'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.caFileId + }else if(fileType === 'zbjbd'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zbjbdFileId + } + }, popoverHide (checkedIds, checkedData) { if(checkedData) { this.form.standSystem = checkedData.id @@ -879,6 +912,16 @@ export default { }).then(res => { if (res) { const processForm = JSON.parse(res.mesg) + this.xgdFileId = processForm.xgd + this.fbgbjbdFileId = processForm.fbgbjbd + this.bpgFileId = processForm.bpg + this.ssgFileId = processForm.ssg + this.zqyjgFileId = processForm.zqyjg + this.jdwjFileId = processForm.jdwj + this.kwjFileId = processForm.kwj + this.glwjFileId = processForm.glwj + this.caFileId = processForm.ca + this.zbjbdFileId = processForm.zbjbd this.getFormFieldList(processForm) } }).catch(e => { diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index b98012836..6c3ddd005 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -709,7 +709,7 @@ class="common-button-primary" size="mini" style="position:absolute;top: 10px;right: 0;" - @click="selectLaws('dtbjh'),config.attrName = '代替标准号'" + @click="selectLaws('yybj'),config.attrName = '引用标准'" >{{'手动查找'}} @@ -718,6 +718,13 @@ placeholder="请输入采标编号" clearable > + {{'手动查找'}} {{'手动查找'}} @@ -1398,12 +1405,15 @@ export default { this.replaceLawsNumModel = false }) // this.SarLawsInfoEO.replaceLawsNum = textArr.join(',') + // 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖 if(this.replaceLawType === 'dtbjh'){ - this.form.dtbjh = textArr.join(',') + this.form.dtbjh = this.form.dtbjh ? this.form.dtbjh + ',' + textArr.join(',') : textArr.join(',') }else if(this.replaceLawType === 'yybj'){ - this.form.yybj = textArr.join(',') - }else { - this.form.byybj = textArr.join(',') + this.form.yybj = this.form.yybj ? this.form.yybj + ',' +textArr.join(',') : textArr.join(',') + }else if(this.replaceLawType === 'cbbh'){ + this.form.cbbh = this.form.cbbh ? this.form.cbbh + ',' +textArr.join(',') : textArr.join(',') + } else { + this.form.byybj = this.form.byybj ? this.form.byybj + ',' +textArr.join(',') : textArr.join(',') } // this.$emit('input', textArr.join(',')) this.$refs.selections.clearSelection() @@ -1605,6 +1615,7 @@ export default { }).then(res => { if (res) { const processForm = JSON.parse(res.mesg) + this.commentText = processForm.commentText this.getFormFieldList(processForm) } }).catch(e => { diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue index eb5a19493..b062aa82e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue @@ -42,13 +42,11 @@ - - + - + + + + + 文本信息
- - - -
- {{ form.xgd }} -
-
- - - -
- - -
- {{ form.fbgbjbd }} -
-
- - - -
- - -
- {{ form.zbjbd }} -
-
- - - -
- - -
- {{ form.bpg }} -
-
- - - -
- - -
- {{ form.ssg }} -
-
- - - -
- - - - -
- {{ form.kwj }} -
-
- - - -
- - -
- {{ form.zqyjg }} -
-
- - - -
- - -
- {{ form.ca }} -
-
- - - -
- - -
- {{ form.jdwj }} -
-
- - - -
- - - + + + +
+ {{ form.xgdName }} +
+
+ - - +
+ + +
+ {{ form.fbgbjbdName }} +
+
+ - - +
+ + +
+ {{ form.zbjbdName }} +
+
+ - - +
+ + +
+ {{ form.bpgName }} +
+
+ - - +
+ + +
+ {{ form.ssgName }} +
+
+ - - +
+ + + + +
+ {{ form.kwjName }} +
+
+ - - +
+ + +
+ {{ form.zqyjgName }} +
+
+ - - +
+ + +
+ {{ form.caName }} +
+
+ - - +
+ + +
+ {{ form.jdwjName }} +
+
+ - - +
+ + +
@@ -317,22 +321,28 @@ - - - - + - - - - + - - - - + - - - + + + + + - - - - -
- {{ form.glwj }} -
-
- - - -
- + + + + + + + + + +
+ {{ form.glwjName }} +
+
+ - - +
+ + @@ -491,22 +505,22 @@ clearable > - - - - - - + + + + + + + + + + + + + + + +
@@ -670,6 +684,16 @@ name: "bzrkStep5", data () { return { + xgdFileId: '', + fbgbjbdFileId: '', + bpgFileId: '', + ssgFileId: '', + zqyjgFileId: '', + jdwjFileId: '', + kwjFileId: '', + glwjFileId: '', + caFileId: '', + zbjbdFileId:'', // 当前流程类型(1待办/2已办) processType: 1, detailData: [], @@ -766,6 +790,7 @@ zrbmOptions: [], // 责任部门 zrgcsOptions: [], // 责任工程师 txlbOptions: [], // 体系类别 + qcdwOption: [], // 起草单位 data: [], // 标准列表数据 ListForm: {}, // 新增数据 user1: '', @@ -790,6 +815,29 @@ }, }, methods: { + downloadFile (fileType) { + if(fileType === 'fbgbjbd'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId + }else if(fileType === 'xgd'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.xgdFileId + }else if(fileType === 'bpg'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.bpgFileId + }else if(fileType === 'ssg'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.ssgFileId + }else if(fileType === 'zqyjg'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zqyjgFileId + }else if(fileType === 'jdwj'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.jdwjFileId + }else if(fileType === 'kwj'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.kwjFileId + }else if(fileType === 'glwj'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.glwjFileId + }else if(fileType === 'ca'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.caFileId + }else if(fileType === 'zbjbd'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zbjbdFileId + } + }, popoverHide (checkedIds, checkedData) { console.log(checkedIds); console.log(checkedData); @@ -816,6 +864,21 @@ }).then(res => { if (res) { const processForm = JSON.parse(res.mesg) + this.xgdFileId = processForm.xgd + this.fbgbjbdFileId = processForm.fbgbjbd + this.bpgFileId = processForm.bpg + this.ssgFileId = processForm.ssg + this.zqyjgFileId = processForm.zqyjg + this.jdwjFileId = processForm.jdwj + this.kwjFileId = processForm.kwj + this.glwjFileId = processForm.glwj + this.caFileId = processForm.ca + this.zbjbdFileId = processForm.zbjbd + this.form.standYear = processForm.standYear + this.form.standSystem = processForm.standSystem + this.form.kccvppsbm = processForm.kccvppsbm + this.form.cycvppsbm = processForm.cycvppsbm + this.form.dybxh = processForm.dybxh this.getFormFieldList(processForm) } }).catch(e => { @@ -914,6 +977,7 @@ this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 this.txlbOptions = res.data.TXLBCLASS // 体系类别 + this.qcdwOption = res.data.QCDW // 体系类别 }) } } diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue index b0315ca40..8d4cf8c13 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue @@ -84,7 +84,7 @@ @@ -304,8 +304,6 @@ export default { }, //提交事件 handleSubmit() { - this.listForm.dataList.forEach(item => { - if (item.workPeople !== undefined) { this.listForm.commentText = this.commentText; const json = JSON.stringify(this.listForm); this.$http.post("lawss/activiti/completeTask", { @@ -321,10 +319,6 @@ export default { } }, e => { }); - } else { - this.$message.warning("请选择分发负责人"); - } - }); }, //批量分发按钮 batchOperation(id) { diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index 4075151f6..b28ec60cb 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -600,6 +600,72 @@ export default { prcType: row.prcType } }) + } else if(row.taskInfo === '分发负责人审批') { + this.$router.push({ + name: 'xmpg2Step7', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if(row.taskInfo === '架构经理审批') { + this.$router.push({ + name: 'xmpg2Step8', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if(row.taskInfo === '工程经理审批') { + this.$router.push({ + name: 'xmpg2Step9', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if(row.taskInfo === '标准法规部经理审批') { + this.$router.push({ + name: 'xmpg2Step10', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if(row.taskInfo === '汇总审批') { + this.$router.push({ + name: 'xmpg2Step11', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if(row.taskInfo === '标准法规部部长审批') { + this.$router.push({ + name: 'xmpg2Step12', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) } break //未符合项整改流程 diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue index 24dcc9a41..f001bac6b 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue @@ -80,55 +80,13 @@ - + - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - + + - - - - + clearable/> + + + + + + 查询
@@ -243,13 +178,12 @@ width="180px" label="标准号"> - - - - - - - - - - - - - - {{$t('m.dataAcquisition')}} @@ -354,6 +242,7 @@ v-btn-permission="''" >删除
+ - - - + - + - + - + - + - + - + - + - + - + - +
@@ -746,19 +633,23 @@ export default { {value: 'FOREIGN_STAND', label: '海外标准法规'}, //{value: 'FOREIGN_LAWS', label: '国内外政策'}, // {value: 'BUSINESS', label: '企业标准 '}, - {value: 'TEMP', label: '标准法规清单 '} + // {value: 'TEMP', label: '标准法规清单 '} ], // 新增、编辑 数据搜索字段 sarAccessInfoSearch: { id: '', - countryArea: '', // 国家 - issueTime: '', standName: '', - textStatus: '', - // applicationScope: '', //适用区域 - keywords: '', // 关键字 - detailedListName: '', //清单名称 - applyArctic: '', // 能源种类 + askType: '', // 监管类型 + dataSource: 'INLAND_STAND', // 数据来源 + page: 1, + pageSize: this.$store.getters.userInfo.configContent, + validFlag: 0, + advanceSearchVOStr: '' + }, + sarAccessInfo: { + id: '', + standNumber: '', + standName: '', askType: '', // 监管类型 dataSource: 'INLAND_STAND', // 数据来源 page: 1, @@ -1104,15 +995,11 @@ export default { }, // 点击清空查询条件 按钮事件 clearSearchLaws () { - this.sarAccessInfoSearch.advanceSearchVOStr = '' - this.sarAccessInfoSearch.applyArctic = '' // 能源种类 - this.sarAccessInfoSearch.keywords = '' // 关键字 this.sarAccessInfoSearch.askType = '' // 监管类型 - this.sarAccessInfoSearch.detailedListName = '' // 清单名称 this.sarAccessInfoSearch.dataSource = 'INLAND_STAND' // 数据来源 this.sarAccessInfoSearch.standName = '' - this.sarAccessInfoSearch.putTime = '' - this.sarAccessInfoSearch.textStatus = '' + this.sarAccessInfo.standName = '' + this.sarAccessInfo.standNumber = '' this.isListType = false this.selectLawsStands() }, @@ -1474,6 +1361,11 @@ export default { }, // 查询数据搜索 table 数据 selectLawsStands () { + if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') { + this.sarAccessInfoSearch.dataSource = 'INLAND_STAND' + } else { + this.sarAccessInfoSearch.standType = 'FOREIGN' + } StandardsInfoPage(this.sarAccessInfoSearch).then(res =>{ this.sarAccessInfoSearchList = res.data.list this.sarAccessInfoSearchList.forEach(item => { @@ -1482,8 +1374,35 @@ export default { } else { item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear } + this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ) + this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ) + this.$set(item, 'sycpx', item.attrInfoMap.SYCPX) + this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX) + this.$set(item, 'nylx', item.attrInfoMap.NYLX) + this.$set(item, 'zrbm', item.attrInfoMap.ZRBM) + this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM) + this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN) + this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM) + this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN) }) + this.drawerTotal = res.data.list.length + }, e => { + }) + }, + selectBtn() { + if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') { + this.sarAccessInfoSearch.dataSource = 'INLAND_STAND' + } else { + this.sarAccessInfoSearch.standType = 'FOREIGN' + } + StandardsInfoPage(this.sarAccessInfo).then(res =>{ + this.sarAccessInfoSearchList = res.data.list this.sarAccessInfoSearchList.forEach(item => { + if (item.standYear === null) { + item.standNumber = item.standSortShow + ' ' + item.standNumber + } else { + item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear + } this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ) this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ) this.$set(item, 'sycpx', item.attrInfoMap.SYCPX) @@ -2169,6 +2088,12 @@ export default { text-align: right; } } +.labelBox { + /deep/ .el-form-item__label { + padding-right: 5px; + padding-left: 10px; + } +} .un-select { user-select: none; } diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue index ab7f62f3e..65ae89739 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue @@ -191,13 +191,13 @@ align="center"> { this.standinfoList = res.data; + this.standinfoList.forEach(item => { + if (item.standYear === null) { + item.standNumber = item.standSortShow + ' ' + item.standNumber + } else { + item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear + } + }) this.total = res.data.total; }, e => { @@ -628,7 +635,7 @@ export default { name: "OtherStandardDetails", params: { id: data.id, - pageType: data.sarType + pageType: data.standType } }); window.open(routeUrl.href, "_blank"); @@ -660,10 +667,10 @@ export default { // changeState(row) { let routeUrl = this.$router.resolve({ - name: "ComplianceDetails", + name: "OtherStandardDetails", query: { - sarId: row.resId, - sarType: row.sarState + id: data.id, + pageType: this.standType } }); window.open(routeUrl.href, "_blank"); diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue index 8cfff16a1..08ec91a6c 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue @@ -65,40 +65,13 @@ - + - - - - - - - - - - - - - 清空 - + + + 高级查询 + + 高级查询 @@ -124,54 +101,23 @@
- - - - - - - - - - - + + + size="small" + clearable/> - + - - - - + clearable/> + + + 查询
@@ -223,7 +169,6 @@ - - - - - - - - - - - - - {{$t('m.dataAcquisition')}} @@ -405,16 +310,6 @@ width="210px" align="center" label="责任部门"> - { + if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') { + this.sarAccessInfoSearch.dataSource = 'INLAND_STAND' + } else { + this.sarAccessInfoSearch.standType = 'FOREIGN' + } + StandardsInfoPage(this.sarAccessInfoSearch).then(res =>{ + this.sarAccessInfoSearchList = res.data.list + this.sarAccessInfoSearchList.forEach(item => { + if (item.standYear === null) { + item.standNumber = item.standSortShow + ' ' + item.standNumber + } else { + item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear + } + this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ) + this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ) + this.$set(item, 'sycpx', item.attrInfoMap.SYCPX) + this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX) + this.$set(item, 'nylx', item.attrInfoMap.NYLX) + this.$set(item, 'zrbm', item.attrInfoMap.ZRBM) + this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM) + this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN) + this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM) + this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN) + }) + this.drawerTotal = res.data.list.length + }, e => { + }) + }, + // 高级检索查询按钮 + selectBtn() { + if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') { + this.sarAccessInfoSearch.dataSource = 'INLAND_STAND' + } else { + this.sarAccessInfoSearch.standType = 'FOREIGN' + } + StandardsInfoPage(this.sarAccessInfo).then(res =>{ this.sarAccessInfoSearchList = res.data.list this.sarAccessInfoSearchList.forEach(item => { if (item.standYear === null) { @@ -1288,8 +1225,6 @@ export default { } else { item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear } - }) - this.sarAccessInfoSearchList.forEach(item => { this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ) this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ) this.$set(item, 'sycpx', item.attrInfoMap.SYCPX) @@ -1303,7 +1238,6 @@ export default { }) this.drawerTotal = res.data.list.length }, e => { - }) }, // 数据搜索table判断checked状态 @@ -1987,6 +1921,12 @@ export default { text-align: right; } } +.labelBox { + /deep/ .el-form-item__label { + padding-right: 5px; + padding-left: 10px; + } +} .un-select { user-select: none; } diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue index 67196879a..a784e604c 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue @@ -65,40 +65,13 @@ - + - - - - - - - - - - - - -
- - - - - - - - - - - + + + size="small" + clearable/> - + - - - - + clearable/> + + + 查询
@@ -227,7 +169,6 @@ - - - - - - - - - - - - - {{$t('m.dataAcquisition')}} @@ -519,7 +420,7 @@ import CustomRoleTree from '@/components/CustomFormComponents/roleTree' import stand from "../../../config/pages/attributeCustom/components/stand"; import { mapGetters } from 'vuex' import {interfaceUrl} from "@/sysConfig"; -import {dicTypeData} from "@/api/unqualProcess"; +import {dicTypeData, StandardsInfoPage} from "@/api/unqualProcess" export default { name: 'OtherAddEit', components: { @@ -601,18 +502,25 @@ export default { dataSourceOptions: [ {value: 'INLAND_STAND', label: '国内标准法规'}, {value: 'FOREIGN_STAND', label: '海外标准法规'}, - {value: 'FOREIGN_LAWS', label: '国内外政策'}, + // {value: 'FOREIGN_LAWS', label: '国内外政策'}, // {value: 'BUSINESS', label: '企业标准 '}, - {value: 'TEMP', label: '标准法规清单 '} + // {value: 'TEMP', label: '标准法规清单 '} ], // 新增、编辑 数据搜索字段 sarAccessInfoSearch: { id: '', - countryArea: '', // 国家 - // applicationScope: '', //适用区域 - keywords: '', // 关键字 - detailedListName: '', //清单名称 - applyArctic: '', // 能源种类 + standName: '', + askType: '', // 监管类型 + dataSource: 'INLAND_STAND', // 数据来源 + page: 1, + pageSize: this.$store.getters.userInfo.configContent, + validFlag: 0, + advanceSearchVOStr: '' + }, + sarAccessInfo: { + id: '', + standName: '', + standNumber: '', askType: '', // 监管类型 dataSource: 'INLAND_STAND', // 数据来源 page: 1, @@ -943,11 +851,10 @@ export default { // 点击清空查询条件 按钮事件 clearSearchLaws () { this.sarAccessInfoSearch.standName = '' + this.sarAccessInfo.standName = '' + this.sarAccessInfo.standNumber = '' this.sarAccessInfoSearch.advanceSearchVOStr = '' - this.sarAccessInfoSearch.applyArctic = '' // 能源种类 - this.sarAccessInfoSearch.keywords = '' // 关键字 this.sarAccessInfoSearch.askType = '' // 监管类型 - this.sarAccessInfoSearch.detailedListName = '' // 清单名称 this.sarAccessInfoSearch.dataSource = 'INLAND_STAND' // 数据来源 this.isListType = false this.selectLawsStands() @@ -1276,9 +1183,12 @@ export default { }, // 查询数据搜索 table 数据 selectLawsStands () { - this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.sarAccessInfoSearch, { - _this: this - }, res =>{ + if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') { + this.sarAccessInfoSearch.dataSource = 'INLAND_STAND' + } else { + this.sarAccessInfoSearch.standType = 'FOREIGN' + } + StandardsInfoPage(this.sarAccessInfoSearch, this.sarAccessInfo).then(res =>{ this.sarAccessInfoSearchList = res.data.list this.sarAccessInfoSearchList.forEach(item => { if (item.standYear === null) { @@ -1286,10 +1196,49 @@ export default { } else { item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear } + this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ) + this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ) + this.$set(item, 'sycpx', item.attrInfoMap.SYCPX) + this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX) + this.$set(item, 'nylx', item.attrInfoMap.NYLX) + this.$set(item, 'zrbm', item.attrInfoMap.ZRBM) + this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM) + this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN) + this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM) + this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN) + }) + this.drawerTotal = res.data.list.length + }, e => { + }) + }, + /** 高级查询查询按钮*/ + selectBtn() { + if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') { + this.sarAccessInfoSearch.dataSource = 'INLAND_STAND' + } else { + this.sarAccessInfoSearch.standType = 'FOREIGN' + } + StandardsInfoPage(this.sarAccessInfo).then(res =>{ + this.sarAccessInfoSearchList = res.data.list + this.sarAccessInfoSearchList.forEach(item => { + if (item.standYear === null) { + item.standNumber = item.standSortShow + ' ' + item.standNumber + } else { + item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear + } + this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ) + this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ) + this.$set(item, 'sycpx', item.attrInfoMap.SYCPX) + this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX) + this.$set(item, 'nylx', item.attrInfoMap.NYLX) + this.$set(item, 'zrbm', item.attrInfoMap.ZRBM) + this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM) + this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN) + this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM) + this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN) }) this.drawerTotal = res.data.list.length }, e => { - }) }, // 数据搜索table判断checked状态 @@ -1987,6 +1936,12 @@ export default { text-align: right; } } +.labelBox { + /deep/ .el-form-item__label { + padding-right: 5px; + padding-left: 10px; + } +} .un-select { user-select: none; } diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 80c28f02a..bc158ef55 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -188,22 +188,21 @@ + prop="XCXSSRQ" + sortable="custom" + width="150px" + label="新车型实施日期"> + prop="ZCCSSRQ" + sortable="custom" + width="150px" + label="在产车实施日期"> { this.$http.delete("sarResource/ts-resource", { - menuId: data.id + resourceId: data.id }, res => { }, e => { if(e.ok){ @@ -2217,10 +2217,11 @@ export default { }, // 树节点鼠标移入移出 mouseenter(data){ - console.log(data) - this.$set(data, 'show', true) - if(data.parentId !== null){ - this.$set(data, 'showDel', true) + if(data.menuName !== '我的收藏'){ + this.$set(data, 'show', true) + if(data.parentId !== null){ + this.$set(data, 'showDel', true) + } } }, mouseleave(data){ @@ -2878,7 +2879,7 @@ export default { formData.nowOrderBy = this.nowOrder ? this.orderBy : '' formData.nowOrder = this.nowOrder // 处理我的收藏和个性化标签传参 - if (this.selectSarMenu.id === 'wdsc') { + if (this.selectSarMenu.menuName === '我的收藏') { formData.menuId = undefined formData.labelMenuId = undefined formData.collectMenuId = 'wdsc'