From d3c5f0a931311903caab6803516075c4fe1b92ad Mon Sep 17 00:00:00 2001
From: "ZHOUZ\\Noble'lift" <1014987728@qq.com>
Date: Fri, 2 Dec 2022 11:35:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/org/nl/wms/ext/wql/QCRM_001.wql          | 2 +-
 .../src/views/wms/st/inStor/change/AddDialog.vue           | 2 +-
 lms/nladmin-ui/src/views/wms/st/inbill/index.vue           | 7 ++++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/wql/QCRM_001.wql b/lms/nladmin-system/src/main/java/org/nl/wms/ext/wql/QCRM_001.wql
index 3e366aeae..87c6b3117 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/wql/QCRM_001.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/wql/QCRM_001.wql
@@ -84,7 +84,7 @@
                     customer_description = 输入.customerdescription
                 ENDOPTION
                 OPTION 输入.width <> ""
-                    width >= 输入.width
+                    sub.width >= 输入.width
                 ENDOPTION
 			ENDSELECT
 		ENDQUERY
diff --git a/lms/nladmin-ui/src/views/wms/st/inStor/change/AddDialog.vue b/lms/nladmin-ui/src/views/wms/st/inStor/change/AddDialog.vue
index ac770e10b..6f3760320 100644
--- a/lms/nladmin-ui/src/views/wms/st/inStor/change/AddDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/st/inStor/change/AddDialog.vue
@@ -130,7 +130,7 @@
     </el-form>
 
     <div class="crud-opts2">
-      <span class="role-span">移库明细</span>
+      <span class="role-span">变更明细</span>
       <span v-if="crud.status.cu > 0" class="crud-opts-right2">
 
         <!--左侧插槽-->
diff --git a/lms/nladmin-ui/src/views/wms/st/inbill/index.vue b/lms/nladmin-ui/src/views/wms/st/inbill/index.vue
index d89c7abf7..895a9fbce 100644
--- a/lms/nladmin-ui/src/views/wms/st/inbill/index.vue
+++ b/lms/nladmin-ui/src/views/wms/st/inbill/index.vue
@@ -168,6 +168,7 @@
       >
         <el-table-column type="selection" width="55" />
         <el-table-column
+          v-permission="['admin','inbill:del','inbill:edit']"
           label="操作"
           width="115"
           align="center"
@@ -254,9 +255,9 @@ export default {
     return {
       height: document.documentElement.clientHeight - 180 + 'px;',
       permission: {
-        add: ['admin', 'user:add'],
-        edit: ['admin', 'user:edit'],
-        del: ['admin', 'user:del']
+        add: ['admin', 'inbill:add'],
+        edit: ['admin', 'inbill:edit'],
+        del: ['admin', 'inbill:del']
       },
       audit_flag: true,
       dis_flag: true,