From de2cf9ed127ac4d3f1568dea4c55aa0e2d7a23dc Mon Sep 17 00:00:00 2001
From: caoyang <caoyang@syxysoft.com>
Date: Fri, 4 Mar 2022 19:56:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E7=AE=A1=E7=90=86=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tags/dialog/OnlCgformTagForm.vue            | 17 +++++++++--------
 .../documentManage/tags/dialog/dicList.vue      |  1 +
 .../documentManage/tags/tabs/tagContent.vue     |  2 +-
 .../views/documentManage/tags/tabs/tagItem.vue  |  4 ++++
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/jero-web/src/views/documentManage/tags/dialog/OnlCgformTagForm.vue b/jero-web/src/views/documentManage/tags/dialog/OnlCgformTagForm.vue
index 2b3b42867..2eddcf29b 100644
--- a/jero-web/src/views/documentManage/tags/dialog/OnlCgformTagForm.vue
+++ b/jero-web/src/views/documentManage/tags/dialog/OnlCgformTagForm.vue
@@ -41,8 +41,8 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24" v-if="isTagContent">
-            <a-form-model-item :label="$t('OptionContent')" prop="dictName">
-              <a-select :placeholder="$t('PleaseSelectOptionContent')" v-model="form.dictName" @change="handleChange">
+            <a-form-model-item :label="$t('OptionContent')" prop="dictId">
+              <a-select :placeholder="$t('PleaseSelectOptionContent')" v-model="form.dictId" @change="handleChange">
                 <a-select-option v-for="(item,index) in contentOption" :key="item.id" :value="item.id">
                   {{item.dictName}}
                 </a-select-option>
@@ -116,7 +116,7 @@
 
 <script>
 
-  import { httpAction, getAction } from '@/api/manage'
+  import { httpAction, getAction, postAction } from '@/api/manage'
   import pick from 'lodash.pick'
   import { validateDuplicateValue } from '@/utils/util'
 
@@ -183,7 +183,7 @@
           fieldShowType: [
               { required: true, message: this.$t('PleaseSelectAttributeType'),trigger: 'change'},
           ],
-          dictName: [
+          dictId: [
               { required: true, message: this.$t('PleaseSelectOptionContent'),trigger: 'change'},
           ],
           dbLength: [
@@ -246,7 +246,7 @@
     },
     computed: {
       changeType(val){
-        console.log('changtType',val)
+        // console.log('changtType',val)
       },
       formDisabled(){
         if(this.formBpm===true){
@@ -351,13 +351,14 @@
             this.form.dbIsKey='0'
             this.form.dbIsNull='1'
             this.form.dbPointLength='0'
-            // let formData = Object.assign(this.editId, this.form);
-            // console.log("表单提交数据",this.form)
+            this.form.dbFieldName=this.form.dbFieldTxt
             httpAction(httpurl,this.form,method).then((res)=>{
               if(res.success){
                 this.$message.success(this.$t('OperationSuccessful'));
+                  postAction(`online/cgform/api/doDbSynch/48308196e7b04761b533dc31bc899707/normal
+`,{}).then(res=>{
+                  })
                 this.$emit('ok',false);
-
               }else{
                 this.$message.warning(this.$t('operationFailed'));
               }
diff --git a/jero-web/src/views/documentManage/tags/dialog/dicList.vue b/jero-web/src/views/documentManage/tags/dialog/dicList.vue
index 8a9f14142..7f66c08ca 100644
--- a/jero-web/src/views/documentManage/tags/dialog/dicList.vue
+++ b/jero-web/src/views/documentManage/tags/dialog/dicList.vue
@@ -211,6 +211,7 @@
 
       //搜索
       search(){
+        this.queryParams.pageNo=1
         this.loadData()
       },
       //重置
diff --git a/jero-web/src/views/documentManage/tags/tabs/tagContent.vue b/jero-web/src/views/documentManage/tags/tabs/tagContent.vue
index a173ed3f0..aac8c62c4 100644
--- a/jero-web/src/views/documentManage/tags/tabs/tagContent.vue
+++ b/jero-web/src/views/documentManage/tags/tabs/tagContent.vue
@@ -176,7 +176,7 @@
       },
       //查询
       searchQuery(){
-
+        this.queryParams.pageNo=1
         this.loadData()
       },
       searchReset(){
diff --git a/jero-web/src/views/documentManage/tags/tabs/tagItem.vue b/jero-web/src/views/documentManage/tags/tabs/tagItem.vue
index e8d461161..d4db2cdcc 100644
--- a/jero-web/src/views/documentManage/tags/tabs/tagItem.vue
+++ b/jero-web/src/views/documentManage/tags/tabs/tagItem.vue
@@ -161,6 +161,7 @@
         });
       },
       searchQuery(){
+        this.queryParam.pageNo=1
         if(this.key==1){
           this.loadData(1)
         }else if(this.key==2){
@@ -279,6 +280,9 @@
                     this.$message.success(this.$t('OperationSuccessful'))
                     this.loadData(0)
                   }
+                  postAction(`online/cgform/api/doDbSynch/48308196e7b04761b533dc31bc899707/normal
+`,{}).then(res=>{
+                  })
                 }else{
                   this.$message.warning(this.$t('operationFailed'))
                 }