- {{ item.name }}
+
@@ -262,7 +276,7 @@
import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle";
-import { inboundLiaisonDetail, processCreateStand, changeAssigneeNew } from "api/process";
+import { inboundLiaisonDetail, processCreateStand, changeAssigneeNew,getBusStandFileByAttId } from "api/process";
import axios from "axios";
export default {
@@ -317,6 +331,50 @@ export default {
ProcessTitle
},
methods: {
+ filesUpload (file) { // 下载
+ const attId = file.attId
+ if (attId) {
+ window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+ } else {
+ this.$message.warning('文件不存在,下载失败')
+ }
+ },
+ getBusStandFileByAttId(attId) { // 预览
+ return new Promise((resolve, reject) => {
+ getBusStandFileByAttId({
+ attId
+ }).then(res => {
+ if (res.ok) {
+ resolve(res.data)
+ } else {
+ reject()
+ }
+ }).catch(e => {
+ reject(e)
+ })
+ })
+ },
+ fileLook(file) { // 预览
+ const attId = file.attId
+ this.getBusStandFileByAttId(attId)
+ .then(res => {
+ if(res){
+ const editFileInfo = res
+ if(editFileInfo.fileSuffix === 'pdg' || editFileInfo.fileSuffix === 'PDG'){
+ window.open('book://ssreader/e0?url='+editFileInfo.downLoadUrl)
+ }else if(editFileInfo.fileSuffix === 'pdf' || editFileInfo.fileSuffix === 'PDF'){
+ window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id))
+ }else {
+ const nowTime = new Date().getTime()
+ // window.open('http://127.0.0.1:8012/onlinePreview?url='+encodeURIComponent(Base64.encode(editFileInfo.downLoadUrl)));
+ window.open('/static/onlyOffice/onlinePreview.html?oldFileName=' + editFileInfo.oldFileName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName)
+ }
+ // window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id))
+ }
+ }).catch(e => {
+ this.$message.warning('文件不存在,预览失败')
+ })
+ },
itermsConditionsClose () {
this.itermsConditionsFlag = false
},
@@ -382,10 +440,12 @@ export default {
reason: "修改理由",
department: "提出部门",
responUserName: "提出人",
- stateText: "处理意见"
},
dataList: []
};
+ if (title === '上报意见.xls') {
+ params.columnName.stateText = "处理意见"
+ }
params.dataList = JSON.parse(JSON.stringify(row));
params.dataList.forEach(item => {
if (item.state === "1") {
diff --git a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step1.vue b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step1.vue
index f46d88d82..c1af624bd 100644
--- a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step1.vue
@@ -186,7 +186,16 @@ export default {
this.$refs["Form"].validate((valid) => {
if (valid) {
this.isSubmit = true
- this.$http.get("lawss/activiti/startProcess", {type: "14"}, {
+ this.$http.post("lawss/activiti/startProcessRollBack", {
+ id: this.bpnId || '',
+ createUser: this.$store.getters.userInfo.userId,
+ createUserName: this.$store.getters.userInfo.userName,
+ type: '14',
+ json: JSON.stringify({
+ taskInfo: '责任部门对接人选择责任人',
+ roleForm: this.roleForm,
+ })
+ }, {
_this: this
}, res => {
if (res.ok) {
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue
index 4702a989d..fe193ebd3 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue
@@ -455,8 +455,10 @@
v-show="verifySarStandard"
show-save
show-submit
+ show-edit
:submitLoading="isSubmit"
:saveLoading="saveLoading"
+ @onLineEdit="handleOnLineEdit"
@save="handleSave"
@submit="handleSubmit"
>
@@ -805,7 +807,7 @@
import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle'
- import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail} from "api/process";
+ import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processModelHisOne} from "api/process";
import TreeSelect from '@/components/treeSelect/treeSelect.vue';
import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
let Base64 = require('js-base64').Base64;
@@ -2263,6 +2265,44 @@
handleTabs(name) {
this.active = name
},
+ processModelHisOne(pId,taskIds) {
+ return new Promise((resolve, reject) => {
+ processModelHisOne({
+ pid: pId,
+ taskId: taskIds
+ }).then(res => {
+ if (res) {
+ resolve(res)
+ } else {
+ reject()
+ }
+ }).catch(e => {
+ reject(e)
+ })
+ })
+ },
+ // 在线编辑
+ handleOnLineEdit(){
+ this.isSubmit = true
+ this.processModelHisOne(this.pId,this.taskIds)
+ .then(res => {
+ console.log(res)
+ if(res){
+ const editFileInfo = res
+ const showName = this.$store.getters.userInfo.userName + editFileInfo.taskInfo
+ const editFilePath = editFileInfo.editFilePath.split("/")
+ editFileInfo.filePath = editFilePath[0]+'/'+editFilePath[1]+'/'
+ editFileInfo.fileName = editFilePath[2]
+ editFileInfo.userName = this.$store.getters.userInfo.userName
+ const nowTime = new Date().getTime()
+ window.open('http://127.0.0.1:8080/editor?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)
+ this.isSubmit = false
+ }
+ }).catch(e => {
+ console.log(e)
+ // this.$message.warning('文件不存在,预览失败')
+ })
+ },
//保存
handleSave() {
this.form.country=this.countryArr;
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue
index 025398b68..a67d73a42 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue
@@ -455,8 +455,10 @@
v-show="verifySarStandard"
show-save
show-submit
+ show-edit
:saveLoading="saveLoading"
:submitLoading="isSubmit"
+ @onLineEdit="handleOnLineEdit"
@save="handleSave"
@submit="handleSubmit"
>
@@ -804,7 +806,7 @@
import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle'
- import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail} from "api/process";
+ import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processModelHisOne} from "api/process";
import TreeSelect from '@/components/treeSelect/treeSelect.vue';
import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
let Base64 = require('js-base64').Base64;
@@ -2262,6 +2264,44 @@
handleTabs(name) {
this.active = name
},
+ processModelHisOne(pId,taskIds) {
+ return new Promise((resolve, reject) => {
+ processModelHisOne({
+ pid: pId,
+ taskId: taskIds
+ }).then(res => {
+ if (res) {
+ resolve(res)
+ } else {
+ reject()
+ }
+ }).catch(e => {
+ reject(e)
+ })
+ })
+ },
+ // 在线编辑
+ handleOnLineEdit(){
+ this.isSubmit = true
+ this.processModelHisOne(this.pId,this.taskIds)
+ .then(res => {
+ console.log(res)
+ if(res){
+ const editFileInfo = res
+ const showName = this.$store.getters.userInfo.userName + editFileInfo.taskInfo
+ const editFilePath = editFileInfo.editFilePath.split("/")
+ editFileInfo.filePath = editFilePath[0]+'/'+editFilePath[1]+'/'
+ editFileInfo.fileName = editFilePath[2]
+ editFileInfo.userName = this.$store.getters.userInfo.userName
+ const nowTime = new Date().getTime()
+ window.open('http://127.0.0.1:8080/editor?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)
+ this.isSubmit = false
+ }
+ }).catch(e => {
+ console.log(e)
+ // this.$message.warning('文件不存在,预览失败')
+ })
+ },
//保存
handleSave() {
this.form.country=this.countryArr;
diff --git a/src/pages/processCenter/pages/creatProcess/wbsm/step5.vue b/src/pages/processCenter/pages/creatProcess/wbsm/step5.vue
index 137e02b6b..24aca3580 100644
--- a/src/pages/processCenter/pages/creatProcess/wbsm/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/wbsm/step5.vue
@@ -60,7 +60,7 @@
-
+
{
if (valid) {
this.isSubmit = true
- const paramsInfo = {
- type: '8'
- }
- startProcess(paramsInfo).then(res => {
+ let paramsInfo = new FormData()
+ paramsInfo.append('id', this.bpnId || '')
+ paramsInfo.append('createUser', this.$store.getters.userInfo.userId)
+ paramsInfo.append('createUserName', this.$store.getters.userInfo.userName)
+ paramsInfo.append('type', '8')
+ paramsInfo.append('json', JSON.stringify({
+ roleForm: this.roleForm,
+ dataList: this.dataList,
+ commentText: this.commentText
+ }))
+ processBack(paramsInfo).then(res => {
this.taskID = res.data
const params = new FormData();
params.set('json', JSON.stringify(json))
diff --git a/src/pages/processCenter/pages/newProcess/index.vue b/src/pages/processCenter/pages/newProcess/index.vue
index 5892599d3..8503a7890 100644
--- a/src/pages/processCenter/pages/newProcess/index.vue
+++ b/src/pages/processCenter/pages/newProcess/index.vue
@@ -125,7 +125,7 @@
-
+
@@ -140,7 +140,7 @@
-
+
@@ -155,7 +155,7 @@
-
+
@@ -190,7 +190,7 @@
企业标准相关流程
-
+
@@ -205,7 +205,7 @@
-
+
@@ -220,7 +220,7 @@
-
+
@@ -235,7 +235,7 @@
-
+
@@ -256,7 +256,7 @@
标准化活动相关流程
-
+
@@ -271,7 +271,7 @@
-
+
@@ -301,7 +301,7 @@
-
+
@@ -316,7 +316,7 @@
-
+
@@ -331,7 +331,7 @@
-
+
@@ -346,14 +346,14 @@
-
-
+
+
-
加入标准化协会信息提报流程
+
参与外部标准制修订信息提报流程
diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
index 59b78eea8..5801004e3 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
@@ -610,16 +610,63 @@
-
+
- 关联模块--VPPS编码
-
+ 关联模块--乘用车VPPS编码
+
+
+
+
+
+
+
+
+ 关联模块--卡车VPPS编码
+
+
+
+
+
+
+
+
+
+
+ 模块结构单元变型号
+
+
+
+
+
+
+
+
+ :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"
+ @popoverHideCancel="popoverHideBusVsCancel">
+
+
@@ -1320,6 +1394,7 @@ import CustomSVPPS from '@/components/CustomFormComponents/SVPPS'
import TreeSelect from '@/components/treeSelect/treeSelect.vue';
import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
import ProcessTitle from '@/pages/processCenter/pages/components/ProcessTitle'
+import treeSelectModule from "@/components/treeSelect/treeSelectModule.vue";
import {mapGetters} from 'vuex'
import store from "@/store";
@@ -1338,6 +1413,7 @@ export default {
CustomSVPPS,
TreeSelect,
TreeSelectNew,
+ treeSelectModule,
ProcessTitle
},
props: {
@@ -1496,6 +1572,12 @@ export default {
sarBussionessStandEO: {
TXLBBUSS:'',
VPPSBMBUSS:'',
+ KCVPPSBMBUSS: '',
+ KCVPPSCNBUSS: '',
+ DYBXHBUSS: '',
+ DYMCBUSS: '',
+ CYCVPPSBMBUSS: '',
+ CYCVPPSCNBUSS: '',
VPPSCNBUSS:'',
regionShow: '亚洲',
region: '2T8PFTSYE7',
@@ -1880,6 +1962,12 @@ export default {
SYCPXCLASS:'',
TXLBBUSS:'',
VPPSBMBUSS:'',
+ KCVPPSBMBUSS: '',
+ KCVPPSCNBUSS: '',
+ CYCVPPSBMBUSS: '',
+ CYCVPPSCNBUSS: '',
+ DYBXHBUSS: '',
+ DYMCBUSS: '',
VPPSCNBUSS:'',
// 关联信息
DTQBBHBUSS:'',
@@ -1965,6 +2053,9 @@ export default {
syrzOptions:[],//适用认证下拉框
gkglbmOptions:[],//归口管理部门下拉框
drawerTitle: '',
+ drawerTitle3: '',
+ drawerTitle4: '',
+ drawerTitle2: '',
modalShowRoleFlag: false,
nodeList: [],
nodeList2: [],
@@ -2023,6 +2114,7 @@ export default {
modalShowFlag2: false, // drawer开关
modalShowFlag3: false, // drawer开关
modalShowFlag4: false, // drawer开关
+ type: '',
url:'',
urlChild:'',
}
@@ -2085,27 +2177,56 @@ export default {
return [year, month, day].join('-') + " " + [hour, minute, second].join(':');//格式为:YY-MM-DD hh:mm:ss(当前时间)
},
popoverHideQuery(ids,attrField){
- console.log(ids)
- console.log("-----------------------------")
- console.log(attrField)
},
+ popoverHideBusVsCancel() {
+ this.modalShowFlag2 = false
+ },
popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
- if(checkedData) {
- if(checkedData.length > 0){
- this.sarBussionessStandEO.VPPSBMBUSS = checkedData.map(item => item.code).join(",")
- this.sarBussionessStandEO.VPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
- this.sarBussionessSearch.VPPSBMBUSS = checkedData.map(item => item.code).join(",")
- this.sarBussionessSearch.VPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
- }else {
- this.sarBussionessStandEO.VPPSBMBUSS = checkedData.code
- this.sarBussionessStandEO.VPPSCNBUSS = checkedData.chineseName
- this.sarBussionessSearch.VPPSBMBUSS = checkedData.code
- this.sarBussionessSearch.VPPSCNBUSS = checkedData.chineseName
- }
+ if (checkedData && checkedData.length != 0) {
+ if (checkedData.length > 0) {
+ this.sarBussionessStandEO.CYCVPPSBMBUSS = checkedData.map(item => item.code).join(",")
+ this.sarBussionessStandEO.CYCVPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
+ } else {
+ this.sarBussionessStandEO.CYCVPPSBMBUSS = checkedData.code
+ this.sarBussionessStandEO.CYCVPPSCNBUSS = checkedData.chineseName
}
this.modalShowFlag2 = false
+ }
this.$forceUpdate()
},
+ popoverHideCarVs(checkedIds, checkedData, isShow, isLoadChild, topId) {
+ if (checkedData && checkedData.length != 0) {
+ if (checkedData.length > 0) {
+ this.sarBussionessStandEO.KCVPPSBMBUSS = checkedData.map(item => item.code).join(",")
+ this.sarBussionessStandEO.KCVPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
+ } else {
+ this.sarBussionessStandEO.KCVPPSBMBUSS = checkedData.code
+ this.sarBussionessStandEO.KCVPPSCNBUSS = checkedData.chineseName
+ }
+ this.modalShowFlag3 = false
+ }
+
+ this.$forceUpdate()
+ },
+ popoverHideCarVsCancel() {
+ this.modalShowFlag3 = false
+ },
+ popoverHideModel(checkedIds, checkedData, isShow, isLoadChild, topId) {
+ if (checkedData && checkedData.length != 0) {
+ if (checkedData.length > 0) {
+ this.sarBussionessStandEO.DYBXHBUSS = checkedData.map(item => item.model).join(",")
+ this.sarBussionessStandEO.DYMCBUSS = checkedData.map(item => item.name).join(",")
+ } else {
+ this.sarBussionessStandEO.DYBXHBUSS = checkedData.model
+ this.sarBussionessStandEO.DYMCBUSS = checkedData.name
+ }
+ this.modalShowFlag4 = false
+ }
+ this.$forceUpdate()
+ },
+ popoverHideModelCancel() {
+ this.modalShowFlag4 = false
+ },
popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) {
if(checkedData) {
if(checkedData.length > 0){
@@ -2120,14 +2241,31 @@ export default {
this.$forceUpdate()
},
choiceZRR2 (type, title, id,multFlag) {
- this.drawerTitle = title
+ this.drawerTitle2 = title
this.modalShowFlag2 = true
this.multipleFlag2 = multFlag
this.url = ''
this.urlChild = ''
+ this.type = type
this.url="sarVppsTree/list"
this.urlChild="sarVppsTree/childByList"
},
+ choiceZRR3(type, title, id) {
+ this.drawerTitle3 = title
+ this.modalShowFlag3 = true
+ this.url = ''
+ this.urlChild = ''
+ this.url = "sarVppsTree/list"
+ this.urlChild = "sarVppsTree/childByList"
+ },
+ choiceZRR4(type, title, id) {
+ this.drawerTitle4 = title
+ this.modalShowFlag4 = true
+ this.url = ''
+ this.urlChild = ''
+ this.url = "sarModelTree/list"
+ this.urlChild = "sarModelTree/childByList"
+ },
choiceZRR1 (type, title, id) {
this.drawerTitle1 = title
this.modalShowFlag1 = true
@@ -2883,7 +3021,6 @@ export default {
})
})
this.dynamicFormField = displayLocation
- console.log('2805',this.dynamicFormField)
this.loading = false
})
this.sarBussionessStandEO = JSON.parse(JSON.stringify(item))
@@ -2935,7 +3072,6 @@ export default {
$('#deptBtn2').click()
},
choiceQCR (type, title, id) {
- console.log('2077',title)
this.nodeList = []
this.nodeList.push(id)
this.userType = type
@@ -2943,7 +3079,6 @@ export default {
this.modalShowRoleFlag = true
},
checkedRole2 (data) {
- console.log('1712',this.drawerTitle)
let idList = ''
let nameList = ''
data.forEach( item => {
@@ -2954,7 +3089,12 @@ export default {
idList += item.id
nameList += item.name
})
- this.sarBussionessStandEO['QCRBUSS'] = nameList
+ this.$set(this.sarBussionessStandEO, 'QCRBUSS', nameList)
+ if(this.sarBussionessStandEO.QCRBUSS){
+ this.$refs.sarBussionessStandForm.validateField('QCRBUSS')
+ }
+ // this.sarBussionessStandEO['QCRBUSS'] = nameList
+
},
choiceQCDW(type, title, id) {
@@ -2966,8 +3106,6 @@ export default {
this.modalshowflagZRBM = true
},
drawerCheckZRBM(data) {
-
- console.log("5389", data);
let idList = ''
let nameList = ''
data.forEach(item => {
@@ -2980,9 +3118,13 @@ export default {
nameList += item.name
// }
})
-
- this.sarBussionessStandEO.QCDWId = idList;
- this.sarBussionessStandEO['QCDW'] = nameList;
+ this.$set(this.sarBussionessStandEO, 'QCDWId', idList)
+ this.$set(this.sarBussionessStandEO, 'QCDW', nameList)
+ if(this.sarBussionessStandEO.QCRBUSS){
+ this.$refs.sarBussionessStandForm.validateField('QCDW')
+ }
+ // this.sarBussionessStandEO.QCDWId = idList;
+ // this.sarBussionessStandEO['QCDW'] = nameList;
},
// 新增-表单空
@@ -3001,7 +3143,6 @@ export default {
if (flag) {
// 时间格式修改
let nowstandinfo = JSON.parse(JSON.stringify(this.sarBussionessStandEO))
- console.log(nowstandinfo)
if (nowstandinfo.issueTime != null && nowstandinfo.issueTime !== '') {
nowstandinfo.issueTime = this.$dateFormat(this.sarBussionessStandEO.issueTime, 'yyyy-MM-dd hh:mm:ss')
}
@@ -3018,7 +3159,6 @@ export default {
}
// 处理动态表单的时间和下拉框格式
const formFieldList = this.formFieldList
- console.log(this.formFieldList)
const sarStandAttrObj = {}
formFieldList.forEach((item) => {
const value = nowstandinfo[item.attrField]
@@ -3713,8 +3853,6 @@ export default {
}
this.standinfoList = []
this.standinfoList = res.data.list
- console.log(this.standinfoList)
- console.log(res.data.list)
this.total = res.data.count
if ((this.standinfoList.length === 0 || this.standinfoList === []) && this.sarBussionessSearch.page !== 1) {
this.pageChange(1)
@@ -3826,7 +3964,6 @@ export default {
}
})
} else if (this.ocrList.length === 1 && type === '2'){
- console.log('4228',this.ocrList)
this.selectStandardPro(this.ocrList[0], 'edit')
}
},
@@ -3983,7 +4120,6 @@ export default {
}, {
_this: this
}, res => {
- console.log('getAreaList',res.data)
this.showRegionOptions = res.data || []
resolve(res.data || [])
}, e => {
@@ -4062,6 +4198,7 @@ export default {
this.reloadAddForm = false
const formFieldList = this.formFieldList
const rules = {...this.defaultAddFormFieldRules}
+ console.log(formFieldList);
formFieldList.forEach((item) => {
const rule = []
if (item.isMust === '0') {
@@ -4073,7 +4210,10 @@ export default {
rule.push({ required: true, message: `${item.attrName}不能为空`, trigger: 'change' })
}
}
- if (item.attrLen && item.attrType !== 'DATE_PICKER' && item.attrType !== 'SEL_OPTION' && item.attrType !== 'SEL_OPTS') {
+ if (item.attrLen && item.attrType === 'INPUT_STR' && item.attrField === 'DTQBBHBUSS') {
+ rule.push({type: 'string', max: 500, message: '代替企标编号不能超过500个字符', trigger: 'change'})
+ }
+ if (item.attrLen && item.attrType !== 'DATE_PICKER' && item.attrType !== 'SEL_OPTION' && item.attrType !== 'SEL_OPTS'&& item.attrType !== 'INPUT_STR') {
rule.push({type: 'string', max: item.attrLen, message: `${item.attrName}不能超过${item.attrLen}个字符`, trigger: 'change'})
}
if (rule.length > 0) {
@@ -4084,6 +4224,7 @@ export default {
// this.rules = rules
this.$set(this, 'sarBussionessStandRules', rules)
+
setTimeout(() => {
this.reloadAddForm = true
}, 1000)
@@ -4140,7 +4281,6 @@ export default {
}
this.stahndinfoList = []
this.stahndinfoList = res.data.list
- console.log(this.stahndinfoList)
this.total = res.data.count
if ((this.stahndinfoList.length === 0 || this.stahndinfoList === []) && this.sarBussionessSearch.page !== 1) {
this.pageChange(1)
@@ -4292,7 +4432,6 @@ export default {
day = "0" + day;
}
const FSRQBUSS = year + "-" + month + "-" + day;
- console.log(FSRQBUSS,"FSRQBUSS");
this.sarBussionessStandEO["FSRQBUSS"] = FSRQBUSS
}
@@ -4332,7 +4471,7 @@ export default {
this.energyKindOptions = res.data.ENERGYTYPES
this.standGeneraOptions = res.data.BUSSBIGCLASS
this.standSubclassOptions = res.data.BUSSFINECLASS
- this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
+ this.standSortOptions = res.data.BUSSSTANDCLASS // 企业标准类别
this.standNatureOptions = res.data.SARPROPERTY // 标准性质
this.standStateOptions = res.data.TEXTSTATUSBUSS // 文本状态
this.standSystemOptions = res.data.TXLBBUSS // 标准体系
diff --git a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
index 76eb6ce52..55900ad98 100644
--- a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
+++ b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
@@ -41,6 +41,22 @@
-
+
+
+
+
+
+ {{ file.name }}
+ 下载
+
+
+
+
-
+
{{ this.$route.query.item.startTime || '-' }}
@@ -80,6 +96,12 @@
align="center"
width="120">
+
+
查看修改前内容
@@ -166,6 +189,9 @@
:value="item.itemsNum">
+
+
+
@@ -207,6 +233,7 @@ export default {
itermsConditionsTitle: '',
options: [],
fileInfoList: [],
+ fileInfoLists: [],
itemData: this.$route.query.item,
id: '', // 选中id
type: '', // 选中状态
@@ -220,7 +247,8 @@ export default {
partCode: '',
oldText: '',
newText: '',
- reason: ''
+ reason: '',
+ chapterName: '',
},
opinionContentRules: {
partCode: [
@@ -260,6 +288,7 @@ export default {
for (let a = 0; a < this.options.length; a++) {
if (data === this.options[a].itemsNum) {
this.opinionContent.oldText = this.options[a].termsConditions
+ this.opinionContent.chapterName = this.options[a].itemsName
}
}
},
@@ -389,6 +418,7 @@ export default {
newText: this.opinionContent.newText,
reason: this.opinionContent.reason,
partCode: this.opinionContent.partCode,
+ chapterName: this.opinionContent.chapterName,
userId: this.$store.getters.userInfo.userId || '',
userName: this.$store.getters.userInfo.userName || '',
deptName: this.$store.getters.userInfo.orgName || '',
@@ -431,6 +461,7 @@ export default {
}
},
mounted() {
+ this.fileInfoLists = JSON.parse(this.$route.query.item.wkfiles)
let json = JSON.parse(this.$route.query.item.files)[0]
this.$http.get('SarStandItems/sar-stand-items/querySarItemAndInterpretation', {
standId: json.standId,
diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js
index 3e7149052..8d821dfcb 100644
--- a/src/sysConfig/index.js
+++ b/src/sysConfig/index.js
@@ -17,6 +17,10 @@ const ssoLogin = 'http://sso.foton.com.cn/oauth2.0/authorize?client_id=app_slrs&
const devWebUrl = 'https://srms.foton.com.cn/#/'
// webLoginType : idm (线上统一登录) 、 webLoginType: dev (测试环境登录)
const webLoginType = 'dev'
+
+// 配置onlyOffice 前端服务
+const onlyOfficeUrl = 'http://127.0.0.1:8080'
+
// 云端端口号
const DEV_CLOUD_RES_INTERFACE_PORT = '7777'
const simpleFilePath = 'att/attFile/upload'
@@ -54,6 +58,7 @@ module.exports = {
webLoginType: webLoginType,
ssoLoginUrlDev: ssoLogin + devWebUrl,
ssoLoginUrl: ssoLogin,
+ onlyOfficeUrl: onlyOfficeUrl,
devWebUrl: devWebUrl,
serverUrl: 'https://' + serverIP, // 服务器IP地址
interfaceUrl: 'https://' + serverIP + ':' + interfacePORT + '/api/', // 服务器端接口访问地址,