diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue index 1feddb37c..b68a266c5 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -305,11 +305,11 @@ export default { // path: '/convertDocView', // menuId: '3F52K25546' // }, - { + /*{ title: '菜单管理', path: '/menuManage', menuId: '87b8b4f5817a7829696e63185c744d52' - }, + },*/ { title: '链接管理', path: '/linkManage', diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 24f5c3bb9..afc9a4ef2 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -376,12 +376,12 @@ 上传时间:{{ dateFormat(file.modifyTime) }}

- - - - - - + 标准分解单 diff --git a/src/pages/localTool/standAutoSplit/index.vue b/src/pages/localTool/standAutoSplit/index.vue index fd2a4796b..1d6be7da5 100644 --- a/src/pages/localTool/standAutoSplit/index.vue +++ b/src/pages/localTool/standAutoSplit/index.vue @@ -186,12 +186,20 @@ prop="standNumber" label="标准号/政策号" align="center"> + + 导入 导出 - 删除 + 模板下载 批量复制 合并条款 diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue index 64ddfde94..2422224f2 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue @@ -190,7 +190,7 @@

点击或拖拽上传文件

- + diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue index 337123722..edcdc36b2 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue @@ -103,13 +103,13 @@ + + - - - - - - { this.listForm = JSON.parse(JSON.stringify(item)) - this.listForm.prcNum = this.prcNum - this.listForm.prcName = this.prcName - this.listForm['id'] = item.id - this.listForm.dataList = item.dataList - this.dataList = item.dataList - this.listForm.applyUpdUserId = item.applyUpdUserId - this.listForm.jlUserId = item.jlUserId - this.listForm.zrUserId = item.zrUserId - this.fileIds = item.fileId; - this.getFileInfo(); + if(item.form === undefined){ + this.listForm.prcNum = this.prcNum + this.listForm.prcName = this.prcName + this.listForm['id'] = item.id + this.listForm.dataList = item.dataList + this.dataList = item.dataList + this.listForm.applyUpdUserId = item.applyUpdUserId + this.listForm.jlUserId = item.jlUserId + this.listForm.zrUserId = item.zrUserId + this.fileIds = item.fileId; + this.getFileInfo(); + } else { + this.listForm = item.form + this.dataList = item.form.dataList + this.listForm.dataList = item.form.dataList + this.fileIds = item.form.fileId; + this.getFileInfo(); + } }) }, //保存事件 @@ -713,23 +721,19 @@ export default { _formData.append("createUser", this.$store.getters.userInfo.userId); _formData.append("createUserName", this.$store.getters.userInfo.userName); _formData.append("prcType", "4"); + _formData.append('taskIds', this.taskIds) _formData.append("json", JSON.stringify({ - taskInfo: '根据会签意见修订', form: this.listForm, - roleForm: this.roleForm, - prcNum: this.$route.query.prcNum, - taskIds: this.$route.query.taskIds, - pId: this.$route.query.prcId, commentText: this.commentText })); - saveinboundTask(_formData).then(res => { - this.saveLoading = false; - this.$message.success("保存成功"); - this.$router.push('/processCenter') - this.bpnId = res.result; - }).catch(e => { - this.saveLoading = false; - }); + + // saveTaskForPub(_formData).then(res => { + // this.saveLoading = false; + // this.$message.success("保存成功"); + // this.bpnId = res.result; + // }).catch(e => { + // this.saveLoading = false; + // }); }, //提交事件 handleSubmit() { diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index b00082a3f..5f38e84b8 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -217,14 +217,15 @@ clearable >
- {{ form.xgdName }} + - 重新上传 + + 查看已上传的文件
@@ -233,7 +234,8 @@ class="common-button-primary" size="mini" @click="fileUpload('xgd')"> - 点击上传 + + 点击上传
@@ -245,14 +247,15 @@ clearable >
- {{ form.fbgbjbdName }} + - 重新上传 + + 查看已上传的文件
@@ -261,6 +264,7 @@ class="common-button-primary" size="mini" @click="fileUpload('fbgbjbd')"> + 点击上传
@@ -273,14 +277,15 @@ clearable >
- {{ form.zbjbdName }} + - 重新上传 + + 查看已上传的文件
@@ -289,6 +294,7 @@ class="common-button-primary" size="mini" @click="fileUpload('zbjbd')"> + 点击上传
@@ -301,14 +307,15 @@ clearable >
- {{ form.bpgName }} + - 重新上传 + + 查看已上传的文件
@@ -317,6 +324,7 @@ class="common-button-primary" size="mini" @click="fileUpload('bpg')"> + 点击上传
@@ -329,14 +337,15 @@ clearable >
- {{ form.ssgName }} + - 重新上传 + + 查看已上传的文件
@@ -345,6 +354,7 @@ class="common-button-primary" size="mini" @click="fileUpload('ssg')"> + 点击上传
@@ -359,14 +369,15 @@ clearable >
- {{ form.kwjName }} + - 重新上传 + + 查看已上传的文件
@@ -375,6 +386,7 @@ class="common-button-primary" size="mini" @click="fileUpload('kwj')"> + 点击上传
@@ -387,14 +399,15 @@ clearable >
- {{ form.zqyjgName }} + - 重新上传 + + 查看已上传的文件
@@ -403,6 +416,7 @@ class="common-button-primary" size="mini" @click="fileUpload('zqyjg')"> + 点击上传
@@ -415,14 +429,15 @@ clearable >
- {{ form.caName }} + - 重新上传 + + 查看已上传的文件
@@ -431,6 +446,7 @@ class="common-button-primary" size="mini" @click="fileUpload('ca')"> + 点击上传
@@ -443,14 +459,15 @@ clearable >
- {{ form.jdwjName }} + - 重新上传 + + 查看已上传的文件
@@ -459,6 +476,7 @@ class="common-button-primary" size="mini" @click="fileUpload('jdwj')"> + 点击上传
@@ -702,7 +720,16 @@ clearable >
- {{ form.glwjName }} + + + + 查看已上传文件 + +
+ 点击上传
@@ -1196,6 +1224,16 @@ data () { return { fileList: [], + caFileList: [], + FBGBJBDFileList: [], + xgdFileList: [], + bpgFileList: [], + ssgFileList: [], + zqyjgFileList: [], + jdwjFileList: [], + zbjbdFileList: [], + kwjFileList: [], + qlwjFileList: [], filterText:'', textStatusMap: {}, // 文本状态id与name对应 standardDrawer: false, @@ -1332,7 +1370,7 @@ zqyjg: '', // 征求意见稿 jdwj: '', // 解读文件 zbjbd: '', // 增补件 - kwj: '', // 勘误件 + kwj: '', // 勘 误件 caName: '', // 草案 fbgbjbdName: '', // 发布稿 xgdName: '', // 修改单 @@ -1413,9 +1451,9 @@ { required: true, message: '请选择文本状态', trigger: 'change' } ] , - // issueTime: [ - // { required: true, message: '请选择标准发布日期', trigger: 'change' } - // ], + issueTime: [ + { required: false, message: '请选择标准发布日期', trigger: 'change' } + ], qcdw: [ { required: true, message: '请选择起草单位', trigger: 'change' } ], @@ -2040,43 +2078,54 @@ // 导入标准数据成功后执行 importFileSuccess (response, file,fileList) { // 上传成功后判断是否是两条数据是的话替换掉旧数据 - if (fileList.length > 1) { - this.fileList = fileList.splice(0, 1) - } + // if (fileList.length > 1) { + // this.fileList = fileList.splice(0, 1) + // } if (response.ok) { - this.fileMadel = false - this.fileList = [] + // this.fileMadel = false + // this.fileList = [] if(this.fileType === 'fbgbjbd'){ + this.FBGBJBDFileList=fileList; this.form.fbgbjbd = response.data.id; this.form.fbgbjbdName = response.data.name; }else if(this.fileType === 'xgd'){ - this.form.xgd = response.data.id; + this.xgdFileList=fileList; + this.form.xgd = response.data.id; this.form.xgdName = response.data.name; }else if(this.fileType === 'bpg'){ + this.bpgFileList=fileList; this.form.bpg = response.data.id; this.form.bpgName = response.data.name; }else if(this.fileType === 'ssg'){ + this.ssgFileList=fileList; this.form.ssg = response.data.id; this.form.ssgName = response.data.name; }else if(this.fileType === 'zqyjg'){ + this.zqyjgFileList=fileList; this.form.zqyjg = response.data.id; this.form.zqyjgName = response.data.name; }else if(this.fileType === 'jdwj'){ + this.jdwjFileList=fileList; this.form.jdwj = response.data.id; this.form.jdwjName = response.data.name; }else if(this.fileType === 'kwj'){ + this.kwjFileList=fileList; this.form.kwj = response.data.id; this.form.kwjName = response.data.name; }else if(this.fileType === 'xgd'){ + this.xgdFileList=fileList; this.form.xgd = response.data.id; this.form.xgdName = response.data.name; }else if(this.fileType === 'glwj'){ + this.qlwjFileList=fileList; this.form.glwj = response.data.id; this.form.glwjName = response.data.name; }else if(this.fileType === 'ca'){ + this.caFileList=fileList; this.form.ca = response.data.id; this.form.caName = response.data.name; }else if(this.fileType === 'zbjbd'){ + this.zbjbdFileList=fileList; this.form.zbjbd = response.data.id; this.form.zbjbdName = response.data.name; } @@ -2089,8 +2138,33 @@ }, fileUpload (type) { this.fileType = ''; - this.fileMadel = true + // this.fileMadel = true;//此句应在最后执行,否则会有先显示没变换的的文件列表,在显示变换了的文件列表 + this.fileType = type; + if (type==='ca'){ + this.fileList=this.caFileList; + }else if (type==='fbgbjbd'){ + this.fileList=this.FBGBJBDFileList; + }else if (type==='xgd'){ + this.fileList=this.xgdFileList; + }else if(type==='bpg'){ + this.fileList=this.bpgFileList; + }else if (type==='ssg'){ + this.fileList=this.ssgFileList; + }else if (type==='zqyjg'){ + this.fileList=this.zqyjgFileList; + }else if (type==='jdwj'){ + this.fileList=this.jdwjFileList; + }else if (type==='zbjbd'){ + this.fileList=this.zbjbdFileList; + }else if (type==='kwj'){ + this.fileList=this.kwjFileList; + }else if (type==='glwj'){ + this.fileList=this.qlwjFileList; + } + + this.fileMadel = true; + }, popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) { if(checkedData) { diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue index 26187ebbd..352131b8a 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue @@ -836,29 +836,26 @@ export default { methods: { downloadFile (fileType) { if(fileType === 'fbgbjbd'){ - if(this.fbgbjbdFileId.search(',')){ - this.fbgbjbdFileId=this.fbgbjbdFileId.replace(",",""); - console.log(this.fbgbjbdFileId); - } - window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId.replace(",",""); }else if(fileType === 'xgd'){ - window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.xgdFileId + + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.xgdFileId.replace(",",""); }else if(fileType === 'bpg'){ - window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.bpgFileId + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.bpgFileId.replace(",",""); }else if(fileType === 'ssg'){ - window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.ssgFileId + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.ssgFileId.replace(",",""); }else if(fileType === 'zqyjg'){ - window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zqyjgFileId + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zqyjgFileId.replace(",",""); }else if(fileType === 'jdwj'){ - window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.jdwjFileId + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.jdwjFileId.replace(",",""); }else if(fileType === 'kwj'){ - window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.kwjFileId + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.kwjFileId.replace(",",""); }else if(fileType === 'glwj'){ - window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.glwjFileId + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.glwjFileId.replace(",",""); }else if(fileType === 'ca'){ - window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.caFileId + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.caFileId.replace(",",""); }else if(fileType === 'zbjbd'){ - window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zbjbdFileId + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zbjbdFileId.replace(",",""); } }, popoverHide (checkedIds, checkedData) { diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index 28fbcddac..9d7c27f09 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -1138,13 +1138,13 @@ export default { { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' } ], standNature: [ - { required: false, message: '请选择标准性质', trigger: 'change' } + { required: true, message: '请选择标准性质', trigger: 'change' } ], textStatus: [ { required: true, message: '请选择文本状态', trigger: 'change' } ], issueTime: [ - { required: true, message: '请选择标准发布日期', trigger: 'change' } + { required: false, message: '请选择标准发布日期', trigger: 'change' } ], qcdw: [ { required: true, message: '请选择起草单位', trigger: 'change' } diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue index cbfc3ee3e..74b330f0a 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue @@ -281,6 +281,7 @@ export default { cid: '', // 编号 endTime: '', // 结束日期 cname: '', // 名称 + standType: '', }, formRules: { cid: [ @@ -454,6 +455,7 @@ export default { } else { this.form.cid = bringData[0].standSortShow + '-' + bringData[0].standNumber } + this.form.standType = bringData[0].standType this.form.cname = bringData[0].standName; this.listModel = false; } else if (this.selectedList.length > 1) { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue index 385f8b8b7..5e3894f7f 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue @@ -533,9 +533,14 @@ export default { }).then(res => { let mes = JSON.parse(res.mes); this.listForm = mes.form; - this.dataList = mes.form.dataList; this.roleForm = mes.roleForm; this.commentText = mes.commentText; + this.dataList = mes.form.dataList; + this.dataList.forEach(item => { + if(!item.productLine){ + this.dataList = null + } + }) }); }, checkedRole(data) { @@ -755,8 +760,10 @@ export default { //选择拆分标准确定事件 OkDrawer() { if (this.selectedList.length == 1) { - this.listForm.standNumber = this.selectedList[0].standNumber; + this.listForm.standNumber = this.selectedList[0].standSortShow + '\xa0\xa0' + this.selectedList[0].standNumber + '-' + this.selectedList[0].standYear ; this.listForm.standName = this.selectedList[0].standName; + this.listForm.standType = this.selectedList[0].standType; + this.listForm.standId = this.selectedList[0].id; this.listForm.id = this.selectedList[0].id; this.$http.get("SarStandItems/sar-stand-items/findAllItems", { ids: this.listForm.id, @@ -866,12 +873,12 @@ export default { }, computed: {}, watch: { - dataList: { - deep: true, - handler (val) { - console.log('dataList update', val) - } - } + // dataList: { + // deep: true, + // handler (val) { + // console.log('dataList update', val) + // } + // } }, mounted() { //从数据库中查询下拉框数据 diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue index 7b8e2183f..ad4acb396 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue @@ -470,6 +470,7 @@ export default { listForm: { standNumber: "", //标准编号 standName: "",//标准名称 + standType: "", //标准类型 XCXSSRQ: "", //新车型实施日期 ZCCSSRQ: "", //在产车实施日期 certifiedEngineer: "", //认证工程师 @@ -662,7 +663,6 @@ export default { saveTaskFirst(_formData).then(res => { this.saveLoading = false; this.$message.success("保存成功"); - this.$router.push("/processCenter"); }).catch(e => { this.saveLoading = false; }); @@ -733,8 +733,10 @@ export default { //选择拆分标准确定事件 OkDrawer() { if (this.selectedList.length === 1) { - this.listForm.standNumber = this.selectedList[0].standSortShow + '-' + this.selectedList[0].standNumber + '-' + this.selectedList[0].standYear ; + this.listForm.standNumber = this.selectedList[0].standSortShow + '\xa0\xa0' + this.selectedList[0].standNumber + '-' + this.selectedList[0].standYear ; this.listForm.standName = this.selectedList[0].standName; + this.listForm.standType = this.selectedList[0].standType; + this.listForm.standId = this.selectedList[0].id; this.listForm.XCXSSRQ = this.selectedList[0].xcxssrqgj this.listForm.ZCCSSRQ = this.selectedList[0].zccssrqgj this.listForm.id = this.selectedList[0].id; diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue index 06ec3df9c..6b7dfb9d1 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue @@ -64,7 +64,7 @@ style="width: 100%" border @selection-change="selectStandChange" - :height="sarProStateTableHeight" + height="56%" :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}"> { + this.dataList.forEach((item, index) => { this.selectList.forEach( items => { if (item.standId === items.standId) { - item.liablePeopleId = data[0].id - item.liablePeople = data[0].name + const newRow = JSON.parse(JSON.stringify(item)) + newRow.liablePeopleId = data[0].id + newRow.liablePeople = data[0].name + this.$set(this.dataList, index, newRow) } - this.$forceUpdate() }) }) } diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue index eae3ab927..dce551cfb 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue @@ -64,7 +64,7 @@ align="center">