From 46a89d7b4a4609374965bd98d108860f8b98cac9 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Fri, 30 Dec 2022 10:52:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=94=B6=E9=9B=86--=E5=8E=86?=
 =?UTF-8?q?=E5=8F=B2=E8=AE=B0=E5=BD=95=E4=B8=AD=E7=9A=84=E5=BC=95=E5=8F=B7?=
 =?UTF-8?q?=E4=B8=8D=E5=AF=B9=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/exporthistory/index.vue    |  2 +-
 .../src/components/tableCollection/index.vue  |  6 ++--
 .../splitting/modules/SplitDetail.vue         | 29 +++++++++++++++++++
 .../projectManagement/components/addModel.vue |  2 +-
 .../src/views/system/modules/UserModal.vue    |  2 +-
 5 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/jero-web/src/components/exporthistory/index.vue b/jero-web/src/components/exporthistory/index.vue
index a2d883e27..547892f33 100644
--- a/jero-web/src/components/exporthistory/index.vue
+++ b/jero-web/src/components/exporthistory/index.vue
@@ -45,7 +45,7 @@
       @change='handleTableChange'>
 
       <template slot="file" slot-scope="text, record">
-        <a class="action-edit" href="javascript:;" @click="dowloadfile(record)" v-has="'bqnrzdpzxlbj'">{{record.exportFileName}}</a>
+        <a class="action-edit" href="javascript:;" @click="dowloadfile(record)">{{record.exportFileName}}</a>
       </template>
     </a-table>
     <div class="page" style='display: flex;justify-content: flex-end;'>
diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue
index f0e53d542..3650d9148 100644
--- a/jero-web/src/components/tableCollection/index.vue
+++ b/jero-web/src/components/tableCollection/index.vue
@@ -698,7 +698,7 @@
             this.dataSourcehistory = res.result.records
             if(this.dataSourcehistory && this.dataSourcehistory.length > 0){
               this.dataSourcehistory.forEach(val=>{
-                  val.logContent = val.logContent.replace(/\"/g,"“")
+                  val.logContent = val.logContent.replace(/\"/g,"<span class='textData'>\"</span>")
               })
             }
             this.total = res.result.total
@@ -1036,6 +1036,9 @@
   .table .ant-table-column-title {
     font-weight: bold;
   }
+  .textData{
+    font-family:cursive;
+  }
 </style>
 <style scoped lang="less">
   .box {
@@ -1043,7 +1046,6 @@
     height: calc(100% - 100px);
     overflow: auto;
   }
-
   .text {
     margin-right: 10px;
   }
diff --git a/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue b/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue
index 0ba7dd070..a2dc1096f 100644
--- a/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue
+++ b/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue
@@ -56,6 +56,12 @@
                         <a-menu-item key="3" @click="orgDelete" v-if="deleteNode"
                                      v-has="'split:sarFileSplitMenu:delete'">{{ $t('deleteNode') }}
                         </a-menu-item>
+                        <a-menu-item key="4" @click="orgMoveUp" v-if="deleteNode"
+                                     v-has="'split:sarFileSplitMenu:moveUp'">{{ $t('moveUp') }}
+                        </a-menu-item>
+                        <a-menu-item key="5" @click="orgmoveDown" v-if="deleteNode"
+                                     v-has="'split:sarFileSplitMenu:moveDown'">{{ $t('moveDown') }}
+                        </a-menu-item>
                       </a-menu>
                     </template>
                   </a-dropdown>
@@ -584,6 +590,29 @@ export default {
           }
       })
     },
+    // 树上移
+    orgMoveUp(){
+      console.log(this.nodeItem)
+      getAction(`split/sarFileSplitMenu/deleteMenu`, { id: this.nodeItem.id }).then(res => {
+        if (res.success) {
+          this.$message.success(this.$t('OperationSuccessful'))
+          this.loadMenuData()
+          let queryParam = {
+            menu_id: this.menuId,
+            info_id: this.infoId
+
+          }
+          eventBUs.$emit('searchQuery', JSON.parse(JSON.stringify(queryParam)))
+          // eventBUs.$emit('searchReset')
+        } else {
+          this.$message.warning(this.$t('operationFailed'))
+        }
+      })
+    },// 树下移
+    orgmoveDown(){
+      console.log(this.nodeItem)
+    },
+
     onContextMenuClick(treeKey, menuKey) {
       // console.log(`treeKey: ${treeKey}, menuKey: ${menuKey}`);
     },
diff --git a/jero-web/src/views/projectManagement/components/addModel.vue b/jero-web/src/views/projectManagement/components/addModel.vue
index f81163685..40418ac3a 100644
--- a/jero-web/src/views/projectManagement/components/addModel.vue
+++ b/jero-web/src/views/projectManagement/components/addModel.vue
@@ -231,7 +231,7 @@
                       :title="$t('brand')">{{$t('brand')}}</span>
               </div>
               <a-form-model-item class="itemModel" :prop="'brand'">
-                <j-multi-select-tag  v-model="formInline.brand"
+                <j-dict-select-tag  v-model="formInline.brand"
                                      :placeholder="$t('PleaseSelect')+$t('brand')"
                                      :type="'select'"
                                      :triggerChange="false" :dictCode="'brand'"/>
diff --git a/jero-web/src/views/system/modules/UserModal.vue b/jero-web/src/views/system/modules/UserModal.vue
index a1637da0f..fa72cc65b 100644
--- a/jero-web/src/views/system/modules/UserModal.vue
+++ b/jero-web/src/views/system/modules/UserModal.vue
@@ -86,7 +86,7 @@
 <!--                              :placeholder="$t('PleaseSelect')+$t('brand')"-->
 <!--                              :type="'select'"-->
 <!--                              :triggerChange="false" :dictCode="'brand'"/>-->
-          <a-select allowClear mode="multiple" :getPopupContainer="triggerNode => triggerNode.parentNode" :placeholder="$t('PleaseSelect')+$t('engineeringInterfacePerson')"
+          <a-select allowClear mode="multiple" :getPopupContainer="triggerNode => triggerNode.parentNode" :placeholder="$t('PleaseSelect')+$t('brand')"
                     v-model="brands">
             <a-select-option v-for="(item, key) in brandsList" :key="key" :value="item.value">
                     <span style="display: inline-block;width: 100%" :title=" item.text || item.label ">