From 038ee5a59abfd830684b79f358957d25a145f92e Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Fri, 22 Jul 2022 16:15:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E5=8D=95=E6=8D=AE=EF=BC=8C?=
 =?UTF-8?q?=E6=89=AB=E7=A0=81=E5=8D=95=E6=8D=AE=E7=B1=BB=E5=9E=8B=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=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       | 588 ++++++++++----------
 src/views/basic/BussinessTypeLoclModify.vue |   9 +-
 src/views/basic/BussinessTypeModify.vue     |  17 +-
 4 files changed, 320 insertions(+), 301 deletions(-)

diff --git a/src/views/basic/BussinessType.vue b/src/views/basic/BussinessType.vue
index ed29533..a31f762 100644
--- a/src/views/basic/BussinessType.vue
+++ b/src/views/basic/BussinessType.vue
@@ -211,8 +211,9 @@ export default {
                 scanPreIn: null,
                 vailInv: null,
                 codeFillCheck: null,
-                defaultInv:null,
+                defaultInv: null,
                 defaultSubInv: null,
+                orderVisibleType: 0,
             },
             enableMap: {
                 true: "是",
@@ -359,8 +360,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 a32acbd..3fd4661 100644
--- a/src/views/basic/BussinessTypeLocl.vue
+++ b/src/views/basic/BussinessTypeLocl.vue
@@ -1,121 +1,121 @@
 <template>
-    <div>
-        <el-card>
-            <el-form :inline="true" :model="filterQuery" class="query-form" size="mini">
-                <el-form-item class="query-form-item">
-                    <el-input
-                        v-model="filterQuery.name"
-                        placeholder="业务类型"
-                        style="width: 400px"
-                    ></el-input>
-                </el-form-item>
-                <el-form-item>
-                    <el-button-group>
-                        <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
-                        <el-button type="primary" icon="search" @click="getList">查询</el-button>
-                        <el-button type="primary" icon="search" @click="handleAddClick"
-                                   :disabled="!configParms.typeBus"
-                        >新增
-                        </el-button
-                        >
-                    </el-button-group>
-
-                </el-form-item>
-            </el-form>
+  <div>
+    <el-card>
+      <el-form :inline="true" :model="filterQuery" class="query-form" size="mini">
+        <el-form-item class="query-form-item">
+          <el-input
+              v-model="filterQuery.name"
+              placeholder="业务类型"
+              style="width: 400px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button-group>
+            <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
+            <el-button type="primary" icon="search" @click="getList">查询</el-button>
+            <el-button type="primary" icon="search" @click="handleAddClick"
+                       :disabled="!configParms.typeBus"
+            >新增
+            </el-button
+            >
+          </el-button-group>
 
-            <el-table v-loading="loading" :data="list" style="width: 100%">
-                <el-table-column label="序号" type="index" width="120" fixed></el-table-column>
-                <el-table-column label="业务单据类型名称" prop="name" fixed></el-table-column>
-                <el-table-column label="业务单据类型代码" prop="action" fixed></el-table-column>
-                <el-table-column label="第三方单据类型" prop="originAction" fixed></el-table-column>
-                <el-table-column label="是否寄售" prop="advanceType" fixed>
-                    <template slot-scope="scope">
-                        <span>{{ enableMap[scope.row.advanceType] }}</span>
-                    </template>
-                </el-table-column>
-                <el-table-column label="预验收" prop="preIn" fixed>
-                    <template slot-scope="scope">
-                        <span>{{ enableMap[scope.row.preIn] }}</span>
-                    </template>
-                </el-table-column>
-                <el-table-column label="缺量自动补单" prop="advanceType" fixed>
-                    <template slot-scope="scope">
-                        <span>{{ enableMap[scope.row.changeEnable] }}</span>
-                    </template>
-                </el-table-column>
-                <el-table-column label="允许供应商使用" prop="spUse" fixed>
-                    <template slot-scope="scope">
-                        <span>{{ enableMap[scope.row.spUse] }}</span>
-                    </template>
-                </el-table-column>
+        </el-form-item>
+      </el-form>
 
+      <el-table v-loading="loading" :data="list" style="width: 100%">
+        <el-table-column label="序号" type="index" width="120" fixed></el-table-column>
+        <el-table-column label="业务单据类型名称" prop="name" fixed></el-table-column>
+        <el-table-column label="业务单据类型代码" prop="action" fixed></el-table-column>
+        <el-table-column label="第三方单据类型" prop="originAction" fixed></el-table-column>
+        <el-table-column label="是否寄售" prop="advanceType" fixed>
+          <template slot-scope="scope">
+            <span>{{ enableMap[scope.row.advanceType] }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="预验收" prop="preIn" fixed>
+          <template slot-scope="scope">
+            <span>{{ enableMap[scope.row.preIn] }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="缺量自动补单" prop="advanceType" fixed>
+          <template slot-scope="scope">
+            <span>{{ enableMap[scope.row.changeEnable] }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="允许供应商使用" prop="spUse" fixed>
+          <template slot-scope="scope">
+            <span>{{ enableMap[scope.row.spUse] }}</span>
+          </template>
+        </el-table-column>
 
-                <el-table-column label="操作" fixed="right">
-                    <template slot-scope="scope">
-                        <el-button
-                            type="text"
-                            size="small"
-                            @click.native.stop="handleModifyClick(scope.row)"
-                        >编辑
-                        </el-button
-                        >
-                        <el-button
-                            type="text"
-                            size="small"
-                            :disabled="!configParms.typeBus"
-                            @click.native.stop="deleteDialog(scope.row)"
-                        >删除
-                        </el-button
-                        >
-                    </template>
-                </el-table-column>
-            </el-table>
 
-            <el-dialog
-                title="新增业务类型关联"
-                :visible.sync="addDialogVisible"
-                width="70%"
-                :close-on-click-modal="false"
-                :close-on-press-escape="false"
-                v-if="addDialogVisible"
+        <el-table-column label="操作" fixed="right">
+          <template slot-scope="scope">
+            <el-button
+                type="text"
+                size="small"
+                @click.native.stop="handleModifyClick(scope.row)"
+            >编辑
+            </el-button
             >
-                <modifyDialog :inputQuery="inputQuery"></modifyDialog>
-                <div style="text-align: center">
-                    <el-button type="primary" size="small" icon="search" @click="onAddSubmit"
-                               :disabled="!configParms.typeBus"
-                    >提交
-                    </el-button
-                    >
-                    <el-button type="primary" size="small" icon="search" @click="cancelDialog"
-                    >取消
-                    </el-button
-                    >
-                </div>
-            </el-dialog>
-
-            <el-dialog
-                title="编辑业务类型关联"
-                :visible.sync="modifyDialogVisible"
-                width="70%"
-                :close-on-click-modal="false"
-                :close-on-press-escape="false"
-                v-if="modifyDialogVisible"
+            <el-button
+                type="text"
+                size="small"
+                :disabled="!configParms.typeBus"
+                @click.native.stop="deleteDialog(scope.row)"
+            >删除
+            </el-button
             >
-                <modifyDialog :inputQuery="inputQuery"></modifyDialog>
-                <div style="text-align: center">
-                    <el-button type="primary" size="small" icon="search" @click="onModifySubmit"
-                               :disabled="!configParms.typeBus"
-                    >提交
-                    </el-button
-                    >
-                    <el-button type="primary" size="small" icon="search" @click="cancelDialog"
-                    >取消
-                    </el-button
-                    >
-                </div>
-            </el-dialog>
-        </el-card>
-    </div>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <el-dialog
+          title="新增业务类型关联"
+          :visible.sync="addDialogVisible"
+          width="70%"
+          :close-on-click-modal="false"
+          :close-on-press-escape="false"
+          v-if="addDialogVisible"
+      >
+        <modifyDialog :inputQuery="inputQuery"></modifyDialog>
+        <div style="text-align: center">
+          <el-button type="primary" size="small" icon="search" @click="onAddSubmit"
+                     :disabled="!configParms.typeBus"
+          >提交
+          </el-button
+          >
+          <el-button type="primary" size="small" icon="search" @click="cancelDialog"
+          >取消
+          </el-button
+          >
+        </div>
+      </el-dialog>
+
+      <el-dialog
+          title="编辑业务类型关联"
+          :visible.sync="modifyDialogVisible"
+          width="70%"
+          :close-on-click-modal="false"
+          :close-on-press-escape="false"
+          v-if="modifyDialogVisible"
+      >
+        <modifyDialog :inputQuery="inputQuery"></modifyDialog>
+        <div style="text-align: center">
+          <el-button type="primary" size="small" icon="search" @click="onModifySubmit"
+                     :disabled="!configParms.typeBus"
+          >提交
+          </el-button
+          >
+          <el-button type="primary" size="small" icon="search" @click="cancelDialog"
+          >取消
+          </el-button
+          >
+        </div>
+      </el-dialog>
+    </el-card>
+  </div>
 </template>
 <script>
 
@@ -124,200 +124,202 @@ import modifyDialog from "./BussinessTypeLoclModify";
 import {findConfig} from "@/api/thrsys/spsSyncStatus";
 
 export default {
-    data() {
-        return {
-            filterQuery: {
-                enabled: "1",
-                udiwmsType: "",
-                thirdType: "",
-                page: 1,
-                limit: 20,
-            },
-            addDialogVisible: false,
-            modifyDialogVisible: false,
-            list: [],
-            inputQuery: {
-                action: "",
-                name: "",
-                enable: "",
-                remark: "",
-                mainAction: "",
-                thirdSysFk: "",
-                id: "",
-                originAction: null,
-                localAction: null,
-                advanceType: null,
-                changeEnable: null,
-                spUse: null,
-                prefix: null,
-                preIn: null,
-            },
-            enableMap: {
-                true: "是",
-                false: "否",
-            },
+  data() {
+    return {
+      filterQuery: {
+        enabled: "1",
+        udiwmsType: "",
+        thirdType: "",
+        page: 1,
+        limit: 20,
+      },
+      addDialogVisible: false,
+      modifyDialogVisible: false,
+      list: [],
+      inputQuery: {
+        action: "",
+        name: "",
+        enable: "",
+        remark: "",
+        mainAction: "",
+        thirdSysFk: "",
+        id: "",
+        originAction: null,
+        localAction: null,
+        advanceType: null,
+        changeEnable: null,
+        spUse: null,
+        prefix: null,
+        preIn: null,
+        supplementAll: false,
+      },
+      enableMap: {
+        true: "是",
+        false: "否",
+      },
 
-            total: 0,
-            multipleSelection: [],
-            configParms: {},
-        };
-    },
+      total: 0,
+      multipleSelection: [],
+      configParms: {},
+    };
+  },
 
-    methods: {
-        onReset() {
-            this.$router.push({
-                path: "",
-            });
-            this.filterQuery = {
-                udiwmsType: "",
-                thirdType: "",
-                page: 1,
-                limit: 20,
-            };
-            this.getList();
-        },
-        cancelDialog() {
-            this.modifyDialogVisible = false;
-            this.addDialogVisible = false;
-        },
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        udiwmsType: "",
+        thirdType: "",
+        page: 1,
+        limit: 20,
+      };
+      this.getList();
+    },
+    cancelDialog() {
+      this.modifyDialogVisible = false;
+      this.addDialogVisible = false;
+    },
 
-        getList() {
-            this.loading = true;
-            getLocalBusType(this.filterQuery)
-                .then((response) => {
-                    this.loading = false;
-                    this.list = response.data.list || [];
-                    this.total = response.data.total || 0;
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.list = [];
-                    this.total = 0;
-                });
-        },
+    getList() {
+      this.loading = true;
+      getLocalBusType(this.filterQuery)
+          .then((response) => {
+            this.loading = false;
+            this.list = response.data.list || [];
+            this.total = response.data.total || 0;
+          })
+          .catch(() => {
+            this.loading = false;
+            this.list = [];
+            this.total = 0;
+          });
+    },
 
 
-        onAddSubmit() {
-            addLocalBusType(this.inputQuery)
-                .then((response) => {
-                    this.loading = false;
-                    if (response.code == 20000) {
-                        this.cancelDialog();
-                        this.getList();
-                    } else {
-                        this.$message.error(response.message);
-                    }
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.cancelDialog();
-                });
-        },
+    onAddSubmit() {
+      addLocalBusType(this.inputQuery)
+          .then((response) => {
+            this.loading = false;
+            if (response.code == 20000) {
+              this.cancelDialog();
+              this.getList();
+            } else {
+              this.$message.error(response.message);
+            }
+          })
+          .catch(() => {
+            this.loading = false;
+            this.cancelDialog();
+          });
+    },
 
-        onModifySubmit() {
-            updateLocalBusType(this.inputQuery)
-                .then((response) => {
-                    this.loading = false;
-                    this.cancelDialog();
-                    this.getList();
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.cancelDialog();
-                });
-        },
+    onModifySubmit() {
+      updateLocalBusType(this.inputQuery)
+          .then((response) => {
+            this.loading = false;
+            this.cancelDialog();
+            this.getList();
+          })
+          .catch(() => {
+            this.loading = false;
+            this.cancelDialog();
+          });
+    },
 
-        handleModifyClick(row) {
-            this.modifyDialogVisible = true;
-            this.inputQuery = {
-                id: row.id,
-                remark: row.remark,
-                action: row.action,
-                name: row.name,
-                enable: row.enable,
-                mainAction: row.mainAction,
-                localAction: row.localAction,
-                thirdSysFk: row.thirdSysFk,
-                originAction: row.originAction,
-                advanceType: row.advanceType,
-                changeEnable: row.changeEnable,
-                spUse: row.spUse,
-                prefix: row.prefix,
-                preIn: row.preIn,
-            };
-        },
+    handleModifyClick(row) {
+      this.modifyDialogVisible = true;
+      this.inputQuery = {
+        id: row.id,
+        remark: row.remark,
+        action: row.action,
+        name: row.name,
+        enable: row.enable,
+        mainAction: row.mainAction,
+        localAction: row.localAction,
+        thirdSysFk: row.thirdSysFk,
+        originAction: row.originAction,
+        advanceType: row.advanceType,
+        changeEnable: row.changeEnable,
+        spUse: row.spUse,
+        prefix: row.prefix,
+        preIn: row.preIn,
+        supplementAll: row.supplementAll,
+      };
+    },
 
-        handleAddClick() {
-            this.addDialogVisible = true;
-            this.inputQuery = {
-                action: "",
-                name: "",
-                enable: "",
-                remark: "",
-                mainAction: null,
-                thirdSysFk: "",
-                id: null,
-                advanceType: null,
-                localAction: null,
-                changeEnable: null,
-                prefix: null,
-                preIn: null,
-            };
-        },
+    handleAddClick() {
+      this.addDialogVisible = true;
+      this.inputQuery = {
+        action: "",
+        name: "",
+        enable: "",
+        remark: "",
+        mainAction: null,
+        thirdSysFk: "",
+        id: null,
+        advanceType: null,
+        localAction: null,
+        changeEnable: null,
+        prefix: null,
+        preIn: null,
+      };
+    },
 
-        deleteDialog(rowId) {
-            this.$confirm("此操作将永久删除该业务类型信息, 是否继续?", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
-            })
-                .then(() => {
-                    this.deleteOrders(rowId);
-                })
-                .catch(() => {
-                });
-        },
+    deleteDialog(rowId) {
+      this.$confirm("此操作将永久删除该业务类型信息, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+          .then(() => {
+            this.deleteOrders(rowId);
+          })
+          .catch(() => {
+          });
+    },
 
-        deleteOrders(data) {
-            this.loading = true;
-            let tquery = {
-                id: data.id + "",
-            };
+    deleteOrders(data) {
+      this.loading = true;
+      let tquery = {
+        id: data.id + "",
+      };
 
-            deleteLocalBusType(tquery)
-                .then((response) => {
-                    this.getList();
-                    if (response.code == 20000) {
-                        this.$message({
-                            type: "success",
-                            message: "删除成功！",
-                        });
-                    } else {
-                        this.$message.error(response.message);
-                    }
-                })
-                .catch(() => {
-                });
-        },
-        getSyncConfig() {
-            findConfig()
-                .then((response) => {
-                    if (response.code == 20000) {
-                        this.configParms = response.data;
-                    }
-                })
-                .catch(() => {
-                });
-        },
-    },
-    components: {
-        modifyDialog,
-    },
-    mounted() {
+      deleteLocalBusType(tquery)
+          .then((response) => {
+            this.getList();
+            if (response.code == 20000) {
+              this.$message({
+                type: "success",
+                message: "删除成功！",
+              });
+            } else {
+              this.$message.error(response.message);
+            }
+          })
+          .catch(() => {
+          });
     },
-    created() {
-        this.getSyncConfig();
-        this.getList();
+    getSyncConfig() {
+      findConfig()
+          .then((response) => {
+            if (response.code == 20000) {
+              this.configParms = response.data;
+            }
+          })
+          .catch(() => {
+          });
     },
+  },
+  components: {
+    modifyDialog,
+  },
+  mounted() {
+  },
+  created() {
+    this.getSyncConfig();
+    this.getList();
+  },
 };
 </script>
diff --git a/src/views/basic/BussinessTypeLoclModify.vue b/src/views/basic/BussinessTypeLoclModify.vue
index b7ec5db..835efb6 100644
--- a/src/views/basic/BussinessTypeLoclModify.vue
+++ b/src/views/basic/BussinessTypeLoclModify.vue
@@ -134,6 +134,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-row>
 
@@ -327,7 +334,7 @@ export default {
         },
         getTypes() {
             let tQuery = {
-                onlyMain:true,
+                onlyMain: true,
             }
             getOriginBusType(tQuery)
                 .then((response) => {
diff --git a/src/views/basic/BussinessTypeModify.vue b/src/views/basic/BussinessTypeModify.vue
index 091b395..df1ac03 100644
--- a/src/views/basic/BussinessTypeModify.vue
+++ b/src/views/basic/BussinessTypeModify.vue
@@ -197,20 +197,29 @@
 
 
         </el-row>
-
-        <el-row :gutter="20" class="el-row" type="flex">
+        <el-divider></el-divider>
+        <span>单据设置：</span>
+        <el-row :gutter="20" class="el-row" type="flex" style="margin-top: 10px">
             <el-col :span="24" class="el-col">
+                <div class="text item" style="margin-top: 6px">
 
 
-                <div class="text item" style="margin-top: 6px">
                     <el-checkbox v-model="inputQuery.enable">启用单据类型</el-checkbox>
                     <el-checkbox v-model="inputQuery.genUnit" :disabled="inputQuery.corpType !=2">允许手动输入客户信息
                     </el-checkbox>
                     <el-checkbox v-model="inputQuery.useDyCount" :disabled="true">以使用单元计量出库
                     </el-checkbox>
-                </div>
+
+                    <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>
 
 
+                </div>
             </el-col>
         </el-row>