From a4eea255b1e8eeb0230c09147aa6eebf5b51dd73 Mon Sep 17 00:00:00 2001
From: guoxing <1369478551@qq.com>
Date: Fri, 17 May 2024 10:29:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BB=93=E5=BA=93=E3=80=81?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E6=9F=A5=E8=AF=A2=E4=BF=9D=E5=AD=98=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yxt-as-ui/src/api/warehouse/warehouseArea.js  |  2 +-
 .../src/views/goods/brands/brandsAdd.vue      | 14 +++---
 yxt-as-ui/src/views/goods/brands/index.vue    |  3 ++
 .../src/views/goods/category/categoryAdd.vue  | 18 ++++----
 yxt-as-ui/src/views/goods/category/index.vue  |  3 ++
 .../src/views/goods/factory/factoryAdd.vue    |  8 ++--
 yxt-as-ui/src/views/goods/factory/index.vue   |  3 ++
 yxt-as-ui/src/views/goods/unit/index.vue      |  3 ++
 yxt-as-ui/src/views/goods/unit/unitAdd.vue    |  2 +
 .../goodsShelves/goodsShelvesAdd.vue          | 15 +++---
 .../views/warehouse/goodsShelves/index.vue    |  3 ++
 .../src/views/warehouse/warehouse/index.vue   |  3 ++
 .../warehouse/warehouse/warehouseAdd.vue      | 46 ++++++++++---------
 .../views/warehouse/warehouseArea/index.vue   |  7 ++-
 .../warehouseArea/warehouseAreaAdd.vue        | 14 +++---
 15 files changed, 89 insertions(+), 55 deletions(-)

diff --git a/yxt-as-ui/src/api/warehouse/warehouseArea.js b/yxt-as-ui/src/api/warehouse/warehouseArea.js
index 809d310c92..4ff69c1a3a 100644
--- a/yxt-as-ui/src/api/warehouse/warehouseArea.js
+++ b/yxt-as-ui/src/api/warehouse/warehouseArea.js
@@ -70,7 +70,7 @@ export default {
   // 库区-- 删除
   deleteBySids: function(data) {
     return request({
-      url: '/wms/apiadmin/base/wmswarehouseinfo/delBySids',
+      url: '/wms/apiadmin/base/wmswarehousearea/delBySids',
       method: 'DELETE',
       data: data,
       headers: {
diff --git a/yxt-as-ui/src/views/goods/brands/brandsAdd.vue b/yxt-as-ui/src/views/goods/brands/brandsAdd.vue
index fe7f30f1ac..9cfee66d1b 100644
--- a/yxt-as-ui/src/views/goods/brands/brandsAdd.vue
+++ b/yxt-as-ui/src/views/goods/brands/brandsAdd.vue
@@ -88,9 +88,10 @@
           remarks: '',
           letter: '',
           image: "",
-          useOrgSid: window.sessionStorage.getItem('departmentSid'),
-          createOrgSid: window.sessionStorage.getItem('orgSid'),
-          userSid: window.sessionStorage.getItem('userSid'),
+         useOrgSid: window.sessionStorage.getItem('departmentSid'),
+         orgPath: window.sessionStorage.getItem('defaultOrgPath'),
+         createOrgSid: window.sessionStorage.getItem('orgSid'),
+         userSid: window.sessionStorage.getItem('userSid'),
 
         },
         hideUploadBtn: false,
@@ -143,9 +144,10 @@
           remarks: '',
           letter: '',
           image: "",
-          useOrgSid: window.sessionStorage.getItem('departmentSid'),
-          createOrgSid: window.sessionStorage.getItem('orgSid'),
-          userSid: window.sessionStorage.getItem('userSid'),
+         useOrgSid: window.sessionStorage.getItem('departmentSid'),
+         orgPath: window.sessionStorage.getItem('defaultOrgPath'),
+         createOrgSid: window.sessionStorage.getItem('orgSid'),
+         userSid: window.sessionStorage.getItem('userSid'),
         }
         this.$emit('doback')
       },
diff --git a/yxt-as-ui/src/views/goods/brands/index.vue b/yxt-as-ui/src/views/goods/brands/index.vue
index b9176ff028..00d435e25e 100644
--- a/yxt-as-ui/src/views/goods/brands/index.vue
+++ b/yxt-as-ui/src/views/goods/brands/index.vue
@@ -173,6 +173,9 @@
       },
       loadList() {
         this.tableLoading = true
+        this.queryParams.params.userSid = window.sessionStorage.getItem('userSid')
+        this.queryParams.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
+        this.queryParams.params.menuUrl = this.$route.path
         req.listPage(this.queryParams).then((resp) => {
           this.tableLoading = false
           if (resp.success) {
diff --git a/yxt-as-ui/src/views/goods/category/categoryAdd.vue b/yxt-as-ui/src/views/goods/category/categoryAdd.vue
index b57f9044e6..0cb63f2ee9 100644
--- a/yxt-as-ui/src/views/goods/category/categoryAdd.vue
+++ b/yxt-as-ui/src/views/goods/category/categoryAdd.vue
@@ -43,7 +43,7 @@
         </div>
         <div class="item">
           <span class="item_text">出库规则：</span>
-          <el-select v-model="formobj.outStockRuleValue" placeholder="请选择出库规则" class="item_input" @change="selectOutStockRuleChange">
+          <el-select v-model="formobj.outstockRuleValue" placeholder="请选择出库规则" class="item_input" @change="selectOutStockRuleChange">
             <el-option v-for="item in outStockRuleList" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey" />
           </el-select>
         </div>
@@ -80,15 +80,16 @@
           goodsTypeCode: '',
           percentageRate: '',
           percentageAmount: '',
-          outStockRuleKey: '',
-          outStockRuleValue: '',
+           outstockRule: '',
+          outstockRuleValue: '',
           sids: '',
           pname: '',
           sortNo: '',
           remarks: '',
-          useOrgSid: window.sessionStorage.getItem('departmentSid'),
-          createOrgSid: window.sessionStorage.getItem('orgSid'),
-          userSid: window.sessionStorage.getItem('userSid'),
+       useOrgSid: window.sessionStorage.getItem('departmentSid'),
+       orgPath: window.sessionStorage.getItem('defaultOrgPath'),
+       createOrgSid: window.sessionStorage.getItem('orgSid'),
+       userSid: window.sessionStorage.getItem('userSid'),
 
         },
         goodsTypeList: [],
@@ -141,13 +142,14 @@
           goodsTypeCode: '',
           percentageRate: '',
           percentageAmount: '',
-          outStockRuleKey: '',
+           outstockRule: '',
           outStockRuleValue: '',
           sids: '',
           pname: '',
           sortNo: '',
           remarks: '',
           useOrgSid: window.sessionStorage.getItem('departmentSid'),
+          orgPath: window.sessionStorage.getItem('defaultOrgPath'),
           createOrgSid: window.sessionStorage.getItem('orgSid'),
           userSid: window.sessionStorage.getItem('userSid'),
         }
@@ -175,7 +177,7 @@
       selectOutStockRuleChange(val){
         const choose = this.outStockRuleList.filter((item) => item.sid == val)
         console.log('>>>>>>>>>selectOutStockRuleChange', choose)
-        this.formobj.outStockRuleKey = choose[0].dictKey
+        this.formobj. outstockRule = choose[0].dictKey
         this.formobj.outStockRuleValue = choose[0].dictValue
       },
     }
diff --git a/yxt-as-ui/src/views/goods/category/index.vue b/yxt-as-ui/src/views/goods/category/index.vue
index 6721e5448a..95b83873cc 100644
--- a/yxt-as-ui/src/views/goods/category/index.vue
+++ b/yxt-as-ui/src/views/goods/category/index.vue
@@ -222,6 +222,9 @@
       },
       loadList() {
         this.tableLoading = true
+        this.queryParams.params.userSid = window.sessionStorage.getItem('userSid')
+        this.queryParams.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
+        this.queryParams.params.menuUrl = this.$route.path
         req.listPage(this.queryParams).then((resp) => {
           this.tableLoading = false
           if (resp.success) {
diff --git a/yxt-as-ui/src/views/goods/factory/factoryAdd.vue b/yxt-as-ui/src/views/goods/factory/factoryAdd.vue
index 597cd466ad..f545d8f57e 100644
--- a/yxt-as-ui/src/views/goods/factory/factoryAdd.vue
+++ b/yxt-as-ui/src/views/goods/factory/factoryAdd.vue
@@ -53,9 +53,10 @@
           manufacturerCode: '',
           sortNo: '',
           remarks: "",
-          useOrgSid: window.sessionStorage.getItem('departmentSid'),
-          createOrgSid: window.sessionStorage.getItem('orgSid'),
-          userSid: window.sessionStorage.getItem('userSid'),
+         useOrgSid: window.sessionStorage.getItem('departmentSid'),
+         orgPath: window.sessionStorage.getItem('defaultOrgPath'),
+         createOrgSid: window.sessionStorage.getItem('orgSid'),
+         userSid: window.sessionStorage.getItem('userSid'),
         },
       }
     },
@@ -88,6 +89,7 @@
           sortNo: '',
           remarks: "",
           useOrgSid: window.sessionStorage.getItem('departmentSid'),
+          orgPath: window.sessionStorage.getItem('defaultOrgPath'),
           createOrgSid: window.sessionStorage.getItem('orgSid'),
           userSid: window.sessionStorage.getItem('userSid'),
         }
diff --git a/yxt-as-ui/src/views/goods/factory/index.vue b/yxt-as-ui/src/views/goods/factory/index.vue
index 23f78ab616..1084b6ea3d 100644
--- a/yxt-as-ui/src/views/goods/factory/index.vue
+++ b/yxt-as-ui/src/views/goods/factory/index.vue
@@ -161,6 +161,9 @@
       },
       loadList() {
         this.tableLoading = true
+        this.queryParams.params.userSid = window.sessionStorage.getItem('userSid')
+        this.queryParams.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
+        this.queryParams.params.menuUrl = this.$route.path
         req.listPage(this.queryParams).then((resp) => {
           this.tableLoading = false
           if (resp.success) {
diff --git a/yxt-as-ui/src/views/goods/unit/index.vue b/yxt-as-ui/src/views/goods/unit/index.vue
index 4ba85588cd..c222abc7b5 100644
--- a/yxt-as-ui/src/views/goods/unit/index.vue
+++ b/yxt-as-ui/src/views/goods/unit/index.vue
@@ -161,6 +161,9 @@
       },
       loadList() {
         this.tableLoading = true
+        this.queryParams.params.userSid = window.sessionStorage.getItem('userSid')
+        this.queryParams.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
+        this.queryParams.params.menuUrl = this.$route.path
         req.listPage(this.queryParams).then((resp) => {
           this.tableLoading = false
           if (resp.success) {
diff --git a/yxt-as-ui/src/views/goods/unit/unitAdd.vue b/yxt-as-ui/src/views/goods/unit/unitAdd.vue
index 60848be4d0..ec908f06a5 100644
--- a/yxt-as-ui/src/views/goods/unit/unitAdd.vue
+++ b/yxt-as-ui/src/views/goods/unit/unitAdd.vue
@@ -70,6 +70,7 @@
           unitName: '',
           remarks: '',
           useOrgSid: window.sessionStorage.getItem('departmentSid'),
+          orgPath: window.sessionStorage.getItem('defaultOrgPath'),
           createOrgSid: window.sessionStorage.getItem('orgSid'),
           userSid: window.sessionStorage.getItem('userSid'),
         },
@@ -104,6 +105,7 @@
           unitName: '',
           remarks: '',
           useOrgSid: window.sessionStorage.getItem('departmentSid'),
+          orgPath: window.sessionStorage.getItem('defaultOrgPath'),
           createOrgSid: window.sessionStorage.getItem('orgSid'),
           userSid: window.sessionStorage.getItem('userSid'),
         }
diff --git a/yxt-as-ui/src/views/warehouse/goodsShelves/goodsShelvesAdd.vue b/yxt-as-ui/src/views/warehouse/goodsShelves/goodsShelvesAdd.vue
index 73a9a38581..137514e265 100644
--- a/yxt-as-ui/src/views/warehouse/goodsShelves/goodsShelvesAdd.vue
+++ b/yxt-as-ui/src/views/warehouse/goodsShelves/goodsShelvesAdd.vue
@@ -69,10 +69,10 @@
           locationName: '',
           locationSid: '',
           remarks: '',
-          useOrgSid: window.sessionStorage.getItem('departmentSid'),
-          createOrgSid: window.sessionStorage.getItem('orgSid'),
-          userSid: window.sessionStorage.getItem('userSid'),
-
+        useOrgSid: window.sessionStorage.getItem('departmentSid'),
+        orgPath: window.sessionStorage.getItem('defaultOrgPath'),
+        createOrgSid: window.sessionStorage.getItem('orgSid'),
+        userSid: window.sessionStorage.getItem('userSid'),
         },
         warehouseList: [],
         warehouseAreaList: [],
@@ -144,9 +144,10 @@
           locationName: '',
           locationSid: '',
           remarks: '',
-          useOrgSid: window.sessionStorage.getItem('departmentSid'),
-          createOrgSid: window.sessionStorage.getItem('orgSid'),
-          userSid: window.sessionStorage.getItem('userSid'),
+        useOrgSid: window.sessionStorage.getItem('departmentSid'),
+        orgPath: window.sessionStorage.getItem('defaultOrgPath'),
+        createOrgSid: window.sessionStorage.getItem('orgSid'),
+        userSid: window.sessionStorage.getItem('userSid'),
         }
         this.$emit('doback')
       },
diff --git a/yxt-as-ui/src/views/warehouse/goodsShelves/index.vue b/yxt-as-ui/src/views/warehouse/goodsShelves/index.vue
index 7ebcb21365..c1274fc5d1 100644
--- a/yxt-as-ui/src/views/warehouse/goodsShelves/index.vue
+++ b/yxt-as-ui/src/views/warehouse/goodsShelves/index.vue
@@ -224,6 +224,9 @@
       },
       loadList() {
         this.tableLoading = true
+        this.queryParams.params.userSid = window.sessionStorage.getItem('userSid')
+        this.queryParams.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
+        this.queryParams.params.menuUrl = this.$route.path
         req.listPage(this.queryParams).then((resp) => {
           this.tableLoading = false
           if (resp.success) {
diff --git a/yxt-as-ui/src/views/warehouse/warehouse/index.vue b/yxt-as-ui/src/views/warehouse/warehouse/index.vue
index 304474b587..55baf4ce02 100644
--- a/yxt-as-ui/src/views/warehouse/warehouse/index.vue
+++ b/yxt-as-ui/src/views/warehouse/warehouse/index.vue
@@ -190,6 +190,9 @@
       },
       loadList() {
         this.tableLoading = true
+        this.queryParams.params.userSid = window.sessionStorage.getItem('userSid')
+        this.queryParams.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
+        this.queryParams.params.menuUrl = this.$route.path
         req.listPage(this.queryParams).then((resp) => {
           this.tableLoading = false
           if (resp.success) {
diff --git a/yxt-as-ui/src/views/warehouse/warehouse/warehouseAdd.vue b/yxt-as-ui/src/views/warehouse/warehouse/warehouseAdd.vue
index ee181ec874..21f721168d 100644
--- a/yxt-as-ui/src/views/warehouse/warehouse/warehouseAdd.vue
+++ b/yxt-as-ui/src/views/warehouse/warehouse/warehouseAdd.vue
@@ -84,7 +84,7 @@
             <div class="span-sty">经度</div>
             <el-form-item>
               <el-input v-model="formobj.longitude" placeholder="经度" class="addinputw addinputInfo" clearable
-              oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
+                oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
             </el-form-item>
           </el-col>
 
@@ -92,7 +92,7 @@
             <div class="span-sty">纬度</div>
             <el-form-item>
               <el-input v-model="formobj.latitude" placeholder="纬度" class="addinputw addinputInfo" clearable
-              oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
+                oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
             </el-form-item>
           </el-col>
 
@@ -194,6 +194,7 @@
           remarks: '',
           warehouseType: "0",
           useOrgSid: window.sessionStorage.getItem('departmentSid'),
+          orgPath: window.sessionStorage.getItem('defaultOrgPath'),
           createOrgSid: window.sessionStorage.getItem('orgSid'),
           userSid: window.sessionStorage.getItem('userSid'),
         },
@@ -247,26 +248,27 @@
       handleReturn(isreload) {
         if (isreload === 'true') this.$emit('reloadlist')
         this.formobj = {
-         sid: '',
-         warehouseName: '',
-         warehouseCode: '',
-         warehouseTypeKey: '',
-         warehouseTypeValue: '',
-         contacts: "",
-         mob: "",
-         telephone: "",
-         manager: '',
-         longitude: '',
-         latitude: '',
-         usageStatus: "",
-         address: '',
-         squareMeter: '',
-         sortNo: '',
-         remarks: '',
-         warehouseType: "0",
-         useOrgSid: window.sessionStorage.getItem('departmentSid'),
-         createOrgSid: window.sessionStorage.getItem('orgSid'),
-         userSid: window.sessionStorage.getItem('userSid'),
+          sid: '',
+          warehouseName: '',
+          warehouseCode: '',
+          warehouseTypeKey: '',
+          warehouseTypeValue: '',
+          contacts: "",
+          mob: "",
+          telephone: "",
+          manager: '',
+          longitude: '',
+          latitude: '',
+          usageStatus: "",
+          address: '',
+          squareMeter: '',
+          sortNo: '',
+          remarks: '',
+          warehouseType: "0",
+        useOrgSid: window.sessionStorage.getItem('departmentSid'),
+        orgPath: window.sessionStorage.getItem('defaultOrgPath'),
+        createOrgSid: window.sessionStorage.getItem('orgSid'),
+        userSid: window.sessionStorage.getItem('userSid'),
         }
         this.$emit('doback')
       },
diff --git a/yxt-as-ui/src/views/warehouse/warehouseArea/index.vue b/yxt-as-ui/src/views/warehouse/warehouseArea/index.vue
index b0b55bea9f..5973fe7193 100644
--- a/yxt-as-ui/src/views/warehouse/warehouseArea/index.vue
+++ b/yxt-as-ui/src/views/warehouse/warehouseArea/index.vue
@@ -57,8 +57,8 @@
             </el-table-column>
             <el-table-column label="是否可用" align="center" width="140">
               <template slot-scope="scope">
-                <el-switch v-model="scope.row.isEnable" active-text="是" inactive-text="否" active-value="1"
-                  inactive-value="2" @change="enableChange(scope.row.sid,scope.row.isEnable)" />
+                <el-switch v-model="scope.row.usageStatus" active-text="是" inactive-text="否" active-value="0"
+                  inactive-value="1" @change="enableChange(scope.row.sid,scope.row.usageStatus)" />
               </template>
             </el-table-column>
             <el-table-column prop="areaName" label="库区名称" align="center" />
@@ -226,6 +226,9 @@
       },
       loadList() {
         this.tableLoading = true
+        this.queryParams.params.userSid = window.sessionStorage.getItem('userSid')
+        this.queryParams.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
+        this.queryParams.params.menuUrl = this.$route.path
         req.listPage(this.queryParams).then((resp) => {
           this.tableLoading = false
           if (resp.success) {
diff --git a/yxt-as-ui/src/views/warehouse/warehouseArea/warehouseAreaAdd.vue b/yxt-as-ui/src/views/warehouse/warehouseArea/warehouseAreaAdd.vue
index e04dd2db98..39b3379d99 100644
--- a/yxt-as-ui/src/views/warehouse/warehouseArea/warehouseAreaAdd.vue
+++ b/yxt-as-ui/src/views/warehouse/warehouseArea/warehouseAreaAdd.vue
@@ -81,9 +81,10 @@
           warehouseSid: '',
           areaTypeSid: "",
           areaTypeName: "",
-          useOrgSid: window.sessionStorage.getItem('departmentSid'),
-          createOrgSid: window.sessionStorage.getItem('orgSid'),
-          userSid: window.sessionStorage.getItem('userSid'),
+        useOrgSid: window.sessionStorage.getItem('departmentSid'),
+        orgPath: window.sessionStorage.getItem('defaultOrgPath'),
+        createOrgSid: window.sessionStorage.getItem('orgSid'),
+        userSid: window.sessionStorage.getItem('userSid'),
 
         },
         warehouseList: [],
@@ -133,9 +134,10 @@
           remarks: '',
           areaTypeSid: "",
           areaTypeName: "",
-          useOrgSid: window.sessionStorage.getItem('departmentSid'),
-          createOrgSid: window.sessionStorage.getItem('orgSid'),
-          userSid: window.sessionStorage.getItem('userSid'),
+        useOrgSid: window.sessionStorage.getItem('departmentSid'),
+        orgPath: window.sessionStorage.getItem('defaultOrgPath'),
+        createOrgSid: window.sessionStorage.getItem('orgSid'),
+        userSid: window.sessionStorage.getItem('userSid'),
 
         }
         this.$emit('doback')