diff --git a/public/static/ueditor/ADT/template/template.css b/public/static/ueditor/ADT/template/template.css index dbbab2d9b..3e7a127c8 100644 --- a/public/static/ueditor/ADT/template/template.css +++ b/public/static/ueditor/ADT/template/template.css @@ -10,8 +10,8 @@ .bottom{height:320px;width:100%;margin: 0 auto;} .transparent{ background: url("images/bg.gif") repeat;} .bottom table tr td{border:1px dashed #ccc;} -#colorPicker{width: 17px;height: 17px;border: 1px solid #CCC;display: inline-block;3px;box-shadow: 2px 2px 5px #D3D6DA;} -.border_style1{padding:2px;border: 1px solid #ccc;5px;box-shadow:2px 2px 5px #d3d6da;} +#colorPicker{width: 17px;height: 17px;border: 1px solid #CCC;display: inline-block;box-shadow: 2px 2px 5px #D3D6DA;} +.border_style1{padding:2px;border: 1px solid #ccc;box-shadow:2px 2px 5px #d3d6da;} p{margin: 5px 0} table{clear:both;margin-bottom:10px;border-collapse:collapse;word-break:break-all;} li{clear:both} diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue index dd309b1b2..7439a02b5 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue @@ -727,6 +727,7 @@ export default { uploadBackSuccess (res, file, fileList) { if (res.ok) { this.fileInfoList.push(res.data) + this.listForm.fileName = this.fileInfoList this.$message.success('上传成功') } else { this.$message.error(res.message) @@ -784,7 +785,6 @@ export default { * @description: 动态表单读取 */ getFormFieldList (item) { - console.log(item.commentText); this.$nextTick(() => { this.listForm = JSON.parse(JSON.stringify(item)) if(item.form === undefined){ diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index af8352887..204e3fc71 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -1476,12 +1476,12 @@ export default { issueTime: [ { required: false, message: '请选择标准发布日期', trigger: 'change' } ], - qcdw: [ - { required: true, message: '请选择起草单位', trigger: 'change' } - ], - cysd: [ - { required: true, message: '请选择我司参与深度', trigger: 'change' } - ], + // qcdw: [ + // { required: true, message: '请选择起草单位', trigger: 'change' } + // ], + // cysd: [ + // { required: true, message: '请选择我司参与深度', trigger: 'change' } + // ], }, form: { // 基础信息 diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue index bc73c6b65..0c2ac6ad7 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue @@ -869,7 +869,11 @@ export default { }, { _this: this }, res => { - this.listForm.breakdownList = res.data; + let breakdown = res.data + breakdown.forEach(item => { + delete item.termsConditions + }) + this.listForm.breakdownList = breakdown; this.ListModel = false; }, e => { this.$message.error("添加失败"); diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue index 66fd6aece..90c62c85f 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue @@ -381,35 +381,34 @@ 添加 - - - - - - - + + + - + + = 1) { - this.infoTableDatas = this.standardCheckedList + let exits = []; + this.standardCheckedList.map(item =>{ + let newStand = false; + for (let itemKey of this.infoTableDatas) { + if (item.id == itemKey.id){ + newStand = true; + break; + } + } + if (newStand){ + this.$message.warning("请勿重复添加数据"); + }else { + this.infoTableDatas.push(item); + exits.push(item.id); + } + }) this.standardDrawer = false } else { this.$message.warning('请选择要带入的数据') @@ -693,50 +708,55 @@ export default { }, //提交事件 handleSubmit() { - this.$refs['zdrzbzORzchgxxmscForm'].validate((valid) => { - if (valid) { - this.$refs['Form'].validate((valid) => { - if (valid) { - this.isSubmit = true - let infoTableDatas = [] - infoTableDatas = JSON.stringify(this.infoTableDatas) - localStorage.setItem('infoTableDatas', JSON.stringify(this.infoTableDatas)) - this.$http.get('lawss/activiti/startProcess', { - type: 'laws3', - }, {_this: this}, res => { - if (res.ok) { - var json = Object.assign(this.form, this.roleForm) - json.commentText = this.commentText - // json.filesId = this.addFjList - // json.filesName = this.form.fjListName - json.infoTableDatas = infoTableDatas - this.$http.post('lawss/activiti/completeTask', { - json: JSON.stringify(json), - taskId: res.data, - userId: this.$store.getters.userInfo.userId - }, {_this: this}, res => { - if (res.success) { - this.$message.success('流程发起成功') - this.$router.push('/processCenter') - this.isSubmit = false - } else { - this.$message.warning('流程启动失败') - this.isSubmit = false - } - }) - } else { - this.$message.warning('流程启动失败') - this.isSubmit = false - } - }) - } else { - return this.$message.warning('请完善人员信息') - } - }) - } else { - return this.$message.warning('请完善基础信息') - } - }) + if (this.infoTableDatas.length>0){ + this.$refs['zdrzbzORzchgxxmscForm'].validate((valid) => { + if (valid) { + this.$refs['Form'].validate((valid) => { + if (valid) { + this.isSubmit = true + let infoTableDatas = [] + infoTableDatas = JSON.stringify(this.infoTableDatas) + localStorage.setItem('infoTableDatas', JSON.stringify(this.infoTableDatas)) + this.$http.get('lawss/activiti/startProcess', { + type: 'laws3', + }, {_this: this}, res => { + if (res.ok) { + var json = Object.assign(this.form, this.roleForm) + json.commentText = this.commentText + // json.filesId = this.addFjList + // json.filesName = this.form.fjListName + json.infoTableDatas = infoTableDatas + this.$http.post('lawss/activiti/completeTask', { + json: JSON.stringify(json), + taskId: res.data, + userId: this.$store.getters.userInfo.userId + }, {_this: this}, res => { + if (res.success) { + this.$message.success('流程发起成功') + this.$router.push('/processCenter') + this.isSubmit = false + } else { + this.$message.warning('流程启动失败') + this.isSubmit = false + } + }) + } else { + this.$message.warning('流程启动失败') + this.isSubmit = false + } + }) + } else { + return this.$message.warning('请完善人员信息') + } + }) + } else { + return this.$message.warning('请完善基础信息') + } + }) + }else { + this.$message.warning('请完善基础信息') + } + }, } } diff --git a/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step5-2.vue b/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step5-2.vue deleted file mode 100644 index f31501021..000000000 --- a/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step5-2.vue +++ /dev/null @@ -1,475 +0,0 @@ - - - - - diff --git a/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step6-1.vue b/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step6-1.vue deleted file mode 100644 index 7bfec7ca9..000000000 --- a/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step6-1.vue +++ /dev/null @@ -1,594 +0,0 @@ - - - - - diff --git a/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step6-2.vue b/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step6-2.vue deleted file mode 100644 index dd71ce1e2..000000000 --- a/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step6-2.vue +++ /dev/null @@ -1,455 +0,0 @@ - - - - - diff --git a/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step7-2.vue b/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step7-2.vue deleted file mode 100644 index f138b6acb..000000000 --- a/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step7-2.vue +++ /dev/null @@ -1,485 +0,0 @@ - - - - - diff --git a/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step8-1.vue b/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step8-1.vue deleted file mode 100644 index 54e6d107a..000000000 --- a/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step8-1.vue +++ /dev/null @@ -1,460 +0,0 @@ - - - - - diff --git a/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step8-2.vue b/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step8-2.vue deleted file mode 100644 index 068636fb7..000000000 --- a/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step8-2.vue +++ /dev/null @@ -1,462 +0,0 @@ - - - - - diff --git a/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step9-1.vue b/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step9-1.vue deleted file mode 100644 index 2063deb87..000000000 --- a/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step9-1.vue +++ /dev/null @@ -1,460 +0,0 @@ - - - - - diff --git a/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step9-2.vue b/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step9-2.vue deleted file mode 100644 index 142e7b7c6..000000000 --- a/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step9-2.vue +++ /dev/null @@ -1,462 +0,0 @@ - - - - - diff --git a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue index 77b36d8f9..f0b5823ce 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue @@ -82,7 +82,7 @@ align="center" > diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue index e0fe6b1e3..2b1e09ec3 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue @@ -6,7 +6,7 @@ @@ -74,7 +74,7 @@ align="center"> @@ -139,14 +139,23 @@ > + + 手动查找 @@ -157,8 +166,9 @@ class="add-form-item" > @@ -304,76 +314,410 @@ fontWeight: 'bold', height: '48px'}" @selection-change="handleSelectTableChange" > + - - - - - - - - + + +
+ + + + + + + + + + + + + + + + + + + +
+ @@ -420,7 +764,7 @@ export default { ], addOrEdit: '', attributeEOFormRules: { - lawId: [ + lawCode: [ { required: true, message: '标准编号/政策编号不能为空', trigger: 'blur' }, ], lawName: [ @@ -437,8 +781,11 @@ export default { ], }, attributeEO: { - id: '', lawId: '', + //数据来源 + dataSource: '', + id: '', + lawCode: '', lawName: '', productType: '', implTime: '', @@ -458,7 +805,7 @@ export default { rows: 10, // 查询相关参数 sarSarAccessEOSearch: { - lawId: '', + lawCode: '', lawName: '', productType: '', accessContent: '', @@ -516,12 +863,6 @@ export default { deadLine: '', // 截止时间 applyAuth: '' // 认证类型 }, - dataSourceOptions: [ - {value: 'INLAND', label: '国内标准法规'}, - {value: 'FOREIGN', label: '海外标准法规'}, - {value: 'FOREIGN_LAWS', label: '国内外政策'}, - {value: 'BUSINESS', label: '企业标准 '} - ], sarAccessInfoSearchList: [], selectedAccInfoSearchList: [], sarAccessInfoListArry: [], @@ -536,6 +877,14 @@ export default { } }, methods: { + formatIssueDate(str) { + const momentDate = this.$moment(str) + if (momentDate.isValid()) { + return this.$moment(str).format('YYYY-MM-DD') + } else { + return str + } + }, // 点击查看 handlePreview(item) { console.log('539',item) @@ -585,6 +934,7 @@ export default { }) }, dataSourceChange() { + this.handleSelectForm.page = 1 this.lawInfoTableLoading = true this.handleSelectForm.standType = this.handleSelectForm.dataSource this.searchLawBtn() @@ -608,13 +958,10 @@ export default { this.$message.warning('请选择一条数据') } else { - // dataSourceOptions: [ - // {value: 'INLAND', label: '国内标准法规'}, - // {value: 'FOREIGN', label: '海外标准法规'}, - // {value: 'FOREIGN_LAWS', label: '国内外政策'}, - // {value: 'BUSINESS', label: '企业标准 '} - // ], - this.attributeEO.lawId =this.handleSelectTableList[0].standCode || this.handleSelectTableList[0].lawsNumber || this.handleSelectTableList[0].standSort+" "+this.handleSelectTableList[0].standNumber+"-"+this.handleSelectTableList[0].standYear + console.log('619',this.handleSelectForm.dataSource) + this.attributeEO.dataSource = this.handleSelectForm.dataSource + this.attributeEO.lawId = this.handleSelectTableList[0].id + this.attributeEO.lawCode =this.handleSelectTableList[0].standCode || this.handleSelectTableList[0].lawsNumber || this.handleSelectTableList[0].standSort+" "+this.handleSelectTableList[0].standNumber+"-"+this.handleSelectTableList[0].standYear this.attributeEO.lawName = this.handleSelectTableList[0].standName || this.handleSelectTableList[0].lawsName this.selectModal = false } @@ -647,7 +994,7 @@ export default { console.log('国内标准库数据',res) if (res.ok){ this.lawInfoTable = res.data.list - this.handleSelectTotal = res.data.count + this.handleSelectForm.total = res.data.count if ((this.lawInfoTable.length === 0 || this.lawInfoTable === []) && this.handleSelectForm.page !== 1) { this.lawInfoTableLoading = true this.handleSelectPageChange(1) @@ -660,7 +1007,7 @@ export default { } },e=>{ this.lawInfoTable = [] - this.total = 0 + this.handleSelectForm.total = 0 }) console.log('国内标准库') }else if(this.handleSelectForm.dataSource === 'FOREIGN'){ @@ -670,7 +1017,7 @@ export default { console.log('海外标准库数据',res) if (res.ok){ this.lawInfoTable = res.data.list - this.handleSelectTotal = res.data.count + this.handleSelectForm.total = res.data.count if ((this.lawInfoTable.length === 0 || this.lawInfoTable === []) && this.handleSelectForm.page !== 1) { this.lawInfoTableLoading = true this.handleSelectPageChange(1) @@ -683,7 +1030,7 @@ export default { } },e=>{ this.lawInfoTable = [] - this.total = 0 + this.handleSelectForm.total = 0 }) console.log('海外标准库') }else if(this.handleSelectForm.dataSource === 'FOREIGN_LAWS'){ @@ -693,7 +1040,7 @@ export default { console.log('国内外政策库数据',res) if (res.ok){ this.lawInfoTable = res.data.list - this.handleSelectTotal = res.data.count + this.handleSelectForm.total = res.data.count if ((this.lawInfoTable.length === 0 || this.lawInfoTable === []) && this.handleSelectForm.page !== 1) { this.lawInfoTableLoading = true this.handleSelectPageChange(1) @@ -706,7 +1053,7 @@ export default { } },e=>{ this.lawInfoTable = [] - this.total = 0 + this.handleSelectForm.total = 0 }) console.log('国内外政策库') }else if(this.handleSelectForm.dataSource === 'BUSINESS_STAND'){ @@ -716,7 +1063,7 @@ export default { console.log('企业标准库数据',res) if (res.ok){ this.lawInfoTable = res.data.list - this.handleSelectTotal = res.data.count + this.handleSelectForm.total = res.data.count if ((this.lawInfoTable.length === 0 || this.lawInfoTable === []) && this.handleSelectForm.page !== 1) { this.lawInfoTableLoading = true this.handleSelectPageChange(1) @@ -729,7 +1076,7 @@ export default { } },e=>{ this.lawInfoTable = [] - this.total = 0 + this.handleSelectForm.total = 0 }) console.log('企业标准库') }else { @@ -744,7 +1091,7 @@ export default { }, handleSelectPageSizeChange(pageSize){ this.lawInfoTableLoading = true - this.handleSelectForm.pageSize = this.$store.getters.userInfo.configContent + this.handleSelectForm.pageSize = pageSize console.log(this.handleSelectForm.pageSize) this.searchLawBtn() }, @@ -816,7 +1163,7 @@ export default { // this.$refs['attributeEO'].resetFields() // this.attributeEO = { // id: '', - // lawId: '', + // lawCode: '', // lawName: '', // productType: '', // implTime: '', @@ -830,7 +1177,7 @@ export default { this.$refs['attributeEO'].resetFields() this.attributeEO = { id: '', - lawId: '', + lawCode: '', lawName: '', productType: '', implTime: '', @@ -848,7 +1195,7 @@ export default { this.$nextTick(() => { this.attributeEO = { id: '', - lawId: '', + lawCode: '', lawName: '', productType: '', implTime: '', @@ -960,12 +1307,12 @@ export default { }, pageSizeChange (pageSize) { this.sarSarAccessEOSearch.page = 1 - this.sarSarAccessEOSearch.pageSize = this.$store.getters.userInfo.configContent + this.sarSarAccessEOSearch.pageSize = pageSize this.searchSarAccess() }, clearSearch (search = true) { // search 字段是为了处理高级查询时清空字段用的 - this.sarSarAccessEOSearch.lawId = '' + this.sarSarAccessEOSearch.lawCode = '' this.sarSarAccessEOSearch.lawName = '' this.sarSarAccessEOSearch.productType = '' this.sarSarAccessEOSearch.accessContent = ''