diff --git a/src/App.vue b/src/App.vue index 6f9e8d55e..0f854550a 100644 --- a/src/App.vue +++ b/src/App.vue @@ -92,7 +92,32 @@ export default { isBoolean: false } }, + created() { + let _this = this; + //窗口改变时 + window.onresize = function () { + _this.handleRefreshTable(); + }; + }, + updated() { + this.handleRefreshTable() + }, methods: { + handleRefreshTable() { + this.$nextTick(() => { + // 获取页面中已注册过ref的所有的子组件。 + let refList = this.$refs.appView.$refs; + if (refList) { + for (let i of Object.keys(refList)) { + // 根据doLayout方法判断子组件是不是el-table + if (refList[i] && refList[i].doLayout) { + // 执行doLayout方法 + refList[i].doLayout(); + } + } + } + }) + }, // 点击下拉选项事件 handleCommand(command) { // 退出登录 @@ -227,6 +252,8 @@ export default { } else { this.isBoolean = false } + //切换标签时 + this.handleRefreshTable(); } }, mounted() { diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue index f455f8e07..a231b62ae 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue @@ -1601,7 +1601,6 @@ this.FBGBUSSName = "" } this.LSBBBUSSFileList=this.LSBBBUSSFileList.concat(this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName)) - console.log(this.LSBBBUSSFileList) this.form.LSBBBUSS = this.form.FBGBUSS this.form.LSBBBUSSName = this.form.FBGBUSSName this.FBGBUSSFileList= [] @@ -1622,10 +1621,10 @@ this.XGDFileList=[]; this.$refs['form'].resetFields() this.form.standStatus = '1' - if(this.form.standStatus === '1'){ - this.isSubmit = true - this.saveLoading = true - } + // if(this.form.standStatus === '1'){ + // this.isSubmit = true + // this.saveLoading = true + // } // this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss2_1',standSort:this.form.standSort}, { // _this: this // }, res => { diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue index 62ea27926..c796b2c89 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue @@ -2700,7 +2700,7 @@ this.formKey++ this.form.standSn = this.form.standNum this.form.standNumber = this.form.standNum - this.form.standYear = this.regDate(year) + this.form.standYear = year this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) this.formKey++ }else if(this.form.standStatus === '1' ){ diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue index 734a8bd92..3d682fa2b 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue @@ -1005,9 +1005,9 @@ { required: true, message: '请输入企标编号', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, ], - standYear: [ - { required: true, message: '请输入标准年份'}, - ], + // standYear: [ + // { required: true, message: '请输入标准年份'}, + // ], standName: [ { required: true, message: '请输入企标中文名称', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, @@ -1140,15 +1140,15 @@ this.formKey++ this.form.standSn = this.form.standNum this.form.standNumber = this.form.standNum - this.form.standYear = this.regDate(year) + this.form.standYear = year this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) this.formKey++ }else if(this.form.standStatus === '1' ){ this.form.id = "" - if(type === '1'){ - this.isSubmit = true - this.saveLoading = true - } + // if(type === '1'){ + // this.isSubmit = true + // this.saveLoading = true + // } this.formKey++ // this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss2_1'}, { // _this: this diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue index 8223f6587..363686aa1 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue @@ -1078,9 +1078,9 @@ { required: true, message: '请输入企标编号', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, ], - standYear: [ - { required: true, message: '请输入标准年份'}, - ], + // standYear: [ + // { required: true, message: '请输入标准年份'}, + // ], standName: [ { required: true, message: '请输入企标中文名称', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, @@ -1218,15 +1218,15 @@ this.formKey++ this.form.standSn = this.form.standNum this.form.standNumber = this.form.standNum - this.form.standYear = this.regDate(year) + this.form.standYear = year this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) this.formKey++ }else if(this.form.standStatus === '1' ){ this.form.id = "" - if(type === '1'){ - this.isSubmit = true - this.saveLoading = true - } + // if(type === '1'){ + // this.isSubmit = true + // this.saveLoading = true + // } this.formKey++ // this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss2_1'}, { // _this: this diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue index cb557e8e8..a70759985 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue @@ -1005,9 +1005,9 @@ { required: true, message: '请输入企标编号', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, ], - standYear: [ - { required: true, message: '请输入标准年份'}, - ], + // standYear: [ + // { required: true, message: '请输入标准年份'}, + // ], standName: [ { required: true, message: '请输入企标中文名称', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, @@ -1140,15 +1140,15 @@ this.formKey++ this.form.standSn = this.form.standNum this.form.standNumber = this.form.standNum - this.form.standYear = this.regDate(year) + this.form.standYear = year this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) this.formKey++ }else if(this.form.standStatus === '1' ){ this.form.id = "" - if(type === '1'){ - this.isSubmit = true - this.saveLoading = true - } + // if(type === '1'){ + // this.isSubmit = true + // this.saveLoading = true + // } this.formKey++ // this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss2_1'}, { // _this: this diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue index 81f0ab9e9..6075d172d 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue @@ -1088,9 +1088,9 @@ { required: true, message: '请输入企标编号', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, ], - standYear: [ - { required: true, message: '请输入标准年份'}, - ], + // standYear: [ + // { required: true, message: '请输入标准年份'}, + // ], standName: [ { required: true, message: '请输入企标中文名称', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, @@ -1228,15 +1228,15 @@ this.formKey++ this.form.standSn = this.form.standNum this.form.standNumber = this.form.standNum - this.form.standYear = this.regDate(year) + this.form.standYear = year this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) this.formKey++ }else if(this.form.standStatus === '1' ){ this.form.id = "" - if(type === '1'){ - this.isSubmit = true - this.saveLoading = true - } + // if(type === '1'){ + // this.isSubmit = true + // this.saveLoading = true + // } this.formKey++ // this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss2_1'}, { // _this: this diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue index 0d480d08c..7644a514c 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue @@ -235,6 +235,7 @@ @submit="handleSubmit" > + 数据获取中 { this.decomposeOptions.push( { - value: 'BDR', + value: "BDR", label: '不带入' } ) @@ -946,15 +948,14 @@ export default { this.dataList = mes.form.dataList; this.roleForm = mes.roleForm; this.commentText = mes.commentText; + this.loading=false }); }, }, mounted() { + this.loading=true this.optionsChange() this.bpnId = this.$route.query.bpnId - if (this.bpnId !== undefined) { - this.getData() - } this.getProjectData(); // 查询各下拉框数据 this.$http.get("sys/dictype/getDicTypeListCode", "", { @@ -965,21 +966,28 @@ export default { }, e => { }); //查找分解单来源数据 - // this.$http.get('lawss/sarStandAttrDetails/getListData',{},{ - // _this: this - // }, res => { - // this.decomposeOptions.push( - // { - // attrField: 'BDR', - // attrName: '不带入' - // } - // ) - // res.data.forEach(item => { - // if(item.sarType === 'STAND' || item.sarType === 'INLAND_STAND' || item.sarType === 'FOREIGN_STAND'){ - // this.decomposeOptions.push(item) - // } - // }) - // }) + this.$http.get('lawss/sarStandAttrDetails/getListData',{},{ + _this: this + }, res => { + this.decomposeOptions.push( + { + value: 'BDR', + label: '不带入' + } + ) + res.data.forEach(item => { + if(item.sarType === 'STAND' || item.sarType === 'INLAND_STAND' || item.sarType === 'FOREIGN_STAND'){ + let itemTemp={ + value:item.attrField, + label:item.attrName + } + this.decomposeOptions.push(itemTemp) + } + }) + if (this.bpnId !== undefined) { + this.getData() + } + }) } };