@@ -542,16 +542,17 @@
+ 搜索
@@ -594,11 +595,11 @@
{{ scope.row.lawsName }}
-
-
-
-
-
+
@@ -931,7 +932,7 @@ export default {
_this: this
}, res => {
this.addSpiltStandList = res.data.list
- this.addFileStandtotal = res.data.count
+ this.addFileStandtotal = res.data.list.length
this.loadData = false
}, e => {
this.loadData = false
@@ -1359,10 +1360,7 @@ export default {
name: 'ItemSplitInfo',
query: {
infoId: row.id,
- // standNumSplit: row.standNumSplit === null ? row.showNumber : row.standNumSplit,
- // standNameSplit: row.standNameSplit === null ? row.standName : row.standNameSplit,
result: row.result,
- // fileType: row.fileType
}
})
},
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
index a3b48f73e..10019cd87 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
@@ -577,6 +577,51 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+
+ 清空
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 标准/政策法规工程师
-
-
- 责任人
-
-
-
-
-
- 标准/政策法规工程师
-
-
- 业务经理
-
-
- 会签责任人
@@ -1331,6 +1335,8 @@ categoryOptions: [], // 能源类型 applyAuthOptions: [], // 适用认证 cysdOptions: [], // 我司参与深度 + wssmrOptions: [], // 我司署名人 + qcdwOptions: [], // 起草单位 sycpxOptions: [], // 适用产品线 zrbmOptions: [], // 责任部门 zrgcsOptions: [], // 责任工程师 @@ -1859,6 +1865,9 @@ }else if(this.fileType === 'ca'){ this.form.ca = response.data.id; this.form.caName = response.data.name; + }else if(this.fileType === 'zbjbd'){ + this.form.zbjbd = response.data.id; + this.form.zbjbdName = response.data.name; } this.$message({ showClose: true, @@ -1943,6 +1952,7 @@ if (valid) { this.$refs['userForm'].validate((valid) => { if (valid) { + this.isSubmit = true var json = Object.assign(this.form, this.roleForm) json.zrUserId = this.form.zrUserId json.jlUserId = this.form.jlUserId @@ -1963,6 +1973,7 @@ }, res => { if (res.success) { this.$message.success(res.message) + this.isSubmit = false } }) } @@ -2006,6 +2017,8 @@ this.categoryOptions = res.data.NYLXCLASS // 能源类型 this.applyAuthOptions = res.data.SYRZCLASS // 适用认证 this.cysdOptions = res.data.WSCYSD // 我司参与深度 + this.wssmrOptions = res.data.WSSMR // 我司署名人 + this.qcdwOptions = res.data.QCDW // 我司署名人 this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线 this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue index 1b7addb1e..9d3675641 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue @@ -315,7 +315,7 @@{{ 11 || '暂无数据' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{
+ this.selectList.map(item => {
+ let index;
+ index = this.dataList.findIndex(items => {
+ return items.productLine = item
+ })
+ if (index > -1) {
+ this.dataList.splice(index, 1);
+ }
+ });
+ this.selectList = [];
+ }).catch(() => {
+ })
+ }
+ },
//取消添加事件
cancelStand() {
this.standModel = false;
@@ -590,6 +660,7 @@ export default {
}, {
_this: this
}, res => {
+ console.log(res.data);
this.listForm.breakdownList = res.data;
this.ListModel = false;
}, e => {
@@ -609,7 +680,7 @@ export default {
selectStandChange(data) {
this.selectList = [];
for (let i = 0; i < data.length; i++) {
- this.selectList.push(data[i].id);
+ this.selectList.push(data[i].productLine);
}
},
//添加产品线select的改变
@@ -655,7 +726,7 @@ export default {
}, {
_this: this
}, res => {
- this.productData = res.data;
+ this.productData = res.data.records;
this.totalNo = res.data.total;
}, e => {
@@ -663,20 +734,24 @@ export default {
},
//获取标准数据
getStandData() {
- console.log(this.page);
- console.log(this.pageSize);
this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", {
page: this.page,
pageSize: this.pageSize,
}, {
_this: this
}, res => {
- console.log(res.data);
this.sarAccessListDatas = res.data.list;
this.total = res.data.count;
}, e => {
});
- }
+ },
+ clearSearch() {
+ this.sarSarAccessEOSearch = {
+ standName: "",
+ standNumber: ""
+ };
+ this.getStandData();
+ },
},
computed: {},
mounted() {
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
index d9e41a3e0..5d6473957 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
@@ -132,14 +132,12 @@
prop="name"
label="任务步骤"
align="center"
- sortable="custom"
>
-
+
{
if (valid) {
let rowlist = []
diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 72c7cc762..38a043c73 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -554,53 +554,7 @@
:config="field"
v-model="sarStandardsInfoEO[field.attrField]"
:disabled="formdisableflag"
- >1
-
-
-
-
-
+
+
+ 乘用车VPPS编码
+
+
+
+
+ 卡车VPPS编码
+
+
+
+
+ 模块结构单元变型号
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
- {
+ this.busVppsOptions = res.data
+ })
+ },
+ modelFunc(){
+ this.$http.get('sarModelTree/list', '', {
+ _this: this
+ }, res => {
+ this.modelOptions = res.data
+ })
+ },
popoverHide (checkedIds, checkedData) {
- console.log(checkedIds);
- console.log(checkedData);
- this.sarStandardsInfoEO.standSystem = checkedData.id
- console.log(this.sarStandardsInfoEO.standSystem);
+ if(checkedData){
+ this.sarStandardsInfoEO.standSystem = checkedData.id
+ }
},
closeModal () {
this.productModal = false
@@ -1854,12 +1954,12 @@ export default {
this.addOrUPdateFlag = 2
this.modalshowtitle = '编辑海外标准'
this.modalshowflag = true
-
this.resolveFormFieldList(item.isRelateAccess)
this.$nextTick(() => {
Promise.all([this.queryDisplayLocation()]).then((values) => {
const [displayLocation] = values
const formFieldList = this.formFieldList
+ console.log(formFieldList)
this.sarStandardsInfoEO = JSON.parse(JSON.stringify(item))
this.defaultCheckedKeys = [this.sarStandardsInfoEO.standSystem];
this.sarStandardsInfoEO.standSort = item.standSort
@@ -1885,6 +1985,15 @@ export default {
if (value && field.attrType === 'DATE_PICKER') {
value = this.$moment(value).format('YYYY-MM-DD')
}
+ if(field.attrField === 'CYCVPPSBM'){
+ this.defaultCheckedKeys1 = [value]
+ }
+ if(field.attrField === 'KCCVPPSBM'){
+ this.defaultCheckedKeys2 = [value]
+ }
+ if(field.attrField === 'DYBXH'){
+ this.defaultCheckedKeys3 = [value]
+ }
field['value'] = value
// 追加用户名称和部门名称
if (field.selVal === 'ROLELIST' || field.selVal === 'ORGLIST' || field.selVal === 'USERLIST' || field.attrField === 'SVPPS' || field.attrField === 'XMPGJS') {
@@ -2516,81 +2625,71 @@ export default {
this.$message.success('保存成功')
},
// 保存或修改标准
- saveOrUpdateStands () {
- this.$refs['sarStandardsInfoForm'].validate((valid) => {
- if (valid) {
- // 验证标准号是否唯一
- this.validateStandNumber(this.sarStandardsInfoEO).then((flag) => {
- if (flag) {
- // 时间格式修改
- let nowstandinfo = JSON.parse(JSON.stringify(this.sarStandardsInfoEO))
- // if (nowstandinfo.issueTime != null && nowstandinfo.issueTime !== '') {
- // nowstandinfo.issueTime = this.$moment(this.sarStandardsInfoEO.issueTime).format('YYYY-MM-DD')
- // }
- if (nowstandinfo.putTime != null && nowstandinfo.putTime !== '') {
- nowstandinfo.putTime = this.$dateFormat(this.sarStandardsInfoEO.putTime, 'yyyy-MM-dd hh:mm:ss')
+ saveOrUpdateStands () {
+ this.isSubmit = true
+ this.$refs['sarStandardsInfoForm'].validate((valid) => {
+ if (valid) {
+ // 验证标准号是否唯一
+ this.validateStandNumber(this.sarStandardsInfoEO).then((flag) => {
+ if (flag) {
+ // 时间格式修改
+ let nowstandinfo = JSON.parse(JSON.stringify(this.sarStandardsInfoEO))
+ if (nowstandinfo.putTime != null && nowstandinfo.putTime !== '') {
+ nowstandinfo.putTime = this.$dateFormat(this.sarStandardsInfoEO.putTime, 'yyyy-MM-dd hh:mm:ss')
+ }
+ // 代替标准号
+ if (nowstandinfo.replaceStandNum != null) {
+ nowstandinfo.replaceStandNum = nowstandinfo.replaceStandNum.replace(/，/ig, ',')
+ }
+ if (nowstandinfo.replaceStandNum != null && nowstandinfo.replaceStandNum !== '') {
+ nowstandinfo.replaceStandNum = nowstandinfo.replaceStandNum.replace(/\r\n/g, '
') + nowstandinfo.replaceStandNum = nowstandinfo.replaceStandNum === '' ? '' : nowstandinfo.replaceStandNum.replace(/\n/g, '
') + } + // 处理动态表单的时间和下拉框格式 + const formFieldList = this.formFieldList + const sarStandAttrObj = {} + formFieldList.forEach((item) => { + const value = nowstandinfo[item.attrField] + // 时间格式处理 + if (item.attrType === 'DATE_PICKER' && value) { + nowstandinfo[item.attrField] = this.$dateFormat(this.sarStandardsInfoEO[item.attrField], 'yyyy-MM-dd hh:mm:ss') + } + // 数组处理 + if (item.attrType === 'SEL_OPTION' || item.attrType === 'SEL_OPTS') { + if (value != null && (value instanceof Array)) { + nowstandinfo[item.attrField] = nowstandinfo[item.attrField].join(',') + } + } + sarStandAttrObj[item.attrField] = nowstandinfo[item.attrField] + }) + nowstandinfo['sarStandAttrEOStr'] = JSON.stringify(sarStandAttrObj).replace(/"/g, "'") + this.$http.postData(this.addOrUPdateFlag === 1 ? 'sarStandardsInfo/sar-standards-info/addarStandardsInfo' : 'sarStandardsInfo/sar-standards-info/updateSarStandardsInfo', nowstandinfo, { + _this: this + }, res => { + this.isSubmit = false + if (res.ok) { + this.getDomesticStandardTable(this.tableFlag) + this.resetForm() + if (this.addOrUPdateFlag === 1) { + sessionStorage.removeItem('STAND_INLAND') + } + } + }, e => { + this.isSubmit = false + }) + } else { + this.isSubmit = false + } + }, e => {}) + } else { + this.isSubmit = false + this.$message({ + message: '请检查表单是否填写正确', + type: 'warning' + }) } - // 代替标准号 - if (nowstandinfo.replaceStandNum != null) { - nowstandinfo.replaceStandNum = nowstandinfo.replaceStandNum.replace(/，/ig, ',') - } - if (nowstandinfo.replaceStandNum != null && nowstandinfo.replaceStandNum !== '') { - nowstandinfo.replaceStandNum = nowstandinfo.replaceStandNum.replace(/\r\n/g, '
') - nowstandinfo.replaceStandNum = nowstandinfo.replaceStandNum === '' ? '' : nowstandinfo.replaceStandNum.replace(/\n/g, '
') - } - // 处理动态表单的时间和下拉框格式 - const formFieldList = this.formFieldList - const sarStandAttrObj = {} - formFieldList.forEach((item) => { - const value = nowstandinfo[item.attrField] - // 时间格式处理 - if (item.attrType === 'DATE_PICKER' && value) { - nowstandinfo[item.attrField] = this.$dateFormat(this.sarStandardsInfoEO[item.attrField], 'yyyy-MM-dd hh:mm:ss') - } - // 数组处理 - if (item.attrType === 'SEL_OPTION' || item.attrType === 'SEL_OPTS') { - if (value != null && (value instanceof Array)) { - nowstandinfo[item.attrField] = nowstandinfo[item.attrField].join(',') - } - } - sarStandAttrObj[item.attrField] = nowstandinfo[item.attrField] - }) - nowstandinfo['sarStandAttrEOStr'] = JSON.stringify(sarStandAttrObj).replace(/"/g, "'") - // 判断三个实施日期不能全部未N/A和TBD - // if ((nowstandinfo.EOPSSRQ === 'N/A' || nowstandinfo.EOPSSRQ === 'TBD' || nowstandinfo.EOPSSRQ === '已实施') && - // (nowstandinfo.XCXSSRQ === 'N/A' || nowstandinfo.XCXSSRQ === 'TBD' || nowstandinfo.XCXSSRQ === '已实施') && - // (nowstandinfo.ZCCSSRQ === 'N/A' || nowstandinfo.ZCCSSRQ === 'TBD' || nowstandinfo.ZCCSSRQ === '已实施')) { - // this.isSubmit = false - // return this.$message.warning('实施日期必须有一项为日期格式') - // } - this.isSubmit = true - this.$http.postData(this.addOrUPdateFlag === 1 ? 'sarStandardsInfo/sar-standards-info/addarStandardsInfo' : 'sarStandardsInfo/sar-standards-info/updateSarStandardsInfo', nowstandinfo, { - _this: this - }, res => { - this.isSubmit = false - if (res.ok) { - this.getDomesticStandardTable(this.tableFlag) - this.resetForm() - if (this.addOrUPdateFlag === 1) { - sessionStorage.removeItem('FOREIGN_INLAND') - } - } - }, e => { - this.isSubmit = false - }) - } else { - this.isSubmit = false - } - }, e => {}) - } else { - this.isSubmit = false - this.$message({ - message: '请检查表单是否填写正确', - type: 'warning' }) - } - }) - }, + }, // 表格排序 sortChange (sortObj) { if (sortObj.column.order !== 'normal') { @@ -3488,28 +3587,70 @@ export default { }) }) }, - resolveFormFieldList (isEdit) { - const data = this.formFieldListData - this.formFieldList = data.map((item) => { - if (item.attrType === 'SEL_OPTION' || item.attrType === 'SEL_OPTS') { - return Object.assign({}, item, { - options: this.allSelectOptions[item.selVal] + resolveFormFieldList (isEdit) { + const data = this.formFieldListData + this.formFieldList = data.map((item) => { + if (item.attrType === 'SEL_OPTION' || item.attrType === 'SEL_OPTS') { + if(item.attrField === 'WSSMR'){ + return Object.assign({}, item, { + options: this.allSelectOptions["WSSMR"] + }) + }else if(item.attrField === 'QCDW'){ + return Object.assign({}, item, { + options: this.allSelectOptions["QCDW"] + }) + }else if(item.attrField === 'CYSD'){ + return Object.assign({}, item, { + options: this.allSelectOptions["WSCYSD"] + }) + }else if(item.attrField === 'CLLX'){ + return Object.assign({}, item, { + options: this.allSelectOptions["ENERGYTYPES"] + }) + }else if(item.attrField === 'NYLX'){ + return Object.assign({}, item, { + options: this.allSelectOptions["NYLXCLASS"] + }) + }else if(item.attrField === 'SYCPX'){ + return Object.assign({}, item, { + options: this.allSelectOptions["SYCPXCLASS"] + }) + }else if(item.attrField === 'SYRZ'){ + return Object.assign({}, item, { + options: this.allSelectOptions["SYRZCLASS"] + }) + }else if(item.attrField === 'ZRBM'){ + return Object.assign({}, item, { + options: this.allSelectOptions["ZRBMCLASS"] + }) + }else if(item.attrField === 'ZRGCS'){ + return Object.assign({}, item, { + options: this.allSelectOptions["ZRGCSCLASS"] + }) + }else if(item.attrField === 'TXLB'){ + return Object.assign({}, item, { + options: this.allSelectOptions["TXLBCLASS"] + }) + }else { + return Object.assign({}, item, { + options: this.allSelectOptions[item.selVal] + }) + } + } else { + return item + } }) - } else { - return item - } - }) - // 处理时间格式的数据 - data.forEach(item => { - if (item.attrType === 'DATE_PICKER') { - const date = this.sarStandardsInfoEO[item.attrField] ? new Date(this.sarStandardsInfoEO[item.attrField]) : '' - this.$set(this.sarStandardsInfoEO, item.attrField, date) - } else { - this.$set(this.sarStandardsInfoEO, item.attrField, this.sarStandardsInfoEO[item.attrField] || '') - } - }) - this.resolveFormFieldListRules(isEdit) - }, + // 处理时间格式的数据 + data.forEach(item => { + if (item.attrType === 'DATE_PICKER') { + const date = this.sarStandardsInfoEO[item.attrField] ? new Date(this.sarStandardsInfoEO[item.attrField]) : '' + this.$set(this.sarStandardsInfoEO, item.attrField, date) + } else { + this.$set(this.sarStandardsInfoEO, item.attrField, this.sarStandardsInfoEO[item.attrField] || '') + } + }) + this.resolveFormFieldListRules(isEdit) + }, /** * 生成校验规则 */ @@ -3812,6 +3953,8 @@ export default { // 加载动态表单数据 this.getAddFormFieldList() this.getDept() + this.busVsFunc() + this.modelFunc() }, destroyed () { this.allSelectOptions = {} diff --git a/src/router/index.js b/src/router/index.js index 4ab6e1b9d..8d295b2a8 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -702,7 +702,7 @@ const routes = [ meta: { requireAuth: false, // parentPath: '/standAutoSplit', - title: '标准分解单' + title: '拆分结果' } }, // 标准编号申领 diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js index 192b22819..2f49323fa 100644 --- a/src/sysConfig/index.js +++ b/src/sysConfig/index.js @@ -7,7 +7,7 @@ // const devIp = '39.98.140.126' // const devInterfacePORT = '10005' // const devIp = '192.168.10.248' -const devIp = '192.168.10.254' +const devIp = '192.168.1.108' const devInterfacePORT = '9999' // 云端端口号 const DEV_CLOUD_RES_INTERFACE_PORT = '7777'
') + nowstandinfo.replaceStandNum = nowstandinfo.replaceStandNum === '' ? '' : nowstandinfo.replaceStandNum.replace(/\n/g, '
') + } + // 处理动态表单的时间和下拉框格式 + const formFieldList = this.formFieldList + const sarStandAttrObj = {} + formFieldList.forEach((item) => { + const value = nowstandinfo[item.attrField] + // 时间格式处理 + if (item.attrType === 'DATE_PICKER' && value) { + nowstandinfo[item.attrField] = this.$dateFormat(this.sarStandardsInfoEO[item.attrField], 'yyyy-MM-dd hh:mm:ss') + } + // 数组处理 + if (item.attrType === 'SEL_OPTION' || item.attrType === 'SEL_OPTS') { + if (value != null && (value instanceof Array)) { + nowstandinfo[item.attrField] = nowstandinfo[item.attrField].join(',') + } + } + sarStandAttrObj[item.attrField] = nowstandinfo[item.attrField] + }) + nowstandinfo['sarStandAttrEOStr'] = JSON.stringify(sarStandAttrObj).replace(/"/g, "'") + this.$http.postData(this.addOrUPdateFlag === 1 ? 'sarStandardsInfo/sar-standards-info/addarStandardsInfo' : 'sarStandardsInfo/sar-standards-info/updateSarStandardsInfo', nowstandinfo, { + _this: this + }, res => { + this.isSubmit = false + if (res.ok) { + this.getDomesticStandardTable(this.tableFlag) + this.resetForm() + if (this.addOrUPdateFlag === 1) { + sessionStorage.removeItem('STAND_INLAND') + } + } + }, e => { + this.isSubmit = false + }) + } else { + this.isSubmit = false + } + }, e => {}) + } else { + this.isSubmit = false + this.$message({ + message: '请检查表单是否填写正确', + type: 'warning' + }) } - // 代替标准号 - if (nowstandinfo.replaceStandNum != null) { - nowstandinfo.replaceStandNum = nowstandinfo.replaceStandNum.replace(/，/ig, ',') - } - if (nowstandinfo.replaceStandNum != null && nowstandinfo.replaceStandNum !== '') { - nowstandinfo.replaceStandNum = nowstandinfo.replaceStandNum.replace(/\r\n/g, '
') - nowstandinfo.replaceStandNum = nowstandinfo.replaceStandNum === '' ? '' : nowstandinfo.replaceStandNum.replace(/\n/g, '
') - } - // 处理动态表单的时间和下拉框格式 - const formFieldList = this.formFieldList - const sarStandAttrObj = {} - formFieldList.forEach((item) => { - const value = nowstandinfo[item.attrField] - // 时间格式处理 - if (item.attrType === 'DATE_PICKER' && value) { - nowstandinfo[item.attrField] = this.$dateFormat(this.sarStandardsInfoEO[item.attrField], 'yyyy-MM-dd hh:mm:ss') - } - // 数组处理 - if (item.attrType === 'SEL_OPTION' || item.attrType === 'SEL_OPTS') { - if (value != null && (value instanceof Array)) { - nowstandinfo[item.attrField] = nowstandinfo[item.attrField].join(',') - } - } - sarStandAttrObj[item.attrField] = nowstandinfo[item.attrField] - }) - nowstandinfo['sarStandAttrEOStr'] = JSON.stringify(sarStandAttrObj).replace(/"/g, "'") - // 判断三个实施日期不能全部未N/A和TBD - // if ((nowstandinfo.EOPSSRQ === 'N/A' || nowstandinfo.EOPSSRQ === 'TBD' || nowstandinfo.EOPSSRQ === '已实施') && - // (nowstandinfo.XCXSSRQ === 'N/A' || nowstandinfo.XCXSSRQ === 'TBD' || nowstandinfo.XCXSSRQ === '已实施') && - // (nowstandinfo.ZCCSSRQ === 'N/A' || nowstandinfo.ZCCSSRQ === 'TBD' || nowstandinfo.ZCCSSRQ === '已实施')) { - // this.isSubmit = false - // return this.$message.warning('实施日期必须有一项为日期格式') - // } - this.isSubmit = true - this.$http.postData(this.addOrUPdateFlag === 1 ? 'sarStandardsInfo/sar-standards-info/addarStandardsInfo' : 'sarStandardsInfo/sar-standards-info/updateSarStandardsInfo', nowstandinfo, { - _this: this - }, res => { - this.isSubmit = false - if (res.ok) { - this.getDomesticStandardTable(this.tableFlag) - this.resetForm() - if (this.addOrUPdateFlag === 1) { - sessionStorage.removeItem('FOREIGN_INLAND') - } - } - }, e => { - this.isSubmit = false - }) - } else { - this.isSubmit = false - } - }, e => {}) - } else { - this.isSubmit = false - this.$message({ - message: '请检查表单是否填写正确', - type: 'warning' }) - } - }) - }, + }, // 表格排序 sortChange (sortObj) { if (sortObj.column.order !== 'normal') { @@ -3488,28 +3587,70 @@ export default { }) }) }, - resolveFormFieldList (isEdit) { - const data = this.formFieldListData - this.formFieldList = data.map((item) => { - if (item.attrType === 'SEL_OPTION' || item.attrType === 'SEL_OPTS') { - return Object.assign({}, item, { - options: this.allSelectOptions[item.selVal] + resolveFormFieldList (isEdit) { + const data = this.formFieldListData + this.formFieldList = data.map((item) => { + if (item.attrType === 'SEL_OPTION' || item.attrType === 'SEL_OPTS') { + if(item.attrField === 'WSSMR'){ + return Object.assign({}, item, { + options: this.allSelectOptions["WSSMR"] + }) + }else if(item.attrField === 'QCDW'){ + return Object.assign({}, item, { + options: this.allSelectOptions["QCDW"] + }) + }else if(item.attrField === 'CYSD'){ + return Object.assign({}, item, { + options: this.allSelectOptions["WSCYSD"] + }) + }else if(item.attrField === 'CLLX'){ + return Object.assign({}, item, { + options: this.allSelectOptions["ENERGYTYPES"] + }) + }else if(item.attrField === 'NYLX'){ + return Object.assign({}, item, { + options: this.allSelectOptions["NYLXCLASS"] + }) + }else if(item.attrField === 'SYCPX'){ + return Object.assign({}, item, { + options: this.allSelectOptions["SYCPXCLASS"] + }) + }else if(item.attrField === 'SYRZ'){ + return Object.assign({}, item, { + options: this.allSelectOptions["SYRZCLASS"] + }) + }else if(item.attrField === 'ZRBM'){ + return Object.assign({}, item, { + options: this.allSelectOptions["ZRBMCLASS"] + }) + }else if(item.attrField === 'ZRGCS'){ + return Object.assign({}, item, { + options: this.allSelectOptions["ZRGCSCLASS"] + }) + }else if(item.attrField === 'TXLB'){ + return Object.assign({}, item, { + options: this.allSelectOptions["TXLBCLASS"] + }) + }else { + return Object.assign({}, item, { + options: this.allSelectOptions[item.selVal] + }) + } + } else { + return item + } }) - } else { - return item - } - }) - // 处理时间格式的数据 - data.forEach(item => { - if (item.attrType === 'DATE_PICKER') { - const date = this.sarStandardsInfoEO[item.attrField] ? new Date(this.sarStandardsInfoEO[item.attrField]) : '' - this.$set(this.sarStandardsInfoEO, item.attrField, date) - } else { - this.$set(this.sarStandardsInfoEO, item.attrField, this.sarStandardsInfoEO[item.attrField] || '') - } - }) - this.resolveFormFieldListRules(isEdit) - }, + // 处理时间格式的数据 + data.forEach(item => { + if (item.attrType === 'DATE_PICKER') { + const date = this.sarStandardsInfoEO[item.attrField] ? new Date(this.sarStandardsInfoEO[item.attrField]) : '' + this.$set(this.sarStandardsInfoEO, item.attrField, date) + } else { + this.$set(this.sarStandardsInfoEO, item.attrField, this.sarStandardsInfoEO[item.attrField] || '') + } + }) + this.resolveFormFieldListRules(isEdit) + }, /** * 生成校验规则 */ @@ -3812,6 +3953,8 @@ export default { // 加载动态表单数据 this.getAddFormFieldList() this.getDept() + this.busVsFunc() + this.modelFunc() }, destroyed () { this.allSelectOptions = {} diff --git a/src/router/index.js b/src/router/index.js index 4ab6e1b9d..8d295b2a8 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -702,7 +702,7 @@ const routes = [ meta: { requireAuth: false, // parentPath: '/standAutoSplit', - title: '标准分解单' + title: '拆分结果' } }, // 标准编号申领 diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js index 192b22819..2f49323fa 100644 --- a/src/sysConfig/index.js +++ b/src/sysConfig/index.js @@ -7,7 +7,7 @@ // const devIp = '39.98.140.126' // const devInterfacePORT = '10005' // const devIp = '192.168.10.248' -const devIp = '192.168.10.254' +const devIp = '192.168.1.108' const devInterfacePORT = '9999' // 云端端口号 const DEV_CLOUD_RES_INTERFACE_PORT = '7777'