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

合并分支 'fix_foton_20230103' 到 'FOTON'

Browse Source 
Fix foton 20230103

查看合并请求 laws-foton-slrs/foton-laws-system-front!18
This commit is contained in:
陈栋
2023-01-31 16:56:42 +08:00
parent f602bb5c81 e51f42c193
commit 7cf9622edc
7 changed files with 1768 additions and 1700 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/details/otherStandardDetails/index.vue
+1704 -1668
View File
File diff suppressed because it is too large Load Diff
src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue
+3 -3
View File
@@ -1632,9 +1632,9 @@ export default {
issueTime: [ issueTime: [
{ required: false, message: '请选择企标发布日期', trigger: 'change' } { required: false, message: '请选择企标发布日期', trigger: 'change' }
], ],
// putTime: [ putTime: [
// { required: true, message: '请选择企标实施日期', trigger: 'change' } { required: true, message: '请选择企标实施日期', trigger: 'change' }
// ], ],
FBGBUSSName: [ FBGBUSSName: [
{ required: false, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' } { required: false, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' }
], ],
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
+4 -1
View File
@@ -1052,11 +1052,13 @@ export default {
choiceShow(){ choiceShow(){
this.showType = 'one' this.showType = 'one'
this.getStandDataBtn() this.getStandDataBtn()
this.clearSearch()
this.ListModel = true; this.ListModel = true;
}, },
choiceShow2(){ choiceShow2(){
this.showType = 'two' this.showType = 'two'
this.getStandDataBtn() this.getStandDataBtn()
this.clearSearch()
this.ListModel = true; this.ListModel = true;
}, },
// 取消带入 // 取消带入
@@ -1112,7 +1114,8 @@ export default {
// this.standinfoList.push(item) // this.standinfoList.push(item)
// } // }
// }) // })
this.total = this.standinfoList.length // this.total = this.standinfoList.length
this.total = res.data.count
this.replaceLoading = false this.replaceLoading = false
this.$nextTick(()=>{ this.$nextTick(()=>{
this.$refs.selection.doLayout(); this.$refs.selection.doLayout();
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue
+49 -22
View File
@@ -11,11 +11,11 @@
</div> </div>
<div class="content" v-show="active === '1'"> <div class="content" v-show="active === '1'">
<div style="flex: auto; overflow: auto"> <div style="flex: auto; overflow: auto">
<process-title v-if="showFlag"> <!-- <process-title v-if="showFlag">-->
<process-title>
<template slot="title">基础信息</template> <template slot="title">基础信息</template>
</process-title> </process-title>
<el-form <el-form
v-if="showFlag"
class="label-input-form prc-content-border" class="label-input-form prc-content-border"
label-width="150px" label-width="150px"
> >
@@ -36,7 +36,8 @@
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<component ref="childForm" :message="qbfsForm" :is="comName"></component> <component ref="childForm" v-if="isWrite" :message="qbfsForm" :is="comName"></component>
<component ref="childForm" v-else :message="JSON.parse(JSON.stringify(qbfsForm))" :is="comName"></component>
</div> </div>
<div> <div>
<el-collapse accordion> <el-collapse accordion>
@@ -274,6 +275,7 @@ export default {
}, },
data() { data() {
return { return {
isWrite:!this.$route.query.taskIds,
disabledXX:!!this.$route.query.disabledXX, disabledXX:!!this.$route.query.disabledXX,
submitFlag: '', submitFlag: '',
toggleType: '5', toggleType: '5',
@@ -281,7 +283,9 @@ export default {
active: "1", active: "1",
commentText: "", commentText: "",
comName: "establish", comName: "establish",
isTrue:true,
qbfsForm: {}, qbfsForm: {},
componentKey:1,
formLoading: false, formLoading: false,
approvalFlag: false, approvalFlag: false,
showFlag: true, showFlag: true,
@@ -384,6 +388,23 @@ export default {
}) })
}) })
}, },
deepClone(orig) {
var copy = Object.create(Object.getPrototypeOf(orig))
this.copyOwnPropertiesFrom(copy,orig);
return copy;
},
copyOwnPropertiesFrom(target, source) {
Object.getOwnPropertyNames(source)
.forEach(ele =>{
// 获取到每个属性的所有描述，然后重新定义对象的属性并返回此对象。
var desc = Object.getOwnPropertyDescriptor(source,ele);
Object.defineProperty(target,ele,desc)
});
return target;
},
getType(target){
return Object.prototype.toString.call(target).toLowerCase().slice(8,-1)
},
/** /**
* @description: 动态表单读取 * @description: 动态表单读取
*/ */
@@ -408,25 +429,30 @@ export default {
this.comName = "establish" this.comName = "establish"
break break
} }
this.qbfsForm = item.qbfsForm || item; this.qbfsForm = item.qbfsForm || item
if (this.qbfsForm.bussSort) { // this.isTrue = false
if(this.qbfsForm.bussSort instanceof Array){ // this.$nextTick(()=>{
this.qbfsForm.bussSort = this.qbfsForm.bussSort[0] // this.isTrue = true
}else { // })
let val = this.qbfsForm.bussSort.replace('//',"").replace('["',"").replace('"]',"").toString() // if (this.qbfsForm.bussSort){
if (val !== '' && val !== null && typeof (val) !== 'undefined') { // if(this.qbfsForm.bussSort instanceof Array){
if (val instanceof Array) { // // if(this.getType(this.qbfsForm.bussSort) === 'array'){
this.qbfsForm.bussSort = this.form.bussSort.join(",")[0]; // this.qbfsForm.bussSort = this.qbfsForm.bussSort[0]
} else { // }else {
this.qbfsForm.bussSort = val // let val = this.qbfsForm.bussSort.replace('//',"").replace('["',"").replace('"]',"").toString()
} // if (val !== '' && val !== null && typeof (val) !== 'undefined') {
} else if (val === '') { // if (val instanceof Array) {
this.qbfsForm.bussSort = "" // this.qbfsForm.bussSort = this.form.bussSort.join(",")[0];
} // } else {
} // this.qbfsForm.bussSort = val
} else { // }
this.qbfsForm.bussSort = "" // } else if (val === '') {
} // this.qbfsForm.bussSort = ""
// }
// }
// } else {
// this.qbfsForm.bussSort = ""
// }
this.formLoading = false; this.formLoading = false;
// this.commentText = item.commentText // this.commentText = item.commentText
this.roleForm.dockUser = item.dockUser || item.roleForm.dockUser; this.roleForm.dockUser = item.dockUser || item.roleForm.dockUser;
@@ -443,6 +469,7 @@ export default {
}, },
handleTabs(name) { handleTabs(name) {
this.active = name; this.active = name;
this.isWrite = true
}, },
toggleComName(name) { toggleComName(name) {
this.qbfsForm = {} this.qbfsForm = {}
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+2 -1
View File
@@ -731,6 +731,7 @@
<!-- disabled--> <!-- disabled-->
<!-- ></custom-input>--> <!-- ></custom-input>-->
<!-- </template>--> <!-- </template>-->
<!-- 去掉模块结构单元 -->
<template v-else-if="['DYBXH','DYMC','DYBXHCAR','DYMCCAR'].indexOf(field.attrField)===-1"> <template v-else-if="['DYBXH','DYMC','DYBXHCAR','DYMCCAR'].indexOf(field.attrField)===-1">
<custom-input <custom-input
:config="field" :config="field"
@@ -764,7 +765,7 @@
:disabled="formdisableflag" :disabled="formdisableflag"
:show-modify-name="true" :show-modify-name="true"
@fileSuccess="fileSuccess" @fileSuccess="fileSuccess"
:limit="['FBGBJBD','FBGYWBD','XDB','KWJ','ZBJBD'].some(item => item===field.attrField) ? 20 : 8" :limit="['FBGBJBD','FBGYWBD','XDB','KWJ','ZBJBD'].some(item => item===field.attrField) ? 40 : 8"
></custom-file> ></custom-file>
</template> </template>
<template v-else-if="field.attrType === 'TEXTAREA'"> <template v-else-if="field.attrType === 'TEXTAREA'">
src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+1 -1
View File
@@ -855,7 +855,7 @@
v-model="sarBussionessStandEO[field.attrField]" v-model="sarBussionessStandEO[field.attrField]"
:disabled="formdisableflag" :disabled="formdisableflag"
:show-modify-name="true" :show-modify-name="true"
:limit="['FBGBJBD','FBGYWBD','XDB','KWJ','ZBJBD'].some(item => item===field.attrField) ? 20 : 8" :limit="['FBGBJBD','FBGYWBD','XDB','KWJ','ZBJBD'].some(item => item===field.attrField) ? 40 : 8"
></custom-file> ></custom-file>
</template> </template>
<template v-else-if="field.attrType === 'TEXTAREA'"> <template v-else-if="field.attrType === 'TEXTAREA'">
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+5 -4
View File
@@ -951,7 +951,7 @@
:disabled="formdisableflag" :disabled="formdisableflag"
:show-modify-name="true" :show-modify-name="true"
@fileSuccess="fileSuccess" @fileSuccess="fileSuccess"
:limit="20" :limit="40"
></custom-file> ></custom-file>
</template> </template>
<template v-else-if="field.attrType === 'FILE' && field.attrField === 'FBGYWBD'"> <template v-else-if="field.attrType === 'FILE' && field.attrField === 'FBGYWBD'">
@@ -961,7 +961,7 @@
:disabled="formdisableflag" :disabled="formdisableflag"
:show-modify-name="true" :show-modify-name="true"
@fileSuccess="fileSuccess" @fileSuccess="fileSuccess"
:limit="20" :limit="40"
></custom-file> ></custom-file>
</template> </template>
</template> </template>
@@ -1175,7 +1175,8 @@
<!-- ></el-input>--> <!-- ></el-input>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- </template>--> <!-- </template>-->
<template v-else> <!-- 去掉模块结构单元 -->
<template v-else-if="['DYBXH','DYMC','DYBXHCAR','DYMCCAR'].includes(field.attrField)">
<custom-input <custom-input
:config="field" :config="field"
v-model="sarStandardsInfoEO[field.attrField]" v-model="sarStandardsInfoEO[field.attrField]"
@@ -1209,7 +1210,7 @@
v-model="sarStandardsInfoEO[field.attrField]" v-model="sarStandardsInfoEO[field.attrField]"
:disabled="formdisableflag" :disabled="formdisableflag"
@fileSuccess="fileSuccess" @fileSuccess="fileSuccess"
:limit="['XDB','KWJ','ZBJBD'].some(item => item===field.attrField) ? 20 : 8" :limit="['XDB','KWJ','ZBJBD'].some(item => item===field.attrField) ? 40 : 8"
></custom-file> ></custom-file>
</template> </template>
<template v-else-if="field.attrType === 'TEXTAREA'"> <template v-else-if="field.attrType === 'TEXTAREA'">