From e870e19458378641a7794929b0064a034dd9e013 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Sun, 12 Dec 2021 17:34:38 +0800 Subject: [PATCH 01/15] =?UTF-8?q?=E6=B5=B7=E5=A4=96=E5=8A=A0=E4=B8=80?= =?UTF-8?q?=E5=88=97=E8=8B=B1=E6=96=87=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../foreignStandardsAndRegulations/index.vue | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index 1caeae904..9c682af2d 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -226,6 +226,24 @@ }} + + + {{ + scope.row.standEnName + }} + {{ + scope.row.standEnName + }} + {{ + scope.row.standEnName + }} + + Date: Mon, 13 Dec 2021 13:41:12 +0800 Subject: [PATCH 02/15] commit --- .../pages/creatProcess/xmpg/step3.vue | 49 +++++--- .../pages/creatProcess/xmpg2/step6.vue | 113 ------------------ 2 files changed, 35 insertions(+), 127 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue index 4c3779ccb..06a3c55c2 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue @@ -142,12 +142,12 @@ - + + { inboundLiaisonDetail({ @@ -555,6 +577,7 @@ export default { xcxssrq: item.pepdtos[i].XCXSSRQ, zccssrq: item.pepdtos[i].ZCCSSRQ }); + this.total = this.listForm.breakdownList.length } } } else { @@ -579,7 +602,7 @@ export default { this.listForm.breakdownList[this.lsIndex].implementer = nameList; } else if (this.type === 2) { this.listForm.breakdownList.forEach(item => { - this.selectList.forEach(items => { + this.selectStandList.forEach(items => { if (item === items) { item.implementerId = idList; item.implementer = nameList; @@ -594,6 +617,7 @@ export default { this.modalshowflag = false; }, choiceZRRS(row, type, index) { + this.selectStandList = this.selectList this.type = type; if (type === 1) { this.drawerTitle = "选择责任人"; @@ -653,14 +677,13 @@ export default { }, //提交事件 handleSubmit() { + let standList = [] this.listForm.breakdownList.forEach(item => { - if (item.implementer === null || item.implementer === "" || item.implementer === undefined) { - this.sarFlag = false; - } else { - this.sarFlag = true; + if (item.implementer) { + standList.push(item) } }); - if (this.sarFlag === true) { + this.listForm.breakdownList = standList this.listForm.prcCreateUser = this.$store.getters.userInfo.userId; this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId; this.listForm.prcCreateUserName = this.$store.getters.userInfo.account; @@ -684,9 +707,6 @@ export default { this.isSubmit = false; }, e => { }); - } else { - this.$message.warning("请选择落实人"); - } }, drawerCheck(data) { var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes()); @@ -699,6 +719,7 @@ export default { }, //标准表格选择框改变 selectStandChange(data) { + console.log(data); this.selectList = data; }, selectThree() { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue index b388d992c..38d19e256 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue @@ -121,10 +121,6 @@ align="center" label="在产车实施日期"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Date: Mon, 13 Dec 2021 13:45:49 +0800 Subject: [PATCH 03/15] commit --- .../pages/creatProcess/xmpg/step1-7.vue | 41 ------------------- 1 file changed, 41 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue index 2ddf02f50..9097c940d 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue @@ -206,10 +206,6 @@ align="center" label="在产车实施日期"> - - - - - - - - - - - - - {{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }} - - - - Date: Mon, 13 Dec 2021 14:20:33 +0800 Subject: [PATCH 04/15] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2=E8=AE=A1=E5=88=92=E7=AE=A1=E6=8E=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qbzxdjhgk/component/cancel.vue | 10 ++++++++-- .../creatProcess/qbzxdjhgk/component/delay.vue | 10 ++++++++-- .../creatProcess/qbzxdjhgk/component/merge.vue | 18 ++++++++++++------ .../qbzxdjhgk/component/rename.vue | 10 ++++++++-- .../pages/creatProcess/qbzxdjhgk/step1-5.vue | 6 ++++++ .../pages/creatProcess/qbzxdjhgk/step2.vue | 8 +++++++- .../pages/creatProcess/qbzxdjhgk/step3.vue | 6 ++++++ .../pages/creatProcess/qbzxdjhgk/step4.vue | 8 +++++++- .../pages/creatProcess/qbzxdjhgk/step5.vue | 8 +++++++- 9 files changed, 69 insertions(+), 15 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue index caa388024..2cf8d8026 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue @@ -188,11 +188,17 @@ prop="planStatus" label="计划状态" align="center"> + + {{ scope.row.planStatus === '0'? '完成' : (scope.row.planStatus === '1'? '修订' : '制定') }} + + + {{ scope.row.reviseStatus === '0'? '制定完成' : (scope.row.reviseStatus === '1'? '制定中' : '未制定') }} + + + {{ scope.row.planStatus === '0'? '完成' : (scope.row.planStatus === '1'? '修订' : '制定') }} + + + {{ scope.row.reviseStatus === '0'? '制定完成' : (scope.row.reviseStatus === '1'? '制定中' : '未制定') }} + - + @@ -37,7 +37,7 @@ - + @@ -216,11 +216,17 @@ prop="planStatus" label="计划状态" align="center"> + + {{ scope.row.planStatus === '0'? '完成' : (scope.row.planStatus === '1'? '修订' : '制定') }} + + + {{ scope.row.reviseStatus === '0'? '制定完成' : (scope.row.reviseStatus === '1'? '制定中' : '未制定') }} + + + {{ scope.row.planStatus === '0'? '完成' : (scope.row.planStatus === '1'? '修订' : '制定') }} + + + {{ scope.row.reviseStatus === '0'? '制定完成' : (scope.row.reviseStatus === '1'? '制定中' : '未制定') }} + - + - + - + Date: Mon, 13 Dec 2021 14:24:46 +0800 Subject: [PATCH 05/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/xmpg2/step1-1.vue | 81 ++++++++++--------- .../pages/creatProcess/xmpg2/step1.vue | 81 ++++++++++--------- 2 files changed, 82 insertions(+), 80 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue index 2f69511df..5ed40df6e 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue @@ -598,47 +598,48 @@ export default { }) if(!fileFlag){ this.$message.warning('请选择分解单来源') + }else{ + if (this.listForm.dataList.length < 1) { + this.$message.warning("请选择带标准的项目"); + } else { + this.listForm.commentText = this.commentText; + var json = Object.assign(this.listForm, this.roleForm); + json.prcCreateUser = this.$store.getters.userInfo.userId; + json.prcCreateUserName = this.$store.getters.userInfo.userName; + json.standId = this.listForm.standId; + this.$refs["listForm"].validate((valid) => { + if (valid) { + this.$refs["roleForm"].validate((valid) => { + if (valid) { + this.isSubmit = true; + this.$http.get("lawss/activiti/startProcess", { type: "6" }, { + _this: this + }, res => { + if (res.ok) { + this.$http.post("lawss/activiti/completeTask", { + taskIds: res.data, + userId: this.$store.getters.userInfo.userId, + json: JSON.stringify(json) + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message); + this.$router.push("/processCenter"); + } + this.isSubmit = false; + }); + } + }); + } else { + return this.$message.warning("请完善人员信息"); + } + }); + } else { + return this.$message.warning("请完善基础信息"); + } + }); } - if (this.listForm.dataList.length < 1) { - this.$message.warning("请选择带标准的项目"); - } else { - this.listForm.commentText = this.commentText; - var json = Object.assign(this.listForm, this.roleForm); - json.prcCreateUser = this.$store.getters.userInfo.userId; - json.prcCreateUserName = this.$store.getters.userInfo.userName; - json.standId = this.listForm.standId; - this.$refs["listForm"].validate((valid) => { - if (valid) { - this.$refs["roleForm"].validate((valid) => { - if (valid) { - this.isSubmit = true; - this.$http.get("lawss/activiti/startProcess", { type: "6" }, { - _this: this - }, res => { - if (res.ok) { - this.$http.post("lawss/activiti/completeTask", { - taskIds: res.data, - userId: this.$store.getters.userInfo.userId, - json: JSON.stringify(json) - }, { - _this: this - }, res => { - if (res.success) { - this.$message.success(res.message); - this.$router.push("/processCenter"); - } - this.isSubmit = false; - }); - } - }); - } else { - return this.$message.warning("请完善人员信息"); - } - }); - } else { - return this.$message.warning("请完善基础信息"); - } - }); } }, choiceZRR(type, title, id) { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue index ce0e2ae44..ccdd41aac 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue @@ -615,47 +615,48 @@ export default { }) if(!fileFlag){ this.$message.warning('请选择分解单来源') + }else{ + if (this.listForm.dataList.length < 1) { + this.$message.warning("请选择带标准的项目"); + } else { + this.listForm.commentText = this.commentText; + var json = Object.assign(this.listForm, this.roleForm); + json.prcCreateUser = this.$store.getters.userInfo.userId; + json.prcCreateUserName = this.$store.getters.userInfo.userName; + json.standId = this.listForm.standId; + this.$refs["listForm"].validate((valid) => { + if (valid) { + this.$refs["roleForm"].validate((valid) => { + if (valid) { + this.isSubmit = true; + this.$http.get("lawss/activiti/startProcess", { type: "6" }, { + _this: this + }, res => { + if (res.ok) { + this.$http.post("lawss/activiti/completeTask", { + taskIds: res.data, + userId: this.$store.getters.userInfo.userId, + json: JSON.stringify(json) + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message); + this.$router.push("/processCenter"); + } + this.isSubmit = false; + }); + } + }); + } else { + return this.$message.warning("请完善人员信息"); + } + }); + } else { + return this.$message.warning("请完善基础信息"); + } + }); } - if (this.listForm.dataList.length < 1) { - this.$message.warning("请选择带标准的项目"); - } else { - this.listForm.commentText = this.commentText; - var json = Object.assign(this.listForm, this.roleForm); - json.prcCreateUser = this.$store.getters.userInfo.userId; - json.prcCreateUserName = this.$store.getters.userInfo.userName; - json.standId = this.listForm.standId; - this.$refs["listForm"].validate((valid) => { - if (valid) { - this.$refs["roleForm"].validate((valid) => { - if (valid) { - this.isSubmit = true; - this.$http.get("lawss/activiti/startProcess", { type: "6" }, { - _this: this - }, res => { - if (res.ok) { - this.$http.post("lawss/activiti/completeTask", { - taskIds: res.data, - userId: this.$store.getters.userInfo.userId, - json: JSON.stringify(json) - }, { - _this: this - }, res => { - if (res.success) { - this.$message.success(res.message); - this.$router.push("/processCenter"); - } - this.isSubmit = false; - }); - } - }); - } else { - return this.$message.warning("请完善人员信息"); - } - }); - } else { - return this.$message.warning("请完善基础信息"); - } - }); } }, // 点击查看 From ef015e9efe3c6ebdf1d09763b31d8cd88d347032 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Mon, 13 Dec 2021 15:14:45 +0800 Subject: [PATCH 06/15] feat: There is no way the, --- src/pages/processCenter/pages/creatProcess/qbrk/step1.vue | 1 + src/pages/processCenter/pages/creatProcess/qbrk/step9.vue | 1 + 2 files changed, 2 insertions(+) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue index 6a1c92983..d087c5262 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue @@ -646,6 +646,7 @@ v-show="verifySarStandard" show-save show-submit + :submitLoading="isSubmit" :saveLoading="saveLoading" @save="handleSave" @submit="handleSubmit" diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue index f6314e0e3..be38c88bc 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue @@ -1003,6 +1003,7 @@ }, loading: false, drawerModal: false, + taskInfo:'标准法规部部长审核', assigneeNewLoading: false, disabledState: true, userId:this.$store.getters.userInfo.userId, From dbd1b054610bced53e9b4de5d95b2e22547a44e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Mon, 13 Dec 2021 15:16:55 +0800 Subject: [PATCH 07/15] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E6=95=B4=E6=94=B9=E6=95=B0=E6=8D=AE=E5=BA=93=E6=96=B0=E5=A2=9E?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/unqualProcess.js | 6 +- .../pages/rectificationDatabase.vue | 101 +++++++++++------- 2 files changed, 63 insertions(+), 44 deletions(-) diff --git a/src/api/unqualProcess.js b/src/api/unqualProcess.js index 229f11353..fd83b43bf 100644 --- a/src/api/unqualProcess.js +++ b/src/api/unqualProcess.js @@ -65,7 +65,7 @@ export function meetingByMonth(params) { export function addUn( closeState,standId, standSerialNumber, standName, itemsNum, itemsName, productType, - productLine, productName,productId,reason, responsibleUnit, + productLine, productName,productId,reason, dutyEngineer, authEngineer, qaEngineer, planCloseTime) { const data = { closeState, @@ -79,7 +79,6 @@ export function addUn( productName, //项目名称 productId, //项目编号 reason, //不合规项目 - responsibleUnit, //责任部门 dutyEngineer, //责任工程师 authEngineer, //认证工程师 qaEngineer, //质量工程师 @@ -96,7 +95,7 @@ export function addUn( export function editUn( closeState, standId, standSerialNumber, standName, itemsNum, itemsName, productType, - productLine, productName, reason, responsibleUnit, + productLine, productName, reason, dutyEngineer, authEngineer, qaEngineer, planCloseTime, id) { const data = { closeState, @@ -109,7 +108,6 @@ export function editUn( productLine, //产品线 productName, //项目名称 reason, //不合规项目 - responsibleUnit, //责任部门 dutyEngineer, //责任工程师 authEngineer, //认证工程师 qaEngineer, //质量工程师 diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue index e5eb602fd..2aa17ac83 100644 --- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue +++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue @@ -250,7 +250,7 @@ {{ historySeeForm.responsibleUnit }} - {{ historySeeForm.dutyEngineer }} + {{ historySeeForm.dutyEngineerName }} {{ historySeeForm.authEngineer }} @@ -418,8 +418,9 @@ @@ -487,14 +488,14 @@ placeholder="请输入项目编号" /> - - - + + + + + + + + - @@ -775,22 +776,22 @@ export default { }, //表单数据 formRules: { standSerialNumber: [ - { required: true, message: "请输入标准号", trigger: "blur" } + { required: true, message: "请输入标准号", trigger: "change" } ], standName: [ - { required: true, message: "请输入标准名称", trigger: "blur" } + { required: true, message: "请输入标准名称", trigger: "change" } + ], + itemsNum: [ + { required: true, message: "请输入条款号", trigger: "change" } + ], + itemsName: [ + { required: true, message: "请输入条款名称", trigger: "change" } ], - // itemsNum: [ - // { required: true, message: "请输入条款号", trigger: "blur" } - // ], - // itemsName: [ - // { required: true, message: "请输入条款名称", trigger: "blur" } - // ], productType: [ - { required: true, message: "请输入产品类型", trigger: "blur" } + { required: true, message: "请输入产品类型", trigger: "change" } ], productLine: [ - { required: true, message: "请输入产品线", trigger: "blur" } + { required: true, message: "请输入产品线", trigger: "change" } ], productName: [ { required: true, message: "请输入项目名称", trigger: "change" } @@ -799,16 +800,16 @@ export default { { required: true, message: "请输入项目编号", trigger: "change" } ], reason: [ - { required: true, message: "请输入不合规项目", trigger: "blur" } - ], - responsibleUnit: [ - { required: true, message: "请输入责任部门", trigger: "blur" } + { required: true, message: "请输入不合规项目", trigger: "change" } ], + // responsibleUnit: [ + // { required: true, message: "请输入责任部门", trigger: "change" } + // ], dutyEngineerName: [ - { required: true, message: "请输入责任工程师", trigger: "blur" } + { required: true, message: "请输入责任工程师", trigger: "change" } ], planCloseTime: [ - { required: true, message: "请选择计划关闭时间", trigger: "blur" } + { required: true, message: "请选择计划关闭时间", trigger: "change" } ] }, drawerTable: false, //表单模态窗 @@ -907,15 +908,18 @@ export default { }, //确认添加标准 okStand(){ - if(this.standList > 1){ + if(this.standList.length > 1){ this.$message.warning('您只能选择一条标准进行添加') - }else if(this.standList < 1){ + }else if(this.standList.length < 1){ this.$message.warning('请至少选择一条数据进行添加') }else{ this.addForm.standId = this.standList[0].id this.addForm.standName = this.standList[0].standName this.addForm.standSerialNumber = this.standList[0].standSort + '-' + this.standList[0].standNumber + '-' + this.standList[0].standYear this.dialogTableVisible = false + if(this.addForm.standName){ + this.$refs.addForm.validateField('standName'); + } } }, //添加标准select的改变 @@ -1094,7 +1098,7 @@ export default { const productName = this.addForm.productName; const productId = this.addForm.productId; const reason = this.addForm.reason; - const responsibleUnit = this.addForm.responsibleUnit; + // const responsibleUnit = this.addForm.responsibleUnit; const dutyEngineer = this.addForm.dutyEngineer; const authEngineer = this.addForm.authEngineer; const qaEngineer = this.addForm.qaEngineer; @@ -1107,7 +1111,7 @@ export default { closeState, standId, standSerialNumber, standName, itemsNum, itemsName, productType, productLine, productName, productId,reason, - responsibleUnit, dutyEngineer, + dutyEngineer, authEngineer, qaEngineer, planCloseTime).then(res => { if (res.ok) { this.submiting = false @@ -1128,7 +1132,7 @@ export default { editUn( closeState, standId, standSerialNumber, standName, itemsNum, itemsName, productType, - productLine, productName, reason, responsibleUnit, + productLine, productName, reason, dutyEngineer, authEngineer, qaEngineer, planCloseTime, id).then(res => { if (res.ok) { @@ -1197,8 +1201,8 @@ export default { this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPageByWk1", { standType: this.standardSearch.standType, standNumber: this.standardSearch.standNumber, - page: this.pageNo, - pageSize: this.pageSizeNo + page: this.page, + pageSize: this.pageSize }, { _this: this }, res => { @@ -1258,13 +1262,24 @@ export default { let routeUrl = this.$router.resolve({ name: "OtherStandardDetails", params: { - id: item.standId, - pageType: "FOREIGN_STAND" - // pageType: item.standType + '_STAND' + id: item.id, + pageType: "INLAND_STAND" } }); window.open(routeUrl.href, "_blank"); }, + // 点击查看 + // handlePreview(item) { + // let routeUrl = this.$router.resolve({ + // name: "OtherStandardDetails", + // params: { + // id: item.standId, + // pageType: "FOREIGN_STAND" + // // pageType: item.standType + '_STAND' + // } + // }); + // window.open(routeUrl.href, "_blank"); + // }, detailsStandard(item) { this.$http.post("lawss/sarTestItem/validateStandNumber", { standNumber: item.standNum @@ -1341,7 +1356,13 @@ export default { this.roleShowflag = true }, drawerCheck(data) { - this.addForm.dutyEngineer = data[0].name + // this.addForm.dutyEngineer = data[0].id + // this.addForm.dutyEngineerName = data[0].name + this.$set(this.addForm, 'dutyEngineer', data[0].id) + this.$set(this.addForm, 'dutyEngineerName', data[0].name) + if(this.addForm.dutyEngineerName){ + this.$refs.addForm.validateField('dutyEngineerName'); + } this.roleShowflag = false }, /** 选择认证工程师和质量工程师 */ From fa799b708affaa35486630dff314262a2584a12a Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Mon, 13 Dec 2021 15:46:48 +0800 Subject: [PATCH 08/15] =?UTF-8?q?=E5=9B=A0=E4=B8=BA=E8=A1=A8=E6=A0=BC?= =?UTF-8?q?=E4=BC=9A=E6=8A=96=E6=89=80=E4=BB=A5=E5=8F=96=E6=B6=88=E4=BA=86?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E7=9A=84=E5=88=86=E9=A1=B5=E5=8A=A0=E8=BD=BD?= =?UTF-8?q?=E9=9A=90=E8=97=8F=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../accessStandardsAndRegulations/page/listTracking.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue index bad3cc6e5..bb9dec62c 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue @@ -712,7 +712,6 @@ Date: Mon, 13 Dec 2021 16:07:32 +0800 Subject: [PATCH 09/15] =?UTF-8?q?=E9=87=8D=E7=82=B9=E6=B8=85=E5=8D=95=20?= =?UTF-8?q?=E6=89=8B=E5=8A=A8=E6=9F=A5=E6=89=BE=E9=A1=B5=E9=9D=A2=EF=BC=8C?= =?UTF-8?q?=E4=B8=89=E4=B8=AA=E5=AE=9E=E6=96=BD=E6=97=A5=E6=9C=9F=EF=BC=8C?= =?UTF-8?q?=E5=BA=94=E8=AF=A5=E6=98=AF=E5=A4=9A=E4=B8=AA=EF=BC=8C=E7=9B=AE?= =?UTF-8?q?=E5=89=8D=E5=8F=AA=E6=98=BE=E7=A4=BA=E4=B8=80=E4=B8=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../page/listTracking.vue | 82 +++++++++++-------- 1 file changed, 50 insertions(+), 32 deletions(-) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue index bb9dec62c..ba646789c 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue @@ -361,8 +361,8 @@ width="120" label="发布日期"> - {{ formatIssueDate(scope.row.issueTime) }} - {{ formatIssueDate(scope.row.issueTime) }} + {{ scope.row.issueTime }} + {{ scope.row.issueTime }} - {{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }} - {{ scope.row.ssrq ? scope.row.ssrq.substring(0, 10) : '-' }} + {{ scope.row.ssrq }} + {{ scope.row.ssrq }} @@ -384,8 +384,8 @@ width="150" label="新车型实施日期"> - {{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' }} - {{ scope.row.xcxssrq ? scope.row.xcxssrq.substring(0, 10) : '-' }} + {{ scope.row.xcxssrq }} + {{ scope.row.xcxssrq }} - {{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' }} - {{ scope.row.zccssrq ? scope.row.zccssrq.substring(0, 10) : '-' }} + {{ scope.row.zccssrq }} + {{ scope.row.zccssrq }} + + + {{ + scope.row.standEnName + }} + {{ + scope.row.standEnName + }} + {{ + scope.row.standEnName + }} + + - {{ formatIssueDate(scope.row.issueTime) }} + {{ scope.row.issueTime }} - {{ formatIssueDate(scope.row.issueTime) }} + {{ scope.row.issueTime }} - {{ formatIssueDate(scope.row.issueTime) }} + {{ scope.row.issueTime }} @@ -480,12 +498,12 @@ {{ - scope.row.ssrq ? scope.row.ssrq.substring(0, 10) : '-' + scope.row.ssrq }} {{ - scope.row.ssrq ? scope.row.ssrq.substring(0, 10) : '-' + scope.row.ssrq }} - {{ scope.row.ssrq ? scope.row.ssrq.substring(0, 10) : '-' }} + {{ scope.row.ssrq}} @@ -496,13 +514,13 @@ label="新车型实施日期"> {{ - scope.row.xcxssrq ? scope.row.xcxssrq.substring(0, 10) : '-' + scope.row.xcxssrq }} {{ - scope.row.xcxssrq ? scope.row.xcxssrq.substring(0, 10) : '-' + scope.row.xcxssrq }} {{ - scope.row.xcxssrq ? scope.row.xcxssrq.substring(0, 10) : '-' + scope.row.xcxssrq }} @@ -513,13 +531,13 @@ label="在产车实施日期"> {{ - scope.row.zccssrq ? scope.row.zccssrq.substring(0, 10) : '-' + scope.row.zccssrq }} {{ - scope.row.zccssrq ? scope.row.zccssrq.substring(0, 10) : '-' + scope.row.zccssrq }} {{ - scope.row.zccssrq ? scope.row.zccssrq.substring(0, 10) : '-' + scope.row.zccssrq }} @@ -588,9 +606,9 @@ width="120" > - {{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}} - {{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}} - {{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}} + {{scope.row.issueTime }} + {{scope.row.issueTime }} + {{scope.row.issueTime }} - {{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}} - {{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}} - {{scope.row.XCXSSRQLAWS ? scope.row.XCXSSRQLAWS.slice(0, 10) : ''}} + {{scope.row.putTime }} + {{scope.row.putTime }} + {{scope.row.XCXSSRQLAWS }} - {{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}} - {{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}} - {{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}} + {{scope.row.issueTime }} + {{scope.row.issueTime }} + {{scope.row.issueTime }} - {{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}} - {{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}} - {{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}} + {{scope.row.putTime }} + {{scope.row.putTime }} + {{scope.row.putTime }} Date: Mon, 13 Dec 2021 16:10:25 +0800 Subject: [PATCH 10/15] =?UTF-8?q?=E9=87=8D=E7=82=B9=E6=B8=85=E5=8D=95=20?= =?UTF-8?q?=E6=89=8B=E5=8A=A8=E6=9F=A5=E6=89=BE=E9=A1=B5=E9=9D=A2=EF=BC=8C?= =?UTF-8?q?=E6=8E=92=E5=BA=8F=E5=8A=9F=E8=83=BD=E5=A4=B1=E6=95=88=EF=BC=88?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E5=8E=BB=E6=8E=89=E6=8E=92=E5=BA=8F=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../page/listTracking.vue | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue index ba646789c..fcf1e5d97 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue @@ -357,7 +357,6 @@ @@ -367,7 +366,6 @@ @@ -380,7 +378,6 @@ @@ -390,7 +387,6 @@ @@ -400,7 +396,6 @@ @@ -475,7 +470,6 @@ @@ -492,7 +486,6 @@ @@ -509,7 +502,6 @@ @@ -526,7 +518,6 @@ @@ -543,7 +534,6 @@ @@ -602,7 +592,6 @@ @@ -614,7 +603,6 @@ @@ -625,7 +613,6 @@ @@ -696,7 +682,6 @@ @@ -707,7 +692,6 @@ Date: Mon, 13 Dec 2021 16:29:22 +0800 Subject: [PATCH 11/15] =?UTF-8?q?=E4=BC=81=E6=A0=87=E8=AF=84=E4=BB=B7=20?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=B9=8B=E5=90=8E=E6=A8=A1=E6=80=81=E6=A1=86?= =?UTF-8?q?=E6=94=B6=E8=B5=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/details/otherBussStandardDetails/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue index 3258600ba..99f3d6e89 100644 --- a/src/pages/details/otherBussStandardDetails/index.vue +++ b/src/pages/details/otherBussStandardDetails/index.vue @@ -1761,6 +1761,7 @@ export default { }, res => { if (res.ok){ this.$message.success('提交成功') + this.businessCommentDialog = false this.commentSubmitLoading = false //重新评分之后刷新历史评分人 let standId = this.$route.params.id From 4507279bf82ddd660b91c525eb47cd9677aa0f89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Mon, 13 Dec 2021 16:56:27 +0800 Subject: [PATCH 12/15] =?UTF-8?q?=E7=BC=96=E8=BE=91=E9=80=89=E4=BA=BA?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nonConfomity/pages/rectificationDatabase.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue index 2aa17ac83..7e03d00a3 100644 --- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue +++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue @@ -1368,7 +1368,9 @@ export default { /** 选择认证工程师和质量工程师 */ choiceMore(type, title, id) { this.nodeListMore = [] - this.nodeListMore.push(id) + if(id){ + this.nodeListMore.push(id) + } this.type = type this.titleMore = title this.roleShowMore = true @@ -1386,6 +1388,7 @@ export default { }) if (this.type === 'authEngineer') { this.addForm.authEngineer = nameList + console.log(this.addForm.authEngineer); } else { this.addForm.qaEngineer = nameList } From 0a124618bb59c222b962c5ef9f61c3cdc557f678 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Mon, 13 Dec 2021 17:12:50 +0800 Subject: [PATCH 13/15] =?UTF-8?q?=E4=BC=81=E6=A0=87=E8=AF=84=E4=BB=B7=20-?= =?UTF-8?q?=20=E5=8F=B3=E4=B8=8A=E8=A7=92=E6=80=BB=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../otherBussStandardDetails/index.vue | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue index 99f3d6e89..4bb1ef841 100644 --- a/src/pages/details/otherBussStandardDetails/index.vue +++ b/src/pages/details/otherBussStandardDetails/index.vue @@ -4,6 +4,7 @@ {{sarStandardsInfoEO.standCode}} 《{{sarStandardsInfoEO.standName}}》 企标详情 + {{ ((qualityCommentScore*2*0.9)+(dynamicCommentScore*2*0.1)).toFixed(3) }} @@ -1778,6 +1779,15 @@ export default { }, e => { }) + //刷新动态评价总平均分和质量评价总平均分 + this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getScore', {lawId:standId}, { + _this: this + }, res => { + this.qualityCommentScore = res.data.quality.toFixed(3)/2 + this.dynamicCommentScore = res.data.dynamic.toFixed(3)/2 + + }, e => { + }) } }, e => { }) @@ -2858,7 +2868,17 @@ export default { // } }, async mounted () { + //查询动态评价总平均分和质量评价总平均分 let standId = this.$route.params.id + this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getScore', {lawId:standId}, { + _this: this + }, res => { + this.qualityCommentScore = res.data.quality.toFixed(3)/2 + this.dynamicCommentScore = res.data.dynamic.toFixed(3)/2 + + }, e => { + }) + //查询评价人表 const qualityRequest = { lawId: standId, evaluationType: 'quality' From d4735e5ed845313f6108e90a71e287af9a0e23f9 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Mon, 13 Dec 2021 17:26:38 +0800 Subject: [PATCH 14/15] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=A0=8F=E8=83=8C?= =?UTF-8?q?=E6=99=AF=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/navMenu/index.vue | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue index 09c1e0610..e9e9b928e 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -16,7 +16,7 @@ Date: Mon, 13 Dec 2021 17:49:13 +0800 Subject: [PATCH 15/15] =?UTF-8?q?=E6=B0=B4=E5=8D=B0=E5=8F=98=E6=B5=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/static/pdf/web/viewer.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/static/pdf/web/viewer.js b/public/static/pdf/web/viewer.js index 47d3d46bc..519ad58a0 100644 --- a/public/static/pdf/web/viewer.js +++ b/public/static/pdf/web/viewer.js @@ -6653,7 +6653,7 @@ var PDFPageView = function () { watermark_cols: 0,//水印列数 watermark_x_space: 18,//水印x轴间隔 watermark_y_space: 20,//水印y轴间隔 - watermark_color: 'rgba(192, 192, 192)',//水印字体颜色 + watermark_color: 'rgba(232,232,240)',//水印字体颜色 watermark_alpha: 0.3,//水印透明度 watermark_fontsize: '40px',//水印字体大小 watermark_font: '微软雅黑',//水印字体 @@ -6671,7 +6671,7 @@ var PDFPageView = function () { watermark_cols: 0,//水印列数 watermark_x_space: 2,//水印x轴间隔 watermark_y_space: 27,//水印y轴间隔 - watermark_color: 'rgba(192, 192, 192)',//水印字体颜色 + watermark_color: 'rgba(232,232,240)',//水印字体颜色 watermark_alpha: 0.3,//水印透明度 watermark_fontsize: '40px',//水印字体大小 watermark_font: '微软雅黑',//水印字体