diff --git a/public/static/pdf/web/viewer.js b/public/static/pdf/web/viewer.js index 519ad58a0..4a4b2d41c 100644 --- a/public/static/pdf/web/viewer.js +++ b/public/static/pdf/web/viewer.js @@ -6648,11 +6648,11 @@ var PDFPageView = function () { var defaultSettings = { watermark_txt: msg, watermark_x: 100,//水印起始位置x轴坐标 - watermark_y: 0,//水印起始位置Y轴坐标 + watermark_y: -130,//水印起始位置Y轴坐标 watermark_rows: 0,//水印行数 watermark_cols: 0,//水印列数 - watermark_x_space: 18,//水印x轴间隔 - watermark_y_space: 20,//水印y轴间隔 + watermark_x_space: 40,//水印x轴间隔 + watermark_y_space: 50,//水印y轴间隔 watermark_color: 'rgba(232,232,240)',//水印字体颜色 watermark_alpha: 0.3,//水印透明度 watermark_fontsize: '40px',//水印字体大小 @@ -6661,25 +6661,9 @@ var PDFPageView = function () { watermark_height: 80,//水印长度 watermark_angle: 40//水印倾斜度数 }; - //判断分辨率 - if (screen.width+"*"+screen.height === '800*600' ){ - defaultSettings = { - watermark_txt: msg, - watermark_x: 0,//水印起始位置x轴坐标 - watermark_y: 0,//水印起始位置Y轴坐标 - watermark_rows: 0,//水印行数 - watermark_cols: 0,//水印列数 - watermark_x_space: 2,//水印x轴间隔 - watermark_y_space: 27,//水印y轴间隔 - watermark_color: 'rgba(232,232,240)',//水印字体颜色 - watermark_alpha: 0.3,//水印透明度 - watermark_fontsize: '40px',//水印字体大小 - watermark_font: '微软雅黑',//水印字体 - watermark_width: 120,//水印宽度 - watermark_height: 80,//水印长度 - watermark_angle: 40//水印倾斜度数 - }; - } + // //判断分辨率 + // if (screen.width+"*"+screen.height === '800*600' ){ + // } @@ -6688,7 +6672,6 @@ var PDFPageView = function () { //获取页面最大宽度 // var getPage = Math.max(document.body.scrollWidth, document.body.clientWidth); // var getPage =document.body.scrollWidth; - var page_width = parseInt(textLayerDiv.style.width) //获取pdf页面宽度 // var page_width = getPage - (0.35 * getPage); //var page_width = canvasWrapper.style.width; //获取页面最大长度 @@ -6699,7 +6682,6 @@ var PDFPageView = function () { // //获取页面最大长度 // var page_height = parseInt(canvasWrapper.style.height); - var page_height = parseInt(textLayerDiv.style.height) //获取pdf页面长度 var pdf_page =document.getElementById("viewer"); //2021/12/5 分辨率不同的情况会出现问题 //如果将水印列数设置为0，或水印列数设置过大，超过页面最大宽度，则重新计算水印列数和水印x轴间隔 @@ -6720,6 +6702,8 @@ var PDFPageView = function () { // // } + var page_width = parseInt(textLayerDiv.style.width) //获取pdf页面宽度 + var page_height = parseInt(textLayerDiv.style.height)+defaultSettings.watermark_y //获取pdf页面长度 //如果将水印列数设置为0，或水印列数设置过大，超过页面最大宽度，则重新计算水印列数和水印x轴间隔 if (defaultSettings.watermark_cols == 0 || (parseInt(defaultSettings.watermark_x + defaultSettings.watermark_width * defaultSettings.watermark_cols + defaultSettings.watermark_x_space * (defaultSettings.watermark_cols - 1)) > page_width)) { diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index f0beb6e21..84fe82c79 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -3177,7 +3177,6 @@ export default { displayLocation.forEach(location => { // 动态属性字段-FBGBJBD 单独添加至基础信息 const list = displayLocation.filter(item => item.label === '过程稿件'); - console.log() if (location.label === '基础信息' && list && list.length > 0) { if (!list[0].child) { location['child1'] = [] @@ -3207,7 +3206,6 @@ export default { } } } - const child = location.child || [] const one = [] const half = [] @@ -3232,7 +3230,6 @@ export default { location.showAll = false }) console.log(displayLocation) - this.$http.get('sarLawsAttrDetailedList/sar-laws-attr-detailed-list', { id: this.$route.params.id }, { @@ -3240,6 +3237,29 @@ export default { }, res => { displayLocation.map(item => { if (item.value === '2URVBGR2Y4UG77KZ5YPL') { + item.child.forEach(items =>{ + let accessCountry = JSON.parse(sessionStorage.getItem("accessCountry")); + if (accessCountry.country === undefined) { + accessCountry.country = '文本' + } + if(items.attrField === 'SSRQ') { + items.attrName = '实施日期' + '(' + accessCountry.country + ')' + ':' + if (accessCountry.ssrq !== undefined) { + item.value = accessCountry.ssrq + } + } else if (items.attrField === 'ZCCSSRQ') { + items.attrName = '在产车实施日期' + '(' + accessCountry.country + ')' + ':' + if (accessCountry.zccssrqgj !== undefined) { + item.value = accessCountry.zccssrqgj + } + } else if(items.attrField === 'XCXSSRQ') { + items.attrName = '新车型实施日期' + '(' + accessCountry.country + ')' + ':' + if (accessCountry.xcxssrqgj !== undefined) { + item.value = accessCountry.xcxssrqgj + } + + } + }) for (let key in res.data) { item.one.push({ attrName: key, diff --git a/src/pages/home2/components/solicitopinions/index.vue b/src/pages/home2/components/solicitopinions/index.vue index 1b36284bd..c01a2fe4e 100644 --- a/src/pages/home2/components/solicitopinions/index.vue +++ b/src/pages/home2/components/solicitopinions/index.vue @@ -25,6 +25,7 @@ @@ -249,6 +335,18 @@ export default { name: "bzzqyjStep4", data() { return { + acceptShow: false, + idList: [], + options: [], + itemId: '', + modalshowflag2: false, + editForm: { + chapterNumber: '', + chapterName: '', + oldText: '', + newText: '', + reason: '', + }, itermsConditionsFlag: false, itermsConditionsTitle: '', drawerModal: false, @@ -281,10 +379,12 @@ export default { textType: '', modelList: [], modelNameList: '', + spId: '', + spName: '', }, formRules: { - responUserList: [ - {required: true, message: '请选择责任人', trigger: 'change'}, + spId: [ + {required: true, message: '请选择审批人', trigger: 'change'}, ] }, json: {} @@ -296,6 +396,116 @@ export default { ProcessTitle }, methods: { + handleSelectionChange(val) { + this.idList = [] + val.forEach(item => { + this.idList.push(item.id) + }) + }, + addDelete() { + if (this.idList.length > 0) { + this.$confirm('删除选中数据, 是否继续?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + for (let a = 0; a < this.data.length; a++) { + this.idList.forEach(item => { + if (this.data[a].id === item) { + this.data.splice(a, 1) + } + }) + } + }).catch(() => { + this.$message({ + type: 'info', + message: '已取消删除' + }); + }); + } else { + this.$message.warning('请选择要删除的数据') + } + }, + addModal() { + var id = Number(Math.random().toString().substr(3, 3) + Date.now()).toString(36); + var json = { + chapterNumber: '', + chapterName: '', + commentText: '', + oldText: '', + newText: '', + reason: '', + id: id, + department: this.$store.getters.userInfo.upDeptName, + responUserName: this.$store.getters.userInfo.userName, + } + this.data.push(json) + this.itemId = id + this.editForm = { + chapterNumber: '', + chapterName: '', + oldText: '', + newText: '', + reason: '', + } + this.modalshowflag2 = true + }, + getItemList (standId, fileType) { // 查询分解单条款数据 + this.$http.get('SarStandItems/sar-stand-items/querySarItemAndInterpretation', { + standId: standId, + fileType: fileType, + pageSize: 9999, + page: 1 + }, {}, res => { + if (res.ok) { + this.options = res.data.list + } + }, e => { + }) + }, + optionsChange (data) { + for (let a = 0; a < this.options.length; a++) { + if (data === this.options[a].itemsNum) { + this.editForm.chapterName = this.options[a].itemsName + this.editForm.oldText = this.options[a].termsConditions + } + } + }, + saveUserInfo2 () { + for( let a = 0; a < this.data.length; a++) { + if (this.data[a].id === this.itemId) { + this.data[a].chapterNumber = this.editForm.chapterNumber + this.data[a].chapterName = this.editForm.chapterName + this.data[a].oldText = this.editForm.oldText + this.data[a].newText = this.editForm.newText + this.data[a].reason = this.editForm.reason + } + } + this.modalshowflag2 = false + }, + cancleUserInfo2 () { + this.modalshowflag2 = false + }, + itemEdit (row) { + this.itemId = row.id + this.modalshowflag2 = true + this.editForm = { + chapterNumber: row.chapterNumber, + chapterName: row.chapterName, + oldText: row.oldText, + newText: row.newText, + reason: row.reason, + } + }, + checkedRole2(data) { + this.form.spId = data[0].id + this.form.spName = data[0].name + }, + choiceZRR(id) { + this.nodeList = [] + this.nodeList.push(id) + this.modalshowflag = true; + }, itermsConditionsClose () { this.itermsConditionsFlag = false }, @@ -363,42 +573,48 @@ export default { handleSave() { }, handleSubmit() { - this.isSubmit = true - var json = this.json - json.actionFlag = 0 - json.commentText = this.commentText - this.$http.post('lawss/activiti/completeTask', { - json: JSON.stringify(json), - taskId: this.taskIds, - userId: this.$store.getters.userInfo.userId - }, {}, res => { - if (res.success) { - this.$message.success('提交成功') - this.$router.push('/processCenter') + this.$refs['bzzqyjForm'].validate((valid) => { + if (valid) { + this.isSubmit = true + var json = this.json + json.actionFlag = 0 + json.commentText = this.commentText + json.spId = this.form.spId + json.spName = this.form.spName + this.$http.post('lawss/activiti/completeTask', { + json: JSON.stringify(json), + taskId: this.taskIds, + userId: this.$store.getters.userInfo.userId + }, {}, res => { + if (res.success) { + this.$message.success('提交成功') + this.$router.push('/processCenter') + } + this.isSubmit = false + }) } - this.isSubmit = false }) }, - handleSubmitNo() { - if (this.commentText) { - var json = this.json - json.actionFlag = 1 - json.commentText = this.commentText - this.$http.post('lawss/activiti/completeTask', { - json: JSON.stringify(json), - taskId: this.taskIds, - userId: this.$store.getters.userInfo.userId - }, {}, res => { - if (res.success) { - this.$message.success('提交成功') - this.$router.push('/processCenter') - } - }) - } else { - this.$message.warning('请输入反馈意见') - } - - }, + // handleSubmitNo() { + // if (this.commentText) { + // var json = this.json + // json.actionFlag = 1 + // json.commentText = this.commentText + // this.$http.post('lawss/activiti/completeTask', { + // json: JSON.stringify(json), + // taskId: this.taskIds, + // userId: this.$store.getters.userInfo.userId + // }, {}, res => { + // if (res.success) { + // this.$message.success('提交成功') + // this.$router.push('/processCenter') + // } + // }) + // } else { + // this.$message.warning('请输入反馈意见') + // } + // + // }, getData() { return new Promise((resolve, reject) => { inboundLiaisonDetail({ @@ -406,6 +622,14 @@ export default { pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) + let commitStatus = res.commitStatus + if(commitStatus && commitStatus > 0){ + this.acceptShow = true + this.submitShow = false + }else { + this.acceptShow = false + this.submitShow = true + } this.form.fjList = data.fjList || data.form.fjList if (data.fjListId === '') { this.form.fjListId = '' @@ -418,8 +642,10 @@ export default { this.form.textType = data.textType this.form.modelList = data.modelList this.form.modelNameList = data.modelNameList + this.form.spId = data.spId || '' + this.form.spName = data.spName || '' this.json = data - console.log(data); + this.getItemList(data.standId,this.form.textValue) this.data = data.info || data.data }).catch(e => { }) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue index d6a4098b4..995ed952d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue @@ -12,11 +12,11 @@
@@ -26,32 +26,42 @@ + disabled + v-model="form.endTime" + type="date" + placeholder="请选择结束日期">
-
+
{{ item.fileName }} 下载
+ +
+
+ {{ item.name }} +
+
+
+ - - +
+
@@ -60,100 +70,79 @@ + type="index" + label="序号" + width="55" + align="center"> + prop="chapterNumber" + align="center" + sortable + label="章条编号" + width="101px"> + prop="chapterName" + align="center" + width="200px" + label="章节名称"> + prop="commentText" + align="center" + label="修改意见内容（包括理由或依据）"> + prop="oldText" + align="center" + label="修改前"> - + prop="newText" + align="center" + label="修改后"> - + prop="reason" + align="center" + label="修改理由"> + prop="department" + align="center" + label="提出部门"> + prop="responUserName" + align="center" + label="提出人"> + prop="state" + align="center" + label="处理意见"> + + +
+ type="textarea" + :rows="3" + resize="none" + placeholder="请输入意见" + v-model="commentText">
@@ -179,57 +180,57 @@
+ height="100%" + ref="selection" + :data="histortData" + tooltip-effect="dark" + style="width: 100%" + border + row-key="id" + :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"> + prop="createTime" + label="创建时间" + sortable="custom" + align="center"> + prop="endTime" + label="完成时间" + align="center"> + prop="comment" + label="流程信息" + align="center"> + prop="completeFlag" + label="状态" + align="center"> @@ -237,13 +238,13 @@
+ +
+
+ 关闭 +
+ + +
+ + + + + + + + + + +
+ + + + + + + + +
+ + diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue index e1c15431d..d5dd0855d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue @@ -52,6 +52,16 @@ + +
+
+ {{ item.name }} +
+
+
+ - - +
+ @@ -62,12 +72,12 @@
生成汇总单 生成上报意见
@@ -108,6 +118,9 @@ prop="oldText" align="center" label="修改前"> + + +
+
+ 关闭 +
+ @@ -247,6 +269,8 @@ export default { name: "bzzqyjStep6", data() { return { + itermsConditionsFlag: false, + itermsConditionsTitle: '', drawerModal: false, histortData: [], oldData: [], @@ -278,6 +302,9 @@ export default { cname: "", // 名称 fjList: [], fjListId: '', + textType: '', + modelList: [], + modelNameList: '', }, formRules: { responUserList: [ @@ -293,6 +320,13 @@ export default { ProcessTitle }, methods: { + itermsConditionsClose () { + this.itermsConditionsFlag = false + }, + itermsConditionsOpen (row) { + this.itermsConditionsFlag = true + this.itermsConditionsTitle = row + }, downloadFile (attId) { window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId }, @@ -355,6 +389,8 @@ export default { } }, upload(row, title) { + console.log(row); + return var params = { columnName: { chapterNumber: "章条编号", @@ -393,7 +429,7 @@ export default { } else { this.isSubmit = true; var json = this.json; - json.actionFlag = 0; + json.hqFlag = '0'; json.commentText = this.commentText; this.$http.post("lawss/activiti/completeTask", { json: JSON.stringify(json), @@ -412,7 +448,7 @@ export default { if (this.commentText) { this.isSubmit = true; var json = this.json; - json.actionFlag = 1; + json.hqFlag = '1'; json.commentText = this.commentText; this.$http.post("lawss/activiti/completeTask", { json: JSON.stringify(json), @@ -445,6 +481,7 @@ export default { this.form.cid = data.cid || data.form.cid; this.form.endTime = data.endTime || data.form.endTime; this.form.cname = data.cname || data.form.cname; + this.oldData = JSON.parse(JSON.stringify(data.info)) var arr = [] data.info.forEach(item => { @@ -453,8 +490,10 @@ export default { } }) this.json = data + this.form.textType = data.textType + this.form.modelList = data.modelList + this.form.modelNameList = data.modelNameList this.data = arr - this.oldData = data.oldinfo }).catch(e => { }); }); diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue index 95f444881..6e959ee91 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue @@ -3,7 +3,7 @@ - +
基础信息
@@ -46,12 +46,22 @@ style="display: none;" >
-
+
{{ item.fileName }} 下载
+ +
+
+ {{ item.name }} +
+
+
+ - - +
+
@@ -62,12 +72,12 @@
生成汇总单 生成上报意见
@@ -108,6 +118,9 @@ prop="oldText" align="center" label="修改前"> + + +
+
+ 关闭 +
+
@@ -247,7 +269,9 @@ export default { name: "bzzqyjStep7", data() { return { - drawerModal: false, + itermsConditionsFlag: false, + itermsConditionsTitle: '', + drawerModal: false, histortData: [], oldData: [], data: [], @@ -275,6 +299,9 @@ export default { cname: '', // 名称 fjList: [], fjListId: '', + textType: '', + modelList: [], + modelNameList: '', }, formRules: { responUserList: [ @@ -290,6 +317,13 @@ export default { ProcessTitle }, methods: { + itermsConditionsClose () { + this.itermsConditionsFlag = false + }, + itermsConditionsOpen (row) { + this.itermsConditionsFlag = true + this.itermsConditionsTitle = row + }, downloadFile (attId) { window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId }, @@ -390,7 +424,7 @@ export default { } else { this.isSubmit = true var json = this.json - json.actionFlag = 0 + json.bdFlag = '0' json.commentText = this.commentText this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), @@ -409,7 +443,7 @@ export default { if (this.commentText) { this.isSubmit = true var json = this.json - json.actionFlag = 1 + json.bdFlag = '1' json.commentText = this.commentText this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), @@ -449,6 +483,9 @@ export default { arr.push(item) } }) + this.form.textType = data.textType + this.form.modelList = data.modelList + this.form.modelNameList = data.modelNameList this.json = data this.data = arr }).catch(e => { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue index c9f4c8eeb..31006296c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue @@ -3,7 +3,7 @@ - +
基础信息
@@ -46,12 +46,22 @@ style="display: none;" >
-
+
{{ item.fileName }} 下载
+ +
+
+ {{ item.name }} +
+
+
+ - - +
+
@@ -62,12 +72,12 @@
生成汇总单 生成上报意见
@@ -108,6 +118,9 @@ prop="oldText" align="center" label="修改前"> + + +
+
+ 关闭 +
+
@@ -247,7 +269,9 @@ export default { name: "bzzqyjStep8", data() { return { - drawerModal: false, + itermsConditionsFlag: false, + itermsConditionsTitle: '', + drawerModal: false, histortData: [], oldData: [], data: [], @@ -275,6 +299,9 @@ export default { cname: '', // 名称 fjList: [], fjListId: '', + textType: '', + modelList: [], + modelNameList: '', }, formRules: { responUserList: [ @@ -290,6 +317,13 @@ export default { ProcessTitle }, methods: { + itermsConditionsClose () { + this.itermsConditionsFlag = false + }, + itermsConditionsOpen (row) { + this.itermsConditionsFlag = true + this.itermsConditionsTitle = row + }, downloadFile (attId) { window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId }, @@ -390,7 +424,7 @@ export default { } else { this.isSubmit = true var json = this.json - json.actionFlag = 0 + json.directorFlag = '0' json.commentText = this.commentText this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), @@ -409,7 +443,7 @@ export default { if (this.commentText) { this.isSubmit = true var json = this.json - json.actionFlag = 1 + json.directorFlag = '0' json.commentText = this.commentText this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), @@ -450,8 +484,10 @@ export default { } }) this.json = data + this.form.textType = data.textType + this.form.modelList = data.modelList + this.form.modelNameList = data.modelNameList this.data = arr - this.oldData = data.oldinfo }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue index 6a7f2b77f..95c0b267d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue @@ -46,12 +46,22 @@ style="display: none;" >
-
+
{{ item.fileName }} 下载
+ +
+
+ {{ item.name }} +
+
+
+ - - +
+
@@ -62,12 +72,12 @@
生成汇总单 生成上报意见
@@ -108,6 +118,9 @@ prop="oldText" align="center" label="修改前"> + + +
+
+ 关闭 +
+ @@ -247,6 +269,8 @@ export default { name: "bzzqyjStep9", data() { return { + itermsConditionsFlag: false, + itermsConditionsTitle: '', drawerModal: false, histortData: [], oldData: [], @@ -275,6 +299,9 @@ export default { cname: "", // 名称 fjList: [], fjListId: '', + textType: '', + modelList: [], + modelNameList: '', }, formRules: { responUserList: [ @@ -290,6 +317,13 @@ export default { ProcessTitle }, methods: { + itermsConditionsClose () { + this.itermsConditionsFlag = false + }, + itermsConditionsOpen (row) { + this.itermsConditionsFlag = true + this.itermsConditionsTitle = row + }, downloadFile (attId) { window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId }, @@ -390,7 +424,7 @@ export default { } else { this.isSubmit = true; var json = this.json; - json.actionFlag = 0; + json.presidentFlag = '0'; json.commentText = this.commentText; this.$http.post("lawss/activiti/completeTask", { json: JSON.stringify(json), @@ -409,7 +443,7 @@ export default { if (this.commentText) { this.isSubmit = true; var json = this.json; - json.actionFlag = 1; + json.presidentFlag = '1'; json.commentText = this.commentText; this.$http.post("lawss/activiti/completeTask", { json: JSON.stringify(json), @@ -450,8 +484,10 @@ export default { } }) this.json = data + this.form.textType = data.textType + this.form.modelList = data.modelList + this.form.modelNameList = data.modelNameList this.data = arr - this.oldData = data.oldinfo }).catch(e => { }); }); diff --git a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step1.vue b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step1.vue index 22e269256..f46d88d82 100644 --- a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step1.vue @@ -89,7 +89,7 @@ import ProcessHeader from "../../components/ProcessHeader"; import ProcessTitle from "process/components/ProcessTitle"; import ProcessFooter from "process/components/ProcessFooter"; -import { queryTaskFirst, saveTaskFirst } from "api/process"; +import { queryTaskFirst, saveTaskFirst, taskDel } from "api/process"; export default { name: "cywbbzzxdStep1", @@ -100,6 +100,7 @@ export default { }, data() { return { + bpnId: '', isSubmit: false, saveLoading: false, modalshowflag: false, // drawer开关 @@ -198,6 +199,14 @@ export default { }, res => { if (res.success) { this.$message.success(res.message); + if (this.bpnId !== '') { + let taskId = { + id: this.bpnId + } + taskDel(taskId).then(res=>{ + return res + }) + } this.$router.push("/processCenter"); } this.isSubmit = false diff --git a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step1.vue b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step1.vue index 4e2e244b3..21eda1b26 100644 --- a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step1.vue @@ -89,7 +89,7 @@ import ProcessHeader from "../../components/ProcessHeader"; import ProcessTitle from "process/components/ProcessTitle"; import ProcessFooter from "process/components/ProcessFooter"; -import { queryTaskFirst, saveTaskFirst } from "api/process"; +import { queryTaskFirst, saveTaskFirst,taskDel } from "api/process"; export default { name: "jrbzhxhStep1", @@ -100,6 +100,7 @@ export default { }, data() { return { + bpnId: '', isSubmit: false, saveLoading: false, modalshowflag: false, // drawer开关 @@ -197,6 +198,14 @@ export default { }, res => { if (res.success) { this.$message.success(res.message); + if (this.bpnId !== '') { + let taskId = { + id: this.bpnId + } + taskDel(taskId).then(res=>{ + return res + }) + } this.$router.push("/processCenter"); } this.isSubmit = false diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue index a3cdcc630..4b687c61d 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue @@ -353,7 +353,7 @@ import ProcessHeader from "../../components/ProcessHeader"; import ProcessFooter from "../../components/ProcessFooter"; import ProcessTitle from "../../components/ProcessTitle"; -import {saveTaskFirst,queryTaskFirst, inboundLiaisonDetail } from "api/process"; +import {saveTaskFirst,queryTaskFirst, inboundLiaisonDetail,taskDel } from "api/process"; export default { name: "qbfsStep1", @@ -364,6 +364,7 @@ export default { }, data(){ return { + bpnId: '', active: '1', commentText: '', fileList: [], @@ -595,6 +596,14 @@ export default { }, res => { if (res.success) { this.$message.success(res.message) + if (this.bpnId !== '') { + let taskId = { + id: this.bpnId + } + taskDel(taskId).then(res=>{ + return res + }) + } this.isSubmit = false this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) } diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue index 8c8eee2a6..c93be5d1e 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue @@ -381,7 +381,7 @@ import ProcessHeader from "../../components/ProcessHeader"; import ProcessFooter from "../../components/ProcessFooter"; import ProcessTitle from "../../components/ProcessTitle"; -import {saveTaskFirst,queryTaskFirst, inboundLiaisonDetail } from "api/process"; +import { saveTaskFirst, queryTaskFirst, inboundLiaisonDetail, taskDel } from "api/process"; export default { name: "qbfzStep1", @@ -392,6 +392,7 @@ export default { }, data(){ return { + bpnId: '', active: '1', commentText: '', fileList: [], @@ -636,6 +637,14 @@ export default { }, res => { if (res.success) { this.$message.success(res.message) + if (this.bpnId !== '') { + let taskId = { + id: this.bpnId + } + taskDel(taskId).then(res=>{ + return res + }) + } this.isSubmit = false this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) } diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue index 167f1f909..74b20d5c7 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue @@ -254,7 +254,7 @@ import rename from "process/creatProcess/qbzxdjhgk/component/rename"; import establish from "process/creatProcess/qbzxdjhgk/component/establish"; import delay from "process/creatProcess/qbzxdjhgk/component/delay"; import cancel from "process/creatProcess/qbzxdjhgk/component/cancel"; -import { saveTaskFirst, queryTaskFirst, inboundLiaisonDetail } from "api/process"; +import { saveTaskFirst, queryTaskFirst, inboundLiaisonDetail, taskDel} from "api/process"; export default { name: "qbzxdjhgkStep1", @@ -484,6 +484,14 @@ export default { }, res => { if (res.success) { this.$message.success(res.message); + if (this.bpnId !== '') { + let taskId = { + id: this.bpnId + } + taskDel(taskId).then(res=>{ + return res + }) + } this.isSubmit = false; this.$router.push({ path: "/processCenter?tabsName=ProcessCenter" }); } diff --git a/src/pages/processCenter/pages/creatProcess/wbsm/step1-5.vue b/src/pages/processCenter/pages/creatProcess/wbsm/step1-5.vue new file mode 100644 index 000000000..1b0d8508a --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/wbsm/step1-5.vue @@ -0,0 +1,543 @@ + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/wbsm/step1.vue b/src/pages/processCenter/pages/creatProcess/wbsm/step1.vue index 06a8b2058..d88f83492 100644 --- a/src/pages/processCenter/pages/creatProcess/wbsm/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/wbsm/step1.vue @@ -61,8 +61,12 @@ @@ -282,18 +286,12 @@ prop="XCXSSRQ" align="center" label="新车型实施日期"> - - + + @@ -343,11 +348,12 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' -import { startProcess, completeTask, saveTaskFirst, queryTaskFirst, inboundLiaisonDetail } from "@/api/process.js"; +import { startProcess, completeTask, saveTaskFirst, queryTaskFirst, inboundLiaisonDetail,taskDel } from "@/api/process.js"; export default { name: "wbsmStep1", data() { return { + bpnId: '', commentText: '', // 意见 active: '1', // 默认显示 isSubmit: false, @@ -357,9 +363,11 @@ export default { deleteDataList: [], drawerTitle: "", //drawer标题 modalshowflag: false, // 选择人员drawer开关 + modalshowflag2: false, standModel: false, //添加标准抽屉 zrIndex: "", nodeList: [], //存放人员信息数组 + nodeList2: [], standOptions: [], //标准类别 standardData:[], pageNo: 1, @@ -519,18 +527,27 @@ export default { this.$set(this.textStatusMap, item.value, item.label); }); }, - // 点击查看 - handlePreview (item) { + // // 点击查看 + // handlePreview (item) { + // let routeUrl = this.$router.resolve({ + // name: 'OtherStandardDetails', + // params: { + // id: item.standId, + // pageType: item.standType + '_STAND' + // } + // }) + // window.open(routeUrl.href, '_blank') + // }, + handlePreview(item) { let routeUrl = this.$router.resolve({ - name: 'OtherStandardDetails', + name: "OtherStandardDetails", params: { - id: item.standId, - pageType: item.standType + '_STAND' + id: item.id, + pageType: "INLAND_STAND" } - }) - window.open(routeUrl.href, '_blank') + }); + window.open(routeUrl.href, "_blank"); }, - handleTabs(name) { this.active = name }, @@ -539,11 +556,14 @@ export default { this.standList = data; }, choiceZRRS(row, index) { - this.drawerTitle = "选择责任人"; - this.nodeList = []; + this.nodeList2 = []; this.zrIndex = index; - this.nodeList.push(row); - this.modalshowflag = true; + if(row.workPeopleId){ + this.nodeList2 = row.workPeopleId.split(","); + }else{ + this.nodeList2.push(row); + } + this.modalshowflag2 = true; }, typeChange(type) { this.standardSearch.standType = type; @@ -603,7 +623,7 @@ export default { }, //查询项目下的标准 getStandData() { - this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", { + this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPageByWk1", { standType: this.standardSearch.standType, standNumber: this.standardSearch.standNumber, page: this.pageNo, @@ -613,13 +633,8 @@ export default { }, res => { this.standardData = res.data.list; this.standardData.forEach(item => { - if (item.attrInfoMap === null) { - this.$set(item, "ZCCSSRQ", ''); - this.$set(item, "XCXSSRQ", ''); - } else { - this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ); - this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ); - } + this.$set(item, "ZCCSSRQ", item.zccssrq); + this.$set(item, "XCXSSRQ", item.xcxssrq); }) this.totalNo = res.data.count; }, e => { @@ -678,6 +693,14 @@ export default { }, res => { if (res.success) { this.$message.success(res.message); + if (this.bpnId !== '') { + let taskId = { + id: this.bpnId + } + taskDel(taskId).then(res=>{ + return res + }) + } this.$router.push("/processCenter"); } this.isSubmit = false @@ -748,14 +771,25 @@ export default { }else if(this.type === 'president'){ this.roleForm.president = data[0].id; this.roleForm.presidentName = data[0].name; - }else{ - const newRow = JSON.parse(JSON.stringify(this.dataList[this.zrIndex])); - newRow.workPeopleId = data[0].id; - newRow.workPeople = data[0].name + '(' + data[0].institutionName + ')'; - this.$set(this.dataList, this.zrIndex, newRow); } this.modalshowflag = false; }, + checkedRole2(data){ + let idList = ""; + let nameList = ""; + data.forEach(item => { + if (nameList.length) { + nameList += ","; + idList += ","; + } + idList += item.id; + nameList += item.name + '(' + item.institutionName + ')'; + }); + const newRow = JSON.parse(JSON.stringify(this.dataList[this.zrIndex])); + newRow.workPeopleId = idList + newRow.workPeople = nameList + this.$set(this.dataList, this.zrIndex, newRow); + }, } } diff --git a/src/pages/processCenter/pages/creatProcess/wbsm/step2.vue b/src/pages/processCenter/pages/creatProcess/wbsm/step2.vue index 10b839be8..33508b21e 100644 --- a/src/pages/processCenter/pages/creatProcess/wbsm/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/wbsm/step2.vue @@ -60,7 +60,7 @@ - +
{ - if (res.success) { - this.$message.success(res.message); - this.$router.push("/processCenter"); + if(!this.commentText){ + this.$message.warning('请填写审批意见') + }else{ + let son = { + signFlag: '2', + commentText: this.commentText, + dataList: this.dataList, + roleForm: this.roleForm } - }, e => { - }); + var json = JSON.stringify(son) + this.$http.post("lawss/activiti/completeTask", { + taskIds: this.taskIds, + userId: this.userId, + json: json + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message); + this.$router.push("/processCenter"); + } + }, e => { + }); + } }, //转办按钮 handleTransfer(){ diff --git a/src/pages/processCenter/pages/creatProcess/wbsm/step3.vue b/src/pages/processCenter/pages/creatProcess/wbsm/step3.vue index 74b15c08e..5da498bb2 100644 --- a/src/pages/processCenter/pages/creatProcess/wbsm/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/wbsm/step3.vue @@ -60,7 +60,7 @@
- +
{ - if (res.success) { - this.$message.success(res.message); - this.$router.push("/processCenter"); + if(!this.commentText){ + this.$message.warning('请填写审批意见') + }else{ + let son = { + signFlag: '2', + commentText: this.commentText, + dataList: this.dataList, + roleForm: this.roleForm } - }, e => { - }); + var json = JSON.stringify(son) + this.$http.post("lawss/activiti/completeTask", { + taskIds: this.taskIds, + userId: this.userId, + json: json + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message); + this.$router.push("/processCenter"); + } + }, e => { + }); + } }, //转办按钮 handleTransfer(){ diff --git a/src/pages/processCenter/pages/creatProcess/wbsm/step4.vue b/src/pages/processCenter/pages/creatProcess/wbsm/step4.vue index ec5ac6e64..7a3433f1b 100644 --- a/src/pages/processCenter/pages/creatProcess/wbsm/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/wbsm/step4.vue @@ -60,7 +60,7 @@
- +
{ - if (res.success) { - this.$message.success(res.message); - this.$router.push("/processCenter"); + if(!this.commentText){ + this.$message.warning('请填写审批意见') + }else{ + let son = { + signFlag: '2', + commentText: this.commentText, + dataList: this.dataList, + roleForm: this.roleForm } - }, e => { - }); + var json = JSON.stringify(son) + this.$http.post("lawss/activiti/completeTask", { + taskIds: this.taskIds, + userId: this.userId, + json: json + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message); + this.$router.push("/processCenter"); + } + }, e => { + }); + } }, //转办按钮 handleTransfer(){ diff --git a/src/pages/processCenter/pages/creatProcess/wbsm/step5.vue b/src/pages/processCenter/pages/creatProcess/wbsm/step5.vue index 5a6de76a0..fde49c6a6 100644 --- a/src/pages/processCenter/pages/creatProcess/wbsm/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/wbsm/step5.vue @@ -388,26 +388,30 @@ export default { }, //驳回按钮 beforeBack(){ - let son = { - yzFlag: '2', - commentText: this.commentText, - dataList: this.dataList, - roleForm: this.roleForm - } - var json = JSON.stringify(son) - this.$http.post("lawss/activiti/completeTask", { - taskIds: this.taskIds, - userId: this.userId, - json: json - }, { - _this: this - }, res => { - if (res.success) { - this.$message.success(res.message); - this.$router.push("/processCenter"); + if(!this.commentText){ + this.$message.warning('请填写审批意见') + }else{ + let son = { + yzFlag: '2', + commentText: this.commentText, + dataList: this.dataList, + roleForm: this.roleForm } - }, e => { - }); + var json = JSON.stringify(son) + this.$http.post("lawss/activiti/completeTask", { + taskIds: this.taskIds, + userId: this.userId, + json: json + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message); + this.$router.push("/processCenter"); + } + }, e => { + }); + } }, //转办按钮 handleTransfer(){ diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue index bcf5d217c..f98820fdc 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue @@ -265,7 +265,7 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' -import { startProcess, completeTask, saveTaskFirst, queryTaskFirst } from '@/api/process.js' +import { startProcess, completeTask, saveTaskFirst, queryTaskFirst, taskDel } from '@/api/process.js' import { standUnqualified, dicTypeData } from '@/api/unqualProcess.js' export default { name: "wfhxzgStep1", @@ -314,6 +314,7 @@ export default { label: 'name' }, taskID: '', + bpnId: '', } }, components: { @@ -516,6 +517,14 @@ export default { 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 diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue index eb446c480..99c1f4b43 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue @@ -507,7 +507,7 @@ import ProcessHeader from "../../components/ProcessHeader"; import ProcessFooter from "../../components/ProcessFooter"; import ProcessTitle from "../../components/ProcessTitle"; -import { saveTaskFirst, queryTaskFirst } from "api/process"; +import { saveTaskFirst, queryTaskFirst, taskDel } from "api/process"; export default { name: "xmpgStep1-1", @@ -518,6 +518,7 @@ export default { }, data() { return { + bpnId: '', //折叠的标志，true为折叠，false为不折叠 foldFormFlag: false, //用来判断提交事件条件是否满足 @@ -886,6 +887,14 @@ export default { }, res => { if (res.success) { this.$message.success(res.message); + if (this.bpnId !== '') { + let taskId = { + id: this.bpnId + } + taskDel(taskId).then(res=>{ + return res + }) + } this.$router.push("/processCenter"); } this.isSubmit = false; @@ -1062,6 +1071,7 @@ export default { // } }, mounted() { + this.bpnId = this.$route.query.bpnId //从数据库中查询下拉框数据 this.$http.get("sys/dictype/getDicTypeListCode", {}, { _this: this diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue index 9c784772c..6d1a5e859 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue @@ -565,6 +565,9 @@ export default { }, //驳回事件 beforeBack () { + if(!this.commentText){ + this.$message.warning('请填写审批意见') + }else{ this.listForm.applyUpdUserId = this.dataList[0].distributePersonId this.listForm.commentText = this.commentText; this.listForm.dataList = this.dataList @@ -583,6 +586,7 @@ export default { } }, e => { }); + } }, //提交事件 handleSubmit() { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue index 2fea7067f..752ac32a1 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue @@ -561,7 +561,8 @@ export default { }) }, //驳回事件 - beforeBack () { if(this.commentText === null || this.commentText === undefined || this.commentText === ''){ + beforeBack () { + if(!this.commentText){ this.$message.warning('请填写审批意见') } else { this.listForm.fenFlag = '2' diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue index 8c069a740..8e1ec4a7b 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue @@ -560,7 +560,7 @@ export default { //驳回事件 beforeBack () { - if(this.commentText === null || this.commentText === undefined || this.commentText === ''){ + if(!this.commentText){ this.$message.warning('请填写审批意见') } else { this.listForm.fenFlag = '2' diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue index 5ed40df6e..ab5bfa4d4 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue @@ -336,7 +336,7 @@ import ProcessHeader from "../../components/ProcessHeader"; import ProcessFooter from "../../components/ProcessFooter"; import ProcessTitle from "../../components/ProcessTitle"; -import { saveTaskFirst, queryTaskFirst } from "api/process"; +import { saveTaskFirst, queryTaskFirst,taskDel } from "api/process"; export default { name: "xmpg2Step1-1", @@ -625,6 +625,14 @@ export default { }, res => { if (res.success) { this.$message.success(res.message); + if (this.bpnId !== '') { + let taskId = { + id: this.bpnId + } + taskDel(taskId).then(res=>{ + return res + }) + } this.$router.push("/processCenter"); } this.isSubmit = false; @@ -663,6 +671,7 @@ export default { } }, mounted() { + this.bpnId = this.$route.query.bpnId //查找分解单来源数据 this.$http.get('lawss/sarStandAttrDetails/getListData',{},{ _this: this diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue index 9101f2de9..9c2083c7c 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue @@ -444,10 +444,9 @@ export default { }, //提交事件 handleSubmit() { + this.peopleFlag = true; this.listForm.dataList.forEach(item => { - if (item.liablePeople !== undefined) { - this.peopleFlag = true; - } else { + if (!item.liablePeople) { this.peopleFlag = false; } }); diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue index bbf9fc527..0cf0dad19 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue @@ -380,7 +380,7 @@ import ProcessHeader from "../../components/ProcessHeader"; import ProcessFooter from "../../components/ProcessFooter"; import ProcessTitle from "../../components/ProcessTitle"; -import { queryTaskFirst, saveTaskFirst} from "api/process"; +import { queryTaskFirst, saveTaskFirst,taskDel} from "api/process"; export default { name: "xmqdqrStep1-1", @@ -391,6 +391,7 @@ export default { }, data() { return { + bpnId: '', active: "1", //默认显示 commentText: "", modalshowflag: false, @@ -667,6 +668,14 @@ export default { }, res => { if (res.success) { this.$message.success(res.message); + if (this.bpnId !== '') { + let taskId = { + id: this.bpnId + } + taskDel(taskId).then(res=>{ + return res + }) + } this.$router.push("/processCenter"); } this.isSubmit = false; @@ -706,6 +715,7 @@ export default { } }, mounted() { + this.bpnId = this.$route.query.bpnId this.getData(); // 查询各下拉框数据 this.$http.get("sys/dictype/getDicTypeListCode", "", { diff --git a/src/pages/processCenter/pages/phone/wbsm/step4.vue b/src/pages/processCenter/pages/phone/wbsm/step4.vue new file mode 100644 index 000000000..e966bff51 --- /dev/null +++ b/src/pages/processCenter/pages/phone/wbsm/step4.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/wbsm/step5.vue b/src/pages/processCenter/pages/phone/wbsm/step5.vue new file mode 100644 index 000000000..60a5fa44d --- /dev/null +++ b/src/pages/processCenter/pages/phone/wbsm/step5.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue index 8914299d4..249a08612 100644 --- a/src/pages/processCenter/pages/processDetail/index.vue +++ b/src/pages/processCenter/pages/processDetail/index.vue @@ -264,7 +264,10 @@ export default { }else if(prcType === '10'){ //项目清单确认 this.toProcessDetail('xmqdqrStep1-3',row) - } else if(prcType === '20') { + } else if(prcType === '16'){ + //外部署名 + this.toProcessDetail('wbsmStep1-5',row) + }else if(prcType === '20') { // 入会流程 this.toProcessDetail('bzrhStep6-1',row) } else if(prcType === '21') { diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index a1eb3947f..2bdb5bb4c 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -614,9 +614,9 @@ export default { prcType: row.prcType } }) - } else if (row.taskInfo === '标准法规工程师汇总填写处理意见') { + } else if (row.taskInfo === '审批人审批') { this.$router.push({ - name: 'bzzqyjStep5', + name: 'bzzqyjStep4-1', query: { taskIds: row.taskIds, prcId: row.prcId, @@ -625,7 +625,29 @@ export default { prcType: row.prcType } }) - } else if (row.taskInfo === '责任人会签') { + } else if (row.taskInfo === '标准法规工程师分线审核') { + this.$router.push({ + name: 'bzzqyjStep4-2', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if (row.taskInfo === '标准法规工程师汇总') { + this.$router.push({ + name: 'bzzqyjStep5', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if (row.taskInfo === '责任人会签') { this.$router.push({ name: 'bzzqyjStep6', query: { @@ -647,7 +669,7 @@ export default { prcType: row.prcType } }) - } else if (row.taskInfo.indexOf('技术委员会相关专委会主任') == 0 ) { + } else if (row.taskInfo === '技术委员会相关专委会主任/研究总院职能部门领导，技术管理中心主任审定' ) { this.$router.push({ name: 'bzzqyjStep8', query: { @@ -658,7 +680,7 @@ export default { prcType: row.prcType } }) - } else { + } else if (row.taskInfo === '工程研究总院院长批准') { this.$router.push({ name: 'bzzqyjStep9', query: { diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue index fcf1e5d97..eb26ecdbf 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue @@ -140,9 +140,7 @@ v-if="showInfoModal" > + + @@ -720,8 +726,8 @@ @pageChange="handleSelectPageChange" @pageSizeChange="handleSelectPageSizeChange">
- 取消 - 确定 + 确定 + 取消
@@ -769,10 +775,10 @@ export default { addOrEdit: '', attributeEOFormRules: { lawCode: [ - { required: true, message: '标准编号/政策编号不能为空', trigger: 'blur' }, + { required: true, message: '标准编号/政策编号不能为空', trigger: 'change' }, ], lawName: [ - { required: true, message: '标准名称/政策名称不能为空', trigger: 'blur' }, + { required: true, message: '标准名称/政策名称不能为空', trigger: 'change' }, ], productType: [ { required: true, message: '产品类型不能为空', trigger: 'change' } @@ -891,7 +897,6 @@ export default { }, // 点击查看 handlePreview(item) { - console.log('539',item) if (item.standType === "INLAND"){ let routeUrlINLAND = this.$router.resolve({ name: 'OtherStandardDetails', @@ -962,14 +967,12 @@ export default { this.$message.warning('请选择一条数据') } else { - console.log('619',this.handleSelectForm.dataSource) this.attributeEO.dataSource = this.handleSelectForm.dataSource this.attributeEO.lawId = this.handleSelectTableList[0].id this.attributeEO.lawCode =this.handleSelectTableList[0].standCode || this.handleSelectTableList[0].lawsNumber || this.handleSelectTableList[0].standSort+" "+this.handleSelectTableList[0].standNumber+"-"+this.handleSelectTableList[0].standYear this.attributeEO.lawName = this.handleSelectTableList[0].standName || this.handleSelectTableList[0].lawsName this.selectModal = false } - console.log('确定',this.handleSelectTableList) }, //手动查找的清空按钮 clearLawBtn(){ @@ -990,12 +993,10 @@ export default { //手动查找的查询按钮 searchLawBtn(){ this.lawInfoTableLoading = true - console.log('533',this.handleSelectForm.dataSource) if (this.handleSelectForm.dataSource === 'INLAND'){ this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage',this.handleSelectForm,{ _this: this },res=>{ - console.log('国内标准库数据',res) if (res.ok){ this.lawInfoTable = res.data.list this.handleSelectForm.total = res.data.count @@ -1013,12 +1014,10 @@ export default { this.lawInfoTable = [] this.handleSelectForm.total = 0 }) - console.log('国内标准库') }else if(this.handleSelectForm.dataSource === 'FOREIGN'){ this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage',this.handleSelectForm,{ _this: this },res=>{ - console.log('海外标准库数据',res) if (res.ok){ this.lawInfoTable = res.data.list this.handleSelectForm.total = res.data.count @@ -1036,12 +1035,10 @@ export default { this.lawInfoTable = [] this.handleSelectForm.total = 0 }) - console.log('海外标准库') }else if(this.handleSelectForm.dataSource === 'FOREIGN_LAWS'){ this.$http.get('lawss/sarLawsInfo/page',this.handleSelectForm,{ _this: this },res=>{ - console.log('国内外政策库数据',res) if (res.ok){ this.lawInfoTable = res.data.list this.handleSelectForm.total = res.data.count @@ -1059,12 +1056,10 @@ export default { this.lawInfoTable = [] this.handleSelectForm.total = 0 }) - console.log('国内外政策库') }else if(this.handleSelectForm.dataSource === 'BUSINESS_STAND'){ this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage',this.handleSelectForm,{ _this: this },res=>{ - console.log('企业标准库数据',res) if (res.ok){ this.lawInfoTable = res.data.list this.handleSelectForm.total = res.data.count @@ -1082,7 +1077,6 @@ export default { this.lawInfoTable = [] this.handleSelectForm.total = 0 }) - console.log('企业标准库') }else { this.$message.warning('请先选择标准/政策来源') } @@ -1090,19 +1084,16 @@ export default { handleSelectPageChange(page){ this.lawInfoTableLoading = true this.handleSelectForm.page = page - console.log(this.handleSelectForm.page) this.searchLawBtn() }, handleSelectPageSizeChange(pageSize){ this.lawInfoTableLoading = true this.handleSelectForm.pageSize = pageSize - console.log(this.handleSelectForm.pageSize) this.searchLawBtn() }, // 手动查找 table选择事件 handleSelectTableChange (row) { this.handleSelectTableList = row - console.log('我选的',this.handleSelectTableList) }, //点击手动查找按钮 handleSelect() { @@ -1116,6 +1107,7 @@ export default { this.$refs['attributeEO'].validate((valid) => { if (valid) { if (this.addOrEdit === 'add') { + this.attributeEO.implTime = this.attributeEO.implTime.join(',') this.submitLoading = true this.$http.putData( 'sarIssueTrack/issueTrack', @@ -1138,6 +1130,9 @@ export default { } ) } else { + if (typeof (this.attributeEO.implTime) === 'object'){ + this.attributeEO.implTime = this.attributeEO.implTime.join(',') + } this.$http.postData( 'sarIssueTrack/issueTrack', this.attributeEO, @@ -1213,6 +1208,7 @@ export default { this.attributeTitle = '编辑' this.getDictionarySelList(null) this.attributeEO = JSON.parse(JSON.stringify(row)) + this.attributeEO.implTime = row.implTime.split(',') this.showInfoModal = true } }, @@ -1263,14 +1259,12 @@ export default { }); }).catch(() => { // 取消删除，清空选择 - // console.log(this.selectedList) // this.selectedList = []; }) } }, // 更多 handleCommand (command) { - console.log('536',command) switch (command[1]) { case '编辑': this.showAddModel(2, command[0]) @@ -1287,7 +1281,6 @@ export default { }, //分页查询 searchSarAccess (advanceSearch) { - console.log('准备开始分页查询') this.tableLoading = true this.$http.get("sarIssueTrack/issueTrack", { current: this.sarSarAccessEOSearch.page, @@ -1298,13 +1291,11 @@ export default { _this: this }, res => { let arr = res.data; - console.log('分页查询中',arr) this.sarAccessListDatas = arr.records this.sarAccessListTotal = res.data.total this.tableLoading = false }, e => { }); - console.log('分页查询完毕') }, pageChange (page) { this.sarSarAccessEOSearch.page = page @@ -1362,7 +1353,6 @@ export default { this.$http.get('sys/dictype/getDicTypeListCode', '', { _this: this }, res => { - console.log(res.data.WBZTCLASS) this.setMap(res.data.WBZTCLASS) }, e => { }) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue index 57b044f8d..afb29ac50 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue @@ -418,7 +418,8 @@ export default { dialogColor: false, dialogType: "", color: "", - isShow: false + isShow: false, + countryAreaShow: '' }; }, methods: { @@ -654,11 +655,18 @@ export default { }, // 点击查看 handlePreview(data) { + let item = { + country: this.countryAreaShow, + ssrq: data.ssrq, + xcxssrqgj: data.xcxssrqgj, + zccssrqgj: data.zccssrqgj + } + sessionStorage.setItem("accessCountry", JSON.stringify(item)); let routeUrl = this.$router.resolve({ name: "OtherStandardDetails", params: { id: data.id, - pageType: data.standType + pageType: data.standType, } }); window.open(routeUrl.href, "_blank"); @@ -773,6 +781,7 @@ export default { let accessRow = JSON.parse(sessionStorage.getItem("accessRow")); this.pageId = accessRow.id; this.sarAccessEO = accessRow; + this.countryAreaShow = accessRow.countryAreaShow this.selectInfobyAccid(); this.getOrgTreeSource(); this.getFileInfo(); diff --git a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue index 884424ec9..76eb6ce52 100644 --- a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue +++ b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue @@ -90,6 +90,9 @@ align="center" label="修改前" > + @@ -155,10 +158,16 @@
- + + + - +
@@ -177,6 +186,15 @@
数据加载中…… + +
+
+ 关闭 +
+ @@ -185,6 +203,9 @@ export default { name: 'consultationDetails', data() { return { + itermsConditionsFlag: false, + itermsConditionsTitle: '', + options: [], fileInfoList: [], itemData: this.$route.query.item, id: '', // 选中id @@ -228,6 +249,20 @@ export default { } }, methods: { + itermsConditionsClose () { + this.itermsConditionsFlag = false + }, + itermsConditionsOpen (row) { + this.itermsConditionsFlag = true + this.itermsConditionsTitle = row + }, + optionsChange (data) { + for (let a = 0; a < this.options.length; a++) { + if (data === this.options[a].itemsNum) { + this.opinionContent.oldText = this.options[a].termsConditions + } + } + }, downloadFile (attId) { window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId }, @@ -396,6 +431,18 @@ export default { } }, mounted() { + let json = JSON.parse(this.$route.query.item.files)[0] + this.$http.get('SarStandItems/sar-stand-items/querySarItemAndInterpretation', { + standId: json.standId, + fileType: json.standFileClassify, + pageSize: 9999, + page: 1 + }, {}, res => { + if (res.ok) { + this.options = res.data.list + } + }, e => { + }) this.getList() this.getIdeaKey() this.getFileInfo() @@ -535,7 +582,8 @@ export default { .add-demo { .search-area { - height: 100%; + height: calc(~'100% - 55px'); + overflow: auto; } ::v-deep .el-textarea__inner { diff --git a/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue b/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue index 3d2e79b8e..69b40fafe 100644 --- a/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue +++ b/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue @@ -1047,7 +1047,7 @@ if (this.pType === '选择联络人') { this.addForm.wgNetInfos[this.pIndex].name = data[0].name this.addForm.wgNetInfos[this.pIndex].netId = data[0].id - this.addForm.wgNetInfos[this.pIndex].unit = data[0].positionName + this.addForm.wgNetInfos[this.pIndex].unit = data[0].unit this.addForm.wgNetInfos[this.pIndex].phone = data[0].phone this.addForm.wgNetInfos[this.pIndex].email = data[0].email } else if (this.pType === '选择我司人员') { @@ -1057,7 +1057,7 @@ this.addForm.wgDepts[this.pIndex].email = data[0].email this.addForm.wgDepts[this.pIndex].deptId = data[0].institutionId this.addForm.wgDepts[this.pIndex].deptName = data[0].institutionName - this.addForm.wgDepts[this.pIndex].unit = data[0].positionId + this.addForm.wgDepts[this.pIndex].unit = data[0].unit this.addForm.wgDepts[this.pIndex].unitName = data[0].positionName } }, diff --git a/src/router/index.js b/src/router/index.js index 3d1818917..81a29c1ec 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1129,6 +1129,24 @@ const routes = [ title: '标准征求意见流程' } }, + { + path: '/bzzqyjStep4-1', + name: 'bzzqyjStep4-1', + component: () => import('@/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue'), + meta: { + requireAuth: true, + title: '标准征求意见流程' + } + }, + { + path: '/bzzqyjStep4-2', + name: 'bzzqyjStep4-2', + component: () => import('@/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue'), + meta: { + requireAuth: true, + title: '标准征求意见流程' + } + }, { path: '/bzzqyjStep5', name: 'bzzqyjStep5', @@ -1493,6 +1511,15 @@ const routes = [ title: '外部署名推荐审批流程' } }, + { + path: '/wbsmStep1-5', + name: 'wbsmStep1-5', + component: () => import('@/pages/processCenter/pages/creatProcess/wbsm/step1-5.vue'), + meta: { + requireAuth: true, + title: '外部署名推荐审批流程' + } + }, { path: '/cywbbzzxdStep1', name: 'cywbbzzxdStep1', @@ -2104,6 +2131,36 @@ const routes = [ title: '加入标准化协会信息提报流程' } }, + { + path: '/phoneWbsmStep3', + name: 'phoneWbsmStep3', + component: () => import('@/pages/processCenter/pages/phone/wbsm/step3.vue'), + meta: { + isBoolean: true, + requireAuth: true, + title: '外部署名推荐审批流程' + } + }, + { + path: '/phoneWbsmStep4', + name: 'phoneWbsmStep4', + component: () => import('@/pages/processCenter/pages/phone/wbsm/step4.vue'), + meta: { + isBoolean: true, + requireAuth: true, + title: '外部署名推荐审批流程' + } + }, + { + path: '/phoneWbsmStep5', + name: 'phoneWbsmStep5', + component: () => import('@/pages/processCenter/pages/phone/wbsm/step5.vue'), + meta: { + isBoolean: true, + requireAuth: true, + title: '外部署名推荐审批流程' + } + }, { path: '/phoneWfhxStep5', name: 'phoneWfhxStep5',