diff --git a/src/assets/styles/phone.less b/src/assets/styles/phone.less index ad098c368..4a6ed2d29 100644 --- a/src/assets/styles/phone.less +++ b/src/assets/styles/phone.less @@ -1,6 +1,21 @@ .phoneBox { width: 100%; height: 100%; + .form-item-disabled { + color: #666 !important; + /deep/.el-form-item__label { + color: #666 !important; + } + /deep/.el-form-item__content { + color: #666 !important; + /deep/.el-input { + color: #666 !important; + /deep/.el-input__inner { + color: #666 !important; + } + } + } + } .headerTabs { height: 52px; display: flex; diff --git a/src/components/CustomFormComponents/InputForAllStandards.vue b/src/components/CustomFormComponents/InputForAllStandards.vue index d33c1a176..9e3ef0db1 100644 --- a/src/components/CustomFormComponents/InputForAllStandards.vue +++ b/src/components/CustomFormComponents/InputForAllStandards.vue @@ -21,6 +21,7 @@ size="mini" style="position:absolute;top: 10px;right: 0;" @click="selectLaws" + :disabled="disabled" v-if="(processModel && !disabled) || !processModel" >{{config.attrField === 'releventStand' ? '选择标准' :'手动查找'}} diff --git a/src/components/CustomFormComponents/InputForAllStandards2.vue b/src/components/CustomFormComponents/InputForAllStandards2.vue index 48ffe0938..a69bd111f 100644 --- a/src/components/CustomFormComponents/InputForAllStandards2.vue +++ b/src/components/CustomFormComponents/InputForAllStandards2.vue @@ -21,6 +21,7 @@ size="mini" style="position:absolute;top: 10px;right: 0;" @click="selectLaws" + :disabled="disabled" v-if="(processModel && !disabled) || !processModel" >{{config.attrField === 'releventStand' ? '选择标准' :'手动查找'}} diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 1404296b9..2d49db0a1 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -90,7 +90,7 @@ - +
{{ file.oldFileName }} @@ -106,7 +106,7 @@ class="icon-download2" v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'" /> - +
{ }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue index 9dde7dcb7..d461befa2 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue @@ -201,7 +201,6 @@ show-submit :submitLoading="isSubmit" :saveLoading="saveLoading" - @save="handleSave" @submit="handleSubmit" show-back @back="handleSubmitNo" @@ -231,6 +230,7 @@ name: "bzdyStep4", data() { return { + newDocUser: '', drawerModal: false, foldFormFlag: false, histortData: [], @@ -329,7 +329,6 @@ handleTabs(name) { this.active = name }, - handleSave() {}, handleSubmit() { // 同意 this.isSubmit = true var json = this.json @@ -384,6 +383,7 @@ this.form.fileId = data.form ? data.form.fileId : data.fileId this.form.modelList = data.form ? data.form.modelList : data.modelList this.form.fjList = data.fjList || data.form.fjList + this.newDocUser = data.form ? data.form.docUser : data.docUser }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue index cc0740c08..4068ac627 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue @@ -237,6 +237,7 @@ name: "bzdyStep5", data() { return { + newDocUser: '', drawerModal: false, foldFormFlag: false, histortData: [], @@ -367,6 +368,7 @@ this.saveLoading = true let json = this.form json.responUserList = this.tableData + this.form.docUser = this.newDocUser let _formData = new FormData() _formData.append('taskIds', this.taskIds) _formData.append('json', JSON.stringify({ @@ -388,6 +390,7 @@ json.commentText = this.commentText json.hzfileId = this.form.hzfileId json.hzfileName = this.form.hzfileName + json.docUser = this.newDocUser this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), taskId: this.taskIds, @@ -415,6 +418,7 @@ this.tableData = data.responUserList || data.form.responUserList this.form.hzfileId = data.hzfileId || data.form.hzfileId this.form.hzfileName = data.hzfileName || data.form.hzfileName + this.newDocUser = data.form ? data.form.docUser : data.docUser }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue index 0383d75d5..464e44119 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue @@ -401,7 +401,7 @@ :size="PLmodalType === 1 && form.itemsNum1 ? '1200px' : '800px'">
-
+
无相似文本
比对条款: {{ plForm.itemsNum }}
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue index 4ef4b219b..0a73ae122 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue @@ -137,8 +137,8 @@ height="100%" :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}" - row-key="id" > + - + prop="newData" + width="180" + show-overflow-tooltip + label="新车型实施日期" + align="center"> + prop="onlineData" + width="180" + show-overflow-tooltip + label="在产车型实施日期" + align="center"> - - - - + prop="applyArctic" + width="200" + label="适用车型" + show-overflow-tooltip + align="center"> + prop="unitDeptName" + label="责任部门" + width="200" + show-overflow-tooltip + align="center"> + label="责任人" + width="170" + prop="zrUserName" + show-overflow-tooltip + align="center"> + + + + + @@ -336,6 +337,7 @@ title="查看比对内容" :visible.sync="BDmodel" size="1100px"> +
比对条款: {{ itemsNum }}
相似度:{{ similarityDegree }}
@@ -355,6 +357,7 @@ export default { name: "bzjdStep1-6", data() { return { + itemsNum: '', similarityDegree: '', BDmodel: false, oldNumber: '', @@ -422,7 +425,7 @@ export default { }, e => { }) }, - checkBD (id,id2) { + checkBD (id,id2,itemsNum) { let itemsEoPage = { oldItemId: id, newItemId: id2, @@ -434,6 +437,7 @@ export default { if (res.data.leftString === '' && res.data.rightString === '') { this.$message.warning('暂无找到相似的文本') } else { + this.itemsNum = itemsNum this.leftData = res.data.leftString this.rightData = res.data.rightString this.BDmodel = true diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue index 8a29886b1..45d840009 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue @@ -69,7 +69,7 @@ 批量编辑
{ diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue index 7c46e44c3..dce60cd1e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue @@ -43,6 +43,16 @@ placeholder="请选择结束日期"> + + + + + +
选择附件 @@ -51,7 +61,7 @@ v-model="form.fjListId" style="display: none;" > -
+
{{ item.fileName }} { - // this.fjList = res.data - // this.fzlistModel = true - // }) }, handleSelection2(data) { - if (data.length > 1) { - this.$message.warning('最多选择1条附件') - } else { - this.addFjList = data - } + this.addFjList = data }, closeDrawer2() { this.fzlistModel = false @@ -619,16 +623,18 @@ export default { enterDrawer2() { this.fzlistModel = false this.form.fjList = this.addFjList - this.form.textType = this.setWBType(this.addFjList[0].standFileClassify) - this.form.textValue = this.addFjList[0].standFileClassify let idList = [] let nameList = [] this.addFjList.forEach(item => { - idList.push(item.id) - nameList.push(item.fileName) + if (nameList.length > 0) { + nameList += ',' + idList += ',' + } + idList += item.id + nameList += item.fileName }) - this.form.fjListName = nameList.join(',') - this.form.fjListId = idList.join(',') + this.form.fjListName = nameList + this.form.fjListId = idList }, // 点击查看 handlePreview(item) { @@ -681,7 +687,7 @@ export default { sarStandCompareHis() { this.spinShow = true var formData = this.standCommonlySearch - this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', formData, { + this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPageByWk1', formData, { _this: this }, res => { this.standInfoList = res.data.list @@ -725,7 +731,14 @@ export default { } else { this.form.cid = bringData[0].standSortShow + '-' + bringData[0].standNumber + ' ' + bringData[0].standName } + this.form.standType = bringData[0].standType + this.form.standId = bringData[0].id this.listModel = false; + this.$http.get('SarStandItems/sar-stand-items/getFileType', { + standId: bringData[0].id + }, {}, res => { + this.textTypeList = res.data + }) } else if (this.selectedList.length > 1) { this.$message.warning("只能选择一条数据进行带入"); } else { @@ -747,7 +760,7 @@ export default { }) if (this.type2 === '1') { this.roleForm.dockUserList = idList - this.roleForm.dockUserName = nameList + this.roleForm.dockUserListName = nameList } else { this.roleForm.directorUser = idList this.roleForm.directorUserName = nameList diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue index 0a2f22706..3d6e695ee 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue @@ -53,7 +53,7 @@ v-model="form.fjListId" style="display: none;" > -
+
{{ item.fileName }}
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue index 49a58d99f..947de6b05 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue @@ -43,6 +43,16 @@ placeholder="请选择结束日期"> + + + + + +
选择附件 @@ -51,7 +61,7 @@ v-model="form.fjListId" style="display: none;" > -
+
{{ item.fileName }} 查询 { - // this.fjList = res.data - // this.fzlistModel = true - // }) }, handleSelection2(data) { - if (data.length > 1) { - this.$message.warning('最多选择1条附件') - } else { - this.addFjList = data - } + this.addFjList = data }, closeDrawer2() { this.fzlistModel = false @@ -630,16 +632,18 @@ export default { enterDrawer2() { this.fzlistModel = false this.form.fjList = this.addFjList - this.form.textType = this.setWBType(this.addFjList[0].standFileClassify) - this.form.textValue = this.addFjList[0].standFileClassify let idList = [] let nameList = [] this.addFjList.forEach(item => { - idList.push(item.id) - nameList.push(item.fileName) + if (nameList.length > 0) { + nameList += ',' + idList += ',' + } + idList += item.id + nameList += item.fileName }) - this.form.fjListName = nameList.join(',') - this.form.fjListId = idList.join(',') + this.form.fjListName = nameList + this.form.fjListId = idList }, // 点击查看 handlePreview(item) { @@ -728,6 +732,11 @@ export default { this.form.standType = bringData[0].standType this.form.standId = bringData[0].id this.listModel = false; + this.$http.get('SarStandItems/sar-stand-items/getFileType', { + standId: bringData[0].id + }, {}, res => { + this.textTypeList = res.data + }) } else if (this.selectedList.length > 1) { this.$message.warning("只能选择一条数据进行带入"); } else { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue index 94ef10e6d..3b8a22377 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue @@ -45,7 +45,7 @@ v-model="form.fjListId" style="display: none;" > -
+
-
+
{ if (res.ok) { this.options = res.data.list + console.log(res); } }, e => { }) @@ -691,7 +692,7 @@ this.form.endTime = data.endTime || data.form.endTime this.todoId = res.id this.json = data - this.getItemList(data.standId,this.form.textValue) + this.getItemList(data.standId,data.textType) this.data = data.info || data.data || data.form.data || [] }).catch(e => { }) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue index 9a957e8d5..f885298fb 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue @@ -45,7 +45,7 @@ v-model="form.fjListId" style="display: none;" > -
+
-
+
-
+
{ }) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue index 7982461c2..1dbab8c1c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue @@ -45,7 +45,7 @@ v-model="form.fjListId" style="display: none;" > -
+
-
+
-
+
-
+
-
+
- +

总院各中心兼职标准化员/各事业部标准化员

@@ -503,7 +503,7 @@ - +

会签征求意见人员

@@ -513,7 +513,7 @@ - +

意见汇总及标准修改人员

@@ -523,7 +523,7 @@ - +

总院标准法规部产品标准工程师/各事业部标准法规部人员

@@ -533,7 +533,7 @@ - +

总院项目总工/各事业部整车所产品经理

@@ -543,7 +543,7 @@ - +

总院标准法规部高级经理/各事业部标准业务/认证业务经理

@@ -553,7 +553,7 @@ - +

总院标准法规部高级经理/各事业部标准业务/认证业务经理

@@ -563,7 +563,7 @@ - +

总院技术管理中心主任/各事业部主管标准业务高级经理

@@ -573,7 +573,7 @@ - +

总院平台总监/各事业部研发副总裁

@@ -583,7 +583,7 @@ - +

总院标准法规部产品标准工程师/各事业部标准化员

@@ -593,7 +593,7 @@ - +

抄送人员

@@ -1330,7 +1330,7 @@ standName: [ { required: true, message: '请输入企标中文名称', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, - {validator: this.verify.valiateName, trigger: 'change'} + {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'} ], standEnName: [ { required: false, message: '请输入企标英文名称', trigger: 'blur' }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step10.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step10.vue index 56b62e5dc..6d042d53c 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step10.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step10.vue @@ -920,7 +920,7 @@ standName: [ { required: true, message: '请输入企标中文名称', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, - {validator: this.verify.valiateName, trigger: 'change'} + {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'} ], standEnName: [ { required: false, message: '请输入企标英文名称', trigger: 'blur' }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step11.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step11.vue index 00ce5e7d1..a850d1ef6 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step11.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step11.vue @@ -920,7 +920,7 @@ standName: [ { required: true, message: '请输入企标中文名称', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, - {validator: this.verify.valiateName, trigger: 'change'} + {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'} ], standEnName: [ { required: false, message: '请输入企标英文名称', trigger: 'blur' }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step12.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step12.vue index 804c28069..39ab3e71e 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step12.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step12.vue @@ -920,7 +920,7 @@ standName: [ { required: true, message: '请输入企标中文名称', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, - {validator: this.verify.valiateName, trigger: 'change'} + {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'} ], standEnName: [ { required: false, message: '请输入企标英文名称', trigger: 'blur' }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue index 0a16da727..b509579d8 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue @@ -1001,7 +1001,7 @@ standName: [ { required: true, message: '请输入企标中文名称', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, - {validator: this.verify.valiateName, trigger: 'change'} + {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'} ], standEnName: [ { required: false, message: '请输入企标英文名称', trigger: 'blur' }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step14.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step14.vue index 8a1fbf833..a8096d977 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step14.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step14.vue @@ -1001,7 +1001,7 @@ standName: [ { required: true, message: '请输入企标中文名称', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, - {validator: this.verify.valiateName, trigger: 'change'} + {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'} ], standEnName: [ { required: false, message: '请输入企标英文名称', trigger: 'blur' }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue index 707f8770b..3f987bda5 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue @@ -923,7 +923,7 @@ standName: [ { required: true, message: '请输入企标中文名称', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, - {validator: this.verify.valiateName, trigger: 'change'} + {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'} ], standEnName: [ { required: false, message: '请输入企标英文名称', trigger: 'blur' }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue index 19e362079..73ad99dda 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue @@ -986,7 +986,7 @@ standName: [ { required: true, message: '请输入企标中文名称', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, - {validator: this.verify.valiateName, trigger: 'change'} + {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'} ], standEnName: [ { required: false, message: '请输入企标英文名称', trigger: 'blur' }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step4.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step4.vue index f73db12da..b626ad27e 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step4.vue @@ -920,7 +920,7 @@ standName: [ { required: true, message: '请输入企标中文名称', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, - {validator: this.verify.valiateName, trigger: 'change'} + {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'} ], standEnName: [ { required: false, message: '请输入企标英文名称', trigger: 'blur' }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue index 24b5c7ff7..089efc835 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue @@ -940,7 +940,7 @@ standName: [ { required: true, message: '请输入企标中文名称', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, - {validator: this.verify.valiateName, trigger: 'change'} + {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'} ], standEnName: [ { required: false, message: '请输入企标英文名称', trigger: 'blur' }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue index 5c93b1bb8..1e2d38fcc 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue @@ -987,7 +987,7 @@ standName: [ { required: true, message: '请输入企标中文名称', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, - {validator: this.verify.valiateName, trigger: 'change'} + {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'} ], standEnName: [ { required: false, message: '请输入企标英文名称', trigger: 'blur' }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue index ed0546294..54bcc37df 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue @@ -208,12 +208,15 @@ @@ -352,6 +355,13 @@ @checkedRole="checkedRole" :nodeList="nodeList" > + @@ -560,7 +570,7 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' - import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail} from "api/process"; + import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,changeAssigneeNew} from "api/process"; import {getEvaluationIndex} from "api/businessApi"; import TreeSelect from '@/components/treeSelect/treeSelect.vue'; import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue'; @@ -1004,7 +1014,7 @@ standName: [ { required: true, message: '请输入企标中文名称', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, - {validator: this.verify.valiateName, trigger: 'change'} + {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'} ], standEnName: [ { required: false, message: '请输入企标英文名称', trigger: 'blur' }, @@ -2310,6 +2320,37 @@ this.rules.commentText[0].required = true; } }, + checkedRoleTransfer (data) { + this.assigneeNewLoading = true + changeAssigneeNew({ + taskId: this.$route.query.taskIds, // 任务id + userId:this.$store.getters.userInfo.userId, // 委托人 + assignee: data[0].id, // 被委托人 + pId: this.$route.query.prcId, // 流程实例 + }).then(res => { + this.assigneeNewLoading = false + if (res.success) { + this.drawerModal = false + this.$message.success('调整成功') + this.processNum() + this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) + } else { + this.$message.warning(res.message) + } + }) + }, + handleTransfer() { + this.drawerModal = true + this.drawerTitle = '转办处理人' + }, + handle1(){ + this.formTongGuo.approvalOpinion = 1 + this.handleSubmit() + }, + handle2(){ + this.formTongGuo.approvalOpinion = 0 + this.handleSubmit() + }, handleSubmit() { this.getRule() // const val= this.form.country; diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step8.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step8.vue index a7b591e0e..3981fc135 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step8.vue @@ -920,7 +920,7 @@ standName: [ { required: true, message: '请输入企标中文名称', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, - {validator: this.verify.valiateName, trigger: 'change'} + {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'} ], standEnName: [ { required: false, message: '请输入企标英文名称', trigger: 'blur' }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step9.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step9.vue index b4e677629..494f38bce 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step9.vue @@ -920,7 +920,7 @@ standName: [ { required: true, message: '请输入企标中文名称', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, - {validator: this.verify.valiateName, trigger: 'change'} + {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'} ], standEnName: [ { required: false, message: '请输入企标英文名称', trigger: 'blur' }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue index a8d12be8a..f1d38f49d 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue @@ -978,7 +978,7 @@ standName: [ { required: true, message: '请输入企标中文名称', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, - {validator: this.verify.valiateName, trigger: 'change'} + {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'} ], standEnName: [ { required: false, message: '请输入企标英文名称', trigger: 'blur' }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue index edcad9083..f3c896278 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue @@ -987,7 +987,7 @@ standName: [ { required: true, message: '请输入企标中文名称', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, - {validator: this.verify.valiateName, trigger: 'change'} + {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'} ], standEnName: [ { required: false, message: '请输入企标英文名称', trigger: 'blur' }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepDetail.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepDetail.vue index 0a465070e..146e654ce 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepDetail.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepDetail.vue @@ -916,7 +916,7 @@ standName: [ { required: true, message: '请输入企标中文名称', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, - {validator: this.verify.valiateName, trigger: 'change'} + {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'} ], standEnName: [ { required: false, message: '请输入企标英文名称', trigger: 'blur' }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue index 97879e923..2c8735abf 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue @@ -25,7 +25,7 @@ - + - + - 根据企标编号、企标名称查询 + 根据企标名称、起草责任单位查询 @@ -493,7 +493,7 @@ - +

总院各中心兼职标准化员/各事业部标准化员

@@ -503,7 +503,7 @@ - +

会签征求意见人员

@@ -513,7 +513,7 @@ - +

技术委员会评审/评审意见修改人员

@@ -523,7 +523,7 @@ - +

标准法规部标准化工程师

@@ -533,7 +533,7 @@ - +

起草单位高级经理

@@ -543,7 +543,7 @@ - +

标准法规部高级经理

@@ -553,7 +553,7 @@ - +

起草单位中心主任

@@ -563,7 +563,7 @@ - +

总院院长或总院主管副院长

@@ -573,7 +573,7 @@ - +

标准法规部标准化工程师发布人员

@@ -791,39 +791,36 @@
- - + + + + + + + + + + + + + + + + - - - - + - - - - - + width="120"> + + + + - - - - - - - + prop="reviseStatus" + width="150" + align="center" + label="制修订状态"> + + + + + + + + + + + + + + + + + + + + + + + +
- 新增 { + if(this.form.planId === undefined || this.form.planId === null || this.form.planId === ''){ + callback(new Error('请先选择企标计划带入企标名称！')) + }else if(value === undefined || value === null || value === ''){ + callback(new Error('请输入企标名称！')) + }else { + callback() + } + }; + + const validateStandSort = (rule, value, callback) => { + if(this.form.planId === undefined || this.form.planId === null || this.form.planId === ''){ + callback(new Error('请先选择企标计划带入企标类别！')) + }else if(value === undefined || value === null || value === ''){ + callback(new Error('请选择企标类别！')) + }else { + callback() + } + callback() + }; + const validateModelName = (rule, value, callback) => { if(this.FBGBUSSFileList.length === 0){ callback(new Error('请上传发布稿文件！')) @@ -1059,11 +1116,10 @@ page: 1, pageSize: this.$store.getters.userInfo.configContent, total: 0, - standType: 'INLAND', - standSort: '', - standName: '', - standEnName: '', - standNumber: '' + unit: '', + esName: '', + planStatus: '0,3', + reviseStatus: '', }, tableData: { // 标准表格数据 @@ -1166,7 +1222,10 @@ fileType: '', countryArr:'', commentCycleDate:'', + planDisabled:true, form: { + planId:'', + reviseStatus:'', modelData:[], modelDataNameVerify:[], modelDataZrUserVerify:[], @@ -1291,7 +1350,7 @@ { required: true, message: '选择维护模块名称', validator: validateModelName,trigger: 'blur' }, ], standSort: [ - { required: true, message: '请选择企标类别', trigger: 'change' } + { required: true, validator:validateStandSort,trigger: 'change' } ], standNumber: [ { required: true, message: '请输入企标编号', trigger: 'blur' }, @@ -1302,9 +1361,9 @@ { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, ], standName: [ - { required: true, message: '请输入企标中文名称', trigger: 'blur' }, + { required: true, validator:validateStandName, trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, - {validator: this.verify.valiateName, trigger: 'change'} + {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'} ], standEnName: [ { required: false, message: '请输入企标英文名称', trigger: 'blur' }, @@ -1407,6 +1466,15 @@ }, }, methods: { + getMap1(item){ + const map = new Map(); + map.set('0','未开始') + map.set('1','制定中') + map.set('2','修订中') + map.set('3','已取消') + map.set('4','已完成') + return map.get(item) + }, modelProp(row,index){ console.log(row) console.log(index) @@ -1697,42 +1765,19 @@ // 带入 case 2: if (this.standardCheckedList.length === 1) { - this.$http.get('lawss/sarLawsInfo/getStandInfoUpdateById', {id: this.standardCheckedList[0].id}, { - _this: this - }, res => { - if(res && res.data){ - const bringData = res.data - - const json = Object.assign(bringData, bringData.attrInfoMap); - this.form = JSON.parse(JSON.stringify(json)) - this.form.TGRLAWS = JSON.parse(JSON.stringify(json)).TGRLAWS && JSON.parse(JSON.stringify(json)).TGRLAWS !== '[]' ? JSON.parse(JSON.stringify(json)).TGRLAWS.split(',') : [] - this.form.TGDWLAWS = JSON.parse(JSON.stringify(json)).TGDWLAWS && JSON.parse(JSON.stringify(json)).TGDWLAWS !== '[]' ? JSON.parse(JSON.stringify(json)).TGDWLAWS.split(',') : [] - this.form.NYLXLAWS = JSON.parse(JSON.stringify(json)).NYLXLAWS && JSON.parse(JSON.stringify(json)).NYLXLAWS !== '[]' ? JSON.parse(JSON.stringify(json)).NYLXLAWS.split(',') : [] - this.form.YYRZLAWS = JSON.parse(JSON.stringify(json)).YYRZLAWS && JSON.parse(JSON.stringify(json)).YYRZLAWS !== '[]' ? JSON.parse(JSON.stringify(json)).YYRZLAWS.split(',') : [] - this.form.ZRBMLAWS = JSON.parse(JSON.stringify(json)).ZRBMLAWS && JSON.parse(JSON.stringify(json)).ZRBMLAWS !== '[]' ? JSON.parse(JSON.stringify(json)).ZRBMLAWS.split(',') : [] - this.form.ZRGCSLAWS = JSON.parse(JSON.stringify(json)).ZRGCSLAWS && JSON.parse(JSON.stringify(json)).ZRGCSLAWS !== '[]' ? JSON.parse(JSON.stringify(json)).ZRGCSLAWS.split(',') : [] - this.form.prcNum = this.prcNum - this.form.prcName = this.prcName - this.form['id'] = bringData.id - this.standardDrawer = false - this.verifySarStandard = true - this.busVsFunc() - this.modelFunc() - this.$forceUpdate() - } - // 遍历对象初始化文件信息 - for(const p in this.form) { - if (typeof (this.form[p ]) != "function") { - this.initializeFileList(p,this.form[p]); - } - } - console.log("res",res); - }) + this.form.standName = this.standardCheckedList[0].esName + this.form.standSort = this.standardCheckedList[0].bussSort + this.form.planId = this.standardCheckedList[0].id + this.form.reviseStatus = this.standardCheckedList[0].reviseStatus + this.standardDrawer = false + this.verifySarStandard = true + this.planDisabled = false + this.$forceUpdate() } else if (this.standardCheckedList.length > 1) { - this.$message.warning('最多可以带入一条政策信息') + this.$message.warning('最多可以带入一条计划信息') } else { - this.$message.warning('请选择要带入的政策信息') + this.$message.warning('请选择要带入的计划信息') } break // 取消 @@ -1751,6 +1796,7 @@ case 'fbgbjbd': this.getFileList(value,this.FBGBJBDFileList); break; + case 'ssg': this.getFileList(value,this.ssgFileList); break; @@ -1818,11 +1864,11 @@ this.standardCheckedList = data }, handleResetSearch() { - this.standardSearchForm.standType = 'BUSINESS' - this.standardSearchForm.standNumber = '' - this.standardSearchForm.standSort = '' - this.standardSearchForm.standName = '' - this.standardSearchForm.standEnName = '' + this.standardSearchForm.page = 1 + this.standardSearchForm.unit = '' + this.standardSearchForm.esName = '' + this.standardSearchForm.planStatus = '' + this.standardSearchForm.reviseStatus = '0,3' setTimeout(() => { this.handleSearchStandard() }, 100) @@ -1836,7 +1882,9 @@ }, getDomesticStandardTable () { this.loadSarStandard = true - this.$http.get('lawss/sarLawsInfo/page', this.standardSearchForm, {}, res => { + this.$http.post('esRevisePlan/es-revise-plan/queryAllPlans', this.standardSearchForm, { + _this: this + }, res => { this.loadSarStandard = false if (res.ok) { this.tableData.standardData = res.data.list @@ -1847,19 +1895,15 @@ }) }, handleSearchStandard () { - if (this.form.standType === '') { - this.$message.warning('请选择标准来源') - } else { - this.standardDrawer = true - this.$nextTick(() => { - // 动态设置表格高度 + this.standardDrawer = true + this.$nextTick(() => { + // 动态设置表格高度 + this.tableHeight.standardTableHeight = $('.standard-table-wrap').height() + window.onresize = () => { this.tableHeight.standardTableHeight = $('.standard-table-wrap').height() - window.onresize = () => { - this.tableHeight.standardTableHeight = $('.standard-table-wrap').height() - } - }) - this.getDomesticStandardTable() - } + } + }) + this.getDomesticStandardTable() }, saveUserInfo () { this.filterText = '' @@ -2577,6 +2621,27 @@ }, res => { if (res.success) { this.$message.success(res.message) + const planForm = {} + planForm.id = this.form.planId + planForm.planStatus = this.form.reviseStatus !== undefined ? ( this.form.reviseStatus === '1' ? '1' : '2') :'' + this.$http.post("esRevisePlan/es-revise-plan/modPlan", planForm, { + _this: this + }, res => { + this.submitLoading = false + if (res.ok) { + if (res.data === '操作成功') { + this.addDrawer = false + this.$message.success(tips + '成功') + this.getData() + } else { + this.addDrawer = false + this.$message.warning(res.data) + this.getData() + } + } else { + this.$message.warning(tips + '失败') + } + }) this.isSubmit = false // 流程提交之后，应该流转至待办任务页面 this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue index a36f16b39..b4720bf4d 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue @@ -934,7 +934,7 @@ standName: [ { required: true, message: '请输入企标中文名称', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, - {validator: this.verify.valiateName, trigger: 'change'} + {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'} ], standEnName: [ { required: false, message: '请输入企标英文名称', trigger: 'blur' }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue index 7cf70dd8a..75ee3ac5d 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue @@ -933,7 +933,7 @@ standName: [ { required: true, message: '请输入企标中文名称', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, - {validator: this.verify.valiateName, trigger: 'change'} + {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'} ], standEnName: [ { required: false, message: '请输入企标英文名称', trigger: 'blur' }, @@ -2194,7 +2194,7 @@ } }, handleSubmit() { - this.getRule() + // this.getRule() // const val= this.form.country; // if (val !== '' && val !== null && typeof (val) !== 'undefined') { // if (val instanceof Array) { diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue index a6518cd31..f41974199 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue @@ -923,7 +923,7 @@ standName: [ { required: true, message: '请输入企标中文名称', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, - {validator: this.verify.valiateName, trigger: 'change'} + {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'} ], standEnName: [ { required: false, message: '请输入企标英文名称', trigger: 'blur' }, @@ -2154,7 +2154,7 @@ } }, handleSubmit() { - this.getRule() + // this.getRule() // const val= this.form.country; // if (val !== '' && val !== null && typeof (val) !== 'undefined') { // if (val instanceof Array) { diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue index e982921b6..e4ffa494f 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue @@ -924,7 +924,7 @@ standName: [ { required: true, message: '请输入企标中文名称', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, - {validator: this.verify.valiateName, trigger: 'change'} + {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'} ], standEnName: [ { required: false, message: '请输入企标英文名称', trigger: 'blur' }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue index 9e3343ac1..f2513b18e 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue @@ -986,7 +986,7 @@ standName: [ { required: true, message: '请输入企标中文名称', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, - {validator: this.verify.valiateName, trigger: 'change'} + {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'} ], standEnName: [ { required: false, message: '请输入企标英文名称', trigger: 'blur' }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue index 84268fca0..ef1825681 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue @@ -929,7 +929,7 @@ standName: [ { required: true, message: '请输入企标中文名称', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, - {validator: this.verify.valiateName, trigger: 'change'} + {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'} ], standEnName: [ { required: false, message: '请输入企标英文名称', trigger: 'blur' }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue index 2f72ddbe4..4897217d7 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue @@ -1044,7 +1044,7 @@ standName: [ { required: true, message: '请输入企标中文名称', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, - {validator: this.verify.valiateName, trigger: 'change'} + {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'} ], standEnName: [ { required: false, message: '请输入企标英文名称', trigger: 'blur' }, @@ -2353,7 +2353,7 @@ } }, handleSubmit() { - this.getRule() + // this.getRule() // const val= this.form.country; // if (val !== '' && val !== null && typeof (val) !== 'undefined') { // if (val instanceof Array) { @@ -2371,7 +2371,7 @@ this.isSubmit = true this.saveLoading = true this.form.commentText = this.formTongGuo.commentText - this.form.approvalOpinion = this.formTongGuo.approvalOpinion + // this.form.approvalOpinion = this.formTongGuo.approvalOpinion // 会签意见存储 const infoList = [] const info = {} diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue index 4b3e170e7..c1bfecd8b 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue @@ -1028,7 +1028,7 @@ standName: [ { required: true, message: '请输入企标中文名称', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, - {validator: this.verify.valiateName, trigger: 'change'} + {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'} ], standEnName: [ { required: false, message: '请输入企标英文名称', trigger: 'blur' }, @@ -2394,7 +2394,7 @@ } }, handleSubmit() { - this.getRule() + // this.getRule() // const val= this.form.country; // if (val !== '' && val !== null && typeof (val) !== 'undefined') { // if (val instanceof Array) { @@ -2413,7 +2413,7 @@ this.isSubmit = true this.saveLoading = true this.form.commentText = this.formTongGuo.commentText - this.form.approvalOpinion = this.formTongGuo.approvalOpinion + // this.form.approvalOpinion = this.formTongGuo.approvalOpinion const json = JSON.stringify(this.form); this.$http.post('lawss/activiti/completeTask', { taskIds: this.taskIds, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue index 0032d2c0a..5a8d24104 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue @@ -314,13 +314,18 @@ + + + @@ -665,7 +678,7 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' - import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail} from "api/process"; + import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,changeAssigneeNew} from "api/process"; import {getEvaluationIndex} from "api/businessApi"; import TreeSelect from '@/components/treeSelect/treeSelect.vue'; import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue'; @@ -1047,7 +1060,7 @@ standName: [ { required: true, message: '请输入企标中文名称', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, - {validator: this.verify.valiateName, trigger: 'change'} + {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'} ], standEnName: [ { required: false, message: '请输入企标英文名称', trigger: 'blur' }, @@ -1383,6 +1396,25 @@ this.roleForm.hqUserName=nameList; } }, + checkedRoleTransfer (data) { + this.assigneeNewLoading = true + changeAssigneeNew({ + taskId: this.$route.query.taskIds, // 任务id + userId:this.$store.getters.userInfo.userId, // 委托人 + assignee: data[0].id, // 被委托人 + pId: this.$route.query.prcId, // 流程实例 + }).then(res => { + this.assigneeNewLoading = false + if (res.success) { + this.drawerModal = false + this.$message.success('调整成功') + this.processNum() + this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) + } else { + this.$message.warning(res.message) + } + }) + }, checkedRole (data) { if (this.type === 0) { this.roleForm.deptUserId = data[0].id @@ -2234,6 +2266,22 @@ handleTabs(name) { this.active = name }, + handleTransfer() { + this.drawerModal = true + this.drawerTitle = '转办处理人' + }, + handle1(){ + this.formTongGuo.approvalOpinion = 1 + this.handleSubmit() + }, + handle2(){ + this.formTongGuo.approvalOpinion = 0 + this.$refs['form'].validate((valid) => { + if (valid) { + this.handleSubmit() + } + }) + }, //保存 handleSave() { this.form.country=this.countryArr; diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue index 1be01628c..0e4c94e6b 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue @@ -1063,7 +1063,7 @@ standName: [ { required: true, message: '请输入企标中文名称', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, - {validator: this.verify.valiateName, trigger: 'change'} + {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'} ], standEnName: [ { required: false, message: '请输入企标英文名称', trigger: 'blur' }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue index 72f34a058..12b0c479f 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue @@ -1063,7 +1063,7 @@ standName: [ { required: true, message: '请输入企标中文名称', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, - {validator: this.verify.valiateName, trigger: 'change'} + {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'} ], standEnName: [ { required: false, message: '请输入企标英文名称', trigger: 'blur' }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue index 29706be06..d689029d4 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue @@ -985,7 +985,7 @@ standName: [ { required: true, message: '请输入企标中文名称', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, - {validator: this.verify.valiateName, trigger: 'change'} + {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'} ], standEnName: [ { required: false, message: '请输入企标英文名称', trigger: 'blur' }, @@ -2333,7 +2333,7 @@ } }, handleSubmit() { - this.getRule() + // this.getRule() // const val= this.form.country; // if (val !== '' && val !== null && typeof (val) !== 'undefined') { // if (val instanceof Array) { @@ -2352,7 +2352,7 @@ this.isSubmit = true this.saveLoading = true this.form.commentText = this.formTongGuo.commentText - this.form.approvalOpinion = this.formTongGuo.approvalOpinion + // this.form.approvalOpinion = this.formTongGuo.approvalOpinion const json = JSON.stringify(this.form); this.$http.post('lawss/activiti/completeTask', { taskIds: this.taskIds, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue index 249b590a0..063e8ed6b 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue @@ -1028,7 +1028,7 @@ standName: [ { required: true, message: '请输入企标中文名称', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, - {validator: this.verify.valiateName, trigger: 'change'} + {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'} ], standEnName: [ { required: false, message: '请输入企标英文名称', trigger: 'blur' }, @@ -2394,7 +2394,7 @@ } }, handleSubmit() { - this.getRule() + // this.getRule() // const val= this.form.country; // if (val !== '' && val !== null && typeof (val) !== 'undefined') { // if (val instanceof Array) { @@ -2413,7 +2413,7 @@ this.isSubmit = true this.saveLoading = true this.form.commentText = this.formTongGuo.commentText - this.form.approvalOpinion = this.formTongGuo.approvalOpinion + // this.form.approvalOpinion = this.formTongGuo.approvalOpinion const json = JSON.stringify(this.form); this.$http.post('lawss/activiti/completeTask', { taskIds: this.taskIds, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepDetail.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepDetail.vue index 6c9481940..0d84b0fd7 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/stepDetail.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepDetail.vue @@ -918,7 +918,7 @@ standName: [ { required: true, message: '请输入企标中文名称', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, - {validator: this.verify.valiateName, trigger: 'change'} + {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'} ], standEnName: [ { required: false, message: '请输入企标英文名称', trigger: 'blur' }, diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue index 91ba66aff..e51337005 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue @@ -22,6 +22,16 @@ clearable > + + + + + + - + @@ -199,9 +209,8 @@ - - - + + @@ -248,7 +257,8 @@ label="计划状态" align="center"> { this.BZList = res.data.ENERGYTYPES //标准范围 + this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别 }) }, methods: { @@ -432,22 +447,28 @@ export default { this.qbfsForm.esName = this.selectList[0].esName this.qbfsForm.draftTime = this.selectList[0].draftTime this.qbfsForm.drafterName = this.selectList[0].drafterName - this.qbfsForm.planStatus = this.selectList[0].planStatus === '0'? '完成' : (this.selectList[0].planStatus === '1'? '修订' : '制定') + this.qbfsForm.planStatus = this.selectList[0].planStatus === '0'? '未开始' : (this.selectList[0].planStatus === '1'? '制定中' : (this.selectList[0] === '2'? '修订中' : + (this.selectList[0] === '3'? '已取消' : '已完成'))) this.qbfsForm.releaseTime = this.selectList[0].releaseTime this.qbfsForm.resPersonName = this.selectList[0].resPersonName - this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus === '0'? '制定完成' : (this.selectList[0].reviseStatus === '1'? '制定中' : '未制定') + this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus === '1'? '制定' : '修订' this.qbfsForm.unitName = this.selectList[0].unitName this.qbfsForm.wgLeaderName = this.selectList[0].wgLeaderName if(this.selectList[0].area){ this.qbfsForm.area = this.selectList[0].area.split(',') } + if(this.selectList[0].bussSort){ + this.qbfsForm.bussSort = this.selectList[0].bussSort.split(',') + } this.qbfsForm.rqbName = this.selectList[0].rqbName this.qbfsForm.tsJsonName = this.selectList[0].tsJsonName this.qbfsForm.isRelate = this.selectList[0].isRelate this.qbfsForm.useLevel = this.selectList[0].useLevel this.qbfsForm.esStandRelations = this.selectList[0].esStandRelations this.qbfsForm.technologic = this.selectList[0].technologic - this.qbfsForm.esMatingRelations = this.selectList[0].esMatingRelations + if(this.selectList[0].esMatingRelations && this.selectList[0].esMatingRelations !== 'null'){ + this.qbfsForm.esMatingRelations = this.selectList[0].esMatingRelations + } this.ListModel = false } }, diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue index 63da88cbe..2b0953c9e 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue @@ -22,6 +22,16 @@ clearable > + + + + + + - - - + + @@ -54,11 +63,11 @@ placeholder="请选择初稿完成时间"> - + @@ -216,9 +225,8 @@ - - - + + @@ -265,7 +273,8 @@ label="计划状态" align="center"> { this.BZList = res.data.ENERGYTYPES //标准范围 + this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别 }) }, methods: { @@ -455,22 +469,28 @@ export default { this.qbfsForm.esName = this.selectList[0].esName this.qbfsForm.draftTime = this.selectList[0].draftTime this.qbfsForm.drafterName = this.selectList[0].drafterName - this.qbfsForm.planStatus = this.selectList[0].planStatus === '0'? '完成' : (this.selectList[0].planStatus === '1'? '修订' : '制定') + this.qbfsForm.planStatus = this.selectList[0].planStatus === '0'? '未开始' : (this.selectList[0].planStatus === '1'? '制定中' : (this.selectList[0] === '2'? '修订中' : + (this.selectList[0] === '3'? '已取消' : '已完成'))) this.qbfsForm.releaseTime = this.selectList[0].releaseTime this.qbfsForm.resPersonName = this.selectList[0].resPersonName - this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus === '0'? '制定完成' : (this.selectList[0].reviseStatus === '1'? '制定中' : '未制定') + this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus === '1'? '制定' : '修订' this.qbfsForm.unitName = this.selectList[0].unitName this.qbfsForm.wgLeaderName = this.selectList[0].wgLeaderName if(this.selectList[0].area){ this.qbfsForm.area = this.selectList[0].area.split(',') } + if(this.selectList[0].bussSort){ + this.qbfsForm.bussSort = this.selectList[0].bussSort.split(',') + } this.qbfsForm.rqbName = this.selectList[0].rqbName this.qbfsForm.tsJsonName = this.selectList[0].tsJsonName this.qbfsForm.isRelate = this.selectList[0].isRelate this.qbfsForm.useLevel = this.selectList[0].useLevel this.qbfsForm.esStandRelations = this.selectList[0].esStandRelations this.qbfsForm.technologic = this.selectList[0].technologic - this.qbfsForm.esMatingRelations = this.selectList[0].esMatingRelations + if(this.selectList[0].esMatingRelations && this.selectList[0].esMatingRelations !== 'null'){ + this.qbfsForm.esMatingRelations = this.selectList[0].esMatingRelations + } this.ListModel = false } }, diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue index a952cac68..c91987b76 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue @@ -11,6 +11,16 @@ clearable > + + + + + + - + @@ -82,7 +92,7 @@ @@ -258,7 +268,7 @@
@@ -334,7 +344,7 @@ export default { standSystemOptions: [], QYBZform: { page: 1, - pageSzie: this.$store.getters.userInfo.configContent, + pageSize: this.$store.getters.userInfo.configContent, validFlag: '0', userId: this.$store.getters.userInfo.userId, standCode: '', @@ -349,6 +359,7 @@ export default { modalshowflag: false, nodeList2: [], nodeList: [], + standSortOptions: [], BZList: [], qcdwOptions: [], qbfsForm: { @@ -372,46 +383,13 @@ export default { newReason: "" //新增原因 // remarks: '', // 备注 }, - useOptions: [ - { - value: "ISO", - label: "ISO" - }, { - value: "ESE", - label: "ESE" - }, { - value: "EC/EEC", - label: "EC/EEC" - }, { - value: "IEC", - label: "IEC" - }, { - value: "GB", - label: "GB" - }, { - value: "GB/T", - label: "GB/T" - }, { - value: "QC/T", - label: "QC/T" - }, { - value: "JT/T", - label: "JT/T" - }, { - value: "HJ", - label: "HJ" - }, { - value: "TB", - label: "团标" - },{ - value: "QT", - label: "其他" - }, - ], qbfsFormRules: { unit: [ { required: true, message: "请选择起草单位", trigger: "change" } ], + bussSort: [ + { required: true, message: "请选择企标类别", trigger: "blur" } + ], esName: [ { required: true, message: "请输入企标名称", trigger: "blur" } ], @@ -464,6 +442,7 @@ export default { _this: this }, res => { this.BZList = res.data.ENERGYTYPES //标准范围 + this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别 this.standSystemOptions = res.data.TXLBBUSS // 体系结构 this.qcdwOptions = res.data.QCDW // 起草单位 }) @@ -646,8 +625,6 @@ export default { @import '~@/assets/styles/mixins'; @import '~@/assets/styles/style'; #establish { - height: 100%; - background: #fff; .classDisplay { /deep/.el-form-item__content { width: calc(~'100% - 180px'); diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue index c57d0d1d7..6ba125ffd 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue @@ -53,6 +53,16 @@ clearable > + + + + + + - - - + + @@ -87,7 +96,7 @@ @click.native="choiceZRBM('unit', '选择起草责任单位', qbfsForm.unit)"> - + @@ -95,7 +104,7 @@ @@ -127,11 +136,13 @@ - - - - - + + + + + + + @@ -213,9 +224,8 @@ - - - + + @@ -262,7 +272,8 @@ label="计划状态" align="center">
@@ -496,12 +507,14 @@ export default { label: 'menuName' }, TXJGList: [], + BZList: [], + standSortOptions: [], QYBZList: [], QYBZformSelect: [], standSystemOptions: [], QYBZform: { page: 1, - pageSzie: this.$store.getters.userInfo.configContent, + pageSize: this.$store.getters.userInfo.configContent, validFlag: '0', userId: this.$store.getters.userInfo.userId, standCode: '', @@ -528,6 +541,9 @@ export default { pageSize: this.$store.getters.userInfo.configContent, selectList: [], qbfsFormRules: { + bussSort: [ + { required: true, message: "请选择企标类别", trigger: "blur" } + ], esName1: [ {required: true, message: '请选择合并计划企标名称', trigger: 'blur'}, ], @@ -616,6 +632,7 @@ export default { _this: this }, res => { this.BZList = res.data.ENERGYTYPES //标准范围 + this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别 this.standSystemOptions = res.data.TXLBBUSS // 体系结构 this.qcdwOptions = res.data.QCDW // 起草单位 }) @@ -825,8 +842,9 @@ export default { if(this.showType === 'one'){ this.qbfsForm.esId1 = this.selectList[0].id || '--' this.qbfsForm.esName1 = this.selectList[0].esName || '--' - this.qbfsForm.planStatus1 = this.selectList[0].planStatus === '0'? '完成' : (this.selectList[0].planStatus === '1'? '修订' : '制定') - this.qbfsForm.reviseStatus1 = this.selectList[0].reviseStatus === '0'? '制定完成' : (this.selectList[0].reviseStatus === '1'? '制定中' : '未制定') + this.qbfsForm.planStatus1 = this.selectList[0].planStatus === '0'? '未开始' : (this.selectList[0].planStatus === '1'? '制定中' : (this.selectList[0] === '2'? '修订中' : + (this.selectList[0] === '3'? '已取消' : '已完成'))) + this.qbfsForm.reviseStatus1 = this.selectList[0].reviseStatus === '1'? '制定' : '修订' this.standShow = true }else{ if(this.qbfsForm.esName1 === this.selectList[0].esName ){ @@ -834,8 +852,9 @@ export default { }else{ this.qbfsForm.esId2 = this.selectList[0].id || '--' this.qbfsForm.esName2 = this.selectList[0].esName || '--' - this.qbfsForm.planStatus2 = this.selectList[0].planStatus === '0'? '完成' : (this.selectList[0].planStatus === '1'? '修订' : '制定') - this.qbfsForm.reviseStatus2 = this.selectList[0].reviseStatus === '0'? '制定完成' : (this.selectList[0].reviseStatus === '1'? '制定中' : '未制定') + this.qbfsForm.planStatus2 = this.selectList[0].planStatus === '0'? '未开始' : (this.selectList[0].planStatus === '1'? '制定中' : (this.selectList[0] === '2'? '修订中' : + (this.selectList[0] === '3'? '已取消' : '已完成'))) + this.qbfsForm.reviseStatus2 = this.selectList[0].reviseStatus === '1'? '制定' : '修订' this.standShow2 = true } } diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue index 8fe1d1227..6d859619d 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue @@ -22,6 +22,16 @@ clearable > + + + + + + - - - + + @@ -54,11 +63,11 @@ placeholder="请选择初稿完成时间"> - + @@ -207,9 +216,8 @@ - - - + + @@ -256,7 +264,8 @@ label="计划状态" align="center"> { this.BZList = res.data.ENERGYTYPES //标准范围 + this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别 }) }, methods: { @@ -441,22 +455,28 @@ export default { this.qbfsForm.esName = this.selectList[0].esName this.qbfsForm.draftTime = this.selectList[0].draftTime this.qbfsForm.drafterName = this.selectList[0].drafterName - this.qbfsForm.planStatus = this.selectList[0].planStatus === '0'? '完成' : (this.selectList[0].planStatus === '1'? '修订' : '制定') + this.qbfsForm.planStatus = this.selectList[0].planStatus === '0'? '未开始' : (this.selectList[0].planStatus === '1'? '制定中' : (this.selectList[0] === '2'? '修订中' : + (this.selectList[0] === '3'? '已取消' : '已完成'))) this.qbfsForm.releaseTime = this.selectList[0].releaseTime this.qbfsForm.resPersonName = this.selectList[0].resPersonName - this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus === '0'? '制定完成' : (this.selectList[0].reviseStatus === '1'? '制定中' : '未制定') + this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus === '1'? '制定' : '修订' this.qbfsForm.unitName = this.selectList[0].unitName this.qbfsForm.wgLeaderName = this.selectList[0].wgLeaderName if(this.selectList[0].area){ this.qbfsForm.area = this.selectList[0].area.split(',') } + if(this.selectList[0].bussSort){ + this.qbfsForm.bussSort = this.selectList[0].bussSort.split(',') + } this.qbfsForm.rqbName = this.selectList[0].rqbName this.qbfsForm.tsJsonName = this.selectList[0].tsJsonName this.qbfsForm.isRelate = this.selectList[0].isRelate this.qbfsForm.useLevel = this.selectList[0].useLevel this.qbfsForm.esStandRelations = this.selectList[0].esStandRelations this.qbfsForm.technologic = this.selectList[0].technologic - this.qbfsForm.esMatingRelations = this.selectList[0].esMatingRelations + if(this.selectList[0].esMatingRelations && this.selectList[0].esMatingRelations !== 'null'){ + this.qbfsForm.esMatingRelations = this.selectList[0].esMatingRelations + } this.ListModel = false } }, diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue index dbde6d77d..29c7e88bd 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue @@ -15,6 +15,16 @@ + + + + + + - + @@ -348,7 +358,7 @@ export default { nodeList:[], drawerTitle: '', detailData: [], - + standSortOptions: [], } }, mounted() { @@ -359,6 +369,7 @@ export default { _this: this }, res => { this.BZList = res.data.ENERGYTYPES //标准范围 + this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别 }) }, methods:{ diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue index c0f297174..8f696fab7 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue @@ -455,7 +455,6 @@ export default { if (valid) { this.isSubmit = true; let json = Object.assign(qbzxdFrom, this.roleForm); - console.log(json); this.$http.post("lawss/activiti/startProcessRollBack", { createUser: this.$store.getters.userInfo.userId, createUserName: this.$store.getters.userInfo.userName, diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue index 61f5b6413..ee883d1ed 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue @@ -15,6 +15,16 @@ + + + + + + - + @@ -335,6 +345,7 @@ export default { data(){ return { BZList: [], + standSortOptions: [], active: '1', type: '', commentText: '', @@ -359,6 +370,7 @@ export default { _this: this }, res => { this.BZList = res.data.ENERGYTYPES //标准范围 + this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别 }) }, methods:{ diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue index b9b2737fc..7c3edf08b 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue @@ -15,6 +15,16 @@ + + + + + + - + @@ -346,7 +356,7 @@ export default { nodeList:[], drawerTitle: '', detailData: [], - + standSortOptions: [], } }, mounted() { @@ -357,6 +367,7 @@ export default { _this: this }, res => { this.BZList = res.data.ENERGYTYPES //标准范围 + this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别 }) }, methods:{ diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue index 1129be8e7..b87aaa715 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue @@ -15,6 +15,16 @@ + + + + + + - + @@ -348,7 +358,7 @@ export default { nodeList:[], drawerTitle: '', detailData: [], - + standSortOptions: [], } }, mounted() { @@ -359,6 +369,7 @@ export default { _this: this }, res => { this.BZList = res.data.ENERGYTYPES //标准范围 + this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别 }) }, methods:{ diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue index 936a1db64..0854c961e 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue @@ -15,6 +15,16 @@ + + + + + + - + @@ -348,7 +358,7 @@ export default { nodeList:[], drawerTitle: '', detailData: [], - + standSortOptions: [], } }, mounted() { @@ -359,6 +369,7 @@ export default { _this: this }, res => { this.BZList = res.data.ENERGYTYPES //标准范围 + this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别 }) }, methods:{ diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue index 84878b786..2c4757534 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue @@ -66,7 +66,6 @@
- + - - - - - - - + @selection-change="selectThree" + > + + + + + + + +
- + - - - - - - - + @selection-change="selectThree" + > + + + + + + + +
{ let index; index = this.breakdownList.findIndex(items => { - return items.itemsName === item.itemsName; + return items.itemsName === item.itemsName && items.projectName === item.projectName; }); if (index > -1) { this.breakdownList.splice(index, 1); @@ -874,6 +875,7 @@ export default { //保存事件 handleSave() { this.saveLoading = true; + this.listForm.breakdownList = this.breakdownList; let _formData = new FormData(); _formData.append("id", this.bpnId || ""); _formData.append("prcType", "5"); diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue index c73ea50ae..c56e7c3fd 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue @@ -731,6 +731,7 @@ export default { item.implementerId = this.$store.getters.userInfo.userId; item.implementer = this.$store.getters.userInfo.userName; }); + // this.commentText = '' this.dataList = item.step3DTOS; this.dataList.forEach(item => { this.$set(item,'complianceReasons', '') @@ -740,6 +741,7 @@ export default { }) } else { this.dataList = item.dataList; + // this.commentText = '' this.dataList.forEach(item => { item.implementerId = this.$store.getters.userInfo.userId; item.implementer = this.$store.getters.userInfo.userName; @@ -870,7 +872,7 @@ export default { saveBatchEditForm() { this.dataList.forEach(item => { this.selectList.forEach(items => { - if (item.itemNum === items.itemNum) { + if (item.itemNum === items.itemNum && item.projectName === items.projectName) { item.complianceReasons = this.batchEditForm.complianceReasons; //不合规 item.noCompliance = this.batchEditForm.noCompliance; @@ -881,6 +883,7 @@ export default { } }); }); + this.$refs.multipleTable.clearSelection() this.modalShowFlag = false; }, cancelBatchEditForm() { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue index 47848c7d6..365050bf3 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue @@ -568,6 +568,7 @@ export default { if(!this.commentText){ this.$message.warning('请填写审批意见') }else{ + this.isSubmit = true this.listForm.applyUpdUserId = this.dataList[0].distributePersonId this.listForm.commentText = this.commentText; this.listForm.dataList = this.dataList @@ -584,6 +585,7 @@ export default { this.$message.success(res.message) this.$router.push('/processCenter') } + this.isSubmit = false }, e => { }); } diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue index 9b38a0e3c..34161e456 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue @@ -553,6 +553,7 @@ export default { this.listForm.prcNum = this.prcNum this.listForm.prcName = this.prcName this.listForm.id = item.id + // this.commentText = '' this.dataList = item.dataList }) }, diff --git a/src/pages/processCenter/pages/creatProcess/zcrk/step1.vue b/src/pages/processCenter/pages/creatProcess/zcrk/step1.vue index aa845207d..769dc0c58 100644 --- a/src/pages/processCenter/pages/creatProcess/zcrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/zcrk/step1.vue @@ -1252,7 +1252,7 @@ lawsName: [ {required: true, message: '中文名称不能为空', trigger: 'change'}, {type: 'string', max: 500, message: '中文名称不能超过500个字符', trigger: 'change'}, - {validator: this.verify.valiateName, trigger: 'change'} + {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'} ], lawsEnName: [ {required: false, message: '英文名称不能为空', trigger: 'change'}, diff --git a/src/pages/processCenter/pages/creatProcess/zcrk/step3.vue b/src/pages/processCenter/pages/creatProcess/zcrk/step3.vue index 82969e214..ebe06b6b8 100644 --- a/src/pages/processCenter/pages/creatProcess/zcrk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/zcrk/step3.vue @@ -1302,7 +1302,7 @@ lawsName: [ {required: true, message: '中文名称不能为空', trigger: 'change'}, {type: 'string', max: 500, message: '中文名称不能超过500个字符', trigger: 'change'}, - {validator: this.verify.valiateName, trigger: 'change'} + {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'} ], lawsEnName: [ {required: false, message: '英文名称不能为空', trigger: 'change'}, diff --git a/src/pages/processCenter/pages/newProcess/index.vue b/src/pages/processCenter/pages/newProcess/index.vue index 153e7102c..84af9e5d8 100644 --- a/src/pages/processCenter/pages/newProcess/index.vue +++ b/src/pages/processCenter/pages/newProcess/index.vue @@ -190,7 +190,7 @@

企业标准相关流程
- +
diff --git a/src/pages/processCenter/pages/phone/bzdy/step4.vue b/src/pages/processCenter/pages/phone/bzdy/step4.vue index f8b76f847..0bc581b48 100644 --- a/src/pages/processCenter/pages/phone/bzdy/step4.vue +++ b/src/pages/processCenter/pages/phone/bzdy/step4.vue @@ -84,7 +84,7 @@
- +
@@ -315,14 +315,14 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - this.form.dyhz = data.form ? data.form.dyhz : '' + this.form.dyhz = data.form ? data.form.dyhz : data.dyhz this.form.title = data.title || data.form.title this.form.date = data.date || data.form.date this.json = data || data.form - this.form.file = data.form ? data.form.fileId : '' - this.form.fileName = data.form ? data.form.fileName : '' - this.form.fileId = data.form ? data.form.fileId : '' - this.form.modelList = data.form ? data.form.modelList : [] + this.form.file = data.form ? data.form.fileId : data.fileId + this.form.fileName = data.form ? data.form.fileName : data.fileName + this.form.fileId = data.form ? data.form.fileId : data.fileId + this.form.modelList = data.form ? data.form.modelList : data.modelList this.form.fjList = data.fjList || data.form.fjList }).catch(e => { }) diff --git a/src/pages/processCenter/pages/phone/bzdy/step7.vue b/src/pages/processCenter/pages/phone/bzdy/step7.vue index 38e644e4e..c65a94785 100644 --- a/src/pages/processCenter/pages/phone/bzdy/step7.vue +++ b/src/pages/processCenter/pages/phone/bzdy/step7.vue @@ -23,7 +23,7 @@
- +
- +
- + 0)) ){ + advanceSearchVOList.push({ + connect: "and", + field: key || '', + type: 'regexp', + value: value.join(',') + }); + }else if (value !== null && value !== '' && (key === 'SSRQ' || key === 'XCXSSRQ' || key === 'ZCCSSRQ' )){ + advanceSearchVOList.push({ + connect: "and", + field: key || '', + type: 'between', + value: value.join(',') + }); + }else if (value !== null && value !== ''){ advanceSearchVOList.push({ connect: "and", field: key || '', diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index 08ca7b061..8bcd81337 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -1919,7 +1919,7 @@ export default { standName: [ {required: true, message: '中文名称不能为空', trigger: 'change'}, {type: 'string', max: 500, message: '中文名称不能超过500个字符', trigger: 'change'}, - {validator: this.verify.valiateName, trigger: 'change'} + {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'} ], standEnName: [ {required: true, message: '英文名称不能为空', trigger: 'change'}, diff --git a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue index b1ce65a48..15a654958 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue @@ -5,6 +5,7 @@ + @@ -14,6 +15,7 @@ + @@ -118,7 +120,7 @@ align="center" label="制修订状态"> - + @@ -321,7 +323,7 @@
- +
- + @@ -343,13 +345,14 @@
- + @@ -359,6 +362,7 @@
@@ -367,6 +371,7 @@