From d670f5d03fcada2856d2afcb63937a33798eed6f Mon Sep 17 00:00:00 2001
From: anthonyywj2 <353682448@qq.com>
Date: Mon, 9 May 2022 15:08:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E7=BB=A7=E6=9C=8D=E5=8A=A1=EF=BC=8C?=
 =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=96=B9=E6=8E=A5=E5=8F=A3=EF=BC=8C=E6=89=B9?=
 =?UTF-8?q?=E6=AC=A1=E5=8F=B7=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/config.json                            |   4 +-
 src/api/basic/basicThirdSys.js                |  21 +
 src/api/basic/busOriginType.js                |   8 +
 src/views/basic/BasicThirdSys.vue             | 381 +++++++-----
 src/views/basic/BussinessTypeThird.vue        | 550 +++++++++---------
 src/views/basic/UdiInfoManage.vue             |  36 +-
 .../business/stockOrderEditDistribution.vue   |   4 +-
 .../business/stockOrderNewDistribution.vue    |   2 +
 src/views/inout/DialogSelectRl.vue            |  38 +-
 src/views/inout/IOAddOrder.vue                |   4 +-
 src/views/inout/IOCheckWaitOrder.vue          |   1 +
 src/views/inout/IONewOrder.vue                |   1 +
 12 files changed, 593 insertions(+), 457 deletions(-)

diff --git a/public/config.json b/public/config.json
index 7ca6b5f..07fe4ff 100644
--- a/public/config.json
+++ b/public/config.json
@@ -1,6 +1,6 @@
 {
     "UDI_SYNC_SERVER_IP": "http://192.168.0.109:9995/",
-    "BASE_URL":"http://192.168.0.109:9991/",
-    "SERVER_IP": "http://192.168.0.109:9991/",
+    "BASE_URL":"http://139.9.178.73:8080/UDI_WMS_MC/",
+    "SERVER_IP": "http://139.9.178.73:8080/",
     "WEBSOCKET_URL": "ws://192.168.0.109:9991/UDI_WMS_MC/api/websocket/"
 }
diff --git a/src/api/basic/basicThirdSys.js b/src/api/basic/basicThirdSys.js
index af970b7..4a697f9 100644
--- a/src/api/basic/basicThirdSys.js
+++ b/src/api/basic/basicThirdSys.js
@@ -43,3 +43,24 @@ export function updateDetailBasicThirdSys(query) {
 }
 
 
+export function filterBusTypeDetail(query) {
+    return axios({
+        url: "/udiwms/basic/thirdsys/filterBusTypeDetail",
+        method: "get",
+        params: query
+    });
+}
+
+
+export function saveBusTypeDetail(query) {
+    return axios({
+        url: "/udiwms/basic/thirdsys/saveBusTypeDetail",
+        method: "post",
+        data: query
+    });
+}
+
+
+
+
+
diff --git a/src/api/basic/busOriginType.js b/src/api/basic/busOriginType.js
index c9e80bb..2f7e707 100644
--- a/src/api/basic/busOriginType.js
+++ b/src/api/basic/busOriginType.js
@@ -22,3 +22,11 @@ export function insertBussinessType(query) {
         data: query
     });
 }
+
+export function downloadBussinessType(query) {
+    return axios({
+        url: "/udiwms/originBusType/download",
+        method: "post",
+        data: query
+    });
+}
diff --git a/src/views/basic/BasicThirdSys.vue b/src/views/basic/BasicThirdSys.vue
index b49560f..bc341cc 100644
--- a/src/views/basic/BasicThirdSys.vue
+++ b/src/views/basic/BasicThirdSys.vue
@@ -83,8 +83,8 @@
 
         </el-card>
         <el-card class="el-card">
-
-            <el-table v-loading="loading" :data="detailList" style="width: 100%">
+            <el-table v-loading="loading" :data="detailList" style="width: 100%"
+                      @current-change="handleBustypeChange">
                 <el-table-column label="序号" type="index" show-overflow-tooltip="true"></el-table-column>
                 <el-table-column label="接口名称" prop="name" show-overflow-tooltip="true"></el-table-column>
 
@@ -101,9 +101,9 @@
                 </el-table-column>
 
                 <!--<el-table-column label="本地缓存" prop="itrCache">-->
-                    <!--<template slot-scope="scope">-->
-                        <!--<span>{{ enableMap[scope.row.enabled] }}</span>-->
-                    <!--</template>-->
+                <!--<template slot-scope="scope">-->
+                <!--<span>{{ enableMap[scope.row.enabled] }}</span>-->
+                <!--</template>-->
                 <!--</el-table-column>-->
 
                 <el-table-column label="备注" prop="remark" show-overflow-tooltip></el-table-column>
@@ -148,175 +148,264 @@
             ></el-pagination>
 
 
-          <div style="margin-top: 18px ;  color: #F71616;">
-            <span>重要提示：本页功能仅供技术提供方修改&nbsp;</span>
-          </div>
+        </el-card>
+
+        <el-card class="el-card">
+
+            <el-table v-loading="busTypeLoading" :data="busTypeList" style="width: 100%">
+                <el-table-column label="序号" type="index" show-overflow-tooltip="true"></el-table-column>
+                <el-table-column label="单据类型" prop="name" show-overflow-tooltip="true"></el-table-column>
+                <el-table-column label="单据类型代码" prop="code">
+                </el-table-column>
+
+                <el-table-column label="接口地址" prop="url" width="400" show-overflow-tooltip>
+
+                    <template slot-scope="scope">
+                        <el-input :disabled="scope.$index !== currentCheckIndex" v-model="scope.row.url"
+                                  placeholder="请输入"></el-input>
+                    </template>
+
+                </el-table-column>
+                <el-table-column label="备注" prop="remark" show-overflow-tooltip></el-table-column>
+
+
+                <el-table-column label="操作" width="150" prop="price" fixed="right">
+                    <template slot-scope="scope">
+                        <el-button
+                            type="text"
+                            size="small"
+                            @click="handleEdit(scope.$index, scope.row)"
+                        >编辑
+                        </el-button>
+                        <el-button
+                            type="text"
+                            size="small"
+                            @click="handleSave(scope.$index, scope.row)"
+                        >保存
+                        </el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+
+            <div style="margin-top: 18px ;  color: #F71616;">
+                <span>重要提示：本页功能仅供技术提供方修改&nbsp;</span>
+            </div>
+
         </el-card>
 
     </div>
 </template>
 <script>
-    import {
-        getBasicThirdSys,
-        updateBasicThirdSys, getDetailBasicThirdSys, updateDetailBasicThirdSys
-    } from "../../api/basic/basicThirdSys";
-
-    import modifyDialog from "./BasicThirdSysModify";
-    import modifyDetailDialog from "./BasicThirdSysDetailModify";
-
-    export default {
-        data() {
-            return {
-                filterQuery: {
-                    thirdId: "",
-                    thirdName: "",
-                    enabled: "1",
-                    page: 1,
-                    limit: 20,
-                },
-                modifyDialogVisible: false,
-                modifyDetailDialogVisible: false,
-                list: [],
-                inputQuery: null,
-                inputDetailQuery: null,
-                enableMap: {
-                    true: "是",
-                    false: "否",
-                },
-                dataMap: {
-                    0: "接口实时获取",
-                    1: "文件缓存",
-                    2:"第三方上传缓存",
-                    3:"接口本地缓存"
-                },
-                detailList: null,
-                total: 0,
-            };
-        },
+import {
+    getBasicThirdSys,
+    updateBasicThirdSys, getDetailBasicThirdSys, updateDetailBasicThirdSys, filterBusTypeDetail, saveBusTypeDetail
+} from "../../api/basic/basicThirdSys";
 
-        methods: {
-            onReset() {
-                this.$router.push({
-                    path: "",
-                });
-                this.filterQuery = {
-                    thirdId: "",
-                    thirdName: "",
-                    enabled: null,
-                    page: 1,
-                    limit: 20,
-                };
-                this.getList();
+import modifyDialog from "./BasicThirdSysModify";
+import modifyDetailDialog from "./BasicThirdSysDetailModify";
+
+export default {
+    data() {
+        return {
+            filterQuery: {
+                thirdId: "",
+                thirdName: "",
+                enabled: "1",
+                page: 1,
+                limit: 20,
             },
-            cancelDialog() {
-                this.modifyDialogVisible = false;
-                this.modifyDetailDialogVisible = false;
+            modifyDialogVisible: false,
+            modifyDetailDialogVisible: false,
+            modifyBusYypeDialogVisible: false,
+            list: [],
+            inputQuery: null,
+            inputDetailQuery: null,
+            inputBusTypeQuery: null,
+            enableMap: {
+                true: "是",
+                false: "否",
             },
-            handleCurrentChange(row) {
-                this.getDetailList(row);
+            dataMap: {
+                0: "接口实时获取",
+                1: "文件缓存",
+                2: "第三方上传缓存",
+                3: "接口本地缓存"
             },
-            getList() {
-                this.loading = true;
-                getBasicThirdSys(this.filterQuery)
-                    .then((response) => {
-                        this.loading = false;
-                        this.list = response.data.list || [];
-                        this.detailList = [];
-                        this.total = response.data.total || 0;
-                        // this.getDetailList(this.list[0]);
+            detailList: null,
+            busTypeList: [],
+            total: 0,
+            loading: false,
+            busTypeLoading:false,
+            currentCheckIndex: -1,
+        };
+    },
 
+    methods: {
+        onReset() {
+            this.$router.push({
+                path: "",
+            });
+            this.filterQuery = {
+                thirdId: "",
+                thirdName: "",
+                enabled: null,
+                page: 1,
+                limit: 20,
+            };
+            this.getList();
+        },
+        cancelDialog() {
+            this.modifyDialogVisible = false;
+            this.modifyDetailDialogVisible = false;
+            this.modifyBusYypeDialogVisible = false;
+        },
+        handleCurrentChange(row) {
+            this.getDetailList(row);
+        },
+        handleBustypeChange(row) {
+            this.getBustyList(row);
+        },
+        getList() {
+            this.loading = true;
+            getBasicThirdSys(this.filterQuery)
+                .then((response) => {
+                    this.loading = false;
+                    this.list = response.data.list || [];
+                    this.detailList = [];
+                    this.total = response.data.total || 0;
+                    // this.getDetailList(this.list[0]);
 
-                    })
-                    .catch(() => {
-                        this.loading = false;
-                        this.list = [];
-                        this.total = 0;
-                    });
-            },
 
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.list = [];
+                    this.total = 0;
+                });
+        },
 
-            getDetailList(row) {
-                let query = {
-                    thirdSysFk: row.thirdId
-                };
-                this.loading = true;
-                getDetailBasicThirdSys(query)
-                    .then((response) => {
-                        this.loading = false;
-                        this.detailList = response.data.list || [];
-                        this.total = response.data.total || 0;
-                    })
-                    .catch(() => {
-                        this.loading = false;
-                        this.list = [];
-                        this.total = 0;
-                    });
-            },
+
+        getDetailList(row) {
+            let query = {
+                thirdSysFk: row.thirdId
+            };
+            this.loading = true;
+            getDetailBasicThirdSys(query)
+                .then((response) => {
+                    this.loading = false;
+                    this.detailList = response.data.list || [];
+                    this.total = response.data.total || 0;
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.list = [];
+                    this.total = 0;
+                });
+        },
+
+        getBustyList(row) {
+            let query = {
+                thirdSysFk: row.thirdSysFk,
+                type: 0,
+            };
+            if (row.key == "orderQueryUrl") {
+                query.type = 1;
+            } else if (row.key == "orderSubmitUrl") {
+                query.type = 2;
+            } else {
+                this.busTypeList = [];
+                return;
+            }
+            this.busTypeLoading = true;
+            filterBusTypeDetail(query)
+                .then((response) => {
+                    this.busTypeLoading = false;
+                    this.busTypeList = response.data.list || [];
+                })
+                .catch(() => {
+                    this.busTypeLoading = false;
+                    this.busTypeList = [];
+                });
+        },
 
 
-            onModifySubmit() {
-                updateBasicThirdSys(this.inputQuery)
-                    .then((response) => {
-                        if (response.code == 20000) {
-                            this.loading = false;
-                            this.cancelDialog();
-                            this.getList();
-                            this.$message.success(response.data);
-                        } else {
-                            this.$message.error(response.message);
-                        }
-
-                    })
-                    .catch(() => {
+        onModifySubmit() {
+            updateBasicThirdSys(this.inputQuery)
+                .then((response) => {
+                    if (response.code == 20000) {
                         this.loading = false;
                         this.cancelDialog();
-                    });
-            },
-            onDetailModifySubmit() {
-                updateDetailBasicThirdSys(this.inputDetailQuery)
-                    .then((response) => {
-                        if (response.code == 20000) {
-                            this.loading = false;
-                            this.cancelDialog();
-                            this.getList();
-                            this.$message.success(response.data);
-                        } else {
-                            this.$message.error(response.message);
-                        }
-
-                    })
-                    .catch(() => {
+                        this.getList();
+                        this.$message.success(response.data);
+                    } else {
+                        this.$message.error(response.message);
+                    }
+
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.cancelDialog();
+                });
+        },
+        onDetailModifySubmit() {
+            updateDetailBasicThirdSys(this.inputDetailQuery)
+                .then((response) => {
+                    if (response.code == 20000) {
                         this.loading = false;
                         this.cancelDialog();
-                    });
-            },
+                        this.getList();
+                        this.$message.success(response.data);
+                    } else {
+                        this.$message.error(response.message);
+                    }
 
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.cancelDialog();
+                });
+        },
 
-            handleModifyClick(row) {
-                this.modifyDialogVisible = true;
-                this.inputQuery = row;
-            },
-            handleDetailModifyClick(row) {
-                this.modifyDetailDialogVisible = true;
-                this.inputDetailQuery = row;
-            },
+
+        handleModifyClick(row) {
+            this.modifyDialogVisible = true;
+            this.inputQuery = row;
         },
-        components: {
-            modifyDialog, modifyDetailDialog
+        handleDetailModifyClick(row) {
+            this.modifyDetailDialogVisible = true;
+            this.inputDetailQuery = row;
         },
-        mounted() {
+
+
+
+        handleEdit(index, row) {
+            this.currentCheckIndex = index;
         },
-        created() {
-            this.getList();
+        handleSave(index, row) {
+            this.currentCheckIndex = -1;
+            saveBusTypeDetail(row).then((res) => {
+                if (res.code == 20000) {
+                    this.$message.success(res.data);
+                }
+            })
         },
-    };
+    },
+    components: {
+        modifyDialog, modifyDetailDialog
+    },
+    mounted() {
+    },
+    created() {
+        this.getList();
+    },
+};
 </script>
 <style scoped>
 
-    .el-card {
-        margin-right: 20px;
-        /*transition: all .5s;*/
-    }
+.el-card {
+    margin-right: 20px;
+    /*transition: all .5s;*/
+}
 
 </style>
 
diff --git a/src/views/basic/BussinessTypeThird.vue b/src/views/basic/BussinessTypeThird.vue
index 2c6694d..c3ce471 100644
--- a/src/views/basic/BussinessTypeThird.vue
+++ b/src/views/basic/BussinessTypeThird.vue
@@ -1,293 +1,325 @@
 <template>
-    <div>
-        <el-card>
+  <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 class="query-form-item">-->
-                <!--                <el-select v-model="filterQuery.enable" placeholder="启用状态" clearable>-->
-                <!--                    <el-option label="全部" value=""></el-option>-->
-                <!--                    <el-option label="已启用" value="1"></el-option>-->
-                <!--                    <el-option label="未启用" value="0"></el-option>-->
-                <!--                </el-select>-->
-                <!--            </el-form-item>-->
-                <el-form-item>
-                    <el-button-group style="margin-left: 10px;display:flex;">
-                        <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
-                        <el-button type="primary" icon="search" @click="getList">查询</el-button>
-                        <!--                    <el-upload-->
-                        <!--                        :action="uploadFileUrl"-->
-                        <!--                        multiple-->
-                        <!--                        :limit="3"-->
-                        <!--                        :show-file-list="false"-->
-                        <!--                        :on-success="handleChange"-->
-                        <!--                        :file-list="fileList"-->
-                        <!--                    >-->
-                        <!--                        <el-button size="mini" type="primary">导入单据类型</el-button>-->
-                        <!--                    </el-upload>-->
-                    </el-button-group>
-                    <!-- <el-button type="primary" icon="search" @click="handleAddClick"
-                      >新增</el-button
-                    > -->
-                </el-form-item>
-            </el-form>
+      <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 class="query-form-item">-->
+        <!--                <el-select v-model="filterQuery.enable" placeholder="启用状态" clearable>-->
+        <!--                    <el-option label="全部" value=""></el-option>-->
+        <!--                    <el-option label="已启用" value="1"></el-option>-->
+        <!--                    <el-option label="未启用" value="0"></el-option>-->
+        <!--                </el-select>-->
+        <!--            </el-form-item>-->
 
-            <el-table v-loading="loading" :data="list" style="width: 100%">
-                <el-table-column label="序号" type="index" width="55" ></el-table-column>
+        <el-form-item class="query-form-item">
+          <el-select v-model="filterQuery.thirdSys" placeholder="请选择第三方系统" @change="thirdSysChange">
+            <el-option
+                v-for="item in thirdSys"
+                :key="item.value"
+                :label="item.thirdName"
+                :value="item.thirdId">
+              <span style="float: left">{{ item.thirdName }}</span>
+              <span style="float: right; color: #8492a6; font-size: 13px">{{ item.thirdId }}</span>
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button-group style="margin-left: 10px;display:flex;">
+            <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="updateDownload">更新下载</el-button>
+            <!--                    <el-upload-->
+            <!--                        :action="uploadFileUrl"-->
+            <!--                        multiple-->
+            <!--                        :limit="3"-->
+            <!--                        :show-file-list="false"-->
+            <!--                        :on-success="handleChange"-->
+            <!--                        :file-list="fileList"-->
+            <!--                    >-->
+            <!--                        <el-button size="mini" type="primary">导入单据类型</el-button>-->
+            <!--                    </el-upload>-->
+          </el-button-group>
+          <!-- <el-button type="primary" icon="search" @click="handleAddClick"
+            >新增</el-button
+          > -->
+        </el-form-item>
+      </el-form>
 
-                <el-table-column label="单据类型名称" prop="name" ></el-table-column>
-                <el-table-column label="单据类型代码" prop="action" ></el-table-column>
-                <!--            <el-table-column label="是否启用" prop="enable" fixed>-->
-                <!--                <template slot-scope="scope">-->
-                <!--                    <span>{{ enableMap[scope.row.enable] }}</span>-->
-                <!--                </template>-->
-                <!--            </el-table-column>-->
-                <el-table-column label="第三方系统" prop="thirdSysName" ></el-table-column>
-                <el-table-column label="备注" prop="remark" ></el-table-column>
-                <el-table-column label="操作" width="100" fixed="right">
-                    <template slot-scope="scope">
-                        <el-button
-                            type="text"
-                            size="small"
-                            @click.native.stop="handleModifyClick(scope.row)"
-                        >编辑
-                        </el-button
-                        >
-                    </template>
-                </el-table-column>
-            </el-table>
+      <el-table v-loading="loading" :data="list" style="width: 100%">
+        <el-table-column label="序号" type="index" width="55"></el-table-column>
 
-            <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="单据类型名称" prop="name"></el-table-column>
+        <el-table-column label="单据类型代码" prop="action"></el-table-column>
+        <!--            <el-table-column label="是否启用" prop="enable" fixed>-->
+        <!--                <template slot-scope="scope">-->
+        <!--                    <span>{{ enableMap[scope.row.enable] }}</span>-->
+        <!--                </template>-->
+        <!--            </el-table-column>-->
+        <el-table-column label="第三方系统" prop="thirdSys"></el-table-column>
+        <el-table-column label="备注" prop="remark"></el-table-column>
+        <el-table-column label="操作" width="100" 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"
-                    >提交
-                    </el-button
-                    >
-                    <el-button type="primary" size="small" icon="search" @click="cancelDialog"
-                    >取消
-                    </el-button
-                    >
-                </div>
-            </el-dialog>
+          </template>
+        </el-table-column>
+      </el-table>
 
-            <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"
-                    >提交
-                    </el-button
-                    >
-                    <el-button type="primary" size="small" icon="search" @click="cancelDialog"
-                    >取消
-                    </el-button
-                    >
-                </div>
-            </el-dialog>
-            <el-pagination
-                :page-size="filterQuery.limit"
-                @current-change="handleCurrentChange"
-                layout="prev, pager, next"
-                :total="total"
-            ></el-pagination>
-        </el-card>
-    </div>
+      <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"
+          >提交
+          </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"
+          >提交
+          </el-button
+          >
+          <el-button type="primary" size="small" icon="search" @click="cancelDialog"
+          >取消
+          </el-button
+          >
+        </div>
+      </el-dialog>
+      <el-pagination
+          :page-size="filterQuery.limit"
+          @current-change="handleCurrentChange"
+          layout="prev, pager, next"
+          :total="total"
+      ></el-pagination>
+    </el-card>
+  </div>
 </template>
 <script>
 import {
-    getOriginBusType,
-    updateBussinessType,
-    insertBussinessType,
+  getOriginBusType,
+  updateBussinessType,
+  insertBussinessType, downloadBussinessType
 } from "../../api/basic/busOriginType";
 
 import modifyDialog from "./BussinessTypeThirdModify";
 import axios from "axios";
+import {getBasicThirdSys} from "@/api/basic/basicThirdSys";
 
 export default {
-    data() {
-        return {
-            filterQuery: {
-                name: "",
-                page: 1,
-                limit: 20,
-            },
-            addDialogVisible: false,
-            modifyDialogVisible: false,
-            list: [],
-            inputQuery: {
-                action: "",
-                name: "",
-                enable: "",
-                remark: "",
-                thirdSys: null,
-                thirdSysName: null,
+  data() {
+    return {
+      filterQuery: {
+        name: "",
+        page: 1,
+        limit: 20,
+      },
+      addDialogVisible: false,
+      modifyDialogVisible: false,
+      list: [],
+      inputQuery: {
+        action: "",
+        name: "",
+        enable: "",
+        remark: "",
+        thirdSys: null,
+        thirdSysName: null,
 
-            },
-            enableMap: {
-                true: "是",
-                false: "否",
-            },
+      },
+      enableMap: {
+        true: "是",
+        false: "否",
+      },
+      thirdSys: [],
+      total: 0,
+      multipleSelection: [],
+      uploadFileUrl: null,
+      loading: false,
+    };
+  },
 
-            total: 0,
-            multipleSelection: [],
-            uploadFileUrl: null,
-        };
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        thirdSys: "thirdId",
+        name: null,
+        enable: null,
+        page: 1,
+        limit: 20,
+      };
+      this.getList();
+    },
+    cancelDialog() {
+      this.modifyDialogVisible = false;
+      this.addDialogVisible = false;
     },
 
-    methods: {
-        onReset() {
-            this.$router.push({
-                path: "",
-            });
-            this.filterQuery = {
-                name: null,
-                enable: null,
-                page: 1,
-                limit: 20,
-            };
+    getList() {
+      this.loading = true;
+      getOriginBusType(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;
+          });
+    },
+    getBasicThirdSys() {
+      let query = {
+        enabled: true,
+      };
+      getBasicThirdSys(query)
+          .then((response) => {
+            this.thirdSys = response.data.list || [];
+            this.filterQuery.thirdSys = this.thirdSys[0].thirdId;
+          })
+          .catch(() => {
+            this.loading = false;
+            this.list = [];
+          });
+    },
+    updateDownload() {
+      let query = {
+        thirdSys: this.filterQuery.thirdSys,
+      }
+      downloadBussinessType(query)
+          .then((response) => {
+            this.loading = false;
             this.getList();
-        },
-        cancelDialog() {
-            this.modifyDialogVisible = false;
-            this.addDialogVisible = false;
-        },
+          })
+          .catch(() => {
+            this.loading = false;
+          });
+    },
+    handleCurrentChange(val) {
+      this.filterQuery.page = val;
+      this.getList();
+    },
 
-        getList() {
-            this.loading = true;
-            getOriginBusType(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;
-                });
-        },
-        handleCurrentChange(val) {
-            this.filterQuery.page = val;
+    onAddSubmit() {
+      insertBussinessType(this.inputQuery)
+          .then((response) => {
+            this.loading = false;
+            this.cancelDialog();
             this.getList();
-        },
-
-        onAddSubmit() {
-            insertBussinessType(this.inputQuery)
-                .then((response) => {
-                    this.loading = false;
-                    this.cancelDialog();
-                    this.getList();
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.cancelDialog();
-                });
-        },
-
-        onModifySubmit() {
-            updateBussinessType(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,
-                thirdSys: row.thirdSys,
-                thirdSysName: row.thirdSysName
-            };
-        },
+          })
+          .catch(() => {
+            this.loading = false;
+            this.cancelDialog();
+          });
+    },
 
-        deleteDialog(rowId) {
-            this.$confirm("此操作将永久删除该业务类型信息, 是否继续?", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
-            })
-                .then(() => {
-                    this.deleteOrders(rowId);
-                })
-                .catch(() => {
-                });
-        },
+    onModifySubmit() {
+      updateBussinessType(this.inputQuery)
+          .then((response) => {
+            this.loading = false;
+            this.cancelDialog();
+            this.getList();
+          })
+          .catch(() => {
+            this.loading = false;
+            this.cancelDialog();
+          });
+    },
 
-        deleteOrders(data) {
-            this.loading = true;
-            let tquery = {
-                id: data.id + "",
-            };
+    handleModifyClick(row) {
+      this.modifyDialogVisible = true;
+      this.inputQuery = {
+        id: row.id,
+        remark: row.remark,
+        action: row.action,
+        name: row.name,
+        enable: row.enable,
+        thirdSys: row.thirdSys,
+        thirdSysName: row.thirdSysName
+      };
+    },
 
-            // deleteBussinessType(tquery)
-            //     .then((response) => {
-            //         this.getList();
-            //         this.$message({
-            //             type: "success",
-            //             message: "删除成功！",
-            //         });
-            //     })
-            //     .catch(() => {
-            //     });
-        },
-        init() {
-            axios.get("./config.json").then(res => {
-                // 基础地址
-                let response = res.data.BASE_URL;
-                this.uploadFileUrl = response + "udiwms/busstiness/file/upload";
-            });
-        },
-        handleChange(response, files, fileList) {
-            console.log(response);
-            if (response.code != 20000) {
-                this.$message.error(response.message);
-            } else {
-                // console.log(files[0] + "\n" + this.fileList[0] + "\n" + fileList[0]);
-                this.$message.success(response.data);
-                this.getList();
-            }
-        },
+    deleteDialog(rowId) {
+      this.$confirm("此操作将永久删除该业务类型信息, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+          .then(() => {
+            this.deleteOrders(rowId);
+          })
+          .catch(() => {
+          });
     },
-    components: {
-        modifyDialog,
+
+    thirdSysChange() {
+      this.getList();
     },
-    mounted() {
+
+    init() {
+      axios.get("./config.json").then(res => {
+        // 基础地址
+        let response = res.data.BASE_URL;
+        this.uploadFileUrl = response + "udiwms/busstiness/file/upload";
+      });
     },
-    created() {
-        this.init();
+    handleChange(response, files, fileList) {
+      console.log(response);
+      if (response.code != 20000) {
+        this.$message.error(response.message);
+      } else {
+        // console.log(files[0] + "\n" + this.fileList[0] + "\n" + fileList[0]);
+        this.$message.success(response.data);
         this.getList();
-
+      }
     },
+  },
+  components: {
+    modifyDialog,
+  },
+  mounted() {
+  },
+  created() {
+    this.init();
+    this.getBasicThirdSys();
+    this.getList();
+
+  },
 };
 </script>
diff --git a/src/views/basic/UdiInfoManage.vue b/src/views/basic/UdiInfoManage.vue
index 5d82c05..f1415ab 100644
--- a/src/views/basic/UdiInfoManage.vue
+++ b/src/views/basic/UdiInfoManage.vue
@@ -158,7 +158,7 @@
                         <el-button
                             type="text"
                             size="small"
-                            :disabled="scope.row.thirdId == null || scope.row.thirdId == '' || scope.row.flbm!=null"
+                            :disabled="scope.row.originUuid != null"
                             @click.native.stop="intentSelectUdi(scope.row)"
                         >关联DI
                         </el-button>
@@ -697,39 +697,24 @@
                     </el-row>
 
                     <el-row :gutter="20" class="el-row" type="flex">
-                        <el-col :span="10" class="el-col">
-                        </el-col>
-                        <el-col :span="4" class="el-col">
-                            <el-form-item prop="name">
-                                <el-checkbox v-model="checked" class="text item itemTag"
+                        <el-col :span="24" class="el-col">
+                            <div style="margin-top: 18px;margin-bottom: 18px">
+                                <el-checkbox v-model="checked" class=""
                                              :disabled="!isUseDyCheck"
                                 >以使用单元数量入库
                                 </el-checkbox>
-                            </el-form-item>
-                        </el-col>
-                        <!--                    <el-col :span="3" class="el-col">-->
-                        <!--                        <el-form-item prop="name">-->
-                        <!--                            <el-checkbox v-model="editQuery.isLock" class="text item itemTag"-->
-                        <!--                            >是否锁定-->
-                        <!--                            </el-checkbox>-->
-                        <!--                        </el-form-item>-->
-                        <!--                    </el-col>-->
-                        <el-col :span="3" class="el-col">
-                            <el-form-item prop="name">
-                                <el-checkbox v-model="editQuery.isDisable" class="text item itemTag"
+                                <el-checkbox v-model="editQuery.isDisable" class=""
                                              @change="diableChange"
                                 >是否禁用
                                 </el-checkbox>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="3" class="el-col">
-                            <el-form-item prop="name">
-                                <el-checkbox v-model="editQuery.isAdavence" class="text item itemTag"
+                                <el-checkbox v-model="editQuery.isAdavence" class=""
                                 >是否寄售
                                 </el-checkbox>
-                            </el-form-item>
+                                <el-checkbox v-model="editQuery.allowNoBatch" class=""
+                                >是否允许无批次号扫码
+                                </el-checkbox>
+                            </div>
                         </el-col>
-
                     </el-row>
                 </el-form>
 
@@ -859,6 +844,7 @@ export default {
                 isUseDy: false,
                 isLock: null,
                 isAdavence: null,
+                allowNoBatch:null,
             },
             defaultSys: null,
             isImport: false,
diff --git a/src/views/business/stockOrderEditDistribution.vue b/src/views/business/stockOrderEditDistribution.vue
index b5ee7d9..ca905e7 100644
--- a/src/views/business/stockOrderEditDistribution.vue
+++ b/src/views/business/stockOrderEditDistribution.vue
@@ -576,7 +576,9 @@ export default {
                     } else {
                         for (let i = 0; i < this.codeArray.length; i++) {
                             if (this.$isBlank(this.codeArray[i].batchNo)) {
-                                return this.$message.error('批次号不能为空');
+                                if (!this.codeArray[i].allowNoBatch) {
+                                    return this.$message.error('批次号不能为空');
+                                }
                             }
                             if (this.$isBlank(this.codeArray[i].productDate) && this.$isBlank(this.codeArray[i].expireDate)) {
                                 return this.$message.error('生产日期与失效日期不能全部为空');
diff --git a/src/views/business/stockOrderNewDistribution.vue b/src/views/business/stockOrderNewDistribution.vue
index bdbee6d..030f05d 100644
--- a/src/views/business/stockOrderNewDistribution.vue
+++ b/src/views/business/stockOrderNewDistribution.vue
@@ -644,7 +644,9 @@ export default {
                                 return this.$message.error('单据数量不能为0');
                             }
                             if (this.$isBlank(this.codeArray[i].batchNo)) {
+                              if (!this.codeArray[i].allowNoBatch) {
                                 return this.$message.error('批次号不能为空');
+                              }
                             }
                             if (this.$isBlank(this.codeArray[i].productDate) && this.$isBlank(this.codeArray[i].expireDate)) {
                                 return this.$message.error('生产日期与失效日期不能全部为空');
diff --git a/src/views/inout/DialogSelectRl.vue b/src/views/inout/DialogSelectRl.vue
index e714072..79a610a 100644
--- a/src/views/inout/DialogSelectRl.vue
+++ b/src/views/inout/DialogSelectRl.vue
@@ -451,29 +451,21 @@
 
 
                 <el-row :gutter="20" class="el-row" type="flex">
-                    <el-col :span="12" class="el-col">
-                    </el-col>
-                    <el-col :span="4" class="el-col">
-                        <el-form-item prop="name">
-                            <el-checkbox v-model="checked" class="text item itemTag"
-                                         :disabled="!isUseDyCheck"
+                    <el-col :span="24" class="el-col">
+                        <div style="margin-top: 18px;margin-bottom: 18px">
+                            <el-checkbox v-model="checked"
                             >以使用单元数量入库
                             </el-checkbox>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="3" class="el-col">
-                        <el-form-item prop="name">
-                            <el-checkbox v-model="editQuery.isLock" class="text item itemTag" :disabled="true"
-                            >是否锁定
-                            </el-checkbox>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="3" class="el-col">
-                        <el-form-item prop="name">
-                            <el-checkbox v-model="editQuery.isDisable" class="text item itemTag" :disabled="true"
+                            <el-checkbox v-model="editQuery.isDisable"
                             >是否禁用
                             </el-checkbox>
-                        </el-form-item>
+                            <el-checkbox v-model="editQuery.isAdavence"
+                            >是否寄售
+                            </el-checkbox>
+                            <el-checkbox v-model="editQuery.allowNoBatch"
+                            >是否允许无批次号扫码
+                            </el-checkbox>
+                        </div>
                     </el-col>
 
                 </el-row>
@@ -723,18 +715,18 @@ export default {
                     id: this.curRow.id,
                     bindStatus: 0,
                     bindRlFk: val.id,
-                    mySupId:this.curRow.unitFk,
+                    mySupId: this.curRow.unitFk,
                 };
                 updateBind(query).then((response) => {
 
-                    console.log(response.code+response.message)
+                    console.log(response.code + response.message)
 
                     if (response.code == 20000) {
                         this.$message.success("绑定成功");
                         this.closeBindDialog(this.curRow.id);
                     } else {
-                        this.$message.error("-----503码？？"+response.message);
-                        if(response.code == 503){
+                        this.$message.error("-----503码？？" + response.message);
+                        if (response.code == 503) {
 
                             this.closeBindDialog(503);
                         }
diff --git a/src/views/inout/IOAddOrder.vue b/src/views/inout/IOAddOrder.vue
index 11e04f8..d86bef1 100644
--- a/src/views/inout/IOAddOrder.vue
+++ b/src/views/inout/IOAddOrder.vue
@@ -911,6 +911,7 @@ export default {
             event.stopPropagation();
         };
         var that = this;
+        let sictomText = "";
         var inputer = document.getElementById("inputer");
         window.sc = new A.KeyScaner(inputer);//传入要监听的DOM节点
         sc.onInput = function (text) {
@@ -920,7 +921,8 @@ export default {
                 return;
             }
             if (that.sitcomScan) {
-                that.formData.code = that.formData.code;
+                sictomText = sictomText+text;
+                that.formData.code = sictomText;
             } else {
                 that.formData.code = text;
             }
diff --git a/src/views/inout/IOCheckWaitOrder.vue b/src/views/inout/IOCheckWaitOrder.vue
index 3bca675..3d9e1e0 100644
--- a/src/views/inout/IOCheckWaitOrder.vue
+++ b/src/views/inout/IOCheckWaitOrder.vue
@@ -557,6 +557,7 @@ export default {
             });
             let tquery = {
                 orderList: orderList,
+                type: 1,
             };
 
             this.$confirm(
diff --git a/src/views/inout/IONewOrder.vue b/src/views/inout/IONewOrder.vue
index fc46437..8ad1060 100644
--- a/src/views/inout/IONewOrder.vue
+++ b/src/views/inout/IONewOrder.vue
@@ -566,6 +566,7 @@ export default {
             });
             let tquery = {
                 orderList: orderList,
+                type: 2,
             };
 
             this.$confirm(