From fd2d4a90b3e41af8c26b7eb4f7d934f29f94dc7c Mon Sep 17 00:00:00 2001
From: guoxing <1369478551@qq.com>
Date: Mon, 1 Jul 2024 15:32:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/Common/dictcommons.js                 | 14 ++---
 src/api/baseinfo/supplier/supplier.js         | 10 ++--
 src/api/baseinfo/suppliertype/suppliertype.js |  6 +--
 .../supplier/relation/openingbank.vue         |  2 +-
 .../supplier/supplier/supplierAdd.vue         | 14 ++---
 .../warehouseArea/warehouseAreaAdd.vue        |  8 +--
 src/views/goods/category/index.vue            |  4 +-
 src/views/goods/goods/goodsAdd.vue            |  2 +-
 .../inStorage/deliveryNotice/receiptAdd.vue   | 54 +++++++++++--------
 .../receivingGoods/receivingGoodsAdd.vue      | 12 ++---
 10 files changed, 66 insertions(+), 60 deletions(-)

diff --git a/src/api/Common/dictcommons.js b/src/api/Common/dictcommons.js
index cc8a7c1..09bc4e2 100644
--- a/src/api/Common/dictcommons.js
+++ b/src/api/Common/dictcommons.js
@@ -11,7 +11,7 @@ export function typeValues(data) {
 // 获取数据字典（根据分组）
 export function getTypeValueList(data) {
   return request({
-    url: '/portal/v1/dictcommons/getTypeValueList',
+    url: '/wms/apiadmin/dictcommons/getTypeValueList',
     method: 'get',
     params: data
   })
@@ -20,7 +20,7 @@ export function getTypeValueList(data) {
 // 根据当前登录人orgSidPath(全路径sid)查询分公司
 export function getOrgSidByPath(data) {
   return request({
-    url: '/portal/v1/sysstafforg/getOrgSidByPath',
+    url: '/wms/apiadmin/sysstafforg/getOrgSidByPath',
     method: 'get',
     params: data
   })
@@ -112,14 +112,14 @@ export function customerListPage(params) {
 // 获取省
 export function getProvince() {
   return request({
-    url: '/portal/v1/regions/getProvince',
+    url: '/wms/apiadmin/regions/getProvince',
     method: 'get'
   })
 }
 // 根据省sid获取该省的所有市
 export function getCity(data) {
   return request({
-    url: '/portal/v1/regions/getCity',
+    url: '/wms/apiadmin/regions/getCity',
     method: 'get',
     params: data
   })
@@ -127,7 +127,7 @@ export function getCity(data) {
 // 根据市sid获取该市的所有县区
 export function getCounty(data) {
   return request({
-    url: '/portal/v1/regions/getCounty',
+    url: '/wms/apiadmin/regions/getCounty',
     method: 'get',
     params: data
   })
@@ -136,8 +136,8 @@ export function getCounty(data) {
 // 获取售后服务--基础信息--供应商信息
 export function choiceSupplierInfo(data) {
   return request({
-    url: '/pms/v1/pmssupplierinfo/choiceSupplierInfo',
-    method: 'post',
+    url: '/wms/apiadmin/supplierinfo/choiceSupplierInfo',
+    method: 'get',
     params: data
   })
 }
diff --git a/src/api/baseinfo/supplier/supplier.js b/src/api/baseinfo/supplier/supplier.js
index 1f9738d..42b7bec 100644
--- a/src/api/baseinfo/supplier/supplier.js
+++ b/src/api/baseinfo/supplier/supplier.js
@@ -4,7 +4,7 @@ export default {
   // 列表查询
   listPage: function(data) {
     return request({
-      url: '/pms/v1/pmssupplierinfo/listPage',
+      url: '/wms/apiadmin/supplierinfo/listPage',
       method: 'post',
       data: data,
       headers: { 'Content-Type': 'application/json' }
@@ -13,7 +13,7 @@ export default {
   // 保存
   saveOrUpdate: function(data) {
     return request({
-      url: '/pms/v1/pmssupplierinfo/save',
+      url: '/wms/apiadmin/supplierinfo/save',
       method: 'post',
       data: data,
       headers: { 'Content-Type': 'application/json' }
@@ -22,14 +22,14 @@ export default {
   // 回显
   fetchDetailsBySid: function(data) {
     return request({
-      url: '/pms/v1/pmssupplierinfo/fetchDetailsBySid/' + data,
+      url: '/wms/apiadmin/supplierinfo/fetchDetailsBySid/' + data,
       method: 'get'
     })
   },
   // 删除
   delBySids: function(data) {
     return request({
-      url: '/pms/v1/pmssupplierinfo/delBySids',
+      url: '/wms/apiadmin/supplierinfo/delBySids',
       method: 'DELETE',
       data: data,
       headers: { 'Content-Type': 'application/json' }
@@ -38,7 +38,7 @@ export default {
   // 获取供应商类型
   selSupplierType: function(data) {
     return request({
-      url: '/pms/v1/pmssuppliertype/selSupplierType',
+      url: '/wms/apiadmin/suppliertype/selSupplierType',
       method: 'post',
       params: data
     })
diff --git a/src/api/baseinfo/suppliertype/suppliertype.js b/src/api/baseinfo/suppliertype/suppliertype.js
index 695f942..909d018 100644
--- a/src/api/baseinfo/suppliertype/suppliertype.js
+++ b/src/api/baseinfo/suppliertype/suppliertype.js
@@ -4,7 +4,7 @@ export default {
   // 列表查询
   listPage: function(data) {
     return request({
-      url: '/pms/v1/pmssuppliertype/listPage',
+      url: '/wms/apiadmin/suppliertype/listPage',
       method: 'post',
       data: data,
       headers: { 'Content-Type': 'application/json' }
@@ -13,7 +13,7 @@ export default {
   // 保存
   saveOrUpdate: function(data) {
     return request({
-      url: '/pms/v1/pmssuppliertype/save',
+      url: '/wms/apiadmin/suppliertype/save',
       method: 'post',
       data: data,
       headers: { 'Content-Type': 'application/json' }
@@ -22,7 +22,7 @@ export default {
   // 删除
   delBySids: function(data) {
     return request({
-      url: '/pms/v1/pmssuppliertype/delBySids',
+      url: '/wms/apiadmin/suppliertype/delBySids',
       method: 'DELETE',
       data: data,
       headers: { 'Content-Type': 'application/json' }
diff --git a/src/views/baseInfo/supplier/supplier/relation/openingbank.vue b/src/views/baseInfo/supplier/supplier/relation/openingbank.vue
index 8b18738..d439332 100644
--- a/src/views/baseInfo/supplier/supplier/relation/openingbank.vue
+++ b/src/views/baseInfo/supplier/supplier/relation/openingbank.vue
@@ -67,7 +67,7 @@
 </template>
 
 <script>
-import { typeValues } from '@/api/system/dictType/dictCommon'
+import { typeValues } from '@/api/Common/dictcommons'
 
 export default {
   name: 'OpeningBank',
diff --git a/src/views/baseInfo/supplier/supplier/supplierAdd.vue b/src/views/baseInfo/supplier/supplier/supplierAdd.vue
index c2cb219..8d291e0 100644
--- a/src/views/baseInfo/supplier/supplier/supplierAdd.vue
+++ b/src/views/baseInfo/supplier/supplier/supplierAdd.vue
@@ -130,7 +130,7 @@
             <div>开户行列表</div>
             <el-button type="primary" size="mini" class="btntopblueline" @click="handleAdd">新增</el-button>
           </div>
-          <el-table :key="tableKey" :data="formobj.pmsSupplierBankList" :index="index" border style="width: 100%">
+          <el-table :key="tableKey" :data="formobj.baseSupplierBankList" :index="index" border style="width: 100%">
             <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center"/>
             <el-table-column fixed width="150" label="操作" align="center">
               <template slot-scope="scope">
@@ -158,7 +158,7 @@
 <script>
 import req from '@/api/baseinfo/supplier/supplier.js'
 import openingbank from './relation/openingbank'
-import { getProvince, getCity, getCounty, typeValues } from '@/api/system/dictType/dictCommon'
+import { getProvince, getCity, getCounty, typeValues } from '@/api/Common/dictcommons'
 
 export default {
   name: 'SupplierAdd',
@@ -210,7 +210,7 @@ export default {
         createOrgSid: '',
         taxRate: '',
         remarks: '',
-        pmsSupplierBankList: []
+        baseSupplierBankList: []
       },
       rules: {
         supplierName: [{ required: true, message: '供应商名称不能为空', trigger: 'blur' }],
@@ -342,13 +342,13 @@ export default {
       this.$refs['divOpen'].showEdit(row, index)
     },
     handleDelete(index) {
-      this.formobj.pmsSupplierBankList.splice(index, 1)
+      this.formobj.baseSupplierBankList.splice(index, 1)
     },
     backData(value, index) {
       this.viewState = 1
       value = JSON.parse(JSON.stringify(value))
       if (index !== '' && index !== null) {
-        this.formobj.pmsSupplierBankList[index] = {
+        this.formobj.baseSupplierBankList[index] = {
           sid: value.sid,
           supplierSid: value.supplierSid,
           bankName: value.bankName,
@@ -363,7 +363,7 @@ export default {
           currency: value.currency
         }
       } else {
-        this.formobj.pmsSupplierBankList.push({
+        this.formobj.baseSupplierBankList.push({
           sid: '',
           supplierSid: value.supplierSid,
           bankName: value.bankName,
@@ -434,7 +434,7 @@ export default {
         createOrgSid: '',
         taxRate: '',
         remarks: '',
-        pmsSupplierBankList: []
+        baseSupplierBankList: []
       }
       this.submitdisabled = false
       this.$emit('doback')
diff --git a/src/views/baseInfo/warehouses/warehouseArea/warehouseAreaAdd.vue b/src/views/baseInfo/warehouses/warehouseArea/warehouseAreaAdd.vue
index e69351d..db4160e 100644
--- a/src/views/baseInfo/warehouses/warehouseArea/warehouseAreaAdd.vue
+++ b/src/views/baseInfo/warehouses/warehouseArea/warehouseAreaAdd.vue
@@ -137,10 +137,10 @@
           remarks: '',
           areaTypeSid: "",
           areaTypeName: "",
-          useOrgSid: window.sessionStorage.getItem('departmentSid'),
-          orgPath: window.sessionStorage.getItem('defaultOrgPath'),
-          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/src/views/goods/category/index.vue b/src/views/goods/category/index.vue
index b38ef9f..bf96b13 100644
--- a/src/views/goods/category/index.vue
+++ b/src/views/goods/category/index.vue
@@ -16,13 +16,13 @@
                 <el-input v-model="queryParams.params.code" placeholder="" clearable />
               </el-form-item>
               <el-form-item label="是否一物一码">
-                <el-select v-model="queryParams.params.goodID" placeholder="请选择" class="addinputw addinputInfo"
+                <el-select v-model="queryParams.params.goodID" placeholder="请选择"
                   @change="selectIsGoodIDChange">
                   <el-option v-for="item in isGoodIDList" :key="item.sid" :label="item.name" :value="item.sid" />
                 </el-select>
               </el-form-item>
               <el-form-item label="出库规则">
-                <el-select v-model="queryParams.params.outStockRule" placeholder="请选择" class="addinputw addinputInfo"
+                <el-select v-model="queryParams.params.outStockRule" placeholder="请选择"
                   @change="selectOutStockRuleChange">
                   <el-option v-for="item in outStockRuleList" :key="item.dictKey" :label="item.dictValue"
                     :value="item.dictKey" />
diff --git a/src/views/goods/goods/goodsAdd.vue b/src/views/goods/goods/goodsAdd.vue
index 40ca87e..7929861 100644
--- a/src/views/goods/goods/goodsAdd.vue
+++ b/src/views/goods/goods/goodsAdd.vue
@@ -919,7 +919,7 @@
         const choose = this.cateList.filter((item) => item.sid == val)
         console.log('>>>>>>>>>selectCateChange', choose)
         this.formobj.goodsTypeSid = choose[0].sid
-        this.formobj.typeName = choose[0].goodsTypeName
+        this.formobj.goodsTypeName = choose[0].goodsTypeName
       },
       selectfacturerChange(val) {
         const choose = this.facturerList.filter((item) => item.sid == val)
diff --git a/src/views/inStorage/deliveryNotice/receiptAdd.vue b/src/views/inStorage/deliveryNotice/receiptAdd.vue
index 5d85d54..58799ba 100644
--- a/src/views/inStorage/deliveryNotice/receiptAdd.vue
+++ b/src/views/inStorage/deliveryNotice/receiptAdd.vue
@@ -83,18 +83,18 @@
 
         <div class="title titleOne">
           <div>商品列表</div>
-          <!-- <el-button type="primary" size="mini" class="btntopblueline" @click="batchAddAll()">批次收货</el-button> -->
+          <el-button type="primary" size="mini" class="btntopblueline" @click="batchAddAll()">批次收货</el-button>
         </div>
         <el-table v-loading="listLoading" :data="formobj.list" border style="width: 100%;">
           <el-table-column fixed width="50" type="selection" align="center" />
           <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
-          <el-table-column fixed label="操作" wid align="center" width="100">
+          <el-table-column fixed label="操作" wid align="center" width="180">
             <template slot-scope="scope">
               <el-button type="primary" size="mini" @click="doGoods(scope.row)">删除</el-button>
-              <!-- <el-button type="primary" size="mini" @click="doAddBatch(scope.row)">批次+</el-button> -->
+              <el-button type="primary" size="mini" @click="doAddBatch(scope.row)">批次+</el-button>
             </template>
           </el-table-column>
-          <el-table-column label="商品名称" prop="goodsSpuName" align="center" width="200" />
+          <el-table-column label="商品名称" prop="goodsSkuTitle" align="center" width="200" />
           <el-table-column label="商品编码" prop="goodsSkuCode" align="center" width="150" />
           <el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" width="150" />
           <el-table-column label="单位" prop="unit" align="center" width="120" />
@@ -165,7 +165,7 @@
         </el-table>
 
 
-        <!--  <div class="title">
+        <div class="title">
           <div>商品-批次</div>
         </div>
         <el-table v-loading="listLoading" :data="formobj.pcList" border style="width: 100%;">
@@ -196,7 +196,7 @@
                 oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
             </template>
           </el-table-column>
-        </el-table> -->
+        </el-table>
 
       </el-form>
 
@@ -262,14 +262,7 @@
       }
     },
     created() {
-      getOrgSidByPath({
-        orgPath: window.sessionStorage.getItem('defaultOrgPath')
-      }).then((res) => {
-        if (res.success) {
-          this.formobj.createOrgSid = res.data
-          this.formobj.useOrgSid = res.data
-        }
-      })
+
     },
     methods: {
       // getOrgPathSid() {
@@ -282,6 +275,21 @@
       //     }
       //   })
       // },
+
+      init() {
+        getOrgSidByPath({
+          orgPath: window.sessionStorage.getItem('defaultOrgPath')
+        }).then((res) => {
+          if (res.success) {
+            this.formobj.createOrgSid = res.data
+            this.formobj.useOrgSid = res.data
+
+              this.getsupplierLust()
+
+          }
+        })
+      },
+
       selectSupplierName(val) {
 
         console.log("supplierNameSelect", val);
@@ -311,8 +319,7 @@
 
 
         choiceSupplierInfo({
-          deptSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
-            .getItem('defaultOrgPath').lastIndexOf('/') + 1)
+          createOrgSid:   this.formobj.createOrgSid
         }).then((resp) => {
           if (resp.success) {
             this.supplierNameList = resp.data
@@ -655,14 +662,16 @@
           this.$refs['form_obj'].clearValidate()
         })
 
+        this.init()
+
       },
       showEdit(row) {
         this.$nextTick(() => {
           this.$refs['form_obj'].clearValidate()
         })
-
+        this.init()
         // this.getWarehouseList()
-        this.getsupplierLust()
+
         // this.getOrgPathSid()
         var params = {
           sourceSid: row.sid
@@ -674,10 +683,11 @@
               this.formobj = resp.data
               this.formobj.deliveryDate = getCurrentDate()
 
-              this.formobj.deptName = window.sessionStorage.getItem('defaultOrgPathName').substring(window
-                .sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1)
-              this.formobj.deptSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
-                .getItem('defaultOrgPath').lastIndexOf('/') + 1)
+              // this.formobj.deptName = window.sessionStorage.getItem('defaultOrgPathName').substring(window
+              //   .sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1)
+              // this.formobj.deptSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
+              //   .getItem('defaultOrgPath').lastIndexOf('/') + 1)
+
 
             }
           })
diff --git a/src/views/inStorage/receivingGoods/receivingGoodsAdd.vue b/src/views/inStorage/receivingGoods/receivingGoodsAdd.vue
index fe91827..b8f2518 100644
--- a/src/views/inStorage/receivingGoods/receivingGoodsAdd.vue
+++ b/src/views/inStorage/receivingGoods/receivingGoodsAdd.vue
@@ -298,10 +298,8 @@
           "sourceBillNo": "",
           "createBySid": window.sessionStorage.getItem('userSid'),
           "createByName": window.sessionStorage.getItem('name'),
-          "deptName": window.sessionStorage.getItem('defaultOrgPathName').substring(window
-            .sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1),
-          "deptSid": window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
-            .getItem('defaultOrgPath').lastIndexOf('/') + 1),
+          "deptName": '',
+          "deptSid": '',
           "createTime": getCurrentDate(),
           "busTypeKey": "",
           "busTypeValue": "",
@@ -648,10 +646,8 @@
           "sourceBillNo": "",
           "createBySid": window.sessionStorage.getItem('userSid'),
           "createByName": window.sessionStorage.getItem('name'),
-          "deptName": window.sessionStorage.getItem('defaultOrgPathName').substring(window
-            .sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1),
-          "deptSid": window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
-            .getItem('defaultOrgPath').lastIndexOf('/') + 1),
+          "deptName": '',
+          "deptSid": '',
           "createTime": getCurrentDate(),
           "busTypeKey": "",
           "busTypeValue": "",