diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 7dc5e94ff..74e5d2ae7 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -1335,7 +1335,7 @@
{{ - standShowItemEO.applyArctic + filterApplyArctic(standShowItemEO) }}
@@ -2100,7 +2100,6 @@ export default { watch: {}, methods: { filterApplyArctic(row){ - console.log(row) if(row.applyArctic){ return row.applyArctic.replaceAll('\"', '').replaceAll('\[', '').replaceAll('\]', '') }else { diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue index 5551e22fa..0e21d53a6 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue @@ -244,7 +244,12 @@ }, methods: { clickButtonToUpload(file) { - const attId = file.attId + let attId = "" + if(file && file.id){ + attId = file.id + }else { + attId = file.response.data.id + } this.$preview(attId) }, handleTransfer() { diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue index ce882650e..ddd97ecde 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue @@ -305,11 +305,21 @@ }, methods: { clickButtonToUpload2(file) { - const attId = file + let attId = "" + if(file && file.id){ + attId = file.id + }else { + attId = file.response.data.id + } this.$preview(attId) }, clickButtonToUpload(file) { - const attId = file.attId + let attId = "" + if(file && file.id){ + attId = file.id + }else { + attId = file.response.data.id + } this.$preview(attId) }, handleTransfer() { diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue index 052047fe6..1d53aa114 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue @@ -280,11 +280,21 @@ }, methods: { clickButtonToUpload2(file) { - const attId = file + let attId = "" + if(file && file.id){ + attId = file.id + }else { + attId = file.response.data.id + } this.$preview(attId) }, clickButtonToUpload(file) { - const attId = file.attId + let attId = "" + if(file && file.id){ + attId = file.id + }else { + attId = file.response.data.id + } this.$preview(attId) }, handleTransfer() { diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue index c218baeca..750bef845 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue @@ -287,7 +287,12 @@ }, methods: { clickButtonToUpload2(file) { - const attId = file + let attId = "" + if(file && file.id){ + attId = file.id + }else { + attId = file.response.data.id + } this.$preview(attId) }, handleTransfer() { diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue index 2c685fa21..0174a2240 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue @@ -282,7 +282,12 @@ }, methods: { clickButtonToUpload2(file) { - const attId = file + let attId = "" + if(file && file.id){ + attId = file.id + }else { + attId = file.response.data.id + } this.$preview(attId) }, handleTransfer() { diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue index 86cca5c41..cfe2cd975 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue @@ -281,7 +281,12 @@ }, methods: { clickButtonToUpload2(file) { - const attId = file + let attId = "" + if(file && file.id){ + attId = file.id + }else { + attId = file.response.data.id + } this.$preview(attId) }, handleTransfer() { diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue index 49a091725..3650118a3 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue @@ -282,7 +282,12 @@ }, methods: { clickButtonToUpload2(file) { - const attId = file + let attId = "" + if(file && file.id){ + attId = file.id + }else { + attId = file.response.data.id + } this.$preview(attId) }, handleTransfer() { diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue index e43f9e8ee..5eb671a22 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue @@ -316,11 +316,21 @@ }, methods: { clickButtonToUpload2(file) { - const attId = file + let attId = "" + if(file && file.id){ + attId = file.id + }else { + attId = file.response.data.id + } this.$preview(attId) }, clickButtonToUpload(file) { - const attId = file.attId + let attId = "" + if(file && file.id){ + attId = file.id + }else { + attId = file.response.data.id + } this.$preview(attId) }, handleTransfer() { diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index d8774ab0a..23d1ca7bf 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -41,16 +41,22 @@ > - + - + - - - - - + + + + + + + + + @@ -109,13 +123,6 @@ - - - diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue index 6926cc12a..2f028b4e5 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue @@ -30,17 +30,6 @@ 国外标准入库 - - - - - - - - + + + + + + + + - + @@ -824,6 +824,7 @@ @checkedRole="checkedRole" :nodeList="nodeList" > + 加载数据
@@ -840,6 +841,7 @@ export default { name: "bzrkStep2", data() { return { + ccc:false, xgdFileMap: [], fbgbjbdFileMap: [], fbgywbdFileMap: [], @@ -1162,6 +1164,7 @@ export default { return list; }, getData() { + this.ccc = true return new Promise((resolve, reject) => { inboundLiaisonDetail({ taskIds: this.taskIds, @@ -1376,35 +1379,48 @@ export default { } }) }, + getDicTypeListCode(res,json) { + return new Promise((resolve, reject) => { + this.$http.get('sys/dictype/getDicTypeListCode', '', { + _this: this + }, res => { + const history = res; + resolve(history) + }) + }) + }, + async getDataAsync(){ + let res = await this.getDicTypeListCode() + if(res && res.data){ + this.countryOptions = res.data.COUNTRY//国家地区 + this.standSortOptions = res.data.STANDCLASSIFY // 标准类别 + this.standNatureOptions = res.data.SARPROPERTY // 标准性质 + this.standStateOptions = res.data.WBZTCLASS // 文本状态 + this.standSystemOptions = res.data.BZTXCLASS // 标准体系 + this.applyArcticOptions = res.data.ENERGYTYPES // 适用车型 + this.categoryOptions = res.data.NYLXCLASS // 能源类型 + this.applyAuthOptions = res.data.SYRZCLASS // 适用认证 + this.cysdOptions = res.data.WSCYSD // 我司参与深度 + this.cyzbpmOptions = res.data.CYZBPM // 我司参与制标排名 + 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 // 责任工程师 + this.txlbOptions = res.data.TXLBCLASS // 体系类别 + this.gkglbmOptions = res.data.GKGLBM // 归口管理部门 + this.cbcdOptions = res.data.DEGREESTANDARD // 采标程度 + this.key++ + this.ccc = false + } + }, }, created() { }, mounted() { this.getData() + this.getDataAsync() this.processTable() - this.$http.get('sys/dictype/getDicTypeListCode', '', { - _this: this - }, res => { - this.countryOptions = res.data.COUNTRY//国家地区 - this.standSortOptions = res.data.STANDCLASSIFY // 标准类别 - this.standNatureOptions = res.data.SARPROPERTY // 标准性质 - this.standStateOptions = res.data.WBZTCLASS // 文本状态 - this.standSystemOptions = res.data.BZTXCLASS // 标准体系 - this.applyArcticOptions = res.data.ENERGYTYPES // 适用车型 - this.categoryOptions = res.data.NYLXCLASS // 能源类型 - this.applyAuthOptions = res.data.SYRZCLASS // 适用认证 - this.cysdOptions = res.data.WSCYSD // 我司参与深度 - this.cyzbpmOptions = res.data.CYZBPM // 我司参与制标排名 - 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 // 责任工程师 - this.txlbOptions = res.data.TXLBCLASS // 体系类别 - this.gkglbmOptions = res.data.GKGLBM // 归口管理部门 - this.cbcdOptions = res.data.DEGREESTANDARD // 采标程度 - this.key++ - }) this.busVsFunc() this.modelFunc() } diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue index 88ac0a167..a22dd6b4b 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue @@ -30,17 +30,6 @@ 海外标准入库 - - - - - - - - + + + + + + + + - + @@ -808,6 +808,7 @@ @checkedRole="checkedRole" :nodeList="nodeList" > + 加载数据 @@ -825,6 +826,7 @@ export default { name: "bzrkStep3", data () { return { + ccc: false, submitType: '', xgdFileMap: [], fbgbjbdFileMap: [], @@ -1123,6 +1125,7 @@ export default { return list; }, getData() { + this.ccc = true return new Promise((resolve, reject) => { inboundLiaisonDetail({ taskIds: this.taskIds, @@ -1301,36 +1304,49 @@ export default { } }) }, + getDicTypeListCode(res,json) { + return new Promise((resolve, reject) => { + this.$http.get('sys/dictype/getDicTypeListCode', '', { + _this: this + }, res => { + const history = res; + resolve(history) + }) + }) + }, + async getDataAsync(){ + let res = await this.getDicTypeListCode() + if(res && res.data){ + this.countryOptions=res.data.COUNTRY//国家地区 + this.standSortOptions = res.data.STANDCLASSIFY // 标准类别 + this.standNatureOptions = res.data.SARPROPERTY // 标准性质 + this.standStateOptions = res.data.WBZTCLASS // 文本状态 + this.standSystemOptions = res.data.BZTXCLASS // 标准体系 + this.applyArcticOptions = res.data.ENERGYTYPES // 适用车型 + this.categoryOptions = res.data.NYLXCLASS // 能源类型 + this.applyAuthOptions = res.data.SYRZCLASS // 适用认证 + this.cysdOptions = res.data.WSCYSD // 我司参与深度 + this.cyzbpmOptions = res.data.CYZBPM // 我司参与制标排名 + 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 // 责任工程师 + this.txlbOptions = res.data.TXLBCLASS // 体系类别 + this.gkglbmOptions = res.data.GKGLBM // 归口管理部门 + this.cbcdOptions = res.data.DEGREESTANDARD // 采标程度 + this.key++ + this.ccc = false + } + }, }, created(){ this.getData() }, mounted () { this.getData() + this.getDataAsync() this.processTable() - this.$http.get('sys/dictype/getDicTypeListCode', '', { - _this: this - }, res => { - this.countryOptions=res.data.COUNTRY//国家地区 - this.standSortOptions = res.data.STANDCLASSIFY // 标准类别 - this.standNatureOptions = res.data.SARPROPERTY // 标准性质 - this.standStateOptions = res.data.WBZTCLASS // 文本状态 - this.standSystemOptions = res.data.BZTXCLASS // 标准体系 - this.applyArcticOptions = res.data.ENERGYTYPES // 适用车型 - this.categoryOptions = res.data.NYLXCLASS // 能源类型 - this.applyAuthOptions = res.data.SYRZCLASS // 适用认证 - this.cysdOptions = res.data.WSCYSD // 我司参与深度 - this.cyzbpmOptions = res.data.CYZBPM // 我司参与制标排名 - 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 // 责任工程师 - this.txlbOptions = res.data.TXLBCLASS // 体系类别 - this.gkglbmOptions = res.data.GKGLBM // 归口管理部门 - this.cbcdOptions = res.data.DEGREESTANDARD // 采标程度 - this.key++ - }) this.busVsFunc() this.modelFunc() }, diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index 02192eb2c..c743463e1 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -31,17 +31,6 @@ 海外标准入库 - - - - - - + - - - + + + + + + + + 国外标准入库 - - - - - + + + + + - + @@ -796,6 +796,7 @@ @checkedRole="checkedRole" :nodeList="nodeList" > + 加载数据 @@ -812,6 +813,7 @@ export default { name: "bzrkStep5", data() { return { + ccc: false, xgdFileMap: [], fbgbjbdFileMap: [], bpgFileMap: [], @@ -1133,6 +1135,7 @@ export default { return list; }, getData() { + this.ccc = true return new Promise((resolve, reject) => { inboundLiaisonDetail({ taskIds: this.taskIds, @@ -1356,35 +1359,48 @@ export default { } }) }, + getDicTypeListCode(res,json) { + return new Promise((resolve, reject) => { + this.$http.get('sys/dictype/getDicTypeListCode', '', { + _this: this + }, res => { + const history = res; + resolve(history) + }) + }) + }, + async getDataAsync(){ + let res = await this.getDicTypeListCode() + if(res && res.data){ + this.countryOptions = res.data.COUNTRY//国家地区 + this.standSortOptions = res.data.STANDCLASSIFY // 标准类别 + this.standNatureOptions = res.data.SARPROPERTY // 标准性质 + this.standStateOptions = res.data.WBZTCLASS // 文本状态 + this.standSystemOptions = res.data.BZTXCLASS // 标准体系 + this.applyArcticOptions = res.data.ENERGYTYPES // 适用车型 + this.categoryOptions = res.data.NYLXCLASS // 能源类型 + this.applyAuthOptions = res.data.SYRZCLASS // 适用认证 + this.cysdOptions = res.data.WSCYSD // 我司参与深度 + this.cyzbpmOptions = res.data.CYZBPM // 我司参与制标排名 + 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 // 责任工程师 + this.txlbOptions = res.data.TXLBCLASS // 体系类别 + this.gkglbmOptions = res.data.GKGLBM // 归口管理部门 + this.cbcdOptions = res.data.DEGREESTANDARD // 采标程度 + this.key++ + this.ccc = false + } + }, }, created() { }, mounted() { this.getData() + this.getDataAsync() this.processTable() - this.$http.get('sys/dictype/getDicTypeListCode', '', { - _this: this - }, res => { - this.countryOptions = res.data.COUNTRY//国家地区 - this.standSortOptions = res.data.STANDCLASSIFY // 标准类别 - this.standNatureOptions = res.data.SARPROPERTY // 标准性质 - this.standStateOptions = res.data.WBZTCLASS // 文本状态 - this.standSystemOptions = res.data.BZTXCLASS // 标准体系 - this.applyArcticOptions = res.data.ENERGYTYPES // 适用车型 - this.categoryOptions = res.data.NYLXCLASS // 能源类型 - this.applyAuthOptions = res.data.SYRZCLASS // 适用认证 - this.cysdOptions = res.data.WSCYSD // 我司参与深度 - this.cyzbpmOptions = res.data.CYZBPM // 我司参与制标排名 - 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 // 责任工程师 - this.txlbOptions = res.data.TXLBCLASS // 体系类别 - this.gkglbmOptions = res.data.GKGLBM // 归口管理部门 - this.cbcdOptions = res.data.DEGREESTANDARD // 采标程度 - this.key++ - }) this.busVsFunc() this.modelFunc() } diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/ZQYJAddFileDetails.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/ZQYJAddFileDetails.vue index 09d882850..ee30a676b 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/ZQYJAddFileDetails.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/ZQYJAddFileDetails.vue @@ -175,6 +175,9 @@