From d2d9fe50c179b0c8ba0c3c58dac2fe7afe8d4597 Mon Sep 17 00:00:00 2001 From: caoyang Date: Mon, 14 Feb 2022 15:07:27 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tags/dialog/OnlCgformTagForm.vue | 129 +++++++--------- .../documentManage/tags/dialog/newDrawer.vue | 144 +++++------------- .../documentManage/tags/tabs/tagItem.vue | 28 ++-- 3 files changed, 112 insertions(+), 189 deletions(-) diff --git a/jero-web/src/views/documentManage/tags/dialog/OnlCgformTagForm.vue b/jero-web/src/views/documentManage/tags/dialog/OnlCgformTagForm.vue index 063de5dde..7a68e7ad8 100644 --- a/jero-web/src/views/documentManage/tags/dialog/OnlCgformTagForm.vue +++ b/jero-web/src/views/documentManage/tags/dialog/OnlCgformTagForm.vue @@ -3,25 +3,11 @@ -
基本信息
+

基本信息

- - - - 文档库 - - - 文档条款 - - - + + @@ -31,69 +17,70 @@ - + - + + + + + + - - - - - - + - + - + -
文档库模块展示
+ +

文档库模块展示

- + - + - + -
其他模块展示
+

其它模块展示

- + - - + + - - 提 交 - + + + @@ -132,10 +119,7 @@ }, data () { return { - form: { - isModel:'', - - }, + form: this.$form.createForm(this), model: {}, labelCol: { xs: { span: 24 }, @@ -149,32 +133,37 @@ validatorRules: { isModel: { rules: [ - { required: true, message: '请输入所属模块(1文档库,0文档拆分!'}, + { required: true, message: '请输入所属模块!'}, ] }, dbFieldTxt: { rules: [ - { required: true, message: '请输入字段备注!'}, + { required: true, message: '请输入属性名称!'}, + ] + }, + dbFieldName: { + rules: [ + { required: true, message: '请输入英文名称!'}, ] }, fieldShowType: { rules: [ - { required: true, message: '请输入表单控件类型!'}, + { required: true, message: '请输入属性类型!'}, ] }, dictName: { rules: [ - { required: true, message: '请输入字典名称!'}, + // { required: true, message: '请输入选项内容!'}, ] }, dbLength: { rules: [ - { required: true, message: '请输入数据库字段长度!'}, + { required: true, message: '请输入字段长度!'}, ] }, orderNum: { rules: [ - { required: true, message: '请输入排序!'}, + { required: true, message: '请输入展示顺序!'}, ] }, fieldMustInput: { @@ -184,12 +173,12 @@ }, isShowForm: { rules: [ - { required: true, message: '请输入表单是否显示0否 1是!'}, + { required: true, message: '请选择是否显示文档库列表'}, ] }, showArea: { rules: [ - { required: true, message: '请输入展示区域!'}, + // { required: true, message: '请输入展示区域!'}, ] }, isQuery: { @@ -199,30 +188,20 @@ }, isShowLawsList: { rules: [ - { required: true, message: '请输入法规清单是否展示0否 1是!'}, + { required: true, message: '请选择法规清单是否展示!'}, ] }, isShowSearch: { rules: [ - { required: true, message: '请输入搜索中心是否展示0否 1是!'}, + { required: true, message: '请选择搜索中心是否展示!'}, ] }, }, url: { - add: "/tag/onlCgformTag/add", - edit: "/tag/onlCgformTag/edit", - queryById: "/tag/onlCgformTag/queryById" - }, - is_model:[ - { - label:1, - value:'文档库' - }, - { - label:2, - value:'文档条款' - } - ] + add: "tag/onlCgformTag/add", + edit: "tag/onlCgformTag/edit", + queryById: "tag/onlCgformTag/queryById" + } } }, computed: { @@ -284,7 +263,7 @@ method = 'post'; }else{ httpurl+=this.url.edit; - method = 'put'; + method = 'put'; } let formData = Object.assign(this.model, values); console.log("表单提交数据",formData) @@ -292,6 +271,7 @@ if(res.success){ that.$message.success(res.message); that.$emit('ok'); + }else{ that.$message.warning(res.message); } @@ -299,18 +279,27 @@ that.confirmLoading = false; }) } - + }) }, popupCallback(row){ this.form.setFieldsValue(pick(row,'isModel','dbFieldTxt','dbFieldName','fieldShowType','dictName','dbLength','orderNum','fieldMustInput','isShowForm','showArea','isQuery','isShowLawsList','isShowSearch')) }, + //正则替换小数点 + limitNumber(value) { + if (typeof value === 'string') { + return !isNaN(Number(value)) ? value.replace(/\./g, '') : 0 + } else if (typeof value === 'number') { + return !isNaN(value) ? String(value).replace(/\./g, '') : 0 + } else { + return 0 + } + } } } \ No newline at end of file diff --git a/jero-web/src/views/documentManage/tags/dialog/newDrawer.vue b/jero-web/src/views/documentManage/tags/dialog/newDrawer.vue index 6610464cf..a40ef4206 100644 --- a/jero-web/src/views/documentManage/tags/dialog/newDrawer.vue +++ b/jero-web/src/views/documentManage/tags/dialog/newDrawer.vue @@ -1,91 +1,34 @@ + + \ No newline at end of file diff --git a/jero-web/src/views/documentManage/tags/tabs/tagItem.vue b/jero-web/src/views/documentManage/tags/tabs/tagItem.vue index be0348ba6..46bf9ff3e 100644 --- a/jero-web/src/views/documentManage/tags/tabs/tagItem.vue +++ b/jero-web/src/views/documentManage/tags/tabs/tagItem.vue @@ -162,10 +162,10 @@ ], tagSplit:[ { - dataIndex: 'name', - key: 'name', + dataIndex: 'dbFieldName', + key: 'dbFieldName', slots: { title: 'customTitle' }, - scopedSlots: { customRender: 'name' }, + scopedSlots: { customRender: 'dbFieldName' }, align: "center", width: 100, }, @@ -173,7 +173,7 @@ title: '英文名称', align: "center", width: 100, - dataIndex: 'englishName', + dataIndex: 'dbFieldEnName', }, { title: this.$t('operation'), @@ -190,7 +190,7 @@ } }, mounted() { - this.loadData() + this.loadData(1) }, methods:{ searchQuery(){ @@ -212,9 +212,17 @@ } }) }, - //标签项管理初始数据 - loadData(){ - getAction(`Field/onlCgformField/page`,{}).then(res=>{ + //标签项管理文档库初始数据 + loadData(val){ + let params={ + isModel:1 + } + if(val==1){ + params.isModel=1 + }else if(val==0){ + params.isModel=0 + } + getAction(`tag/onlCgformTag/page`,params).then(res=>{ if(res.success){ this.tableData= [ ...res.result.records] } @@ -223,9 +231,11 @@ //标签项管理tab切换 callbackTab(value){ if(value==1){ - this.loadData() + this.loadData(1) // this.tableData=this.taglab // this.tableData=this.taglabSplit + }else if(value=2){ + this.loadData(0) } }, diaHide(vis){