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
2022-03-29 16:06:51 +08:00
parent b81bc08602 685176a17b
commit dd6291779f
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/config/pages/roleManage/index.vue
+5
View File
@@ -535,6 +535,11 @@ export default {
message: '删除成功!' message: '删除成功!'
}); });
this.getTree() this.getTree()
} else if(!res.ok) {
this.$message({
type: 'warning',
message: res.message
});
} }
}) })
}).catch(() => { }).catch(() => {
src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+3 -2
View File
@@ -1169,14 +1169,15 @@ export default {
* @description: 动态表单读取 * @description: 动态表单读取
*/ */
getFormFieldList(item) { getFormFieldList(item) {
console.log(item);
this.$nextTick(() => { this.$nextTick(() => {
this.form = JSON.parse(JSON.stringify(item)) this.form = JSON.parse(JSON.stringify(item))
console.log(this.form); let wssmrName = this.form.wssmrname
this.form.wssmr = wssmrName
this.form.sycpx = this.form.sycpx.split(',') this.form.sycpx = this.form.sycpx.split(',')
this.form.nylx = this.form.nylx.split(',') this.form.nylx = this.form.nylx.split(',')
this.form.cllx = this.form.cllx.split(',') this.form.cllx = this.form.cllx.split(',')
this.form.syrz = this.form.syrz.split(',') this.form.syrz = this.form.syrz.split(',')
this.form.syrz = this.form.syrz.split(',')
this.defaultCheckedKeys = [this.form.standSystem] this.defaultCheckedKeys = [this.form.standSystem]
this.defaultCheckedKeys1 = [this.form.cycvppsbm] this.defaultCheckedKeys1 = [this.form.cycvppsbm]
this.defaultCheckedKeys2 = [this.form.kccvppsbm] this.defaultCheckedKeys2 = [this.form.kccvppsbm]
src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
+4 -4
View File
@@ -226,10 +226,10 @@
<el-form :model="localProTableSearch" :inline="true" class="label-input-form table-lattice" <el-form :model="localProTableSearch" :inline="true" class="label-input-form table-lattice"
style="display: flex;flex-wrap: wrap"> style="display: flex;flex-wrap: wrap">
<!-- 产品平台--> <!-- 产品平台-->
<el-form-item label="产品平台" class="serch-form-item"> <!-- <el-form-item label="产品平台" class="serch-form-item">-->
<el-input v-model="localProTableSearch.projectPlatfor" placeholder="根据产品平台" clearable :maxlength="100" <!-- <el-input v-model="localProTableSearch.projectPlatfor" placeholder="根据产品平台" clearable :maxlength="100"-->
@keyup.enter.native="getLocalProductTableBtn"></el-input> <!-- @keyup.enter.native="getLocalProductTableBtn"></el-input>-->
</el-form-item> <!-- </el-form-item>-->
<!-- 项目编号--> <!-- 项目编号-->
<el-form-item label="项目编号" class="serch-form-item"> <el-form-item label="项目编号" class="serch-form-item">
<el-input v-model="localProTableSearch.projectNumber" placeholder="根据项目编号" clearable :maxlength="500" <el-input v-model="localProTableSearch.projectNumber" placeholder="根据项目编号" clearable :maxlength="500"