From adb0f18cea2b8dcb738240aa496ef547f6a70292 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Mon, 29 Jul 2024 14:11:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=94=A8=E6=88=B7=E5=A7=93?=
 =?UTF-8?q?=E5=90=8D=E8=8E=B7=E5=8F=96=E5=80=BC=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../merchandiseReturnAdd.vue                  |  2 +-
 .../purchaseOrder/purchaseOrderAdd.vue        |  4 +--
 src/views/sales/salesOrder/salesOrderAdd.vue  | 26 ++++++++++++-------
 .../salesOrderReview/salesOrderReview.vue     |  2 +-
 4 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/src/views/merchandiseReturn/merchandiseReturnAdd.vue b/src/views/merchandiseReturn/merchandiseReturnAdd.vue
index 9d1cd15..0dfdeba 100644
--- a/src/views/merchandiseReturn/merchandiseReturnAdd.vue
+++ b/src/views/merchandiseReturn/merchandiseReturnAdd.vue
@@ -239,7 +239,7 @@ export default {
         this.$refs['form_obj'].clearValidate()
       })
       this.init()
-      this.formobj.createByName = window.sessionStorage.getItem('userName')
+      this.formobj.createByName = window.sessionStorage.getItem('name')
       this.formobj.createBySid = window.sessionStorage.getItem('userSid')
       this.formobj.createOrgSid = window.sessionStorage.getItem('orgSid')
       this.formobj.useOrgSid = window.sessionStorage.getItem('orgSid')
diff --git a/src/views/purchase/purchaseOrder/purchaseOrderAdd.vue b/src/views/purchase/purchaseOrder/purchaseOrderAdd.vue
index 978ae14..2e57bfd 100644
--- a/src/views/purchase/purchaseOrder/purchaseOrderAdd.vue
+++ b/src/views/purchase/purchaseOrder/purchaseOrderAdd.vue
@@ -298,7 +298,7 @@
           "remarks": "",
           "createTime": getCurrentDate(),
           "createBySid": window.sessionStorage.getItem('userSid'),
-          "createByName": window.sessionStorage.getItem('userName'),
+          "createByName": window.sessionStorage.getItem('name'),
           "sourceBillSid": "",
           "sourceBillNo": "",
           "billNo": "",
@@ -871,7 +871,7 @@
           "remarks": "",
           "createTime": getCurrentDate(),
           "createBySid": window.sessionStorage.getItem('userSid'),
-          "createByName": window.sessionStorage.getItem('userName'),
+          "createByName": window.sessionStorage.getItem('name'),
           "sourceBillSid": "",
           "sourceBillNo": "",
           "billNo": "",
diff --git a/src/views/sales/salesOrder/salesOrderAdd.vue b/src/views/sales/salesOrder/salesOrderAdd.vue
index 649288a..e773610 100644
--- a/src/views/sales/salesOrder/salesOrderAdd.vue
+++ b/src/views/sales/salesOrder/salesOrderAdd.vue
@@ -34,8 +34,8 @@
             <el-col :span="6">
               <div class="span-sty">店铺名称</div>
               <el-form-item>
-                <el-select class="addinputInfo" v-model="formobj.billTypeKey" placeholder="请选择" clearable filterable>
-                  <el-option v-for="item in billType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
+                <el-select class="addinputInfo" v-model="formobj.shopName" placeholder="请选择" clearable filterable>
+                  <el-option v-for="item in shop_list" :key="item.sid" :label="item.name" :value="item.name"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -369,7 +369,7 @@ export default {
       viewTitle: '',
       viewState: 1,
       submitdisabled: false,
-      billType_list: [], // 店铺名称
+      shop_list: [], // 店铺名称
       warehouse_list: [], // 仓库
       deliveryType_list: [], // 配送方式
       province_list: [],
@@ -502,10 +502,6 @@ export default {
       return bcqk
     }
   },
-  created() {
-    this.showAdd()
-    this.init()
-  },
   methods: {
     init() {
       typeValues({ type: 'deliveryType' }).then((res) => {
@@ -599,8 +595,8 @@ export default {
       this.$nextTick(() => {
         this.$refs['form_obj'].clearValidate()
       })
-      // this.init()
-      this.formobj.createByName = window.sessionStorage.getItem('userName')
+      this.init()
+      this.formobj.createByName = window.sessionStorage.getItem('name')
       this.formobj.createBySid = window.sessionStorage.getItem('userSid')
       this.formobj.createOrgSid = window.sessionStorage.getItem('orgSid')
       this.formobj.useOrgSid = window.sessionStorage.getItem('orgSid')
@@ -613,6 +609,18 @@ export default {
       this.formobj.createTime = date.year + '-' + (date.month >= 10 ? date.month : '0' + date.month) + '-' + (date.day >= 10 ? date.day : '0' + date.day)
       this.formobj.discountRate = '100'
     },
+    showEdit(row) {
+      this.viewTitle = '【编辑】商品销售单'
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      this.init()
+      req.fetchBySid(row.sid).then((res) => {
+        if (res.success) {
+          this.formobj = res.data
+        }
+      })
+    },
     warehouseChange(value) {
       const choose = this.warehouse_list.filter((item) => item.warehouseSid === value)
       if (choose !== null && choose.length > 0) {
diff --git a/src/views/sales/salesOrderReview/salesOrderReview.vue b/src/views/sales/salesOrderReview/salesOrderReview.vue
index 187e28d..fa7dfe2 100644
--- a/src/views/sales/salesOrderReview/salesOrderReview.vue
+++ b/src/views/sales/salesOrderReview/salesOrderReview.vue
@@ -560,7 +560,7 @@ export default {
       }
     },
     auditConfirm() {
-      this.audit.createByName = window.sessionStorage.getItem('userName')
+      this.audit.createByName = window.sessionStorage.getItem('name')
       this.audit.createBySid = window.sessionStorage.getItem('userSid')
       req.reviewConfirm(this.audit).then((res) => {
         if (res.success) {