FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
yuezhihang
2022-07-05 14:48:31 +08:00
parent 7d2ab53ed7 9d4e8ce2de
commit 76cad2af76
8 changed files with 91 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/App.vue
+27
View File
@@ -92,7 +92,32 @@ export default {
isBoolean: false isBoolean: false
} }
}, },
created() {
let _this = this;
//窗口改变时
window.onresize = function () {
_this.handleRefreshTable();
};
},
updated() {
this.handleRefreshTable()
},
methods: { 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) { handleCommand(command) {
// 退出登录 // 退出登录
@@ -227,6 +252,8 @@ export default {
} else { } else {
this.isBoolean = false this.isBoolean = false
} }
//切换标签时
this.handleRefreshTable();
} }
}, },
mounted() { mounted() {
src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue
+4 -5
View File
@@ -1601,7 +1601,6 @@
this.FBGBUSSName = "" this.FBGBUSSName = ""
} }
this.LSBBBUSSFileList=this.LSBBBUSSFileList.concat(this.assemble(this.form.FBGBUSS,this.form.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.LSBBBUSS = this.form.FBGBUSS
this.form.LSBBBUSSName = this.form.FBGBUSSName this.form.LSBBBUSSName = this.form.FBGBUSSName
this.FBGBUSSFileList= [] this.FBGBUSSFileList= []
@@ -1622,10 +1621,10 @@
this.XGDFileList=[]; this.XGDFileList=[];
this.$refs['form'].resetFields() this.$refs['form'].resetFields()
this.form.standStatus = '1' this.form.standStatus = '1'
if(this.form.standStatus === '1'){ // if(this.form.standStatus === '1'){
this.isSubmit = true // this.isSubmit = true
this.saveLoading = true // this.saveLoading = true
} // }
// this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss2_1',standSort:this.form.standSort}, { // this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss2_1',standSort:this.form.standSort}, {
// _this: this // _this: this
// }, res => { // }, res => {
src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue
+1 -1
View File
@@ -2700,7 +2700,7 @@
this.formKey++ this.formKey++
this.form.standSn = this.form.standNum this.form.standSn = this.form.standNum
this.form.standNumber = 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.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
this.formKey++ this.formKey++
}else if(this.form.standStatus === '1' ){ }else if(this.form.standStatus === '1' ){
src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue
+8 -8
View File
@@ -1005,9 +1005,9 @@
{ required: true, message: '请输入企标编号', trigger: 'blur' }, { required: true, message: '请输入企标编号', trigger: 'blur' },
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
], ],
standYear: [ // standYear: [
{ required: true, message: '请输入标准年份'}, // { required: true, message: '请输入标准年份'},
], // ],
standName: [ standName: [
{ required: true, message: '请输入企标中文名称', trigger: 'blur' }, { required: true, message: '请输入企标中文名称', trigger: 'blur' },
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
@@ -1140,15 +1140,15 @@
this.formKey++ this.formKey++
this.form.standSn = this.form.standNum this.form.standSn = this.form.standNum
this.form.standNumber = 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.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
this.formKey++ this.formKey++
}else if(this.form.standStatus === '1' ){ }else if(this.form.standStatus === '1' ){
this.form.id = "" this.form.id = ""
if(type === '1'){ // if(type === '1'){
this.isSubmit = true // this.isSubmit = true
this.saveLoading = true // this.saveLoading = true
} // }
this.formKey++ this.formKey++
// this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss2_1'}, { // this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss2_1'}, {
// _this: this // _this: this
src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue
+8 -8
View File
@@ -1078,9 +1078,9 @@
{ required: true, message: '请输入企标编号', trigger: 'blur' }, { required: true, message: '请输入企标编号', trigger: 'blur' },
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
], ],
standYear: [ // standYear: [
{ required: true, message: '请输入标准年份'}, // { required: true, message: '请输入标准年份'},
], // ],
standName: [ standName: [
{ required: true, message: '请输入企标中文名称', trigger: 'blur' }, { required: true, message: '请输入企标中文名称', trigger: 'blur' },
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
@@ -1218,15 +1218,15 @@
this.formKey++ this.formKey++
this.form.standSn = this.form.standNum this.form.standSn = this.form.standNum
this.form.standNumber = 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.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
this.formKey++ this.formKey++
}else if(this.form.standStatus === '1' ){ }else if(this.form.standStatus === '1' ){
this.form.id = "" this.form.id = ""
if(type === '1'){ // if(type === '1'){
this.isSubmit = true // this.isSubmit = true
this.saveLoading = true // this.saveLoading = true
} // }
this.formKey++ this.formKey++
// this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss2_1'}, { // this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss2_1'}, {
// _this: this // _this: this
src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue
+8 -8
View File
@@ -1005,9 +1005,9 @@
{ required: true, message: '请输入企标编号', trigger: 'blur' }, { required: true, message: '请输入企标编号', trigger: 'blur' },
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
], ],
standYear: [ // standYear: [
{ required: true, message: '请输入标准年份'}, // { required: true, message: '请输入标准年份'},
], // ],
standName: [ standName: [
{ required: true, message: '请输入企标中文名称', trigger: 'blur' }, { required: true, message: '请输入企标中文名称', trigger: 'blur' },
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
@@ -1140,15 +1140,15 @@
this.formKey++ this.formKey++
this.form.standSn = this.form.standNum this.form.standSn = this.form.standNum
this.form.standNumber = 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.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
this.formKey++ this.formKey++
}else if(this.form.standStatus === '1' ){ }else if(this.form.standStatus === '1' ){
this.form.id = "" this.form.id = ""
if(type === '1'){ // if(type === '1'){
this.isSubmit = true // this.isSubmit = true
this.saveLoading = true // this.saveLoading = true
} // }
this.formKey++ this.formKey++
// this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss2_1'}, { // this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss2_1'}, {
// _this: this // _this: this
src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue
+8 -8
View File
@@ -1088,9 +1088,9 @@
{ required: true, message: '请输入企标编号', trigger: 'blur' }, { required: true, message: '请输入企标编号', trigger: 'blur' },
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
], ],
standYear: [ // standYear: [
{ required: true, message: '请输入标准年份'}, // { required: true, message: '请输入标准年份'},
], // ],
standName: [ standName: [
{ required: true, message: '请输入企标中文名称', trigger: 'blur' }, { required: true, message: '请输入企标中文名称', trigger: 'blur' },
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
@@ -1228,15 +1228,15 @@
this.formKey++ this.formKey++
this.form.standSn = this.form.standNum this.form.standSn = this.form.standNum
this.form.standNumber = 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.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
this.formKey++ this.formKey++
}else if(this.form.standStatus === '1' ){ }else if(this.form.standStatus === '1' ){
this.form.id = "" this.form.id = ""
if(type === '1'){ // if(type === '1'){
this.isSubmit = true // this.isSubmit = true
this.saveLoading = true // this.saveLoading = true
} // }
this.formKey++ this.formKey++
// this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss2_1'}, { // this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss2_1'}, {
// _this: this // _this: this
src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
+27 -19
View File
@@ -235,6 +235,7 @@
@submit="handleSubmit" @submit="handleSubmit"
> >
</ProcessFooter> </ProcessFooter>
<loading :loading="loading">数据获取中</loading>
<!-- 选择项目抽屉--> <!-- 选择项目抽屉-->
<el-drawer <el-drawer
title="选择项目" title="选择项目"
@@ -461,6 +462,7 @@ export default {
return time.getTime() < Date.now() - 8.64e7; return time.getTime() < Date.now() - 8.64e7;
}, },
}, },
loading:false,
managementHostName: [], //管理主体名称下拉框 managementHostName: [], //管理主体名称下拉框
developmentHostName: [], //开发主体名称下拉框 developmentHostName: [], //开发主体名称下拉框
categoryName: [], //项目细分类下拉框 categoryName: [], //项目细分类下拉框
@@ -577,7 +579,7 @@ export default {
}, {}, res => { }, {}, res => {
this.decomposeOptions.push( this.decomposeOptions.push(
{ {
value: 'BDR', value: "BDR",
label: '不带入' label: '不带入'
} }
) )
@@ -946,15 +948,14 @@ export default {
this.dataList = mes.form.dataList; this.dataList = mes.form.dataList;
this.roleForm = mes.roleForm; this.roleForm = mes.roleForm;
this.commentText = mes.commentText; this.commentText = mes.commentText;
this.loading=false
}); });
}, },
}, },
mounted() { mounted() {
this.loading=true
this.optionsChange() this.optionsChange()
this.bpnId = this.$route.query.bpnId this.bpnId = this.$route.query.bpnId
if (this.bpnId !== undefined) {
this.getData()
}
this.getProjectData(); this.getProjectData();
// 查询各下拉框数据 // 查询各下拉框数据
this.$http.get("sys/dictype/getDicTypeListCode", "", { this.$http.get("sys/dictype/getDicTypeListCode", "", {
@@ -965,21 +966,28 @@ export default {
}, e => { }, e => {
}); });
//查找分解单来源数据 //查找分解单来源数据
// this.$http.get('lawss/sarStandAttrDetails/getListData',{},{ this.$http.get('lawss/sarStandAttrDetails/getListData',{},{
// _this: this _this: this
// }, res => { }, res => {
// this.decomposeOptions.push( this.decomposeOptions.push(
// { {
// attrField: 'BDR', value: 'BDR',
// attrName: '不带入' label: '不带入'
// } }
// ) )
// res.data.forEach(item => { res.data.forEach(item => {
// if(item.sarType === 'STAND' || item.sarType === 'INLAND_STAND' || item.sarType === 'FOREIGN_STAND'){ if(item.sarType === 'STAND' || item.sarType === 'INLAND_STAND' || item.sarType === 'FOREIGN_STAND'){
// this.decomposeOptions.push(item) let itemTemp={
// } value:item.attrField,
// }) label:item.attrName
// }) }
this.decomposeOptions.push(itemTemp)
}
})
if (this.bpnId !== undefined) {
this.getData()
}
})
} }
}; };
</script> </script>