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

fix: 解决bug #45290

Browse Source
This commit is contained in:
super_liu
2021-07-19 14:09:03 +08:00
parent 1d6f9d0a59
commit 88fbde8b51
6 changed files with 120 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+13 -5
View File
@@ -532,11 +532,15 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '0'" label="起草单位" prop="qcdw" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '0'" label="起草单位" prop="qcdw" class="add-form-item form-item-disabled">
<el-input <el-select v-model="form.qcdw" placeholder="请选择起草单位" multiple>
v-model="form.qcdw" <el-option
placeholder="请选择起草单位" v-for="item in qcdwOptions"
clearable placeholder="请选择"
></el-input> :key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '1'" label="体系类别" prop="txlb" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '1'" label="体系类别" prop="txlb" class="add-form-item form-item-disabled">
<el-select v-model="form.txlb" placeholder="请选择体系类别" multiple> <el-select v-model="form.txlb" placeholder="请选择体系类别" multiple>
@@ -1331,6 +1335,8 @@
categoryOptions: [], // 能源类型 categoryOptions: [], // 能源类型
applyAuthOptions: [], // 适用认证 applyAuthOptions: [], // 适用认证
cysdOptions: [], // 我司参与深度 cysdOptions: [], // 我司参与深度
wssmrOptions: [], // 我司署名人
qcdwOptions: [], // 起草单位
sycpxOptions: [], // 适用产品线 sycpxOptions: [], // 适用产品线
zrbmOptions: [], // 责任部门 zrbmOptions: [], // 责任部门
zrgcsOptions: [], // 责任工程师 zrgcsOptions: [], // 责任工程师
@@ -2011,6 +2017,8 @@
this.categoryOptions = res.data.NYLXCLASS // 能源类型 this.categoryOptions = res.data.NYLXCLASS // 能源类型
this.applyAuthOptions = res.data.SYRZCLASS // 适用认证 this.applyAuthOptions = res.data.SYRZCLASS // 适用认证
this.cysdOptions = res.data.WSCYSD // 我司参与深度 this.cysdOptions = res.data.WSCYSD // 我司参与深度
this.wssmrOptions = res.data.WSSMR // 我司署名人
this.qcdwOptions = res.data.QCDW // 我司署名人
this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线 this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+20 -8
View File
@@ -361,12 +361,15 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '0'" label="起草单位" prop="qcdw" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '0'" label="起草单位" prop="qcdw" class="add-form-item form-item-disabled">
<el-input <el-select v-model="form.qcdw" placeholder="请选择起草单位" multiple disabled>
disabled <el-option
v-model="form.qcdw" v-for="item in qcdwOptions"
placeholder="请选择起草单位" placeholder="请选择"
clearable :key="item.value"
></el-input> :value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '1'" label="体系类别" prop="txlb" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '1'" label="体系类别" prop="txlb" class="add-form-item form-item-disabled">
<el-select v-model="form.txlb" placeholder="请选择体系类别" multiple disabled> <el-select v-model="form.txlb" placeholder="请选择体系类别" multiple disabled>
@@ -437,8 +440,13 @@
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '0'" label="我司署名人" prop="wssmr" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '0'" label="我司署名人" prop="wssmr" class="add-form-item form-item-disabled">
<el-select v-model="form.wssmr" placeholder="请选择我司署名人" multiple disabled> <el-select v-model="form.wssmr" placeholder="请选择我司署名人" multiple disabled>
<el-option label="署名人1" value="1"></el-option> <el-option
<el-option label="署名人2" value="2"></el-option> v-for="item in wssmrOptions"
placeholder="请选择"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '0'" label="我司参与深度" prop="cysd" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '0'" label="我司参与深度" prop="cysd" class="add-form-item form-item-disabled">
@@ -811,6 +819,8 @@
categoryOptions: [], // 能源类型 categoryOptions: [], // 能源类型
applyAuthOptions: [], // 适用认证 applyAuthOptions: [], // 适用认证
cysdOptions: [], // 我司参与深度 cysdOptions: [], // 我司参与深度
wssmrOptions: [], // 我司署名人
qcdwOptions: [], // 起草单位
sycpxOptions: [], // 适用产品线 sycpxOptions: [], // 适用产品线
zrbmOptions: [], // 责任部门 zrbmOptions: [], // 责任部门
zrgcsOptions: [], // 责任工程师 zrgcsOptions: [], // 责任工程师
@@ -1006,6 +1016,8 @@
this.categoryOptions = res.data.NYLXCLASS // 能源类型 this.categoryOptions = res.data.NYLXCLASS // 能源类型
this.applyAuthOptions = res.data.SYRZCLASS // 适用认证 this.applyAuthOptions = res.data.SYRZCLASS // 适用认证
this.cysdOptions = res.data.WSCYSD // 我司参与深度 this.cysdOptions = res.data.WSCYSD // 我司参与深度
this.wssmrOptions = res.data.WSSMR // 我司署名人
this.qcdwOptions = res.data.QCDW // 起草单位
this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线 this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
+20 -8
View File
@@ -354,12 +354,15 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '0'" label="起草单位" prop="qcdw" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '0'" label="起草单位" prop="qcdw" class="add-form-item form-item-disabled">
<el-input <el-select v-model="form.qcdw" placeholder="请选择起草单位" multiple disabled>
disabled <el-option
v-model="form.qcdw" v-for="item in qcdwOptions"
placeholder="请选择起草单位" placeholder="请选择"
clearable :key="item.value"
></el-input> :value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '1'" label="体系类别" prop="txlb" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '1'" label="体系类别" prop="txlb" class="add-form-item form-item-disabled">
<el-select v-model="form.txlb" placeholder="请选择体系类别" multiple disabled> <el-select v-model="form.txlb" placeholder="请选择体系类别" multiple disabled>
@@ -430,8 +433,13 @@
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '0'" label="我司署名人" prop="wssmr" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '0'" label="我司署名人" prop="wssmr" class="add-form-item form-item-disabled">
<el-select v-model="form.wssmr" placeholder="请选择我司署名人" multiple disabled> <el-select v-model="form.wssmr" placeholder="请选择我司署名人" multiple disabled>
<el-option label="署名人1" value="1"></el-option> <el-option
<el-option label="署名人2" value="2"></el-option> v-for="item in wssmrOptions"
placeholder="请选择"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '0'" label="我司参与深度" prop="cysd" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '0'" label="我司参与深度" prop="cysd" class="add-form-item form-item-disabled">
@@ -803,6 +811,8 @@ export default {
categoryOptions: [], // 能源类型 categoryOptions: [], // 能源类型
applyAuthOptions: [], // 适用认证 applyAuthOptions: [], // 适用认证
cysdOptions: [], // 我司参与深度 cysdOptions: [], // 我司参与深度
wssmrOptions: [], // 我司署名人
qcdwOptions: [], // 起草单位
sycpxOptions: [], // 适用产品线 sycpxOptions: [], // 适用产品线
zrbmOptions: [], // 责任部门 zrbmOptions: [], // 责任部门
zrgcsOptions: [], // 责任工程师 zrgcsOptions: [], // 责任工程师
@@ -994,6 +1004,8 @@ export default {
this.categoryOptions = res.data.NYLXCLASS // 能源类型 this.categoryOptions = res.data.NYLXCLASS // 能源类型
this.applyAuthOptions = res.data.SYRZCLASS // 适用认证 this.applyAuthOptions = res.data.SYRZCLASS // 适用认证
this.cysdOptions = res.data.WSCYSD // 我司参与深度 this.cysdOptions = res.data.WSCYSD // 我司参与深度
this.wssmrOptions = res.data.WSSMR // 我司署名人
this.qcdwOptions = res.data.QCDW // 起草单位
this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线 this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+20 -7
View File
@@ -519,11 +519,15 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '0'" label="起草单位" prop="qcdw" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '0'" label="起草单位" prop="qcdw" class="add-form-item form-item-disabled">
<el-input <el-select v-model="form.qcdw" placeholder="请选择起草单位" multiple>
v-model="form.qcdw" <el-option
placeholder="请选择起草单位" v-for="item in qcdwOptions"
clearable placeholder="请选择"
></el-input> :key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '1'" label="体系类别" prop="txlb" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '1'" label="体系类别" prop="txlb" class="add-form-item form-item-disabled">
<el-select v-model="form.txlb" placeholder="请选择体系类别" multiple> <el-select v-model="form.txlb" placeholder="请选择体系类别" multiple>
@@ -594,8 +598,13 @@
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '0'" label="我司署名人" prop="wssmr" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '0'" label="我司署名人" prop="wssmr" class="add-form-item form-item-disabled">
<el-select v-model="form.wssmr" placeholder="请选择我司署名人" multiple> <el-select v-model="form.wssmr" placeholder="请选择我司署名人" multiple>
<el-option label="署名人1" value="1"></el-option> <el-option
<el-option label="署名人2" value="2"></el-option> v-for="item in wssmrOptions"
placeholder="请选择"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '0'" label="我司参与深度" prop="cysd" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '0'" label="我司参与深度" prop="cysd" class="add-form-item form-item-disabled">
@@ -1173,6 +1182,8 @@ export default {
categoryOptions: [], // 能源类型 categoryOptions: [], // 能源类型
applyAuthOptions: [], // 适用认证 applyAuthOptions: [], // 适用认证
cysdOptions: [], // 我司参与深度 cysdOptions: [], // 我司参与深度
wssmrOptions: [], // 我司署名人
qcdwOptions: [], // 起草单位
sycpxOptions: [], // 适用产品线 sycpxOptions: [], // 适用产品线
zrbmOptions: [], // 责任部门 zrbmOptions: [], // 责任部门
zrgcsOptions: [], // 责任工程师 zrgcsOptions: [], // 责任工程师
@@ -1602,6 +1613,8 @@ export default {
this.categoryOptions = res.data.NYLXCLASS // 能源类型 this.categoryOptions = res.data.NYLXCLASS // 能源类型
this.applyAuthOptions = res.data.SYRZCLASS // 适用认证 this.applyAuthOptions = res.data.SYRZCLASS // 适用认证
this.cysdOptions = res.data.WSCYSD // 我司参与深度 this.cysdOptions = res.data.WSCYSD // 我司参与深度
this.wssmrOptions = res.data.WSSMR // 我司署名人
this.qcdwOptions = res.data.QCDW // 起草单位
this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线 this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+5 -4
View File
@@ -3713,11 +3713,12 @@ export default {
this.formFieldList = data.map((item) => { this.formFieldList = data.map((item) => {
if (item.attrType === 'SEL_OPTION' || item.attrType === 'SEL_OPTS') { if (item.attrType === 'SEL_OPTION' || item.attrType === 'SEL_OPTS') {
if(item.attrField === 'WSSMR'){ if(item.attrField === 'WSSMR'){
const options = [
{label:"署名人1",value:"1"},{label:"署名人2",value:"2"}
]
return Object.assign({}, item, { return Object.assign({}, item, {
options: options options: this.allSelectOptions["WSSMR"]
})
}else if(item.attrField === 'QCDW'){
return Object.assign({}, item, {
options: this.allSelectOptions["QCDW"]
}) })
}else if(item.attrField === 'CYSD'){ }else if(item.attrField === 'CYSD'){
return Object.assign({}, item, { return Object.assign({}, item, {
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+42 -41
View File
@@ -3591,50 +3591,51 @@ export default {
const data = this.formFieldListData const data = this.formFieldListData
this.formFieldList = data.map((item) => { this.formFieldList = data.map((item) => {
if (item.attrType === 'SEL_OPTION' || item.attrType === 'SEL_OPTS') { if (item.attrType === 'SEL_OPTION' || item.attrType === 'SEL_OPTS') {
if(item.attrField === 'WSSMR'){ if(item.attrField === 'WSSMR'){
const options = [ return Object.assign({}, item, {
{label:"署名人1",value:"1"},{label:"署名人2",value:"2"} options: this.allSelectOptions["WSSMR"]
] })
return Object.assign({}, item, { }else if(item.attrField === 'QCDW'){
options: options return Object.assign({}, item, {
}) options: this.allSelectOptions["QCDW"]
}else if(item.attrField === 'CYSD'){ })
}else if(item.attrField === 'CYSD'){
return Object.assign({}, item, { return Object.assign({}, item, {
options: this.allSelectOptions["WSCYSD"] options: this.allSelectOptions["WSCYSD"]
}) })
}else if(item.attrField === 'CLLX'){ }else if(item.attrField === 'CLLX'){
return Object.assign({}, item, { return Object.assign({}, item, {
options: this.allSelectOptions["ENERGYTYPES"] options: this.allSelectOptions["ENERGYTYPES"]
}) })
}else if(item.attrField === 'NYLX'){ }else if(item.attrField === 'NYLX'){
return Object.assign({}, item, { return Object.assign({}, item, {
options: this.allSelectOptions["NYLXCLASS"] options: this.allSelectOptions["NYLXCLASS"]
}) })
}else if(item.attrField === 'SYCPX'){ }else if(item.attrField === 'SYCPX'){
return Object.assign({}, item, { return Object.assign({}, item, {
options: this.allSelectOptions["SYCPXCLASS"] options: this.allSelectOptions["SYCPXCLASS"]
}) })
}else if(item.attrField === 'SYRZ'){ }else if(item.attrField === 'SYRZ'){
return Object.assign({}, item, { return Object.assign({}, item, {
options: this.allSelectOptions["SYRZCLASS"] options: this.allSelectOptions["SYRZCLASS"]
}) })
}else if(item.attrField === 'ZRBM'){ }else if(item.attrField === 'ZRBM'){
return Object.assign({}, item, { return Object.assign({}, item, {
options: this.allSelectOptions["ZRBMCLASS"] options: this.allSelectOptions["ZRBMCLASS"]
}) })
}else if(item.attrField === 'ZRGCS'){ }else if(item.attrField === 'ZRGCS'){
return Object.assign({}, item, { return Object.assign({}, item, {
options: this.allSelectOptions["ZRGCSCLASS"] options: this.allSelectOptions["ZRGCSCLASS"]
}) })
}else if(item.attrField === 'TXLB'){ }else if(item.attrField === 'TXLB'){
return Object.assign({}, item, { return Object.assign({}, item, {
options: this.allSelectOptions["TXLBCLASS"] options: this.allSelectOptions["TXLBCLASS"]
}) })
}else { }else {
return Object.assign({}, item, { return Object.assign({}, item, {
options: this.allSelectOptions[item.selVal] options: this.allSelectOptions[item.selVal]
}) })
} }
} else { } else {
return item return item
} }