From 5e65a4501e5ec7a346f9c41f8f35e878d40e9723 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=B5=B7?= <963808678@qq.com>
Date: Thu, 29 Dec 2022 18:10:59 +0800
Subject: [PATCH 1/3] 12/29

---
 src/api/modular/main/PrinttemplateRight.js  | 10 +++++++++
 src/views/main/PrinttemplateRight/index.vue | 23 ++++++++++++++-------
 2 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/src/api/modular/main/PrinttemplateRight.js b/src/api/modular/main/PrinttemplateRight.js
index c73d689..8e14748 100644
--- a/src/api/modular/main/PrinttemplateRight.js
+++ b/src/api/modular/main/PrinttemplateRight.js
@@ -50,3 +50,13 @@ export function BookingPrintTemplateGetPrintTemplateList(parameter) {
     params: { PageNo: 1, PageSize: 999 }
   })
 }
+/**
+ * 删除打印模板权限
+ */
+export function BookingPrintTemplateDeletePrinttemplateRight(parameter) {
+  return axios({
+    url: '/BookingPrintTemplate/DeletePrinttemplateRight',
+    method: 'get',
+    params: parameter
+  })
+}
diff --git a/src/views/main/PrinttemplateRight/index.vue b/src/views/main/PrinttemplateRight/index.vue
index bb8572e..910f516 100644
--- a/src/views/main/PrinttemplateRight/index.vue
+++ b/src/views/main/PrinttemplateRight/index.vue
@@ -1,11 +1,7 @@
 <template>
   <div>
     <a-card :bordered="false" :bodyStyle="tstyle">
-      <div
-        class="table-page-search-wrapper"
-        v-if="hasPerm('BookingTemplate:page')"
-        :class="advanced ? 'Open' : 'Close'"
-      >
+      <div class="table-page-search-wrapper" :class="advanced ? 'Open' : 'Close'">
         <a-form layout="inline">
           <a-row :gutter="48">
             <a-col :md="18">
@@ -58,6 +54,7 @@
         <vxe-column title="操作" fixed="right" width="200" align="center">
           <template #default="{ row }">
             <vxe-button type="text" @click="$refs.editForm.edit(row)">编辑</vxe-button>
+            <vxe-button type="text" @click="FnDel(row)">删除</vxe-button>
           </template>
         </vxe-column>
       </vxe-table>
@@ -67,7 +64,11 @@
   </div>
 </template>
 <script>
-import { BookingTemplateGetPrinttemplateRightList, SysUserPage } from '@/api/modular/main/PrinttemplateRight'
+import {
+  BookingTemplateGetPrinttemplateRightList,
+  BookingPrintTemplateDeletePrinttemplateRight,
+  SysUserPage
+} from '@/api/modular/main/PrinttemplateRight'
 import addForm from './addForm.vue'
 import editForm from './editForm.vue'
 export default {
@@ -101,9 +102,9 @@ export default {
           dataIndex: 'typeName'
         },
         {
-          title: '租户名称',
+          title: '用户名称',
           align: 'center',
-          dataIndex: 'tenantName'
+          dataIndex: 'userName'
         }
       ],
       tstyle: { 'padding-bottom': '0px', 'margin-bottom': '10px' },
@@ -121,6 +122,12 @@ export default {
     this.init()
   },
   methods: {
+    FnDel(data) {
+      BookingPrintTemplateDeletePrinttemplateRight({ Ids: data.id }).then(res => {
+        this.$message.success('删除成功')
+        this.FnGetData()
+      })
+    },
     toggleAdvanced() {
       this.advanced = !this.advanced
     },

From 13a3ce210da224120ebae487c77c1ee826cf8fda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=B5=B7?= <963808678@qq.com>
Date: Fri, 30 Dec 2022 08:58:01 +0800
Subject: [PATCH 2/3] 12/30

---
 src/views/main/PrinttemplateRight/index.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/views/main/PrinttemplateRight/index.vue b/src/views/main/PrinttemplateRight/index.vue
index 910f516..37444e2 100644
--- a/src/views/main/PrinttemplateRight/index.vue
+++ b/src/views/main/PrinttemplateRight/index.vue
@@ -54,7 +54,9 @@
         <vxe-column title="操作" fixed="right" width="200" align="center">
           <template #default="{ row }">
             <vxe-button type="text" @click="$refs.editForm.edit(row)">编辑</vxe-button>
-            <vxe-button type="text" @click="FnDel(row)">删除</vxe-button>
+            <a-popconfirm title="是否确认删除?" ok-text="是" cancel-text="否" @confirm="confirm(row)">
+              <vxe-button type="text">删除</vxe-button>
+            </a-popconfirm>
           </template>
         </vxe-column>
       </vxe-table>
@@ -122,6 +124,9 @@ export default {
     this.init()
   },
   methods: {
+    confirm(e) {
+      this.FnDel(e)
+    },
     FnDel(data) {
       BookingPrintTemplateDeletePrinttemplateRight({ Ids: data.id }).then(res => {
         this.$message.success('删除成功')

From a63d735f163bf0d97130fc2e04feee8c8deb6da8 Mon Sep 17 00:00:00 2001
From: liuxiaoxue <1126966868@qq.com>
Date: Fri, 30 Dec 2022 11:15:46 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E8=AE=A2=E8=88=B1=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/main/BookingLedger/detail/modules/operationArea.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/main/BookingLedger/detail/modules/operationArea.vue b/src/views/main/BookingLedger/detail/modules/operationArea.vue
index fa83a86..f9f1a36 100644
--- a/src/views/main/BookingLedger/detail/modules/operationArea.vue
+++ b/src/views/main/BookingLedger/detail/modules/operationArea.vue
@@ -28,7 +28,7 @@
         <button @click="openModel('cutOff')" :style="{ marginLeft: '4px' }">
           <span class="iconfont icon-daibanshixiang"></span>截单
         </button>
-        <button><span class="iconfont icon-xiugai" :style="{ marginLeft: '8px' }"></span>更改及退舱</button>
+        <button :style="{ marginLeft: '14px' }"><span class="iconfont icon-xiugai"></span>更改及退舱</button>
         <button @click="openModel('vgm')"><span class="iconfont icon-dingdan"></span>VGM</button>
         <button @click="openModel('paper')">
           <span class="iconfont icon-zhizhishu" style="font-size:18px;"></span>下货纸
@@ -1601,7 +1601,7 @@ export default {
     }
   }
   .more-view-1 {
-    width: 265px;
+    width: 270px;
     .iconfont {
       color: #26b578;
     }