diff --git a/src/api/process.js b/src/api/process.js index 10bc76630..a5ea70a6e 100644 --- a/src/api/process.js +++ b/src/api/process.js @@ -448,6 +448,22 @@ export function processModelHisOne (data) { }) } +export function saveEditFile (data) { + return axios({ + url: '/api/lawss/activiti/saveEditFile', + method: 'get', + params: data + }) +} + +export function processEditFile (data) { + return axios({ + url: '/api/lawss/activiti/processEditFile', + method: 'get', + params: data + }) +} + export function processModelHisOneCount (data) { return axios({ url: '/api/lawss/activiti/processModelHisOneCount', diff --git a/src/common/index.js b/src/common/index.js index 9e702c2e8..0839e9819 100644 --- a/src/common/index.js +++ b/src/common/index.js @@ -6,6 +6,9 @@ import base64 from './base64' import dateFormat from './date' import hasPermission from './hasPermission' import preview from './preview' +import onlineEdit from './onlineEdit' +import onlinePreview from './onlinePreview' +import onlineEditPreview from './onlineEditPreview' // 表单验证 import verify from './verify' @@ -38,7 +41,22 @@ const install = function (Vue) { get () { return preview } - } + }, + $onlinePreview: { + get () { + return onlinePreview + } + }, + $onlineEditPreview: { + get () { + return onlineEditPreview + } + }, + $onlineEdit: { + get () { + return onlineEdit + } + }, }) } export default { diff --git a/src/common/onlineEdit/index.js b/src/common/onlineEdit/index.js new file mode 100644 index 000000000..7b1eff3d1 --- /dev/null +++ b/src/common/onlineEdit/index.js @@ -0,0 +1,27 @@ +/** + * 在线编辑 + */ +import { onlyOfficeUrl,kkFileViewUrl } from '@/sysConfig' +import { processEditFile } from 'api/process' +let Base64 = require('js-base64').Base64; +export default (id,nodeName,userId,userName) => { + processEditFile({ + id + }).then(res => { + if(res){ + const editFileInfo = res + const showName = nodeName + const editFilePath = editFileInfo.editFilePath.split("/") + editFileInfo.filePath = editFilePath[0]+'/'+editFilePath[1]+'/' + editFileInfo.fileName = editFilePath[2] + editFileInfo.userId = userId + editFileInfo.userName = userName + if(editFileInfo.pid){ + editFileInfo.pId = editFileInfo.pid + } + const nowTime = new Date().getTime() + window.open(onlyOfficeUrl+'/editor?pid='+editFileInfo.pId+'&taskIds='+editFileInfo.taskId+'&editType='+editFileInfo.editType+'&oldFileName=' + showName + '&fileType=' + 'docx' + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName+'&userId='+editFileInfo.userId+'&userName='+editFileInfo.userName) + } + }).catch(e => { + }) +} diff --git a/src/common/onlineEditPreview/index.js b/src/common/onlineEditPreview/index.js new file mode 100644 index 000000000..ce790d2cb --- /dev/null +++ b/src/common/onlineEditPreview/index.js @@ -0,0 +1,29 @@ +/** + * 工作流文件在线编辑预览 + */ +import { onlyOfficeUrl,kkFileViewUrl } from '@/sysConfig' +import { processEditFile } from 'api/process' +let Base64 = require('js-base64').Base64; +export default (id,nodeName,userId,userName) => { + processEditFile({ + id + }).then(res => { + if(res){ + const editFileInfo = res + const showName = nodeName + const editFilePath = editFileInfo.editFilePath.split("/") + editFileInfo.filePath = editFilePath[0]+'/'+editFilePath[1]+'/' + editFileInfo.fileName = editFilePath[2] + editFileInfo.userId = userId + editFileInfo.userName = userName + if(editFileInfo.pid){ + editFileInfo.pId = editFileInfo.pid + } + editFileInfo.fileSuffix = 'docx' + const nowTime = new Date().getTime() + window.open(onlyOfficeUrl+'/onlyOffice?oldFileName=' + showName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName) + } + }).catch(e => { + }) +} + diff --git a/src/common/onlinePreview/index.js b/src/common/onlinePreview/index.js new file mode 100644 index 000000000..4df73731a --- /dev/null +++ b/src/common/onlinePreview/index.js @@ -0,0 +1,17 @@ +/** + * 工作流文件预览 + */ +import { onlyOfficeUrl,kkFileViewUrl } from '@/sysConfig' +import { processEditFile } from 'api/process' +let Base64 = require('js-base64').Base64; +export default id => { + processEditFile({ + id + }).then(res => { + if(res){ + const editFileInfo = res + window.open(kkFileViewUrl+'/onlinePreview?url='+encodeURIComponent(Base64.encode(editFileInfo.downLoadUrl))); + } + }).catch(e => { + }) +} diff --git a/src/components/CustomFormComponents/DatePicker.vue b/src/components/CustomFormComponents/DatePicker.vue index f06f9f854..665e1b03b 100644 --- a/src/components/CustomFormComponents/DatePicker.vue +++ b/src/components/CustomFormComponents/DatePicker.vue @@ -15,6 +15,7 @@ format="yyyy-MM-dd" :value="value" type="date" + clearable :editable="true" :disabled="disabled" :placeholder="placeholder" diff --git a/src/pages/loginVerify/index.vue b/src/pages/loginVerify/index.vue index b92c39d53..caefa55bb 100644 --- a/src/pages/loginVerify/index.vue +++ b/src/pages/loginVerify/index.vue @@ -135,10 +135,12 @@ if (res.ok) { this.loginNew(res) } else { - this.$message.warning('系统无权限访问') - this.$store.dispatch('logout') - // window.location.href = 'http://sso.foton.com.cn/logout?service=' - window.location.href = ssoLogoutUrlDev + if(res.code && res.code === 'r0011'){ + this.$message.warning('系统无权限访问') + this.$store.dispatch('logout') + // window.location.href = 'http://sso.foton.com.cn/logout?service=' + window.location.href = ssoLogoutUrlDev + } } }) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue index d9b1cc81f..35a648308 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue @@ -132,21 +132,6 @@ show-overflow-tooltip align="center"> - - - - + + + +
-
无相似文本
+
+
+
无内容
+
比对条款: {{ plForm.itemsNum }}
相似度: {{ similarityDegree }}
@@ -414,7 +417,7 @@
-
+
无内容
@@ -710,7 +713,7 @@ }) }, itemEdit (row, type, index) { - this.itermsConditions = row.itermsConditions + this.itermsConditions = row.itermsConditions.replace(/''/g, '\'') let itemsEoPage = { oldItemId: row.itemsId, newItemId: row.itemsId2, @@ -844,7 +847,7 @@ }, itermsConditionsOpen (row) { this.itermsConditionsFlag = true - this.itermsConditionsTitle = row + this.itermsConditionsTitle = row.replace(/''/g, '\'') }, getData () { queryTaskFirst({ @@ -1085,11 +1088,12 @@ } } } - if (num4 > 0) { - this.$message.warning('请输入新车型实施日期') - } else if (num5 > 0) { - this.$message.warning('请输入在产车实施日期') - } else if (num6 > 0) { + // if (num4 > 0) { + // this.$message.warning('请输入新车型实施日期') + // } else if (num5 > 0) { + // this.$message.warning('请输入在产车实施日期') + // } else + if (num6 > 0) { this.$message.warning('请选择适用车型') } else if (b > 0) { this.$message.warning('请选择责任人') diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue index 7391b50e6..d76679f24 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue @@ -68,6 +68,15 @@ clearable > + + + +
@@ -164,22 +173,6 @@ 查看条款内容
- - - - + + + + { @@ -459,7 +473,7 @@ export default { }, itermsConditionsOpen (row) { this.itermsConditionsFlag = true - this.itermsConditionsTitle = row + this.itermsConditionsTitle = row.replace(/''/g, '\'') }, getHistoryData () { this.$http.get('lawss/activiti/get_list_by_instance', { @@ -500,6 +514,7 @@ export default { pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) + this.form.endTime = data.endTime || data.form.endTime this.form.itemsNum = data.itemsNum || data.form.itemsNum this.form.itemsName = data.itemsName || data.form.itemsName if (data.form) { diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue index ec1945309..2fe3ef083 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue @@ -139,21 +139,6 @@ show-overflow-tooltip align="center"> - - - - + + + +
-
无相似文本
+
+
+
无内容
+
比对条款: {{ plForm.itemsNum }}
相似度: {{ similarityDegree }}
@@ -422,7 +425,7 @@
-
+
无内容
@@ -723,7 +726,7 @@ export default { }) }, itemEdit (row, type, index) { - this.itermsConditions = row.itermsConditions + this.itermsConditions = row.itermsConditions.replace(/''/g, '\'') let itemsEoPage = { oldItemId: row.itemsId, newItemId: row.itemsId2, @@ -857,7 +860,7 @@ export default { }, itermsConditionsOpen(row) { this.itermsConditionsFlag = true - this.itermsConditionsTitle = row + this.itermsConditionsTitle = row.replace(/''/g, '\'') }, showUser(row) { let routeUrl = this.$router.resolve({ @@ -1090,11 +1093,12 @@ export default { } } } - if (num4 > 0) { - this.$message.warning('请输入新车型实施日期') - } else if (num5 > 0) { - this.$message.warning('请输入在产车实施日期') - } else if (num6 > 0) { + // if (num4 > 0) { + // this.$message.warning('请输入新车型实施日期') + // } else if (num5 > 0) { + // this.$message.warning('请输入在产车实施日期') + // } else + if (num6 > 0) { this.$message.warning('请选择适用车型') } else if (b > 0) { this.$message.warning('请选择责任人') diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue index 33229bbdd..5f9c0d958 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue @@ -54,6 +54,15 @@ clearable > + + + +
@@ -114,21 +123,6 @@ show-overflow-tooltip align="center">
- - - - + + + + + + + + @@ -113,14 +122,6 @@ show-overflow-tooltip align="center"> - - + +
-
无相似文本
+
+
+
无内容
+
比对条款: {{ editForm.itemsNum }}
相似度: {{ similarityDegree }}
@@ -368,7 +380,7 @@
-
+
无内容
@@ -535,6 +547,7 @@ itemsName: '', itemsNum1: '', itemsName1: '', + endTime: '', }, json: {}, idList: [] @@ -610,7 +623,7 @@ }) }, itemEdit (row) { - this.itermsConditions = row.itermsConditions + this.itermsConditions = row.itermsConditions.replace(/''/g, '\'') let itemsEoPage = { oldItemId: row.itemsId, newItemId: row.itemsId2, @@ -704,7 +717,7 @@ }, itermsConditionsOpen (row) { this.itermsConditionsFlag = true - this.itermsConditionsTitle = row + this.itermsConditionsTitle = row.replace(/''/g, '\'') }, getHistoryData () { this.$http.get('lawss/activiti/get_list_by_instance', { @@ -832,11 +845,13 @@ } if (num3 > 0) { this.$message.warning('请输入符合性要求') - } else if (num4 > 0) { - this.$message.warning('请输入新车型实施日期') - } else if (num5 > 0) { - this.$message.warning('请输入在产车实施日期') - } else if (num6 > 0) { + } + // else if (num4 > 0) { + // this.$message.warning('请输入新车型实施日期') + // } else if (num5 > 0) { + // this.$message.warning('请输入在产车实施日期') + // } + else if (num6 > 0) { this.$message.warning('请选择适用车型') } else if (b > 0) { this.$message.warning('请选择责任人') @@ -870,6 +885,7 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) + this.form.endTime = data.endTime || data.form.endTime let commitStatus = res.commitStatus if(commitStatus && commitStatus > 0){ this.acceptShow = true diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue index a7527401d..df4ea3dbb 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue @@ -54,6 +54,15 @@ clearable > + + + +
@@ -108,22 +117,6 @@ show-overflow-tooltip align="center">
- - - - + + + + { let data = JSON.parse(res.mesg) + this.form.endTime = data.endTime || data.form.endTime this.form.itemsNum = data.itemsNum || data.form.itemsNum this.form.itemsName = data.itemsName || data.form.itemsName this.commentText4 = data.commentText4 || '' diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue index 6a1a4c682..0a1a0c86c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue @@ -54,6 +54,15 @@ clearable > + + + + @@ -108,22 +117,6 @@ show-overflow-tooltip align="center"> - - - - + + + + { let data = JSON.parse(res.mesg) + this.form.endTime = data.endTime || data.form.endTime this.form.itemsNum = data.itemsNum || data.form.itemsNum this.form.itemsName = data.itemsName || data.form.itemsName this.commentText5 = data.commentText5 || '' diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue index 62555ab9f..164ef2a68 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue @@ -54,6 +54,15 @@ clearable > + + + + @@ -108,22 +117,6 @@ show-overflow-tooltip align="center"> - - - - + + + + { let data = JSON.parse(res.mesg) + this.form.endTime = data.endTime || data.form.endTime this.form.itemsNum = data.itemsNum || data.form.itemsNum this.form.itemsName = data.itemsName || data.form.itemsName this.commentText6 = data.commentText6 || '' diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue index 783410f60..5f120ea66 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue @@ -76,7 +76,7 @@ - - - + { let data = JSON.parse(res.mesg); - console.log(data); this.commentText5 = data.commentText5 || '' this.form.fjList = data.form ? data.form.fjList : (data.fjList ? data.fjList : [] ) this.form.modelList = data.form ? data.form.modelList : (data.modelList ? data.modelList : [] ) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue index db4ee6551..97723e319 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue @@ -105,7 +105,7 @@ { let data = JSON.parse(res.mesg); - console.log(data); this.commentText6 = data.commentText6 || '' this.form.fjList = data.fjList || data.form.fjList this.form.cid = data.cid || data.form.cid; @@ -544,6 +546,7 @@ } }) this.json = data + this.data2 = newArr this.data = arr }).catch(e => { }); diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue index 544bed354..e30146ceb 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue @@ -97,7 +97,7 @@ { }) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue index 90dbad5a6..c87546e05 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue @@ -97,7 +97,7 @@ { }) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue index 61c52caf5..a851a20d5 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue @@ -97,7 +97,7 @@ { }); }); diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue index 6a113aacd..98b183dcf 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue @@ -64,13 +64,6 @@ placeholder="请选择初稿完成时间"> - - - - - -
@@ -115,6 +100,14 @@ >
+ + + - - - + + + + + + + + + + { + this.cbcdOptions = res.data.DEGREESTANDARD //采标程度 this.BZList = res.data.ENERGYTYPES //标准范围 this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别 }) diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue index c0f6b8804..400d5eb8d 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue @@ -63,13 +63,6 @@ placeholder="请选择初稿完成时间"> - - -
- - -
@@ -122,6 +107,14 @@ >
+ + + - - + + + + + + + + { this.BZList = res.data.ENERGYTYPES //标准范围 this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别 + this.cbcdOptions = res.data.DEGREESTANDARD //采标程度 }) }, methods: { diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue index cba002292..a1c57cf5e 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue @@ -34,11 +34,17 @@ - - - + + + + @@ -47,6 +53,13 @@ @click.native="choiceZRBM('unit', '选择起草责任单位', qbfsForm.unit)"> + + + + + @@ -75,19 +88,6 @@ placeholder="请选择计划标准发布时间"> - - - - - - + +
+ {{ item.name }} + + + + + + +
+
{ + console.log(res) + if(res){ + this.qbfsForm.LXD = res.id + this.qbfsForm.LXDName = '立项单' + this.LXDList=this.assemble(res.id,'立项单'); + } + + }) + } }, methods: { + assemble(ids,names){ + let list= new Array(); + let idArray=ids.split(','); + let nameArray=names.split(','); + for(let i=0; i
- - - - - - @@ -1082,7 +1080,7 @@ class="add-form-item" > - +