diff --git a/src/api/phone.js b/src/api/phone.js new file mode 100644 index 000000000..ae39051e5 --- /dev/null +++ b/src/api/phone.js @@ -0,0 +1,9 @@ +import axios from "@/common/axiosV2"; + +export function phoneUser(params) { + return axios({ + url: "api/sys/user/getUserByPhone", + method: "get", + params + }); +} diff --git a/src/api/process.js b/src/api/process.js index 5e1a05740..87fc515ef 100644 --- a/src/api/process.js +++ b/src/api/process.js @@ -689,3 +689,11 @@ export function getStandInfoById (data) { params: data }) } +// 标准法规工作组接口 +export function workGroup(data) { + return axios({ + url: 'api/wg_work_group/researchData', + method: 'get', + params: data + }) +} diff --git a/src/components/CustomFormComponents/Input.vue b/src/components/CustomFormComponents/Input.vue index 38f2728e5..aa3e5a3ba 100644 --- a/src/components/CustomFormComponents/Input.vue +++ b/src/components/CustomFormComponents/Input.vue @@ -12,6 +12,9 @@ :value="value" :placeholder="placeholder" :disabled="disabled" + type="textarea" + resize="none" + :autosize="true" clearable @input="handleChange" > @@ -63,6 +66,15 @@ export default { } - diff --git a/src/components/CustomFormComponents/InputForStandardsForEnterprise.vue b/src/components/CustomFormComponents/InputForStandardsForEnterprise.vue index 8c74fdbfb..0fdc6e1bb 100644 --- a/src/components/CustomFormComponents/InputForStandardsForEnterprise.vue +++ b/src/components/CustomFormComponents/InputForStandardsForEnterprise.vue @@ -1,73 +1,78 @@ @@ -180,7 +195,7 @@ export default { default: '150px' } }, - data () { + data() { return { replaceLawsNumModel: false, sarBussionessLawsEO: { @@ -212,28 +227,28 @@ export default { } }, computed: { - placeholder () { + placeholder() { return `请输入${this.config.attrName}` }, - showMessage () { + showMessage() { return `${this.config.attrName}不能为空` }, - isRequired () { + isRequired() { return !!this.config.isMust } }, methods: { - getReplaceLawsNumRowSearch () { + getReplaceLawsNumRowSearch() { this.replaceLawsNumForm.page = 1 this.replacePage = 1 this.getReplaceLawsNumRow() }, - handleChange (event) { + handleChange(event) { // const value = event.target.value const value = event this.$emit('input', value) }, - selectLaws () { + selectLaws() { // if (this.standNumFlag === 1) { // this.$refs.selections.selectAll(false) // } @@ -242,7 +257,7 @@ export default { this.getReplaceLawsNumRow() }, // 代替政策号 请求数据 - getReplaceLawsNumRow () { + getReplaceLawsNumRow() { if (this.sarBussionessLawsEO.replaceLawsNum !== null && this.sarBussionessLawsEO.replaceLawsNum !== '') { this.replaceLawsNumForm.quoteIdList = this.quoteIdList1.toString() === '' ? '' : this.quoteIdList1 } else { @@ -257,7 +272,7 @@ export default { formData.standType = this.replaceLawsNumForm.dataSource === 'INLAND_STAND' ? 'INLAND' : this.replaceLawsNumForm.dataSource === 'FOREIGN_STAND' ? 'FOREIGN' : '' formData.standNumber = formData.numberName - let url = this.replaceLawsNumForm.dataSource === 'BUSINESS' ? 'lawss/sarBussionessStand/getSarBussionStandPage' : 'sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage' + let url = this.replaceLawsNumForm.dataSource === 'BUSINESS' ? 'lawss/sarBussionessStand/getSarBussionStandPage' : 'sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage' this.$http.get(url, formData, { _this: this, loading: 'replaceLoading' @@ -277,27 +292,27 @@ export default { }) }, // 代替政策编号-取消 - replaceLawsNumModelCancel () { + replaceLawsNumModelCancel() { // this.replaceLawsNumModel = false this.$refs.selections.clearSelection() }, // 代替政策号 table选择事件 - selectReplaceStandNumRowChange (row) { + selectReplaceStandNumRowChange(row) { this.selectedListRep = row }, // 代替政策分页 - pageChangeReplace (page) { + pageChangeReplace(page) { this.replacePage = page this.replaceLawsNumForm.page = page this.getReplaceLawsNumRow() }, - pageSizeChangeReplace (pageSize) { + pageSizeChangeReplace(pageSize) { // this.replaceRows = pageSize this.replaceLawsNumForm.pageSize = pageSize this.getReplaceLawsNumRow() }, // 代替政策编号确定 - replaceLawsNumModelBt () { + replaceLawsNumModelBt() { let textArr = [] if (typeof this.value === 'string') { @@ -342,7 +357,7 @@ export default { this.$refs.selections.clearSelection() }, // 点击查看 - handlePreview (item) { + handlePreview(item) { let name = '' let pageType = '' switch (this.dataSource) { @@ -369,7 +384,7 @@ export default { window.open(routeUrl.href, '_blank') }, - getResetLawsNumRow () { + getResetLawsNumRow() { this.replaceLawsNumForm = { dataSource: 'BUSINESS', numberName: '', // 政策编号 @@ -387,13 +402,23 @@ export default { diff --git a/src/components/index.js b/src/components/index.js index d5f444b04..4d040a51b 100644 --- a/src/components/index.js +++ b/src/components/index.js @@ -27,6 +27,8 @@ import SQTree from './SQTree' import OrgTable from './OrgTable' import MySelect from './mySelect' +import phoneRole from './phoneRole' + const install = function (Vue) { Vue.component('loading', Loading) Vue.component('navMenu', NavMenu) @@ -52,6 +54,7 @@ const install = function (Vue) { Vue.component('RoleTree', RoleTree) Vue.component('MechanismTree', MechanismTree) Vue.component('MySelect', MySelect) + Vue.component('phoneRole', phoneRole) } export default { diff --git a/src/components/phoneRole/index.vue b/src/components/phoneRole/index.vue new file mode 100644 index 000000000..132ce3b5b --- /dev/null +++ b/src/components/phoneRole/index.vue @@ -0,0 +1,250 @@ + + + + + diff --git a/src/pages/config/pages/attributeCustom/components/buss.vue b/src/pages/config/pages/attributeCustom/components/buss.vue index e45fbcff2..e0b1918aa 100644 --- a/src/pages/config/pages/attributeCustom/components/buss.vue +++ b/src/pages/config/pages/attributeCustom/components/buss.vue @@ -77,7 +77,7 @@ 编辑 - 删除 + 删除 diff --git a/src/pages/config/pages/dynamicInformationManage/dynamicInfomationDetails/index.vue b/src/pages/config/pages/dynamicInformationManage/dynamicInfomationDetails/index.vue index 69a6e9f69..dc59712d8 100644 --- a/src/pages/config/pages/dynamicInformationManage/dynamicInfomationDetails/index.vue +++ b/src/pages/config/pages/dynamicInformationManage/dynamicInfomationDetails/index.vue @@ -185,7 +185,7 @@ export default { pubOrgName: '', content: '', linkUri: '', - uploadPath: 'uploadPath', + uploadPath: 'file', resPk: '', fileList: [], picList: [], diff --git a/src/pages/config/pages/dynamicInformationManage/dynamicInfomationDetails/index2.vue b/src/pages/config/pages/dynamicInformationManage/dynamicInfomationDetails/index2.vue index 1a97d9e98..44e1c8863 100644 --- a/src/pages/config/pages/dynamicInformationManage/dynamicInfomationDetails/index2.vue +++ b/src/pages/config/pages/dynamicInformationManage/dynamicInfomationDetails/index2.vue @@ -174,7 +174,7 @@ export default { pubOrgName: '', content: '', linkUri: '', - uploadPath: 'uploadPath', + uploadPath: 'file', resPk: '', fileList: [], picList: [], diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 84fe82c79..d2775ce22 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -3235,41 +3235,41 @@ export default { }, { _this: this }, res => { - displayLocation.map(item => { - if (item.value === '2URVBGR2Y4UG77KZ5YPL') { - item.child.forEach(items =>{ - let accessCountry = JSON.parse(sessionStorage.getItem("accessCountry")); - if (accessCountry.country === undefined) { - accessCountry.country = '文本' - } - if(items.attrField === 'SSRQ') { - items.attrName = '实施日期' + '(' + accessCountry.country + ')' + ':' - if (accessCountry.ssrq !== undefined) { - item.value = accessCountry.ssrq - } - } else if (items.attrField === 'ZCCSSRQ') { - items.attrName = '在产车实施日期' + '(' + accessCountry.country + ')' + ':' - if (accessCountry.zccssrqgj !== undefined) { - item.value = accessCountry.zccssrqgj - } - } else if(items.attrField === 'XCXSSRQ') { - items.attrName = '新车型实施日期' + '(' + accessCountry.country + ')' + ':' - if (accessCountry.xcxssrqgj !== undefined) { - item.value = accessCountry.xcxssrqgj - } - - } - }) - for (let key in res.data) { - item.one.push({ - attrName: key, - value: res.data[key].join(','), - isShowImp: '0', - id: key - }) - } - } - }) + // displayLocation.map(item => { + // if (item.value === '2URVBGR2Y4UG77KZ5YPL') { + // item.child.forEach(items =>{ + // let accessCountry = JSON.parse(sessionStorage.getItem("accessCountry")); + // if (accessCountry.country === undefined) { + // accessCountry.country = '文本' + // } + // if(items.attrField === 'SSRQ') { + // items.attrName = '实施日期' + '(' + accessCountry.country + ')' + ':' + // if (accessCountry.ssrq !== undefined) { + // item.value = accessCountry.ssrq + // } + // } else if (items.attrField === 'ZCCSSRQ') { + // items.attrName = '在产车实施日期' + '(' + accessCountry.country + ')' + ':' + // if (accessCountry.zccssrqgj !== undefined) { + // item.value = accessCountry.zccssrqgj + // } + // } else if(items.attrField === 'XCXSSRQ') { + // items.attrName = '新车型实施日期' + '(' + accessCountry.country + ')' + ':' + // if (accessCountry.xcxssrqgj !== undefined) { + // item.value = accessCountry.xcxssrqgj + // } + // + // } + // }) + // for (let key in res.data) { + // item.one.push({ + // attrName: key, + // value: res.data[key].join(','), + // isShowImp: '0', + // id: key + // }) + // } + // } + // }) this.dynamicFormField = displayLocation }) sessionStorage.setItem('displayLocation', JSON.stringify(displayLocation)) @@ -3688,6 +3688,7 @@ export default { //报批稿撑开 //top: 10px; right: 0; + top:-20px; padding: 0 10px; height: 30px; line-height: 30px; diff --git a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue index e585b1928..7291d830e 100644 --- a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue +++ b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue @@ -1707,7 +1707,7 @@ export default { if (res.ok) { let imgPath = res.data.filePath let imgName = res.data.fileName - let imgSrc = 'uploadPath' + imgPath + imgName + let imgSrc = 'file' + imgPath + imgName // let imgSrc = imgPath + imgName // this.itemsContentList[this.saveUploadImgIndex].itemContent = 'uploadPath' + imgPath + imgName this.itemsContentList[this.saveAddIndex + 1].itemContent = '' diff --git a/src/pages/personal/pages/my-collection/collectionDetail/CollectionDynamicDetail.vue b/src/pages/personal/pages/my-collection/collectionDetail/CollectionDynamicDetail.vue index 4fb19a066..5a01a5c5c 100644 --- a/src/pages/personal/pages/my-collection/collectionDetail/CollectionDynamicDetail.vue +++ b/src/pages/personal/pages/my-collection/collectionDetail/CollectionDynamicDetail.vue @@ -87,7 +87,7 @@ export default { pubOrgName: '', content: '', linkUri: '', - uploadPath: 'uploadPath', + uploadPath: 'file', resPk: '', fileList: [], picList: [], diff --git a/src/pages/personal/pages/personal-info/components/PersonalData.vue b/src/pages/personal/pages/personal-info/components/PersonalData.vue index 8fd9e170b..d315952ed 100644 --- a/src/pages/personal/pages/personal-info/components/PersonalData.vue +++ b/src/pages/personal/pages/personal-info/components/PersonalData.vue @@ -194,7 +194,7 @@ export default { loading: 'loading' }, res => { this.userInfo.userPic = res.data.id - this.userAvator = 'uploadPath' + res.data.filePath + res.data.fileName + this.userAvator = 'file' + res.data.filePath + res.data.fileName }) }, // 保存用户信息 diff --git a/src/pages/processCenter/pages/components/ProcessMixin.vue b/src/pages/processCenter/pages/components/ProcessMixin.vue index e3167ef54..c675cb441 100644 --- a/src/pages/processCenter/pages/components/ProcessMixin.vue +++ b/src/pages/processCenter/pages/components/ProcessMixin.vue @@ -22,7 +22,7 @@ export default { value: "laws1" }, { - label: "企标制修订流程及企业标准库流程", + label: "企标制修订-技术标准", value: "buss1" }, { diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue index cbc6b1261..79dff1783 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue @@ -24,7 +24,7 @@
- + { if (res.success) { this.$message.success('流程发起成功') + let taskId = { + id: this.$route.query.bpnId + } + taskDel(taskId).then(res=>{ + return res + }) this.$router.push('/processCenter') } this.isSubmit = false diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue index 7b3be3269..ae1b8ef08 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue @@ -237,7 +237,7 @@ :action="fileUrl" ref="importfile" name="file" - accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx" + accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF" :before-upload="beginImportFile" :on-success="importFileSuccess2" :on-remove="importFileRemove2" @@ -257,12 +257,13 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' import { saveTaskFirst } from 'api/process' -import { getBusStandFileByAttId } from 'api/process' +import { getBusStandFileByAttId,taskDel } from 'api/process' export default { name: "bzdyStep1", data() { return { + bpnId: '', foldFormFlag: false, fileMadel2: false, commentText: '', @@ -434,10 +435,10 @@ export default { 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' || fileSuffix === '.XLS' || fileSuffix === '.XLSX') { + if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.XLS' || fileSuffix === '.XLSX' || fileSuffix === '.pdf' || fileSuffix === '.PDF') { return true } else { - this.$message.error('文件' + file.name + '格式不正确,请上传PPT,DOCX,XLS文件') + this.$message.error('文件' + file.name + '格式不正确,请上传PPT,DOCX,XLS,PDF文件') return false } // 判断文件上传大小 @@ -571,6 +572,14 @@ export default { }, {}, res => { if (res.success) { this.$message.success('流程发起成功') + if (this.bpnId !== '') { + let taskId = { + id: this.bpnId + } + taskDel(taskId).then(res=>{ + return res + }) + } this.$router.push('/processCenter') } this.isSubmit = false @@ -590,7 +599,9 @@ export default { }) } }, - mounted () {}, + mounted () { + this.bpnId = this.$route.query.bpnId + }, } diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue index c9e2b3e0d..9991a3e2e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue @@ -230,7 +230,7 @@ :action="fileUrl" ref="importfile" name="file" - accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx" + accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF" :before-upload="beginImportFile" :on-success="importFileSuccess" :show-file-list="true" @@ -408,11 +408,11 @@ 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') { + if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.XLS' || fileSuffix === '.XLSX' || fileSuffix === '.pdf' || fileSuffix === '.PDF') { return true } else { this.spinShow = false - this.$message.error('文件' + file.name + '格式不正确,请上传PPT,DOCX,XLS文件') + this.$message.error('文件' + file.name + '格式不正确,请上传PPT,DOCX,XLS,PDF文件') return false } // 判断文件上传大小 diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue index 56db15162..160df19ce 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue @@ -209,7 +209,7 @@ :action="fileUrl" ref="importfile" name="file" - accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx" + accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF" :before-upload="beginImportFile" :on-success="importFileSuccess" :show-file-list="true" @@ -320,11 +320,11 @@ 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') { + if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.XLS' || fileSuffix === '.XLSX' || fileSuffix === '.pdf' || fileSuffix === '.PDF') { return true } else { this.spinShow = false - this.$message.error('文件' + file.name + '格式不正确,请上传PPT,DOCX,XLS文件') + this.$message.error('文件' + file.name + '格式不正确,请上传PPT,DOCX,XLS,PDF文件') return false } // 判断文件上传大小 diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue index 8d5d6233e..87da7b48f 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue @@ -199,7 +199,7 @@ :action="fileUrl" ref="importfile" name="file" - accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx" + accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF" :before-upload="beginImportFile" :on-success="importFileSuccess" :show-file-list="false" @@ -311,11 +311,11 @@ 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') { + if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.XLS' || fileSuffix === '.XLSX' || fileSuffix === '.pdf' || fileSuffix === '.PDF') { return true } else { this.spinShow = false - this.$message.error('文件' + file.name + '格式不正确,请上传PPT,DOCX,XLS文件') + this.$message.error('文件' + file.name + '格式不正确,请上传PPT,DOCX,XLS,PDF文件') return false } // 判断文件上传大小 diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue index 0305ec5b7..e170af563 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue @@ -199,7 +199,7 @@ :action="fileUrl" ref="importfile" name="file" - accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx" + accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF" :before-upload="beginImportFile" :on-success="importFileSuccess" :show-file-list="false" @@ -311,11 +311,11 @@ 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') { + if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.XLS' || fileSuffix === '.XLSX' || fileSuffix === '.pdf' || fileSuffix === '.PDF') { return true } else { this.spinShow = false - this.$message.error('文件' + file.name + '格式不正确,请上传PPT,DOCX,XLS文件') + this.$message.error('文件' + file.name + '格式不正确,请上传PPT,DOCX,XLS,PDF文件') return false } // 判断文件上传大小 diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue index ac013d389..5024d3034 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue @@ -199,7 +199,7 @@ :action="fileUrl" ref="importfile" name="file" - accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx" + accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF" :before-upload="beginImportFile" :on-success="importFileSuccess" :show-file-list="false" @@ -311,11 +311,11 @@ 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') { + if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.XLS' || fileSuffix === '.XLSX' || fileSuffix === '.pdf' || fileSuffix === '.PDF') { return true } else { this.spinShow = false - this.$message.error('文件' + file.name + '格式不正确,请上传PPT,DOCX,XLS文件') + this.$message.error('文件' + file.name + '格式不正确,请上传PPT,DOCX,XLS,PDF文件') return false } // 判断文件上传大小 diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue index 9079796c2..aaaab8fb0 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue @@ -199,7 +199,7 @@ :action="fileUrl" ref="importfile" name="file" - accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx" + accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF" :before-upload="beginImportFile" :on-success="importFileSuccess" :show-file-list="false" @@ -311,11 +311,11 @@ 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') { + if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.XLS' || fileSuffix === '.XLSX' || fileSuffix === '.pdf' || fileSuffix === '.PDF') { return true } else { this.spinShow = false - this.$message.error('文件' + file.name + '格式不正确,请上传PPT,DOCX,XLS文件') + this.$message.error('文件' + file.name + '格式不正确,请上传PPT,DOCX,XLS,PDF文件') return false } // 判断文件上传大小 diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue index fee7e0340..0c1ce8d08 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue @@ -163,7 +163,7 @@ sortable="custom" align="center"> diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue index 6d606aad2..f826a4d4f 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue @@ -162,7 +162,7 @@ sortable="custom" align="center">
- + @@ -20,120 +20,64 @@ - -
- - - -
- 导入 -
-
- - - - - - - - - - - - - - - - - - -
-
-
-
- 隐藏基础信息 - 展开基础信息 - + +
+ + + +
+ 导入 +
+
+ + + + + + + +
+ 导入 +
+
+ + + + + + + + + + +
+
+
+
+ 隐藏基础信息 + 展开基础信息
@@ -426,6 +370,49 @@ 关闭
+ +
+
+
+
+ + + + + + + +
+
+
+ 数据加载中…… + +
+
@@ -434,11 +421,15 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' - import { saveTaskFirst, queryTaskFirst } from 'api/process' + import { saveTaskFirst, queryTaskFirst,taskDel } from 'api/process' export default { name: "bzjdStep1-1", data() { return { + listModel3: false, + standInfoList3: [], + spinShow3: false, + selectedList3: [], //折叠的标志,true为折叠,false为不折叠 foldFormFlag: false, itermsConditionsFlag: false, @@ -535,6 +526,51 @@ ProcessTitle }, methods: { + handleSelection3 (data) { + this.selectedList3 = []; + for (let i = 0; i < data.length; i++) { + this.selectedList3.push(data[i].id); + } + }, + getDbList () { + this.$http.get('lawss/sarStandCompareHis/page', { + page: 1, + pageSize: 9999, + newNumOrName: this.form.itemsNum + }, { + _this: this + }, res => { + this.standInfoList3 = res.data.list + console.log(res); + }, e => { + }) + }, + addDbList () { + this.listModel3 = true + }, + closeDrawer3 () { + this.listModel3 = false + }, + enterDrawer3 () { + if (this.selectedList3.length === 1) { + let deposit = new Map(); + this.standInfoList3.forEach(item => { + deposit.set(item.id, item); + }); + let bringData = []; + for (let i = 0; i < this.selectedList3.length; i++) { + bringData.push(deposit.get(this.selectedList3[i])); + } + this.form.itemsNum1 = bringData[0].oldStandNum + this.form.itemsName1 = bringData[0].oldStandName + this.form.oldNumber = bringData[0].oldStandId + this.listModel3 = false + } else if (this.selectedList3.length > 1) { + this.$message.warning("只能选择一条数据进行导入"); + } else { + this.$message.warning("请选择一条数据进行导入"); + } + }, //折叠/展开基础信息方法 foldForm() { this.foldFormFlag = !this.foldFormFlag @@ -679,20 +715,14 @@ } this.form.itemsNum = bringData[0].showNumber this.form.itemsName = bringData[0].standName - // if (bringData[0].splitStatus === '0') { - // this.form.itemsNum = bringData[0].standNumSplit - // this.form.itemsName = bringData[0].standNameSplit - // } else { - // this.form.itemsNum = bringData[0].showNumber - // this.form.itemsName = bringData[0].standName - // } this.form.standId = bringData[0].standId this.sarType = bringData[0].standType this.standId = bringData[0].standId this.statusId = bringData[0].id this.form.statusId = bringData[0].id this.listModel = false; - this.listModel2 = true + this.listModel3 = true + this.getDbList() this.$http.get('lawss/sarFileSplitItems/getSplitItemsByPage', { infoId: bringData[0].id, page: 1, @@ -857,6 +887,12 @@ }, {}, res => { if (res.success) { this.$message.success('流程发起成功') + let taskId = { + id: this.$route.query.bpnId + } + taskDel(taskId).then(res=>{ + return res + }) this.$router.push('/processCenter') } }) @@ -927,6 +963,9 @@ height: calc(~'100% - 107px'); overflow: auto; } + .content2 { + height: calc(~'100% - 57px') !important; + } .standardForComments { height: 100%; background: #fff; diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue index 0935d0099..27d9b6888 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue @@ -46,28 +46,19 @@ clearable > - + +
+ 导入 +
+
+ - - - - - - - + 隐藏基础信息 展开基础信息 - - - @@ -446,6 +380,49 @@ @checkedRole="saveUserInfo" :nodeList="nodeList" > + +
+
+
+
+ + + + + + + +
+
+
+ 数据加载中…… + +
+
@@ -454,12 +431,18 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' -import {saveTaskFirst} from 'api/process' +import {saveTaskFirst, taskDel} from 'api/process' export default { name: "bzjdStep1", data() { return { + bpnId: '', + listModel3: false, + standInfoList3: [], + spinShow3: false, + selectedList3: [], + //折叠的标志,true为折叠,false为不折叠 foldFormFlag: false, itermsConditionsFlag: false, @@ -562,6 +545,50 @@ export default { ProcessTitle }, methods: { + handleSelection3 (data) { + this.selectedList3 = []; + for (let i = 0; i < data.length; i++) { + this.selectedList3.push(data[i].id); + } + }, + getDbList () { + this.$http.get('lawss/sarStandCompareHis/page', { + page: 1, + pageSize: 9999, + newNumOrName: this.form.itemsNum + }, { + _this: this + }, res => { + this.standInfoList3 = res.data.list + }, e => { + }) + }, + addDbList () { + this.listModel3 = true + }, + closeDrawer3 () { + this.listModel3 = false + }, + enterDrawer3 () { + if (this.selectedList3.length === 1) { + let deposit = new Map(); + this.standInfoList3.forEach(item => { + deposit.set(item.id, item); + }); + let bringData = []; + for (let i = 0; i < this.selectedList3.length; i++) { + bringData.push(deposit.get(this.selectedList3[i])); + } + this.form.itemsNum1 = bringData[0].oldStandNum + this.form.itemsName1 = bringData[0].oldStandName + this.form.oldNumber = bringData[0].id + this.listModel3 = false + } else if (this.selectedList3.length > 1) { + this.$message.warning("只能选择一条数据进行导入"); + } else { + this.$message.warning("请选择一条数据进行导入"); + } + }, //折叠/展开基础信息方法 foldForm() { this.foldFormFlag = !this.foldFormFlag @@ -582,14 +609,6 @@ export default { } }) window.open(routeUrl.href, '_blank') - // this.$store.commit('setDetailMap', this.$route.path) - // this.$router.push({ - // name: 'ItemSplitInfo', - // query: { - // infoId: row.id, - // result: row.result, - // } - // }) }, setMap(data) { data.forEach(item => { @@ -651,7 +670,6 @@ export default { item.ZCCSSRQ = item.attrInfoMap.ZCCSSRQ } }) - this.total2 = res.data.count this.$http.get('sys/dictype/getDicTypeListCode', '', { _this: this @@ -711,13 +729,6 @@ export default { } this.form.itemsNum = bringData[0].showNumber this.form.itemsName = bringData[0].standName - // if (bringData[0].splitStatus === '0') { - // this.form.itemsNum = bringData[0].standNumSplit - // this.form.itemsName = bringData[0].standNameSplit - // } else { - // this.form.itemsNum = bringData[0].showNumber - // this.form.itemsName = bringData[0].standName - // } this.form.standId = bringData[0].standId this.sarType = bringData[0].standType this.standId = bringData[0].standId @@ -725,7 +736,8 @@ export default { this.form.statusId = bringData[0].id this.form.fileType = bringData[0].fileType this.listModel = false; - this.listModel2 = true + this.listModel3 = true + this.getDbList() this.$http.get('lawss/sarFileSplitItems/getSplitItemsByPage', { infoId: bringData[0].id, page: 1, @@ -767,13 +779,6 @@ export default { for (let i = 0; i < this.selectedList2.length; i++) { bringData.push(deposit.get(this.selectedList2[i])); } - // if (bringData[0].splitStatus === '0') { - // this.form.itemsNum1 = bringData[0].standNumSplit - // this.form.itemsName1 = bringData[0].standNameSplit - // } else { - // this.form.itemsNum1 = bringData[0].showNumber - // this.form.itemsName1 = bringData[0].standName - // } if (bringData[0].standYear) { this.form.itemsNum1 = bringData[0].standSortShow + ' ' + bringData[0].standNumber + '-' + bringData[0].standYear } else { @@ -897,6 +902,14 @@ export default { }, {}, res => { if (res.success) { this.$message.success('流程发起成功') + if (this.bpnId !== '') { + let taskId = { + id: this.bpnId + } + taskDel(taskId).then(res=>{ + return res + }) + } this.$router.push('/processCenter') } }) @@ -972,6 +985,9 @@ export default { height: calc(~'100% - 107px'); overflow: auto; } + .content2 { + height: calc(~'100% - 57px') !important; + } .standardForComments { height: 100%; diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue index 4b69ae72a..5bad6f19c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue @@ -40,28 +40,14 @@ clearable >
- + - - - - - - - + 隐藏基础信息 展开基础信息 - diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue index ac2a92c75..c36e59a94 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue @@ -40,28 +40,14 @@ clearable > - + - - - - - - - + 隐藏基础信息 展开基础信息 - @@ -131,6 +67,7 @@
批量编辑 + 查看比对
加载中... + +
+
+
+
+ {{ item1.itemsNum }} +
+
+
+
+
+
+
+ {{ item2.itemsNum }} +
+
+
+
+
+
@@ -503,6 +463,11 @@ name: "bzjdStep3", data() { return { + BDmodel: false, + oldNumber: '', + leftData: [], + rightData: [], + modalshowflag2: false, itemId: '', drawerModal: false, @@ -571,6 +536,30 @@ ProcessTitle }, methods: { + getBDList () { + this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', { + standHisId: this.oldNumber, + leftOrRight: 'LEFT' + }, { + _this: this + }, res => { + this.leftData = res.data + }, e => { + }) + this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', { + standHisId: this.oldNumber, + leftOrRight: 'RIGHT' + }, { + _this: this + }, res => { + this.rightData = res.data + }, e => { + }) + }, + checkBD () { + this.BDmodel = true + this.getBDList() + }, itemEdit (row) { this.itemId = row.id this.modalshowflag2 = true @@ -819,6 +808,7 @@ this.form.itemsName1 = data.itemsName1 || '' this.form.itemsNum1 = data.itemsNum1 || '' } + this.oldNumber = data.oldNumber || '' this.sarType = data.standInData || data.sarType this.json = data let itemList @@ -839,8 +829,6 @@ item.itemsTitle = item.itermsConditions item.applyArctic = item.applyArctic || [] }) - - this.itemList = itemList this.loading = false }).catch(e => { @@ -872,6 +860,9 @@ padding: 0 20px 0; } } + .myText { + line-height: 20px; + } .myDataPick { /deep/.el-form-item__content { margin-left: 0px !important; diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue index 2163d6e9d..53cae2420 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue @@ -40,28 +40,14 @@ clearable >
- + - - - - - - - + 隐藏基础信息 展开基础信息 - diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue index 143354727..86a29e90e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue @@ -40,28 +40,14 @@ clearable > - + - - - - - - - + 隐藏基础信息 展开基础信息 - diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue index 9154689b2..a521f2e7f 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue @@ -40,28 +40,14 @@ clearable > - + - - - - - - - + 隐藏基础信息 展开基础信息 - diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue index 77990f427..10b5ef783 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue @@ -177,7 +177,7 @@ label="创建时间" align="center"> - + + + + + + + @@ -689,13 +689,13 @@ - + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - +
@@ -2442,7 +2442,7 @@ _formData.append('createUser', this.$store.getters.userInfo.userId) _formData.append('createUserName', this.$store.getters.userInfo.uName) _formData.append('prcType', 'buss1') - _formData.append('prcName', '企标制修订流程及企业标准库流程') + _formData.append('prcName', '企标制修订-技术标准') _formData.append('json', JSON.stringify({ taskInfo: '发起企标制修订流程', form: this.form, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue index c6efa54c0..ac1822a40 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue @@ -1,7 +1,7 @@