From 8919f520b7abbc63584f6fbd6f146f68ccf1ce0c Mon Sep 17 00:00:00 2001
From: guoxing <1369478551@qq.com>
Date: Thu, 23 May 2024 14:37:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=8E=B7=E5=8F=96=E7=BB=84?=
 =?UTF-8?q?=E7=BB=87sid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../storage/deliveryNotice/receiptAdd.vue     | 29 ++++++++++++-------
 .../storage/deliveryNotice/receiptInfo.vue    |  2 +-
 .../receivingGoods/receivingGoodsInfo.vue     |  2 +-
 3 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/yxt-as-ui/src/views/storage/deliveryNotice/receiptAdd.vue b/yxt-as-ui/src/views/storage/deliveryNotice/receiptAdd.vue
index 34bb29ae88..12d87c3ff3 100644
--- a/yxt-as-ui/src/views/storage/deliveryNotice/receiptAdd.vue
+++ b/yxt-as-ui/src/views/storage/deliveryNotice/receiptAdd.vue
@@ -227,11 +227,11 @@
           busTypeValue: "",
           createTime: '',
           createByName: window.sessionStorage.getItem('name'),
-          deptName: window.sessionStorage.getItem('departmentName'),
-          deptSid: window.sessionStorage.getItem('departmentSid'),
+          deptName: '',
+          deptSid: '',
           createBySid: window.sessionStorage.getItem('userSid'),
-          useOrgSid: window.sessionStorage.getItem('departmentSid'),
-          createOrgSid: window.sessionStorage.getItem('orgSid'),
+          useOrgSid: '',
+          createOrgSid: '',
           billState: '新建',
           billStateKey: 0,
           reviewStatus: "",
@@ -261,6 +261,16 @@
     },
     created() {},
     methods: {
+      // getOrgPathSid() {
+      //   getOrgSidByPath({
+      //     orgPath: window.sessionStorage.getItem('defaultOrgPath')
+      //   }).then((res) => {
+      //     if (res.success) {
+      //       this.formobj.createOrgSid = res.data
+      //       this.formobj.useOrgSid = res.data
+      //     }
+      //   })
+      // },
       selectSupplierName(val) {
 
         console.log("supplierNameSelect", val);
@@ -620,6 +630,7 @@
       showEdit(row) {
         this.getWarehouseList()
         this.getsupplierLust()
+        // this.getOrgPathSid()
         var params = {
           sourceSid: row.sid
         }
@@ -630,12 +641,10 @@
               this.formobj = resp.data
               this.formobj.deliveryDate = getCurrentDate()
 
-              this.formobj.createByName = window.sessionStorage.getItem('name')
-              this.formobj.deptName = window.sessionStorage.getItem('departmentName')
-              this.formobj.deptSid = window.sessionStorage.getItem('departmentSid')
-              this.formobj.createBySid = window.sessionStorage.getItem('userSid')
-              this.formobj.useOrgSid = window.sessionStorage.getItem('departmentSid')
-              this.formobj.createOrgSid = window.sessionStorage.getItem('orgSid')
+              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/yxt-as-ui/src/views/storage/deliveryNotice/receiptInfo.vue b/yxt-as-ui/src/views/storage/deliveryNotice/receiptInfo.vue
index 7b7e1a9611..0ffbc86369 100644
--- a/yxt-as-ui/src/views/storage/deliveryNotice/receiptInfo.vue
+++ b/yxt-as-ui/src/views/storage/deliveryNotice/receiptInfo.vue
@@ -59,7 +59,7 @@
           </el-col>
           <el-col :span="8">
             <div class="span-sty">单据状态</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.billstate }}</span></el-form-item>
+            <el-form-item><span class="addinputInfo">{{ formobj.billState }}</span></el-form-item>
           </el-col>
           <el-col :span="8">
             <div class="span-sty">审核状态</div>
diff --git a/yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsInfo.vue b/yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsInfo.vue
index b2a75cc5ec..68300ae46a 100644
--- a/yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsInfo.vue
+++ b/yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsInfo.vue
@@ -25,7 +25,7 @@
           </el-col>
           <el-col :span="8">
             <div class="span-sty">制单部门</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.departmentName }}</span></el-form-item>
+            <el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
           </el-col>
 
           <el-col :span="8">