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/processList/tabComponents/taskDraft/index.vue b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue index bd68b0c25..9c30e58d3 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 082aff793..28e1db059 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -3511,7 +3511,6 @@ export default { } } this.stahndinfoList = res.data.list - console.log(this.stahndinfoList) this.total = res.data.count if ((this.stahndinfoList.length === 0 || this.stahndinfoList === []) && this.sarStandardsSearch.page !== 1) { this.pageChange(1) 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',