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: '微软雅黑',//水印字体 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/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 @@
{{sarStandardsInfoEO.standCode}} 《{{sarStandardsInfoEO.standName}}》 企标详情 + {{ ((qualityCommentScore*2*0.9)+(dynamicCommentScore*2*0.1)).toFixed(3) }}
@@ -1761,6 +1762,7 @@ export default { }, res => { if (res.ok){ this.$message.success('提交成功') + this.businessCommentDialog = false this.commentSubmitLoading = false //重新评分之后刷新历史评分人 let standId = this.$route.params.id @@ -1777,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 => { }) @@ -2857,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' diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue index 7cb9d901e..c82eb09dd 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue @@ -56,6 +56,28 @@ + + +
+
+ {{ item.name }} +
+
+
+ + 点击上传 + +
+ @@ -97,12 +119,12 @@ -

责任领导

+

责任部门对接人

@@ -253,7 +275,7 @@ + + +
+ +

点击或拖拽上传文件

+
+ + @@ -311,6 +353,9 @@ export default { name: "bzzqyjStep1-1", data() { return { + fileUrl: 'api/att/attFile/upload', + fileMadel: false, + OCRoptions: [], addFjList: [], fzShow: false, fzlistModel: false, @@ -330,7 +375,11 @@ export default { standType: '', standId: '', fjList: [], - fjListId: '' + fjListId: '', + fjListId: '', + textType: '', + modelList: [], + modelNameList: '' }, formRules: { cid: [ @@ -401,6 +450,11 @@ export default { ProcessTitle }, mounted() { + this.$http.get('lawss/sarStandAttrDetails/getListData', '', { + _this: this + }, res => { + this.OCRoptions = res.data + }) this.getData() this.sarStandCompareHis() this.$http.get('sys/dictype/getDicTypeListCode', '', { @@ -415,6 +469,78 @@ export default { } }, methods: { + beginImportFile (file) { + var filename = file.name + var index1 = filename.lastIndexOf('.') + var index2 = filename.length + var fileSuffix = filename.substring(index1, index2) + // const fileSuffix = file.name.split('.')[1] // 后缀名 + // 判断上传文件格式 + if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { + return true + } else { + this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件') + return false + } + // 判断文件上传大小 + // eslint-disable-next-line no-unreachable + if (file.size / 1024 / 1024 <= 200) { + return true + } else { + this.$message.error('文件' + file.name + '大小不超过200M') + return false + } + return true + }, + importFileRemove (file, fileList) { + let list = '' + this.form.modelList = [] + fileList.forEach(item => { + this.form.modelList.push(item) + if (list.length > 0) { + list += ',' + list += item.name + } else { + list+= item.name + } + }) + this.form.modelNameList = list + }, + // 导入标准数据成功后执行 + importFileSuccess (response, file) { + if (response.ok) { + this.form.modelList.push(response.data) + let list = '' + this.form.modelList.forEach(item => { + if (list.length > 0) { + list += ',' + list += item.name + } else { + list+= item.name + } + }) + this.form.modelNameList = list + this.$message({ + showClose: true, + message: response.message, + type: 'success' + }) + } else { + this.$message.error('程序异常，上传失败') + } + }, + fileUpload () { + this.fileMadel = true + }, + setWBType(type) { + let text = '' + for (let a = 0; a < this.OCRoptions.length; a++) { + if (this.OCRoptions[a].attrField === type) { + text = this.OCRoptions[a].attrName + } + } + return text + }, updataFj(item) { let id let type = item.fileName.split('.') @@ -426,15 +552,36 @@ export default { window.open('/static/pdf/phone/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id)) }, addfjList() { - this.$http.get('lawss/sarStandFile/queryFileInfo', { + this.$http.get('lawss/sarStandFile/queryFileInfoNew', { + type: '0', standId: this.form.standId - }, {}, res => { - this.fjList = res.data + }, { + _this: this + }, res => { + this.OCRLoading = false + if (res.ok) { + if (res.data.length > 0) { + this.fjList = res.data + this.fzlistModel = true + } else { + this.$message.warning('当前标准没有' + text + '文件') + this.fjList = [] + } + } }) - this.fzlistModel = true + // this.$http.get('lawss/sarStandFile/queryFileInfo', { + // standId: this.form.standId + // }, {}, res => { + // this.fjList = res.data + // this.fzlistModel = true + // }) }, handleSelection2(data) { - this.addFjList = data + if (data.length > 1) { + this.$message.warning('最多选择1条附件') + } else { + this.addFjList = data + } }, closeDrawer2() { this.fzlistModel = false @@ -443,11 +590,16 @@ export default { enterDrawer2() { this.fzlistModel = false this.form.fjList = this.addFjList - let idList + 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 += item.id + ',' + idList.push(item.id) + nameList.push(item.fileName) }) - this.form.fjListId = idList + this.form.fjListName = nameList.join(',') + this.form.fjListId = idList.join(',') }, // 点击查看 handlePreview(item) { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue index d78716bf4..adb01fa52 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue @@ -56,6 +56,34 @@ + + + + + + + + +
+
+ {{ item.name }} +
+
+
+ + 点击上传 + +
+ @@ -97,12 +125,12 @@ -

责任领导

+

责任部门对接人

@@ -254,7 +282,7 @@ - + + + + @@ -298,6 +334,26 @@ + + +
+ +

点击或拖拽上传文件

+
+ + @@ -312,6 +368,9 @@ export default { name: "bzzqyjStep1", data() { return { + fileUrl: 'api/att/attFile/upload', + fileMadel: false, + OCRoptions: [], addFjList: [], fzShow: false, fzlistModel: false, @@ -332,7 +391,11 @@ export default { standId: '', fjList: [], fjListName: '', - fjListId: '' + fjListId: '', + textValue: '', + textType: '', + modelList: [], + modelNameList: '' }, formRules: { cid: [ @@ -401,6 +464,11 @@ export default { ProcessTitle }, mounted() { + this.$http.get('lawss/sarStandAttrDetails/getListData', '', { + _this: this + }, res => { + this.OCRoptions = res.data + }) this.sarStandCompareHis() this.$http.get('sys/dictype/getDicTypeListCode', '', { _this: this @@ -414,6 +482,78 @@ export default { } }, methods: { + beginImportFile (file) { + var filename = file.name + var index1 = filename.lastIndexOf('.') + var index2 = filename.length + var fileSuffix = filename.substring(index1, index2) + // const fileSuffix = file.name.split('.')[1] // 后缀名 + // 判断上传文件格式 + if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { + return true + } else { + this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件') + return false + } + // 判断文件上传大小 + // eslint-disable-next-line no-unreachable + if (file.size / 1024 / 1024 <= 200) { + return true + } else { + this.$message.error('文件' + file.name + '大小不超过200M') + return false + } + return true + }, + importFileRemove (file, fileList) { + let list = '' + this.form.modelList = [] + fileList.forEach(item => { + this.form.modelList.push(item) + if (list.length > 0) { + list += ',' + list += item.name + } else { + list+= item.name + } + }) + this.form.modelNameList = list + }, + // 导入标准数据成功后执行 + importFileSuccess (response, file) { + if (response.ok) { + this.form.modelList.push(response.data) + let list = '' + this.form.modelList.forEach(item => { + if (list.length > 0) { + list += ',' + list += item.name + } else { + list+= item.name + } + }) + this.form.modelNameList = list + this.$message({ + showClose: true, + message: response.message, + type: 'success' + }) + } else { + this.$message.error('程序异常，上传失败') + } + }, + fileUpload () { + this.fileMadel = true + }, + setWBType(type) { + let text = '' + for (let a = 0; a < this.OCRoptions.length; a++) { + if (this.OCRoptions[a].attrField === type) { + text = this.OCRoptions[a].attrName + } + } + return text + }, updataFj(item) { let id let type = item.fileName.split('.') @@ -427,14 +567,30 @@ export default { addfjList() { this.$http.get('lawss/sarStandFile/queryFileInfo', { standId: this.form.standId - }, {}, res => { - this.fjList = res.data + }, { + _this: this + }, res => { + this.OCRLoading = false + if (res.ok) { + if (res.data.length > 0) { + this.fjList = res.data + this.fzlistModel = true + } else { + this.$message.warning('当前标准没有文件') + this.fjList = [] + } + } }) - this.fzlistModel = true + // this.$http.get('lawss/sarStandFile/queryFileInfo', { + // standId: this.form.standId + // }, {}, res => { + // this.fjList = res.data + // this.fzlistModel = true + // }) }, handleSelection2(data) { - if (data.length > 5) { - this.$message.warning('最多选择5条附件') + if (data.length > 1) { + this.$message.warning('最多选择1条附件') } else { this.addFjList = data } @@ -446,6 +602,8 @@ 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 => { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue index a6c61d6db..3a573f99c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue @@ -46,7 +46,17 @@ style="display: none;" >
-
{{ item.fileName }}
+
{{ item.fileName }}
+
+ + +
+
+ {{ item.name }} +
+
+
+ - -
@@ -192,7 +202,10 @@ export default { fjList: [], fjListId: '', responUserList: "", - responUserListName: "" + responUserListName: "", + textType: '', + modelList: [], + modelNameList: '', }, formRules: { responUserList: [ @@ -339,11 +352,14 @@ export default { this.form.endTime = data.endTime this.form.cname = data.cname this.form.fjList = data.fjList - this.form.fjListId = data.fjListId + // this.form.fjListId = data.fjListId + this.form.textType = data.textType + this.form.modelList = data.modelList + this.form.modelNameList = data.modelNameList if (data.fjListId === '') { this.form.fjListId = '' } else { - this.form.fjListId = data.form.fjListId || data.fjListId + this.form.fjListId = data.fjListId || data.form.fjListId } this.json = data }).catch(e => { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue index 4cfba66a0..f2baded1b 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue @@ -1,86 +1,96 @@ diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue index 56a4700cd..1a73bdd22 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue @@ -46,12 +46,22 @@ style="display: none;" >
-
+
{{ item.fileName }} 下载
+ +
+
+ {{ item.name }} +
+
+
+ - - +
+
@@ -96,6 +106,9 @@ prop="oldText" align="center" label="修改前"> + + +
+
+ 关闭 +
+ @@ -227,6 +249,8 @@ export default { name: "bzzqyjStep4", data() { return { + itermsConditionsFlag: false, + itermsConditionsTitle: '', drawerModal: false, histortData: [], data: [], @@ -254,6 +278,9 @@ export default { cname: '', // 名称 fjList: [], fjListId: '', + textType: '', + modelList: [], + modelNameList: '', }, formRules: { responUserList: [ @@ -269,6 +296,13 @@ export default { ProcessTitle }, methods: { + itermsConditionsClose () { + this.itermsConditionsFlag = false + }, + itermsConditionsOpen (row) { + this.itermsConditionsFlag = true + this.itermsConditionsTitle = row + }, downloadFile (attId) { window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId }, @@ -381,7 +415,11 @@ export default { this.form.cid = data.cid || data.form.cid this.form.endTime = data.endTime || data.form.endTime this.form.cname = data.cname || data.form.cname + this.form.textType = data.textType + this.form.modelList = data.modelList + this.form.modelNameList = data.modelNameList this.json = data + console.log(data); this.data = data.info || data.data }).catch(e => { }) 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, 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"> + + + + - + @@ -37,7 +37,7 @@ - + @@ -216,11 +216,17 @@ prop="planStatus" label="计划状态" align="center"> + + + +
-
+
-
+
-
+
- - - - - - - - - - - - - - - - + + { 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/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("请完善基础信息"); - } - }); } }, // 点击查看 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="在产车实施日期"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -455,77 +450,90 @@ }} + + + @@ -584,30 +592,27 @@ + + + {{ 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,13 +1356,21 @@ 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 }, /** 选择认证工程师和质量工程师 */ 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 @@ -1365,6 +1388,7 @@ export default { }) if (this.type === 'authEngineer') { this.addForm.authEngineer = nameList + console.log(this.addForm.authEngineer); } else { this.addForm.qaEngineer = nameList }