diff --git a/src/common/axiosV2/index.js b/src/common/axiosV2/index.js index e86814c70..f4aaa8125 100644 --- a/src/common/axiosV2/index.js +++ b/src/common/axiosV2/index.js @@ -2,6 +2,7 @@ import axios from 'axios' import router from '@/router' import store from '@/store' import {Message} from 'element-ui' +import { baseUrl } from '@/sysConfig' // import 'element-ui/lib/theme-chalk/index.css' /** @@ -18,7 +19,7 @@ let formData = (data) => { } const service = axios.create({ - baseURL: '/' + baseURL: process.env.NODE_ENV === 'production' ? baseUrl : '/' }) service.defaults.timeout = 99999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999 diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue new file mode 100644 index 000000000..337123722 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue @@ -0,0 +1,873 @@ + + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue index 55c6529cd..0e1e083c2 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue @@ -272,7 +272,7 @@ - - - - + label="标准号" + > + - - - - + label="标准名称"> + + + + + + + + + + + + @@ -339,11 +363,12 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' - + import { saveTaskFirst } from 'api/process' export default { name: "bzjdStep1", data() { return { + textStatusMap: {}, listModel2: false, standInfoList2: [], sarType: '', @@ -384,7 +409,7 @@ standCommonlySearch2: { page: 1, pageSize: this.$store.getters.userInfo.configContent, - result: '1', + userId : this.$store.getters.userInfo.userId, standType: 'INLAND' }, spinShow: false, @@ -433,6 +458,19 @@ ProcessTitle }, methods: { + setMap(data){ + data.forEach(item => { + this.$set(this.textStatusMap, item.value, item.label) + }) + }, + formatIssueDate(str) { + const momentDate = this.$moment(str) + if (momentDate.isValid()) { + return this.$moment(str).format('YYYY-MM-DD') + } else { + return str + } + }, addZqyjList() { this.title = '标准拆分数据库' this.listModel = true @@ -468,11 +506,25 @@ }, sarStandCompareHis2 () { var form = this.standCommonlySearch2 - this.$http.get('lawss/sarFileSplitInfo/getSarFileSplitInfoEOPage', form, { + this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', form, { _this: this }, res => { this.standInfoList2 = res.data.list - this.total2 = res.data.total + this.standInfoList2.forEach(item => { + if (item.attrInfoMap && item.attrInfoMap.XCXSSRQ) { + item.XCXSSRQ = item.attrInfoMap.XCXSSRQ + } + if (item.attrInfoMap && item.attrInfoMap.ZCCSSRQ) { + item.ZCCSSRQ = item.attrInfoMap.ZCCSSRQ + } + }) + + this.total2 = res.data.count + this.$http.get('sys/dictype/getDicTypeListCode', '', { + _this: this + }, res => { + this.setMap(res.data.WBZTCLASS) + }) }, e => { }) }, @@ -580,7 +632,11 @@ // this.form.itemsNum1 = bringData[0].showNumber // this.form.itemsName1 = bringData[0].standName // } - this.form.itemsNum1 = bringData[0].showNumber + if (bringData[0].standYear) { + this.form.itemsNum1 = bringData[0].standSortShow + ' ' + bringData[0].standNumber + '-' + bringData[0].standYear + } else { + this.form.itemsNum1 = bringData[0].standSortShow + ' ' + bringData[0].standNumber + } this.form.itemsName1 = bringData[0].standName this.form.oldNumber = bringData[0].id this.listModel2 = false @@ -646,7 +702,28 @@ handleTabs(name) { this.active = name }, - handleSave() {}, + handleSave() { + this.saveLoading = true + let _formData = new FormData() + _formData.append('id', this.bpnId || '') + _formData.append('createUser', this.$store.getters.userInfo.userId) + _formData.append('createUserName', this.$store.getters.userInfo.userName) + _formData.append('prcType', '9') + _formData.append('json', JSON.stringify({ + form: this.form, + roleForm: this.roleForm, + commentText: this.commentText, + itemList: this.itemList, + sarType: this.sarType + })) + saveTaskFirst(_formData).then(res => { + this.saveLoading = false + this.$message.success('保存成功') + this.bpnId = res.result + }).catch(e => { + this.saveLoading = false + }) + }, handleSubmit() { this.$refs['bzzqyjForm'].validate((valid) => { if (valid) { @@ -682,9 +759,9 @@ }) } else { this.$message.warning('流程启动失败') + this.isSubmit = false } }) - this.isSubmit = false } } else { return this.$message.warning('请完善人员信息') diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue index 77c7bec18..1ebcac3fe 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue @@ -332,8 +332,8 @@ this.$message.success('提交成功') this.$router.push('/processCenter') } + this.isSubmit = false }) - this.isSubmit = false } } else { return this.$message.warning('请完善基础信息') diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue index 5a7bfc5ef..b1513d569 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue @@ -509,8 +509,8 @@ this.$message.success('提交成功') this.$router.push('/processCenter') } + this.isSubmit = false }) - this.isSubmit = false } } else { return this.$message.warning('请完善基础信息') diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index fd24218c6..4701fe62d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -1392,14 +1392,15 @@ { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' } ], standNature: [ - { required: false, message: '请选择标准性质', trigger: 'change' } + { required: true, message: '请选择标准性质', trigger: 'change' } ], textStatus: [ { required: true, message: '请选择文本状态', trigger: 'change' } - ], - issueTime: [ - { required: true, message: '请选择标准发布日期', trigger: 'change' } - ], + ] + , + // issueTime: [ + // { required: true, message: '请选择标准发布日期', trigger: 'change' } + // ], qcdw: [ { required: true, message: '请选择起草单位', trigger: 'change' } ], diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue index 49068ff27..6d8ca7b07 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue @@ -78,8 +78,8 @@

流程发起人

- - + +
@@ -265,7 +265,7 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' -import { startProcess, completeTask, saveTaskFirst } from '@/api/process.js' +import { startProcess, completeTask, saveTaskFirst, queryTaskFirst } from '@/api/process.js' import { standUnqualified, dicTypeData } from '@/api/unqualProcess.js' export default { name: "wfhxzgStep1", @@ -322,7 +322,23 @@ export default { ProcessFooter, ProcessTitle }, + mounted() { + this.bpnId = this.$route.query.bpnId + if (this.bpnId !== undefined) { + this.getData() + } + }, methods: { + getData() { + queryTaskFirst({ + bpnId: this.$route.query.bpnId + }).then(res => { + let mes = JSON.parse(res.mes); + this.dataList = mes.dataList; + this.roleForm = mes.roleForm; + this.commentText = mes.commentText; + }); + }, //点击新增事件 addList() { dicTypeData().then(res => { diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue index b5827c953..df0c6c866 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue @@ -13,7 +13,7 @@ - + + + + + + + @@ -97,32 +107,30 @@ - + - @@ -214,23 +222,6 @@ @submit="handleSubmit" > - - -
- -

点击或拖拽上传文件

-
- - @@ -238,7 +229,7 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' -import {interfaceUrl} from "@/sysConfig"; +import {uploadFile} from '@/api/unqualProcess.js'; import {inboundLiaisonDetail, completeTask} from "@/api/process" export default { @@ -268,6 +259,8 @@ export default { // 上传路径 uploadPath: 'api/att/attFile/upload', fileMadel: false, + // 上传所储存文件数组 + fileTextList: [], newDataList: [], // 责任部门 zNodesSItem: [], @@ -315,12 +308,18 @@ export default { this.$nextTick(() => { this.dataList = [JSON.parse(JSON.stringify(item.responUserInfo.info))] - /*for (let i = 0; i { + if (item.fileText.length !== 0) { + item.fileText.forEach(item1 => { + this.fileTextList.push({ + id: item1.id, + name: item1.name + }) + }) } - }*/ + }) }) }, @@ -328,16 +327,22 @@ export default { this.active = name }, /************ 上传佐证材料 *****************/ - fileUpload (val) { - this.newDataList = val - this.fileMadel = true + uploadFile (val) { + this.fileListData = val }, // 文件上传成功 handleOnsuccess(res, file, fileList) { if (res.ok) { - this.newDataList.fileText = res.data.name - this.newDataList.fileTextId = res.data.id - this.newDataList.fileTextPath = res.data.filePath + this.newDataList.push({ + id: res.data.attId, + name: res.data.standName + }) + this.newDataList.forEach(item =>{ + this.fileListData.fileText.push({ + id: item.id, + name: item.name + }) + }) this.$message({ showClose: true, message: res.message, @@ -374,13 +379,28 @@ export default { return true }, // 移除上传的文件 - handleBeforeRemove() {}, - handleOnRemove() {}, - // 文件超过限制数量提示 - handleExceed() { - this.$message.error(``) + handleBeforeRemove(file, fileList) { + this.fileTextList = fileList + this.newDataList.forEach((item, index) => { + if (file.name === item.name || file.id === item.id) { + this.newDataList.splice(index, 1) + } + }) }, + /************ ********* *****************/ + // 点击查看 + 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') + }, // 保存按钮 handleSave() {}, // 提交按钮 @@ -388,7 +408,7 @@ export default { this.isSubmit = true let flag=false this.dataList.forEach(item => { - if (item.fileText === '') { + if (item.fileText.length === 0) { flag=true this.isSubmit = false } diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue index 389c2dc99..073001399 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue @@ -13,7 +13,7 @@ - + + + + + + + @@ -96,14 +106,19 @@ - - + + - @@ -222,6 +237,7 @@ export default { productName: '', // 项目名称 responsibleUnit: '' // 责任部门 }, + fileTextList: [], active: '1', // 默认显示 isSubmit: false, backLoading: false, @@ -281,13 +297,39 @@ export default { getFormFieldList (item) { this.$nextTick(() => { this.dataList = JSON.parse(JSON.stringify(item)).info.fileDataList + this.dataList.forEach(item => { + item.fileText.forEach(item1 => { + this.fileTextList.push({ + id: item1.id, + name: item1.name + }) + }) + }) }) }, handleTabs(name) { this.active = name }, - + // 点击查看 + 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') + }, + // 点击上传的文件进行下载 + handleOnPreview(file) { + let attId = file.id + if (attId != null && attId !== "") { + window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId; + } + }, // 提交按钮 handleSubmit() { this.isSubmit = true @@ -407,6 +449,9 @@ export default { background: #E6A23C; } } + /deep/.el-upload{ + display: block; + } .content-center { padding: 10px 0px 10px 10px; } diff --git a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue index cca5d95c9..3e3f73c32 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue @@ -335,6 +335,16 @@ export default { } }) break + case '9': + this.$router.push({ + name: 'bzjdStep1-1', + query: { + type: '9', + processName: '标准解读流程', + bpnId: id + } + }) + break } }, ...mapMutations(['setProcess', 'setHandleInfo']), diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index f14971026..28e1db059 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -189,6 +189,16 @@ {{ formatIssueDate(scope.row.issueTime) }} + + + + + label="不合规项目"> -
{{historySeeForm.standId}}
+
{{historySeeForm.standSerialNumber}}
{{historySeeForm.standName}}
@@ -253,7 +253,7 @@
{{historySeeForm.productName}}
 - +
{{historySeeForm.reason}}
 diff --git a/src/router/index.js b/src/router/index.js index 9b3ba16fc..abb7f7bf3 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -781,6 +781,15 @@ const routes = [ title: '标准解读流程' } }, + { + path: '/bzjdStep1-1', + name: 'bzjdStep1-1', + component: () => import('@/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue'), + meta: { + requireAuth: true, + title: '标准解读流程' + } + }, { path: '/bzjdStep2', name: 'bzjdStep2',