From a3c737095b649182525a1769ce5c946c3bad1e1c Mon Sep 17 00:00:00 2001
From: anthonyywj2 <353682448@qq.com>
Date: Sat, 23 Jul 2022 17:26:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E6=8F=90=E4=BA=A4=E4=B8=8E?=
 =?UTF-8?q?=E5=8D=95=E6=8D=AE=E7=B1=BB=E5=9E=8B=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/BussinessType.vue           |  7 +++--
 src/views/basic/BussinessTypeLocl.vue       |  3 +-
 src/views/basic/BussinessTypeLoclModify.vue | 15 +++++++---
 src/views/basic/BussinessTypeModify.vue     | 11 +++++++
 src/views/business/stockOrderDelSearch.vue  |  1 +
 src/views/business/stockOrderSearch.vue     |  1 +
 src/views/business/stockOrderUpload.vue     | 32 ++++++++++++++++-----
 src/views/thrsys/ThrInvWarehouse.vue        |  1 -
 8 files changed, 55 insertions(+), 16 deletions(-)

diff --git a/src/views/basic/BussinessType.vue b/src/views/basic/BussinessType.vue
index 21d83a0..30f9b10 100644
--- a/src/views/basic/BussinessType.vue
+++ b/src/views/basic/BussinessType.vue
@@ -222,8 +222,9 @@ export default {
                 vailInv: null,
                 entrutSpms: null,
                 codeFillCheck: null,
-                defaultInv:null,
+                defaultInv: null,
                 defaultSubInv: null,
+                orderVisibleType: 0,
             },
             enableMap: {
                 true: "是",
@@ -399,8 +400,8 @@ export default {
                 codeFillCheck: row.codeFillCheck,
                 changeEnable: row.changeEnable,
                 defaultSubInv: row.defaultSubInv,
-                defaultInv:row.defaultInv,
-
+                defaultInv: row.defaultInv,
+                orderVisibleType: row.orderVisibleType,
 
             };
             this.modifyDialogVisible = true;
diff --git a/src/views/basic/BussinessTypeLocl.vue b/src/views/basic/BussinessTypeLocl.vue
index 4659bfd..b13a66b 100644
--- a/src/views/basic/BussinessTypeLocl.vue
+++ b/src/views/basic/BussinessTypeLocl.vue
@@ -154,7 +154,7 @@ export default {
                 changeEnable: null,
                 spUse: null,
                 prefix: null,
-                preIn: null,
+                preIn: null, supplementAll: false,
             },
             enableMap: {
                 true: "是",
@@ -248,6 +248,7 @@ export default {
                 spUse: row.spUse,
                 prefix: row.prefix,
                 preIn: row.preIn,
+                supplementAll: row.supplementAll,
             };
         },
 
diff --git a/src/views/basic/BussinessTypeLoclModify.vue b/src/views/basic/BussinessTypeLoclModify.vue
index f5a79cb..7b8c87d 100644
--- a/src/views/basic/BussinessTypeLoclModify.vue
+++ b/src/views/basic/BussinessTypeLoclModify.vue
@@ -36,7 +36,7 @@
                         <span>第三方单据类型:&nbsp;</span>
                     </div>
 
-<!--                    <el-select v-model="inputQuery.originAction" placeholder="请选择第三方系统单据类型" clearable="true">-->
+                    <!--                    <el-select v-model="inputQuery.originAction" placeholder="请选择第三方系统单据类型" clearable="true">-->
                     <!--                        <el-option-->
                     <!--                            v-for="item in originTypes"-->
                     <!--                            :key="item.name"-->
@@ -131,6 +131,13 @@
                     </el-checkbox>
                 </div>
             </el-col>
+            <el-col :span="4" class="el-col">
+                <div class="text item">
+                    <el-checkbox v-model="inputQuery.supplementAll"
+                                 :disabled="!inputQuery.changeEnable">是否全量补单
+                    </el-checkbox>
+                </div>
+            </el-col>
 
             <!--            <el-col :span="4" class="el-col">
                             <div class="text item">
@@ -330,7 +337,7 @@ export default {
         getTypes(query) {
             let tQuery = {
                 key: query,
-                onlyMain:true,
+                onlyMain: true,
             }
             getOriginBusType(tQuery)
                 .then((response) => {
@@ -340,10 +347,10 @@ export default {
                 });
             this.getBusTypes();
         },
-        findMethod(query){
+        findMethod(query) {
             let tQuery = {
                 key: query,
-                onlyMain:true,
+                onlyMain: true,
             }
             getOriginBusType(tQuery)
                 .then((response) => {
diff --git a/src/views/basic/BussinessTypeModify.vue b/src/views/basic/BussinessTypeModify.vue
index 1ddb312..c7855b4 100644
--- a/src/views/basic/BussinessTypeModify.vue
+++ b/src/views/basic/BussinessTypeModify.vue
@@ -236,6 +236,17 @@
                 </div>
             </el-col>
         </el-row>
+        <el-row :gutter="20" class="el-row" type="flex">
+            <el-col :span="24" class="el-col">
+                <span style="margin-left: 15px">单据详情展示方式:</span>
+                <el-select v-model="inputQuery.orderVisibleType" style="margin-left: 5px"
+                           placeholder="单据详情展示方式"
+                           size="mini">
+                    <el-option label="批次号" :value=0></el-option>
+                    <el-option label="条码清单" :value=1></el-option>
+                </el-select>
+            </el-col>
+        </el-row>
 
         <el-divider></el-divider>
         <span>单据默认选项：</span>
diff --git a/src/views/business/stockOrderDelSearch.vue b/src/views/business/stockOrderDelSearch.vue
index 895b9dc..fb9ff03 100644
--- a/src/views/business/stockOrderDelSearch.vue
+++ b/src/views/business/stockOrderDelSearch.vue
@@ -196,6 +196,7 @@
                 <el-table-column label="单据数量" width="100" prop="count"></el-table-column>
                 <el-table-column label="实际数量" width="100" prop="reCount"></el-table-column>
                 <el-table-column label="价格" width="120" prop="price"></el-table-column>
+                <el-table-column label="序列号" width="120" prop="serialNo"></el-table-column>
                 <el-table-column label="销售清单号（第二票）" width="180" prop="secSalesListNo">
                     <template slot-scope="scope">
                         <el-input :disabled="scope.$index !== currentCheckIndex" v-model="scope.row.secSalesListNo"
diff --git a/src/views/business/stockOrderSearch.vue b/src/views/business/stockOrderSearch.vue
index f48fc66..d0b10e4 100644
--- a/src/views/business/stockOrderSearch.vue
+++ b/src/views/business/stockOrderSearch.vue
@@ -166,6 +166,7 @@
                 <el-table-column label="单据数量" width="100" prop="count"></el-table-column>
                 <el-table-column label="实际数量" width="100" prop="reCount"></el-table-column>
                 <el-table-column label="价格" width="120" prop="price"></el-table-column>
+                <el-table-column label="序列号" width="120" prop="serialNo"></el-table-column>
                 <el-table-column label="销售清单号（第二票）" width="180" prop="secSalesListNo">
                     <template slot-scope="scope">
                         <el-input :disabled="scope.$index !== currentCheckIndex" v-model="scope.row.secSalesListNo"
diff --git a/src/views/business/stockOrderUpload.vue b/src/views/business/stockOrderUpload.vue
index b7df80d..9b820f1 100644
--- a/src/views/business/stockOrderUpload.vue
+++ b/src/views/business/stockOrderUpload.vue
@@ -87,11 +87,13 @@
                     </template>
                 </el-table-column>
                 <el-table-column label="单据日期" prop="billdate"></el-table-column>
-                <el-table-column label="单据状态">
-                    <template slot-scope="scope">
-                        {{ scope.row.status | statusFilterName }}
-                    </template>
-                </el-table-column>
+                <!--                <el-table-column label="单据状态">-->
+                <!--                    <template slot-scope="scope">-->
+                <!--                        {{ scope.row.status | statusFilterName }}-->
+                <!--                    </template>-->
+                <!--                </el-table-column>-->
+
+
                 <el-table-column label="业务类型" prop="billType">
                     <template slot-scope="scope">
                         <span>{{ getActionName(scope.row.billType) }}</span>
@@ -102,6 +104,17 @@
                         <span>{{ getStorageName(scope.row.locStorageCode) }}</span>
                     </template>
                 </el-table-column>
+                <el-table-column label="提交状态">
+
+
+                    <template slot-scope="scope">
+
+                        <el-tag :type="(scope.row.exportStatus) | statusFilterType">
+                            {{ exportStatusMap[scope.row.exportStatus] }}
+                        </el-tag>
+
+                    </template>
+                </el-table-column>
                 <el-table-column label="操作" fixed="right" width="200">
                     <template slot-scope="scope">
                         <el-button
@@ -199,6 +212,11 @@ export default {
             idQuery: {
                 id: "",
             },
+            exportStatusMap: {
+                null: "未提交",
+                "1": "已提交",
+                "0": "未提交",
+            },
             distributionVisible: false,
             detailFormRules: {
                 batchNo: [
@@ -502,8 +520,7 @@ export default {
             }
         }
     },
-    components: {
-    },
+    components: {},
     filters: {
         statusFilterType(status) {
             const statusMap = {
@@ -530,6 +547,7 @@ export default {
             return typeMap[type];
         }
     },
+
     created() {
         this.getStorage();
         this.getBusType();
diff --git a/src/views/thrsys/ThrInvWarehouse.vue b/src/views/thrsys/ThrInvWarehouse.vue
index 4c5fc94..efcd0df 100644
--- a/src/views/thrsys/ThrInvWarehouse.vue
+++ b/src/views/thrsys/ThrInvWarehouse.vue
@@ -292,7 +292,6 @@ import {findConfig} from "@/api/thrsys/spsSyncStatus";
 import {isBlank} from "@/utils/strUtil";
 import {
     filterThridSubAll,
-    filterSubByInv,
     deleteSubWarehouse,
     saveSubWarehouse
 } from "@/api/thrsys/thrdSubInvWarehouse";