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:
super_liu
2021-08-18 13:20:41 +08:00
parent 5f6a1c6951 0220cf0147
commit 131b49f3cc
6 changed files with 86 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/details/otherStandardDetails/index.vue
+1 -1
View File
@@ -552,7 +552,7 @@
</template>
</el-table-column>
<el-table-column
prop="interpretationContent"
prop="readContent"
label="解读内容"
show-overflow-tooltip
>
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+39 -3
View File
@@ -80,15 +80,29 @@
<el-col :span="12">
<el-form-item v-if="form.standInData=='1'" label="国家/地区" prop="country" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.country" placeholder="国家/地区">
<!-- <el-form-item v-if="form.standInData=='1'" label="国家/地区" prop="country" class="add-form-item form-item-disabled">-->
<!-- <el-select :popper-append-to-body="false" v-model="form.country" placeholder="国家/地区">-->
<!-- <el-option-->
<!-- v-for="item in countryOptions"-->
<!-- placeholder="请选择"-->
<!-- :key="item.value"-->
<!-- :value="item.value"-->
<!-- :label="item.label"-->
<!-- ></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item v-if="form.standInData=='1'"label="国家/地区" prop="" label-width="150px" class="add-form-item">
<el-select v-model="form.country" multiple filterable clearable>
<el-option
v-for="item in countryOptions"
placeholder="请选择"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
>
</el-option>
</el-select>
</el-form-item>
@@ -892,6 +906,7 @@
</el-collapse-item>
</el-collapse>
</div>
<!-- 保存||提交-->
<ProcessFooter
v-show="verifySarStandard"
show-save
@@ -1354,6 +1369,7 @@
fileUrl: 'api/att/attFile/upload',
fileMadel: false,
fileType: '',
countryArr:'',
form: {
// 基础信息
textStatus: '', // 文本状态
@@ -1509,6 +1525,20 @@
}
},
watch:{
'form.country': {
handler (val) {
console.log("val")
if (val !== '' && val !== null && typeof (val) !== 'undefined') {
if (val instanceof Array) {
this.countryArr = val.join(",");
} else {
this.countryArr = val
}
} else if (val === '') {
this.countryArr = []
}
}
},
filterText(val) {
this.$refs.tree.filter(val);
},
@@ -2252,6 +2282,11 @@
},
//保存
handleSave() {
this.form.country=this.countryArr;
// if(item.country !== undefined && item.country !== null){
// this.sarStandardsInfoEO.country = item.country.split(",");
// }
this.saveLoading = true
let _formData = new FormData()
// _formData.append('id', this.bpnId)
@@ -2280,6 +2315,7 @@
})
},
handleSubmit() {
this.form.country=this.countryArr;
this.$refs['form'].validate((valid) => {
if (valid) {
this.$refs['userForm'].validate((valid) => {
src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+15 -1
View File
@@ -33,7 +33,7 @@
<el-form-item v-if="form.standInData=='1'" label="国家/地区" prop="country" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.country" placeholder="国家/地区" disabled>
<el-select :popper-append-to-body="false" v-model="form.country" placeholder="国家/地区" multiple disabled>
<el-option
v-for="item in countryOptions"
placeholder="请选择"
@@ -680,6 +680,7 @@
<loading :loading="loading">流程列表加载中</loading>
</div>
</div>
<!-- 提交-->
<ProcessFooter
:show-save="false"
show-submit
@@ -1006,6 +1007,9 @@
this.defaultCheckedKeys3 = [this.form.dybxh]
this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
this.form.standYear = this.form.standYear ? parseInt(this.form.standYear) : ''
if( this.form.country !== undefined && this.form.country !== null && this.form.country !== ''){
this.form.country=this.form.country.split(",");
}
this.form.prcNum = this.prcNum
this.form.prcName = this.prcName
this.form['id'] = item.id
@@ -1030,6 +1034,16 @@
},
handleSave() {},
handleSubmit() {
const val= this.form.country;
if (val !== '' && val !== null && typeof (val) !== 'undefined') {
if (val instanceof Array) {
this.form.country = val.join(",");
} else {
this.form.country = val
}
} else if (val === '') {
this.form.country = []
}
this.$refs['formTongGuo'].validate((valid) => {
if (valid) {
this.isSubmit = true
src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
+7 -1
View File
@@ -33,7 +33,7 @@
<el-form-item v-if="form.standInData=='1'" label="国家/地区" prop="country" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.country" placeholder="国家/地区" disabled>
<el-select :popper-append-to-body="false" v-model="form.country" placeholder="国家/地区" multiple disabled>
<el-option
v-for="item in countryOptions"
placeholder="请选择"
@@ -956,6 +956,8 @@ export default {
getFormFieldList (item) {
this.$nextTick(() => {
this.form = JSON.parse(JSON.stringify(item))
console.log("this.form");
console.log(this.form);
this.defaultCheckedKeys = [this.form.standSystem]
this.defaultCheckedKeys1 = [this.form.cycvppsbm]
this.defaultCheckedKeys2 = [this.form.kccvppsbm]
@@ -964,6 +966,10 @@ export default {
this.form.standYear = this.form.standYear ? parseInt(this.form.standYear) : ''
this.form.prcNum = this.prcNum
this.form.prcName = this.prcName
if( this.form.country !== undefined && this.form.country !== null && this.form.country !== ''){
this.form.country=this.form.country.split(",");
}
this.form['id'] = item.id
this.$forceUpdate()
})
src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+19 -1
View File
@@ -32,7 +32,7 @@
</el-radio-group>
</el-form-item>
<el-form-item v-if="form.standInData=='1'" label="国家/地区" prop="country" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.country" placeholder="国家/地区">
<el-select :popper-append-to-body="false" v-model="form.country" placeholder="国家/地区" multiple>
<el-option
v-for="item in countryOptions"
placeholder="请选择"
@@ -912,6 +912,7 @@
<loading :loading="loading">流程列表加载中</loading>
</div>
</div>
<!-- 提交-->
<ProcessFooter
show-save
show-submit
@@ -1060,6 +1061,7 @@ export default {
},
data () {
return {
countryArr:'',
activeName:'1',
// 当前流程类型(1待办/2已办)
processType: 1,
@@ -1693,6 +1695,7 @@ export default {
this.active = name
},
handleSave() {
this.form.country=this.countryArr;
this.saveLoading = true
let _formData = new FormData()
// _formData.append('id', this.bpnId)
@@ -1714,6 +1717,7 @@ export default {
})
},
handleSubmit() {
this.form.country=this.countryArr;
this.$refs['form'].validate((valid) => {
if (valid) {
this.isSubmit = true
@@ -1795,6 +1799,20 @@ export default {
this.modelFunc()
},
watch:{
'form.country': {
handler (val) {
if (val !== '' && val !== null && typeof (val) !== 'undefined') {
if (val instanceof Array) {
this.countryArr = val.join(",");
} else {
this.countryArr = val
}
} else if (val === '') {
this.countryArr = []
}
}
},
form(val){
if(this.form){
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+5 -2
View File
@@ -623,6 +623,7 @@
</div>
</el-drawer>
<!-- 新增海外标准 -->
<!-- 编辑海外标准-->
<el-drawer
:title="modalshowtitle"
:visible.sync="modalshowflag"
@@ -680,7 +681,6 @@
:value="item.value"
:label="item.label"
>
{{ item.label }}
</el-option>
</el-select>
</el-form-item>
@@ -943,6 +943,7 @@
</template>
</el-form>
</div>
<!-- 提交/取消-->
<div class="demo-drawer-footer">
<el-button v-show="modalshowtitle === '新增海外标准'" type="primary" size="mini" class="common-button-primary" icon="el-icon-check" @click="saveBt">保存</el-button>
<el-button size="mini" class="common-button-primary" icon="el-icon-check" type="primary" @click="saveOrUpdateStands" :loading="isSubmit">提交</el-button>
@@ -2431,7 +2432,7 @@ export default {
console.log(formFieldList, 'AAAAAAAAAAAAAAAAAAAAA')
this.sarStandardsInfoEO = JSON.parse(JSON.stringify(item))
this.defaultCheckedKeys = [this.sarStandardsInfoEO.standSystem];
if(item.country !== undefined && item.country !== null){
if(item.country !== undefined && item.country !== null && item.country !== ''){
this.sarStandardsInfoEO.country = item.country.split(",");
}
this.sarStandardsInfoEO.standSort = item.standSort
@@ -3139,6 +3140,8 @@ export default {
sarStandAttrObj[item.attrField] = nowstandinfo[item.attrField]
})
nowstandinfo['sarStandAttrEOStr'] = JSON.stringify(sarStandAttrObj).replace(/"/g, "'")
console.log("nowstandinfo");
console.log(nowstandinfo);
this.$http.postData(this.addOrUPdateFlag === 1 ? 'sarStandardsInfo/sar-standards-info/addarStandardsInfo' : 'sarStandardsInfo/sar-standards-info/updateSarStandardsInfo', nowstandinfo, {
_this: this
}, res => {