From 03e17c6c68ee21d8f1a81c7d5729bca9412743af Mon Sep 17 00:00:00 2001
From: caoyang <caoyang@syxysoft.com>
Date: Fri, 11 Feb 2022 18:14:40 +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

---
 jero-web/src/components/addForm/index.vue     |  4 +-
 jero-web/src/components/tableDate/index.vue   |  2 +-
 .../views/documentManage/library/index.vue    | 53 ++++++++----
 .../library/modules/addForm.vue               | 38 ++++++++-
 .../tags/dialog/OnlCgformTagForm.vue          | 81 +++++++++++--------
 .../documentManage/tags/dialog/areaManage.vue | 46 +++++++++--
 .../documentManage/tags/tabs/tagItem.vue      | 12 ++-
 7 files changed, 174 insertions(+), 62 deletions(-)

diff --git a/jero-web/src/components/addForm/index.vue b/jero-web/src/components/addForm/index.vue
index cac3635ea..5822fe27e 100644
--- a/jero-web/src/components/addForm/index.vue
+++ b/jero-web/src/components/addForm/index.vue
@@ -518,6 +518,7 @@
           })
         })
       }
+      console.log('dataheae',this.headerText)
     },
     methods: {
       sumber() {
@@ -547,7 +548,8 @@
         /** 赋值给当前对应的表单文件 */
         this.formInline[this.uploadName] = attIdList.join(',')
         this.formInline = { ...this.formInline }
-      }
+      },
+
     }
   }
 </script>
diff --git a/jero-web/src/components/tableDate/index.vue b/jero-web/src/components/tableDate/index.vue
index 79832bf76..9dc1fe868 100644
--- a/jero-web/src/components/tableDate/index.vue
+++ b/jero-web/src/components/tableDate/index.vue
@@ -122,7 +122,7 @@
         }
         getAction(this.url.tableList, params).then((res) => {
           if (res.success) {
-
+            this.jsonBody=res.result
           }
         })
       },
diff --git a/jero-web/src/views/documentManage/library/index.vue b/jero-web/src/views/documentManage/library/index.vue
index 5d0f1ae26..b525f4c3c 100644
--- a/jero-web/src/views/documentManage/library/index.vue
+++ b/jero-web/src/views/documentManage/library/index.vue
@@ -19,9 +19,15 @@
         @editTable="editTable"
         @deleteTable="deleteTable"
         :url="url"
+        @Collection="Collection"
+        @subscribe="subscribe"
       />
     </div>
-    <addForm ref="addFormClick1"/>
+    <addForm
+      ref="addFormClick1"
+      :url="url"
+      :flag="'1'"
+    />
   </a-card>
 </template>
 
@@ -30,6 +36,7 @@
   import tableData from '@/components/tableDate/index'
   import addForm from './modules/addForm'
 
+
   export default {
     name: 'docLibrary',
     components: {
@@ -44,6 +51,14 @@
           { name: '标题', placeholder: '请输入标题', attrModel: 'title', enName: 'title' }
         ],
         OperationList: [
+          {
+            text: '收藏',
+            ClickEvent: 'Collection'
+          },
+          {
+            text: '订阅',
+            ClickEvent: 'subscribe'
+          },
           {
             text: '编辑',
             ClickEvent: 'editTable'
@@ -52,21 +67,16 @@
             text: '删除',
             ClickEvent: 'deleteTable'
           },
-          {
-            text: '收藏',
-            ClickEvent: 'Collection'
-          },
-          {
-            text: '订阅',
-            ClickEvent: 'subscribe'
-          }
         ],
         selectedRowKeys: [],
         loading: false,
         url:{
-          tableHeader:'document/bussDocumentLibraryEO/getHeader',
-          seachList:'document/bussDocumentLibraryEO/queryCondition',
-          tableList:'/document/bussDocumentLibraryEO/queryPageInfo',
+          tableHeader:'document/bussDocumentLibraryEO/getHeader',      //表格头部字段
+          seachList:'document/bussDocumentLibraryEO/queryCondition',   //搜索字段
+          tableList:'document/bussDocumentLibraryEO/list',         //表格数据
+          formList:'document/bussDocumentLibraryEO/getAddForm',   //新增表单的字段
+          formAdd:'document/bussDocumentLibraryEO/addInfo',      //新增
+
         }
       }
     },
@@ -95,12 +105,23 @@
       handleFileImport(){
 
       },
-      editTable(item) {
-        console.log(item)
+      //编辑按钮
+      editTable(val) {
+        this.$refs.addFormClick1.add()
+        console.log(val)
       },
-      deleteTable(){
-        console.log(3)
+      //删除按钮
+      deleteTable(val){
+        console.log(val)
       },
+      //收藏按钮
+      Collection(val){
+        console.log('val111',val)
+      },
+      //订阅按钮
+      subscribe(val){
+        console.log('val222',val)
+      }
     }
   }
 </script>
diff --git a/jero-web/src/views/documentManage/library/modules/addForm.vue b/jero-web/src/views/documentManage/library/modules/addForm.vue
index e753d5f7a..71a792792 100644
--- a/jero-web/src/views/documentManage/library/modules/addForm.vue
+++ b/jero-web/src/views/documentManage/library/modules/addForm.vue
@@ -26,6 +26,7 @@
 
 <script>
   import addFormData from '@/components/addForm/index'
+  import { getAction, postAction } from '@/api/manage'
 
   export default {
     name: 'docLibraryAddForm',
@@ -38,12 +39,40 @@
         drawerWidth: 1000,
         visible: false,
         confirmLoading: false,
-        url: {}
+        isDisplayType:false,
+        dataList:[]
       }
     },
+    props:{
+      flag: {
+        type: String,
+        default: ''
+      },
+      //接口
+      url: {
+        type: Object,
+        default: {}
+      },
+    },
+    mounted() {
+      this.formData()
+    },
     methods: {
+      formData(){
+        let params = {
+          flag: this.flag
+        }
+        getAction(this.url.formList, params).then((res) => {
+          if(res.success){
+
+          }
+          console.log('res',res)
+        })
+      },
       handleCancel() {
         this.visible = false
+
+        console.log('2222')
       },
       add() {
         this.visible = true
@@ -53,6 +82,13 @@
       },
       handleSubmit() {
         this.$refs.addFormDataRef.sumber()
+        // postAction(this.url.datarule,params).then(res=>{
+        //   if(res.success){
+        //     this.$message.success(res.message)
+        //   }else{
+        //     this.$message.error(res.message)
+        //   }
+        // })
         console.log('11111')
       }
     }
diff --git a/jero-web/src/views/documentManage/tags/dialog/OnlCgformTagForm.vue b/jero-web/src/views/documentManage/tags/dialog/OnlCgformTagForm.vue
index f02b2ac09..334ba9ba7 100644
--- a/jero-web/src/views/documentManage/tags/dialog/OnlCgformTagForm.vue
+++ b/jero-web/src/views/documentManage/tags/dialog/OnlCgformTagForm.vue
@@ -3,49 +3,54 @@
     <j-form-container :disabled="formDisabled">
       <a-form :form="form" slot="detail">
         <a-row>
+          <div class="form-title">基本信息</div>
+          <a-divider dashed />
           <a-col :span="24">
-            <a-form-item label="所属模块(1文档库,0文档拆分" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-dict-select-tag type="list" v-decorator="['isModel', validatorRules.isModel]" :trigger-change="true" dictCode="onl_cgform_area,所属模块,is_model" placeholder="请选择所属模块(1文档库,0文档拆分" />
+            <a-form-item label="所属模块" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-dict-select-tag type="list" v-decorator="['isModel', validatorRules.isModel]" :trigger-change="true" dictCode="onl_cgform_area,所属模块,is_model" placeholder="请选择所属模块(1文档库,0文档拆分)" />
             </a-form-item>
           </a-col>
           <a-col :span="24">
-            <a-form-item label="字段备注" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input v-decorator="['dbFieldTxt', validatorRules.dbFieldTxt]" placeholder="请输入字段备注" :maxLength="120"  ></a-input>
+            <a-form-item label="属性名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input v-decorator="['dbFieldTxt', validatorRules.dbFieldTxt]" placeholder="请输入属性名称" :maxLength="120"  ></a-input>
             </a-form-item>
           </a-col>
           <a-col :span="24">
-            <a-form-item label="字段英文名称描述" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input v-decorator="['dbFieldName']" placeholder="请输入字段英文名称描述" :maxLength="120"  ></a-input>
+            <a-form-item label="英文名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input v-decorator="['dbFieldName']" placeholder="请输入英文名称" :maxLength="120"  ></a-input>
             </a-form-item>
           </a-col>
           <a-col :span="24">
-            <a-form-item label="表单控件类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-dict-select-tag type="list" v-decorator="['fieldShowType', validatorRules.fieldShowType]" :trigger-change="true" dictCode="onl_cgform_field,属性类型,field_show_type" placeholder="请选择表单控件类型" />
+            <a-form-item label="属性类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-dict-select-tag type="list" v-decorator="['fieldShowType', validatorRules.fieldShowType]" :trigger-change="true" dictCode="onl_cgform_field,属性类型,field_show_type" placeholder="请选择属性类型" />
+            </a-form-item>
+          </a-col>
+<!--          <a-col :span="24">-->
+<!--            <a-form-item label="字典名称" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
+<!--              <j-dict-select-tag type="list" v-decorator="['dictName', validatorRules.dictName]" :trigger-change="true" dictCode="sys_dict,选项内容,dict_name" placeholder="请选择字典名称" />-->
+<!--            </a-form-item>-->
+<!--          </a-col>-->
+          <a-col :span="24">
+            <a-form-item label="字段长度" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input-number v-decorator="['dbLength', validatorRules.dbLength]" placeholder="请输入字段长度" style="width: 100%" />
             </a-form-item>
           </a-col>
           <a-col :span="24">
-            <a-form-item label="字典名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-dict-select-tag type="list" v-decorator="['dictName', validatorRules.dictName]" :trigger-change="true" dictCode="sys_dict,选项内容,dict_name" placeholder="请选择字典名称" />
+            <a-form-item label="展示顺序" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input-number v-decorator="['orderNum', validatorRules.orderNum]" placeholder="请输入展示顺序" style="width: 100%" />
             </a-form-item>
           </a-col>
           <a-col :span="24">
-            <a-form-item label="数据库字段长度" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input-number v-decorator="['dbLength', validatorRules.dbLength]" placeholder="请输入数据库字段长度" style="width: 100%" />
+            <a-form-item label="是否必填" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-dict-select-tag type="list" v-decorator="['fieldMustInput', validatorRules.fieldMustInput]" :trigger-change="true" dictCode="onl_cgform_field,是否必填,field_must_input" placeholder="请选择是否必填" />
             </a-form-item>
           </a-col>
+
+          <div class="form-title">文档库模块展示</div>
+          <a-divider dashed />
           <a-col :span="24">
-            <a-form-item label="排序" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input-number v-decorator="['orderNum', validatorRules.orderNum]" placeholder="请输入排序" style="width: 100%" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-item label="字段是否必填" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-dict-select-tag type="list" v-decorator="['fieldMustInput', validatorRules.fieldMustInput]" :trigger-change="true" dictCode="onl_cgform_field,是否必填,field_must_input" placeholder="请选择字段是否必填" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-item label="表单是否显示0否 1是" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-dict-select-tag type="list" v-decorator="['isShowForm', validatorRules.isShowForm]" :trigger-change="true" dictCode="onl_cgform_field,文档库列表展示,is_show_form" placeholder="请选择表单是否显示0否 1是" />
+            <a-form-item label="文档库列表展示" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-dict-select-tag type="list" v-decorator="['isShowForm', validatorRules.isShowForm]" :trigger-change="true" dictCode="onl_cgform_field,文档库列表展示,is_show_form" placeholder="请选择文档库列表是否展示" />
             </a-form-item>
           </a-col>
           <a-col :span="24">
@@ -54,17 +59,21 @@
             </a-form-item>
           </a-col>
           <a-col :span="24">
-            <a-form-item label="是否查询条件0否 1是" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-dict-select-tag type="list" v-decorator="['isQuery', validatorRules.isQuery]" :trigger-change="true" dictCode="onl_cgform_field,是否搜索,is_query" placeholder="请选择是否查询条件0否 1是" />
+            <a-form-item label="是否搜索" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-dict-select-tag type="list" v-decorator="['isQuery', validatorRules.isQuery]" :trigger-change="true" dictCode="onl_cgform_field,是否搜索,is_query" placeholder="请选择是否搜索" />
+            </a-form-item>
+          </a-col>
+
+
+          <div class="form-title">其他模块展示</div>
+          <a-divider dashed />
+          <a-col :span="24">
+            <a-form-item label="法规清单展示" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-dict-select-tag type="list" v-decorator="['isShowLawsList', validatorRules.isShowLawsList]" :trigger-change="true" dictCode="onl_cgform_field,法规清单展示,is_show_laws_list" placeholder="请选择法规清单是否展示" />
             </a-form-item>
           </a-col>
           <a-col :span="24">
-            <a-form-item label="法规清单是否展示0否 1是" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-dict-select-tag type="list" v-decorator="['isShowLawsList', validatorRules.isShowLawsList]" :trigger-change="true" dictCode="onl_cgform_field,法规清单展示,is_show_laws_list" placeholder="请选择法规清单是否展示0否 1是" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-item label="搜索中心是否展示0否 1是" :labelCol="labelCol" :wrapperCol="wrapperCol">
+            <a-form-item label="搜索中心是否展示" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-dict-select-tag type="list" v-decorator="['isShowSearch', validatorRules.isShowSearch]" :trigger-change="true" dictCode="onl_cgform_field,搜索中心展示,is_show_search" placeholder="请选择搜索中心是否展示0否 1是" />
             </a-form-item>
           </a-col>
@@ -271,4 +280,10 @@
       },
     }
   }
-</script>
\ No newline at end of file
+</script>
+<style lang="less" scoped>
+  .form-title{
+    margin-left: 30px;
+    font-weight: 600;
+  }
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/documentManage/tags/dialog/areaManage.vue b/jero-web/src/views/documentManage/tags/dialog/areaManage.vue
index 9a8b01417..f81101108 100644
--- a/jero-web/src/views/documentManage/tags/dialog/areaManage.vue
+++ b/jero-web/src/views/documentManage/tags/dialog/areaManage.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="diolag-area">
     <a-button type="primary" @click="showModal">新增</a-button>
-    <a-modal class="area-module" v-model="newVisible" title="新增" ok-text="保存" cancel-text="取消" @ok="hideModal" @cancel="cancelModel">
+    <a-modal class="area-module" v-model="newVisible" title="新增" ok-text="保存" cancel-text="取消" @ok="hideModal" @cancel="cancelModel" v-if="newVisible">
       <a-form-model
         class="tag-module"
         ref="ruleForm"
@@ -67,16 +67,22 @@
       <a slot="name" slot-scope="text">{{ text }}</a>
       <span slot="customTitle">属性名称</span>
       <span slot="action" slot-scope="text, record">
-          <a>编辑</a>
+          <a @click="editArea(record.id)">编辑</a>
           <a-divider type="vertical" />
-          <a class="table-del">删除</a>
+         <a-popconfirm
+           v-if="areaTable.length"
+           title="Sure to delete?"
+           @confirm="() => deleteArea(record.id)"
+         >
+          <a style="color:red" href="javascript:;">删除</a>
+        </a-popconfirm>
         </span>
     </a-table>
   </div>
 </template>
 
 <script>
-  import { putAction,postAction,getAction } from '@/api/manage'
+  import { putAction,postAction,getAction,deleteAction } from '@/api/manage'
   export default {
     name: 'diolagArea',
     components:{
@@ -132,7 +138,7 @@
         },
         rules: {
           isModel:[{ required: true, message: '请选择所属模块', trigger: 'change' }],
-          area:[
+          showArea:[
             { required: true, message: '请选择展示区域', trigger: 'blur' },
             { min: 1, max: 100, message: 'Length should be 1 to 100', trigger: 'blur' },
           ],
@@ -156,19 +162,25 @@
       showModal() {
         this.newVisible = true;
       },
+      //新增
       hideModal() {
         this.newVisible = false;
-        console.log('form',this.form)
         this.$refs.ruleForm.validate(valid => {
           if (valid) {
             postAction(`/tag/onlCgformArea/add`,this.form).then(res=>{
                 if(res.success){
                   this.$emit('submitOk',res.result)
+                  this.form={
+                    isModel:'',
+                    showArea:'',
+                    enName:'',
+                    sort:''
+                  }
                 }
               }
             )
           } else {
-            console.log('error submit!!');
+            // console.log('error submit!!');
             return false;
           }
         });
@@ -178,7 +190,27 @@
         this.newVisible=false
         this.$refs.ruleForm.resetFields();
       },
+      //删除按钮
+      deleteArea(val){
+        deleteAction(`tag/onlCgformArea/delete`, {id: val}).then((res) => {
+          if(res.success){
+            this.$emit('deleteOk',res.result)
 
+          }
+        })
+      },
+      //编辑按钮
+      editArea(val){
+        let params={
+          id:val
+        }
+        getAction(`tag/onlCgformArea/queryById`, params).then((res) => {
+          if(res.success){
+
+            // this.$emit('updateOk',res.result)
+          }
+        })
+      }
     }
   }
 </script>
diff --git a/jero-web/src/views/documentManage/tags/tabs/tagItem.vue b/jero-web/src/views/documentManage/tags/tabs/tagItem.vue
index e53c15331..dfab84bbe 100644
--- a/jero-web/src/views/documentManage/tags/tabs/tagItem.vue
+++ b/jero-web/src/views/documentManage/tags/tabs/tagItem.vue
@@ -25,14 +25,14 @@
       </a-form>
     </div>
     <div class="table-operator" style="border-top: 5px">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button @click="handleAdd" type="primary" icon="plus">{{$t('add')}}</a-button>
       <a-button type="primary" @click="handleShow">展示区域管理</a-button>
     </div>
     <a-drawer class="show-drawer" title="新增标签项" placement="right" width="1000px" @close="close" :visible="drawerVisible">
       <new-drawer v-if="drawerVisible"></new-drawer>
     </a-drawer>
     <a-modal class="show-area" v-model="areaVisible" title="展示区域管理" :footer="null" @cancel="hideModal">
-      <area-manage v-if="areaVisible" @diaHide="diaHide" :areaTable="areaTable" @submit-ok="submitOk"></area-manage>
+      <area-manage v-if="areaVisible" @diaHide="diaHide" :areaTable="areaTable" @submitOk="submitOk" @deleteOk="deleteOk" @updateOk="updateOk"></area-manage>
     </a-modal>
     <div class="tag-doc-tab">
       <a-tabs default-active-key="1" @change="callbackTab">
@@ -214,7 +214,6 @@
       },
       diaHide(vis){
         this.areaVisible=vis
-        console.log('vis',vis)
       },
       hideModal(){
         this.visible = false;
@@ -224,6 +223,13 @@
       },
       submitOk(value){
         this.handleShow()
+      },
+      deleteOk(value){
+        this.handleShow()
+      },
+      //编辑按钮
+      updateOk(value){
+        this.handleShow()
       }
     }
   }