From a368b00d5a94347f83b69002f056966cc8a03d34 Mon Sep 17 00:00:00 2001
From: mabaoyan <mabaoyan0405@163.com>
Date: Thu, 20 Apr 2023 17:33:25 +0800
Subject: [PATCH] =?UTF-8?q?hdsmesin-44=20=20feat=20=20so=E6=89=8B=E6=8C=81?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit dcce7af14bac8cd22356ee4e0146292c6764464d)
---
 src/pages/raw/so/rawSo/index.vue | 9 +++++----
 src/pages/raw/so/spSo/config.ts  | 5 -----
 src/pages/raw/so/spSo/index.vue  | 9 +++++----
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/pages/raw/so/rawSo/index.vue b/src/pages/raw/so/rawSo/index.vue
index 013eae6..0683751 100644
--- a/src/pages/raw/so/rawSo/index.vue
+++ b/src/pages/raw/so/rawSo/index.vue
@@ -74,13 +74,13 @@
     <!-- 底部按钮 -->
     <view class="bottom-bar">
       <u-row class="button-bar">
-        <u-col :span="4">
+        <!-- <u-col :span="4">
           <u-button type="primary" @click="bill">{{ $t('message.detailed') }}</u-button>
-        </u-col>
-        <u-col :span="4">
+        </u-col> -->
+        <u-col :span="6">
           <u-button type="primary" @click="onSubmit">{{ $t('message.product_Upload') }}</u-button>
         </u-col>
-        <u-col :span="4">
+        <u-col :span="6">
           <u-button type="error" @click="uni.navigateBack({})">{{ $t('message.po_Return') }}</u-button>
         </u-col>
       </u-row>
@@ -288,6 +288,7 @@ export default class RawSo extends BasePage {
         locCode: this.every.userDefined1,
         //barcode: this.Container.barcode,
         qty: this.nowAmount,
+        proOutType: 'raw',
       };
       this.list.push(arr);
       this.material[this.materialIndex].outAmount += parseFloat(this.list[this.list.length - 1].qty);
diff --git a/src/pages/raw/so/spSo/config.ts b/src/pages/raw/so/spSo/config.ts
index e878c23..dd6369d 100644
--- a/src/pages/raw/so/spSo/config.ts
+++ b/src/pages/raw/so/spSo/config.ts
@@ -70,9 +70,4 @@ export const detailHeader = [
     key: 'qty',
     width: 186,
   },
-  {
-    label: vm.$t('message.product_barCode'),
-    key: 'barcode',
-    width: 300,
-  },
 ];
diff --git a/src/pages/raw/so/spSo/index.vue b/src/pages/raw/so/spSo/index.vue
index 1ae24b3..3ff2c15 100644
--- a/src/pages/raw/so/spSo/index.vue
+++ b/src/pages/raw/so/spSo/index.vue
@@ -74,13 +74,13 @@
     <!-- 底部按钮 -->
     <view class="bottom-bar">
       <u-row class="button-bar">
-        <u-col :span="4">
+        <!-- <u-col :span="4">
           <u-button type="primary" @click="bill">{{ $t('message.detailed') }}</u-button>
-        </u-col>
-        <u-col :span="4">
+        </u-col> -->
+        <u-col :span="6">
           <u-button type="primary" @click="onSubmit">{{ $t('message.product_Upload') }}</u-button>
         </u-col>
-        <u-col :span="4">
+        <u-col :span="6">
           <u-button type="error" @click="uni.navigateBack({})">{{ $t('message.po_Return') }}</u-button>
         </u-col>
       </u-row>
@@ -284,6 +284,7 @@ export default class SpSo extends BasePage {
         locCode: this.every.userDefined1,
         //barcode: this.Container.barcode,
         qty: this.nowAmount,
+        proOutType: 'sp',
       };
       this.list.push(arr);
       this.material[this.materialIndex].outAmount += parseFloat(this.list[this.list.length - 1].qty);