单据提交与单据类型修改

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;

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,
             };
         },
 

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) => {

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>

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"

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"

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="单据状态">
+                <!--                <el-table-column label="单据状态">-->
-                    <template slot-scope="scope">
+                <!--                    <template slot-scope="scope">-->
-                        {{ scope.row.status | statusFilterName }}
+                <!--                        {{ scope.row.status | statusFilterName }}-->
-                    </template>
+                <!--                    </template>-->
-                </el-table-column>
+                <!--                </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();

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";