diff --git a/public/config.json b/public/config.json
index 407ca2c..61112ea 100644
--- a/public/config.json
+++ b/public/config.json
@@ -1,5 +1,5 @@
 {
-    "BASE_URL": "http://139.9.178.73:8080/SPMS_SERVER",
-    "SERVER_IP": "http://139.9.178.73:8080/SPMS_SERVER",
+    "BASE_URL": "http://192.168.0.109:9996",
+    "SERVER_IP": "http://192.168.0.109:9996",
     "hosp_name": "诏安县总医院（测试）"
 }
diff --git a/src/api/ad/ad.js b/src/api/ad/ad.js
deleted file mode 100644
index 80253f4..0000000
--- a/src/api/ad/ad.js
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * Created by lk on 17/6/4.
- */
-import axios from "../../utils/axios";
-
-// 谁最懂我相关
-
-// 列表
-export function adList(query) {
-    return axios({
-        url: "/admin/ad/ad/index",
-        method: "get",
-        params: query
-    });
-}
-
-// 保存
-export function adSave(data, formName, method = "post") {
-    var url = formName === "add" ? "/admin/ad/ad/save" : "/admin/ad/ad/edit";
-    return axios({
-        url: url,
-        method: method,
-        data: data
-    });
-}
-
-// 删除
-export function adDelete(data) {
-    return axios({
-        url: "/admin/ad/ad/delete",
-        method: "post",
-        data: data
-    });
-}
diff --git a/src/api/ad/adSite.js b/src/api/ad/adSite.js
deleted file mode 100644
index acfb893..0000000
--- a/src/api/ad/adSite.js
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * Created by lk on 17/6/4.
- */
-import axios from "../../utils/axios";
-
-// 谁最懂我相关
-
-// 列表
-export function adSiteList(query) {
-    return axios({
-        url: "/admin/ad/site/index",
-        method: "get",
-        params: query
-    });
-}
-
-// 广告列表
-export function adSiteAdList(query) {
-    return axios({
-        url: "/admin/ad/site/adList",
-        method: "get",
-        params: query
-    });
-}
-
-// 保存
-export function adSiteSave(data, formName, method = "post") {
-    var url =
-        formName === "add" ? "/admin/ad/site/save" : "/admin/ad/site/edit";
-    return axios({
-        url: url,
-        method: method,
-        data: data
-    });
-}
-
-// 删除
-export function adSiteDelete(data) {
-    return axios({
-        url: "/admin/ad/site/delete",
-        method: "post",
-        data: data
-    });
-}
diff --git a/src/api/basic/busOriginType.js b/src/api/basic/busOriginType.js
index 476366b..23b08e9 100644
--- a/src/api/basic/busOriginType.js
+++ b/src/api/basic/busOriginType.js
@@ -7,8 +7,38 @@ export function getOriginBusType(query) {
         params: query
     });
 }
+export function updateBussinessType(query) {
+    return axios({
+        url: "/udiwms/originBusType/update",
+        method: "post",
+        data: query
+    });
+}
+
+export function insertBussinessType(query) {
+    return axios({
+        url: "/udiwms/originBusType/add",
+        method: "post",
+        data: query
+    });
+}
+export function delBussinessType(query) {
+    return axios({
+        url: "/udiwms/originBusType/delete",
+        method: "post",
+        data: query
+    });
+}
+
 
 
+export function downloadBussinessType(query) {
+    return axios({
+        url: "/udiwms/originBusType/download",
+        method: "post",
+        data: query
+    });
+}
 export function getOriginJoinBusType(query) {
     return axios({
         url: "/udiwms/originBusType/filterJoin",
diff --git a/src/api/basic/udiInfo.js b/src/api/basic/udiInfo.js
index 519ec61..23eb696 100644
--- a/src/api/basic/udiInfo.js
+++ b/src/api/basic/udiInfo.js
@@ -30,6 +30,15 @@ export function filterByVersion(query) {
     });
 }
 
+export function superSearch(query) {
+    return axios({
+        url: "/udiwms/udiinfo/superSearch",
+        method: "get",
+        params: query
+    });
+}
+
+
 
 
 
diff --git a/src/router/index.js b/src/router/index.js
index 14dc4c0..3bfd312 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -59,6 +59,7 @@ import stockOrderPrint from "../views/warehouse/stockOrderPrint";
 import stockDeliveryOrder from "../views/warehouse/stockDeliveryOrder";
 import BussinessType from "../views/basic/BussinessType.vue";
 import BussinessTypeLocl from "../views/basic/BussinessTypeLocl.vue";
+import bussinessTypeThird from "../views/basic/BussinessTypeThird.vue";
 
 //基础数据维护
 import invWarehouse from "../views/basic/invWarehouse"
@@ -327,6 +328,14 @@ export const asyncRouterMap = [
                             authRule: ["product/BussinessTypeLocl"]
                         }
                     },
+                    {
+                        path: "bussinessTypeThird",
+                        name: "第三方单据类型",
+                        component: bussinessTypeThird,
+                        meta: {
+                            authRule: ["system/bussinessTypeThird"]
+                        }
+                    },
                     {
                         path: "thirdSys",
                         name: "第三方系统",
diff --git a/src/views/basic/BussinessTypeLocl.vue b/src/views/basic/BussinessTypeLocl.vue
index 1894983..0b2b807 100644
--- a/src/views/basic/BussinessTypeLocl.vue
+++ b/src/views/basic/BussinessTypeLocl.vue
@@ -257,6 +257,7 @@ export default {
                 localAction: null,
                 changeEnable: null,
                 prefix: null,
+                preIn:null,
             };
         },
 
diff --git a/src/views/basic/BussinessTypeThird.vue b/src/views/basic/BussinessTypeThird.vue
new file mode 100644
index 0000000..74e1ac0
--- /dev/null
+++ b/src/views/basic/BussinessTypeThird.vue
@@ -0,0 +1,342 @@
+<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 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="handleAddClick"
+            >新增
+            </el-button
+            >
+            <el-button type="primary" icon="search" @click="updateDownload">更新下载</el-button>
+          </el-button-group>
+
+        </el-form-item>
+      </el-form>
+
+      <el-table v-loading="loading" :data="list" style="width: 100%">
+        <el-table-column label="序号" type="index" width="55"></el-table-column>
+
+        <el-table-column label="单据类型名称" prop="name"></el-table-column>
+        <el-table-column label="单据类型代码" prop="action"></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
+            >
+            <el-button
+                type="text"
+                size="small"
+                @click.native.stop="handleDeleteClick(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"
+      >
+        <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, delBussinessType,
+  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,
+
+      },
+      enableMap: {
+        true: "是",
+        false: "否",
+      },
+      thirdSys: [],
+      total: 0,
+      multipleSelection: [],
+      uploadFileUrl: null,
+      loading: false,
+    };
+  },
+
+  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;
+    },
+
+    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();
+          })
+          .catch(() => {
+            this.loading = false;
+          });
+    },
+    handleCurrentChange(val) {
+      this.filterQuery.page = val;
+      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.inputQuery = {
+        id: row.id,
+        remark: row.remark,
+        action: row.action,
+        name: row.name,
+        enable: row.enable,
+        thirdSys: row.thirdSys,
+        thirdSysName: row.thirdSysName
+      };
+      this.modifyDialogVisible = true;
+    },
+
+
+    handleDeleteClick(row) {
+      this.deleteDialog(row.id)
+    },
+
+    handleAddClick() {
+      this.inputQuery = {
+        action: "",
+        name: "",
+        enable: "",
+        remark: "",
+        thirdSys: null,
+        thirdSysName: null
+      };
+      this.addDialogVisible = true;
+    },
+
+    deleteDialog(rowId) {
+      this.$confirm("此操作将永久删除该单据类型信息, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+          .then(() => {
+            let query = {
+              id: rowId,
+            }
+            delBussinessType(query)
+                .then((response) => {
+                  this.getList();
+                })
+                .catch(() => {
+                });
+
+
+          })
+          .catch(() => {
+          });
+    },
+
+    thirdSysChange() {
+      this.getList();
+    },
+
+    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();
+      }
+    },
+  },
+  components: {
+    modifyDialog,
+  },
+  mounted() {
+  },
+  created() {
+    this.init();
+    this.getBasicThirdSys();
+    this.getList();
+
+  },
+};
+</script>
diff --git a/src/views/basic/BussinessTypeThirdModify.vue b/src/views/basic/BussinessTypeThirdModify.vue
new file mode 100644
index 0000000..aed48cc
--- /dev/null
+++ b/src/views/basic/BussinessTypeThirdModify.vue
@@ -0,0 +1,156 @@
+<template>
+    <div>
+        <el-row :gutter="20" class="el-row" type="flex">
+            <el-col :span="10" class="el-col">
+                <div class="text item">
+                    <div class="itemTag">
+                        <span>单据类型名称:&nbsp;</span>
+                    </div>
+                    <el-input
+                        style="width: 200px"
+                        size="small"
+                        splaceholder="请输入内容"
+                        :disabled="!isAdd"
+                        v-model="inputQuery.name"
+                    ></el-input>
+                </div>
+            </el-col>
+            <el-col :span="10" class="el-col">
+                <div class="text item">
+                    <div class="itemTag">
+                        <span>单据类型代码:&nbsp;</span>
+                    </div>
+                    <el-input
+                        style="width: 200px"
+                        :disabled="!isAdd"
+                        size="small"
+                        splaceholder="请输入内容"
+                        v-model="inputQuery.action"
+                    ></el-input>
+                </div>
+            </el-col>
+        </el-row>
+
+        <el-row :gutter="20" class="el-row" type="flex">
+            <el-col :span="10" class="el-col">
+                <div class="text item">
+                    <div class="itemTag">
+                        <span>第三方系统:&nbsp;</span>
+                    </div>
+                    <el-select v-model="inputQuery.thirdSys" placeholder="请选择" clearable="true">
+                        <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>
+                </div>
+            </el-col>
+            <el-col :span="10" class="el-col">
+                <div class="text item">
+                    <div class="itemTag">
+                        <span>备注:&nbsp;</span>
+                    </div>
+                    <el-input
+                        style="width: 200px"
+                        size="small"
+                        splaceholder="请输入内容"
+                        v-model="inputQuery.remark"
+                    ></el-input>
+                </div>
+            </el-col>
+        </el-row>
+
+        <el-divider></el-divider>
+    </div>
+</template>
+
+<script>
+
+import {
+    getBasicThirdSys,
+} from "../../api/basic/basicThirdSys";
+
+import {
+    getLocalBusType,
+} from "../../api/basic/busLocalType";
+
+export default {
+    name: "inputQuery",
+    props: {
+        inputQuery: {
+            type: Object,
+            required: true,
+        },
+    },
+
+    data() {
+        return {
+            filterQuery: {
+                enabled: true,
+                isBuType: true,
+            },
+            thirdSys: [],
+            localTypes: [],
+            isAdd: false,
+            value: "",
+        }
+    },
+    methods: {
+        getList() {
+            getBasicThirdSys(this.filterQuery)
+                .then((response) => {
+                    this.thirdSys = response.data.list || [];
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.list = [];
+                });
+            getLocalBusType(this.filterQuery)
+                .then((response) => {
+                    this.localTypes = response.data.list || [];
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.localTypes = [];
+                });
+        },
+
+    },
+
+    created() {
+        if (this.inputQuery.action == "") {
+            this.isAdd = true;
+        }
+        this.getList();
+    },
+};
+</script>
+
+<style scoped>
+.itemTag {
+    float: left;
+    text-align: left;
+    margin-top: 10px;
+    width: 100px;
+}
+
+.text {
+    font-size: 13px;
+    font-family: "Microsoft YaHei";
+}
+
+.el-row {
+    display: flex;
+    flex-wrap: wrap;
+    margin-bottom: 20px;
+}
+
+.el-col {
+    border-radius: 4px;
+    flex-wrap: wrap;
+}
+</style>
diff --git a/src/views/basic/UdiInfoRelevance.vue b/src/views/basic/UdiInfoRelevance.vue
index 27c85a4..3156f29 100644
--- a/src/views/basic/UdiInfoRelevance.vue
+++ b/src/views/basic/UdiInfoRelevance.vue
@@ -1,10 +1,6 @@
 <template>
     <div>
         <div style="display: flex;  width: 100%;">
-            <!--<el-checkbox v-model="checked" class="checkitemTag"-->
-            <!--&gt;是否关联第三方产品信息-->
-            <!--</el-checkbox-->
-            <!--&gt;-->
             <span class="checkitemTag"></span>
             <el-button
                 style="margin-right: 20px;float: right"
@@ -168,6 +164,11 @@
                                 >查询
                                 </el-button
                                 >
+
+                              <el-button type="primary" icon="search" @click="getSuperSeaech" size="mini"
+                              >高级查询
+                              </el-button
+                              >
                             </el-button-group>
                         </el-form-item>
                     </el-row>
@@ -250,7 +251,7 @@
 </template>
 
 <script>
-import {getUdiInfos, filterCompany} from "../../api/basic/udiInfo";
+import {getUdiInfos, filterCompany, superSearch} from "../../api/basic/udiInfo";
 import {combineUdi} from "../../api/basic/udiRelevance";
 import {getBasicThirdSys} from "../../api/basic/basicThirdSys";
 import {getInvbasdoc} from "../../api/basic/getErps";
@@ -340,7 +341,29 @@ export default {
                     this.total = 0;
                 });
         },
+      getSuperSeaech() {
+        if (this.unionQuery.nameCode == "") {
+          this.$message.warning("请输入查询条件");
+          return;
+        }
+        this.loading = true;
+        superSearch(this.unionQuery)
+            .then((response) => {
+              this.loading = false;
+              if (response.code == 20000) {
+                this.udidlList = response.data.list || [];
+                this.total = response.data.total || 0;
+              } else {
+                this.$message.error(response.message);
+              }
+            })
+            .catch(() => {
+              this.loading = false;
+              this.udidlList = [];
+              this.total = 0;
+            });
 
+      },
         checkSelectable(row) {
             return !row.check;
         },
diff --git a/src/views/basic/UdiInfoSelectLocalUdi.vue b/src/views/basic/UdiInfoSelectLocalUdi.vue
index 5bacc65..9cb38b7 100644
--- a/src/views/basic/UdiInfoSelectLocalUdi.vue
+++ b/src/views/basic/UdiInfoSelectLocalUdi.vue
@@ -81,11 +81,11 @@
                                 >选入
                                 </el-button
                                 >
-                                <!--                                <el-button type="primary" size="mini" icon="search" @click="combineUdiAll"-->
-                                <!--                                           v-if="relId==null"-->
-                                <!--                                >结果全部选入-->
-                                <!--                                </el-button-->
-                                <!--                                >-->
+                                <el-button type="primary" icon="search" @click="getSuperSeaech" size="mini"
+                                >高级查询
+                                </el-button
+                                >
+
                             </el-button-group>
                         </el-form-item>
                     </el-row>
@@ -369,11 +369,9 @@
 </template>
 
 <script>
-import {getUdiInfos, filterCompany} from "../../api/basic/udiInfo";
+import {getUdiInfos, filterCompany, superSearch} from "../../api/basic/udiInfo";
 import {combineUdi, combineAllUdi, checkExitUdi} from "../../api/basic/udiRelevance";
 import selectDiDetail from "./SelectDIDetailDialog"
-import selectUdi from "@/views/basic/UdiInfoRelevance";
-import selectErp from "@/views/basic/UdiInfoselectErpUdi";
 
 export default {
     name: "closeDialog",
@@ -423,7 +421,7 @@ export default {
                 thirdId: "",
                 relId: "",
                 erpName: "",
-                thirdName:null,
+                thirdName: null,
                 keys: [],
             },
             checked: true,
@@ -460,7 +458,6 @@ export default {
                 return;
             }
             this.loading = true;
-            // this.unionQuery.page = 1;
             getUdiInfos(this.unionQuery)
                 .then((response) => {
                     this.loading = false;
@@ -470,14 +467,36 @@ export default {
                     } else {
                         this.$message.error(response.message);
                     }
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.udidlList = [];
+                    this.total = 0;
+                });
+        },
 
-
+        getSuperSeaech() {
+            if (this.unionQuery.nameCode == "") {
+                this.$message.warning("请输入查询条件");
+                return;
+            }
+            this.loading = true;
+            superSearch(this.unionQuery)
+                .then((response) => {
+                    this.loading = false;
+                    if (response.code == 20000) {
+                        this.udidlList = response.data.list || [];
+                        this.total = response.data.total || 0;
+                    } else {
+                        this.$message.error(response.message);
+                    }
                 })
                 .catch(() => {
                     this.loading = false;
                     this.udidlList = [];
                     this.total = 0;
                 });
+
         },
 
         combineUdiAll() {
diff --git a/src/views/basic/basicCompanyProducts.vue b/src/views/basic/basicCompanyProducts.vue
index 593c915..f384ba0 100644
--- a/src/views/basic/basicCompanyProducts.vue
+++ b/src/views/basic/basicCompanyProducts.vue
@@ -35,16 +35,6 @@
                     <el-form-item class="query-form-item">
                         <el-input v-model="filterQuery.thrPiId" placeholder="第三方产品编码" clearable="true"></el-input>
                     </el-form-item>
-                    <!--                    <el-form-item class="query-form-item">-->
-                    <!--                        <el-select v-model="filterQuery.auditStatus" placeholder="审核状态">-->
-                    <!--                            <el-option label="全部" value=""></el-option>-->
-                    <!--                            <el-option label="通过" value='1'></el-option>-->
-                    <!--                            <el-option label="不通过" value='2'></el-option>-->
-                    <!--                            <el-option label="反审" value='3'></el-option>-->
-                    <!--                            <el-option label="申请反审" value='4'></el-option>-->
-                    <!--                            <el-option label="拒绝反审" value='5'></el-option>-->
-                    <!--                        </el-select>-->
-                    <!--                    </el-form-item>-->
                     <el-form-item class="query-form-item" v-if="isSpCombine">
                         <el-select v-model="filterQuery.lockStatus" placeholder="审核状态">
                             <el-option label="全部" value=""></el-option>
@@ -58,16 +48,6 @@
                         <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="intentDetail"-->
-                            <!--&gt;关联选入-->
-                            <!--</el-button>-->
-
-                            <!--<el-button type="primary" icon="search" @click="intentImportUdi"-->
-                            <!--&gt;选入DI器械-->
-                            <!--</el-button-->
-                            <!--&gt;-->
-
-
                             <el-button
                                 type="primary"
                                 icon="search"
@@ -75,11 +55,6 @@
                             >选入产品
                             </el-button
                             >
-                            <!--                            <el-button type="primary" icon="search" @click="intentImportErp"-->
-                            <!--                            >添加产品信息-->
-                            <!--                            </el-button-->
-                            <!--                            >-->
-                            <!--                            <el-button type="primary" @click="addProductVisible=true">新增产品信息</el-button>-->
                         </el-button-group>
                     </el-form-item>
                 </el-row>
@@ -150,13 +125,6 @@
                             @click.native.stop="intentSelectUdi(scope.row)"
                         >关联DI
                         </el-button>
-                        <!--<el-button-->
-                        <!--type="text"-->
-                        <!--size="small"-->
-                        <!--@click.native.stop="intentSelectErp(scope.row)"-->
-                        <!--&gt;关联ERP-->
-                        <!--</el-button>-->
-                        <!--:disabled="scope.row.tyshxydm == null"-->
                         <el-button
                             v-if="scope.row.lockStatus!=3"
                             type="text"
@@ -713,6 +681,22 @@
                             </div>
                         </el-col>
                     </el-row>
+                    <el-row :gutter="20" class="el-row" type="flex">
+                        <el-col :span="12" class="el-col">
+                            <div class="text item">
+                                <div class="itemTag">
+                                    <span>产品价格:&nbsp;</span>
+                                </div>
+                                <el-input
+                                    style="width: 65%"
+                                    size="small"
+                                    splaceholder="请输入内容"
+                                    type='number'
+                                    v-model="editQuery.price"
+                                ></el-input>
+                            </div>
+                        </el-col>
+                    </el-row>
                     <el-row :gutter="20" class="el-row" type="flex">
                         <el-col :span="24" class="el-col">
                             <div style="margin-top: 18px;margin-bottom: 18px">
@@ -1503,17 +1487,6 @@ export default {
         getList() {
             this.loading = true;
             this.getProductRelevanceList();
-            // getUdiInfos(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;
-            //     });
         },
         getProductRelevanceList() {
             this.loading = true;
@@ -1713,7 +1686,6 @@ export default {
             this.relId = val.rlId;
             this.isImportUdi = true;
             this.thisData = val;
-            console.log("-----" + this.relId);
             this.idSpliUdi = false;
             this.thirdId = val.thirdId;
             this.selectLocalVisible = true;
@@ -1724,7 +1696,6 @@ export default {
             this.isImportUdi = true;
             this.thisData = val;
             this.idSpliUdi = true;
-            console.log("-----" + this.relId);
             this.selectLocalVisible = true;
         },
 
@@ -1782,7 +1753,6 @@ export default {
             this.editQuery = row;
             this.relevanceEdit = {
                 id: row.rlId,
-                // thirdId: row.thirdId,
                 isUseDy: row.isUseDy,
                 isDisable: row.isDisable,
                 isAdavence: row.isAdavence,
@@ -1832,6 +1802,7 @@ export default {
                 isUseDy: row.isUseDy,
                 isDisable: row.isDisable,
                 isAdavence: row.isAdavence,
+                price:row.price,
             };
             this.checked = row.isUseDy == 1;
 
@@ -1983,8 +1954,6 @@ export default {
                 this.getList();
             }
             this.addProductVisible = false;
-            console.log("------closeAddDialog-------")
-            // Object.keys(this.newProductData).forEach(key => this.newProductData[key] = null);
         }
 
     }
diff --git a/src/views/basic/basicCompanyProductsImport.vue b/src/views/basic/basicCompanyProductsImport.vue
index 8a65235..cab4bf6 100644
--- a/src/views/basic/basicCompanyProductsImport.vue
+++ b/src/views/basic/basicCompanyProductsImport.vue
@@ -3,17 +3,6 @@
 
         <el-form :inline="true" :model="filterQuery" size="mini">
 
-
-            <!--<el-row style="margin-top: 15px;width: 1000px">-->
-            <!--<el-form-item class="query-form-item">-->
-            <!--<el-input v-model="filterQuery.udiCode"-->
-            <!--style="width: 600px"-->
-            <!--placeholder="请扫描或输入UDI码"-->
-            <!--clearable="true"-->
-            <!--@keyup.enter.native="keyup_submit($event)"></el-input>-->
-            <!--</el-form-item>-->
-            <!--</el-row>-->
-
             <el-row>
                 <el-form-item class="query-form-item">
                     <el-input v-model="filterQuery.unionCode" placeholder="DI/医保编码/商品条码" clearable="true"></el-input>
@@ -127,11 +116,11 @@
                 show-overflow-tooltip
             ></el-table-column>
 
-            <el-table-column
-                label="配送企业"
-                prop="supName"
-                show-overflow-tooltip
-            ></el-table-column>
+<!--            <el-table-column-->
+<!--                label="配送企业"-->
+<!--                prop="supName"-->
+<!--                show-overflow-tooltip-->
+<!--            ></el-table-column>-->
 
             <el-table-column width="200" label="操作" fixed="right">
                 <template slot-scope="scope">
diff --git a/src/views/thrsys/ThrOrdedrReceiveAdd.vue b/src/views/thrsys/ThrOrdedrReceiveAdd.vue
index 5c8cd91..9a07d52 100644
--- a/src/views/thrsys/ThrOrdedrReceiveAdd.vue
+++ b/src/views/thrsys/ThrOrdedrReceiveAdd.vue
@@ -107,7 +107,6 @@
                 <el-table-column label="批次号" prop="batchNo"></el-table-column>
                 <el-table-column label="生产日期" prop="productDate"></el-table-column>
                 <el-table-column label="失效日期" prop="expireDate"></el-table-column>
-                <!--                <el-table-column label="单据数量" prop="reCount"></el-table-column>-->
                 <el-table-column label="单据数量" prop="count"></el-table-column>
             </el-table>
         </el-card>
diff --git a/src/views/thrsys/thrOrderNew.vue b/src/views/thrsys/thrOrderNew.vue
index 596c2d7..830be39 100644
--- a/src/views/thrsys/thrOrderNew.vue
+++ b/src/views/thrsys/thrOrderNew.vue
@@ -638,66 +638,6 @@ export default {
 
         return;
       }
-      // this.code = this.code.trim();
-      //
-      // if (this.code.length > 13) {
-      //     let tStr = this.code.substring(0, 2);
-      //     tStr = tStr.replace('m', 'M');
-      //     tStr = tStr.replace('a', 'A');
-      //     if (tStr.indexOf("MA") !== -1) {
-      //         this.code = tStr + this.code.substring(2, this.code.length);
-      //     }
-      // }
-      //
-      // this.loading = true;
-      // let tQuery = {
-      //     code: this.code,
-      //     customerId: store.getters.customerId,
-      // };
-      //
-      // stockOrderDetailQueryProduct(tQuery).then((response) => {
-      //     this.loading = false;
-      //     console.log(response)
-      //     if (response.code === 20000) {
-      //         if (response.data.getType === "1") {
-      //             this.loading = true;
-      //
-      //             let ids = [response.data.getId];
-      //             let tQuery2 = {
-      //                 ids: ids,
-      //                 udiEntity: response.data
-      //             };
-      //             getStockOrderDetailInstrumentById(tQuery2).then((response) => {
-      //                 this.loading = false;
-      //                 if (response.code === 20000) {
-      //                     this.closeDialogC2(response.data);
-      //                 } else {
-      //                     this.$message.error(response.message);
-      //                 }
-      //             }).catch(() => {
-      //                 this.loading = false;
-      //             });
-      //         } else {
-      //             this.thisData = response.data;
-      //             this.thisData.code = this.code;
-      //             this.thisData.orderEditor = this.orderEditor;
-      //             this.thisData.orderId = "";
-      //             if (this.orderEditor) {
-      //                 this.thisData.orderId = this.formData.id
-      //             }
-      //             this.thisData.stockOrderLists = this.codeArray;
-      //             this.selectProductVisible = true;
-      //         }
-      //     } else {
-      //         this.$message.warning(response.message);
-      //         // this.focusNext('inputRef');
-      //         if (this.$isNotBlank(event)) {
-      //             event.target.select();
-      //         }
-      //         // event.target.select();
-      //         // event.currentTarget.select();
-      //     }
-      // });
 
 
     },
@@ -726,22 +666,8 @@ export default {
 
       this.focusNext('iCount');
 
-      // let sc = this.selectedIndex + 'reCount';
-      // const _this = this;
-      // this.$nextTick(() => {
-      //     setTimeout(function() {
-      //         console.log(sc);
-      //         console.log(_this.$refs[sc]);
-      //         console.log(_this.$refs[sc].focus());
-      //         _this.$refs[sc].focus();
-      //     }, 1)
-      //     // this.$refs['inputBatchNoRef'][0].focus()
-      // })
     },
     iCountChange() {
-      // console.log(this.iCount)
-      // this.currentRow.count = this.iCount;
-      // this.currentRow.reCount = this.iCount;
     },
     iCountEnterFunction() {
       if (this.$isNotBlank(this.currentRow)) {
@@ -846,13 +772,6 @@ export default {
       if (this.$isBlank(row.batchNo)) {
         return this.$message.error('批次号不能为空');
       }
-      // if (this.$isBlank(row.productDate)) {
-      //     return this.$message.error('生产日期不能为空');
-      // }
-      // if (this.$isBlank(row.expireDate)) {
-      //     return this.$message.error('失效日期不能为空');
-      // }
-
       this.$refs.multipleTable.setCurrentRow();
       this.currentRow = {};
       this.selectedIndex = "";
@@ -974,13 +893,12 @@ export default {
       let tQuery = {
         action: this.formData.billType
       }
-      this.loading = true;
+      // this.loading = true;
       generateBillNoInt(tQuery)
           .then((response) => {
             this.loading = false;
             if (response.code === 20000) {
               this.formData.billNo = response.data;
-              // this.formData.billdate = parseTime(new Date(), '{y}{m}{d}');
               this.formData.billdate = new Date();
             } else {
               this.closeDialog(true);
@@ -991,7 +909,6 @@ export default {
       let query = {
         enabled: true,
         corpType: 1,
-        // code: invCode,
       };
       getOriginJoinBusType(query)
           .then((response) => {
@@ -1006,8 +923,6 @@ export default {
       this.formData.corpName = event.name;
       this.formData.corpId = event.erpId;
       this.formData.unitIdFk = event.erpId;
-      // console.log("this.inputQuery.companyId" + item);
-      console.log("this.inputQuery.companyId" + event.erpId);
     },
     findMethod(query) {
       console.log(query);
diff --git a/src/views/warehouse/DialogSelectErpOrder.vue b/src/views/warehouse/DialogSelectErpOrder.vue
index b3a6b7e..4647f1a 100644
--- a/src/views/warehouse/DialogSelectErpOrder.vue
+++ b/src/views/warehouse/DialogSelectErpOrder.vue
@@ -164,6 +164,10 @@ export default {
     orderAction: {
       type: Object,
       required: true,
+    },
+    curLocInv:{
+      type: Object,
+      required: true,
     }
   },
   data() {
@@ -177,6 +181,7 @@ export default {
         status: 3,
         page: 1,
         limit: 5,
+        locStorageCode:null,
       },
       value: "",
       total: 0,
@@ -241,6 +246,7 @@ export default {
         page: 1,
         limit: 5,
         status: 3,
+        locStorageCode:null,
       };
       this.actDateRange = [];
       this.getList();
@@ -258,6 +264,7 @@ export default {
     },
     getList() {
       this.loading = true;
+      this.filterQuery.locStorageCode = this.curLocInv;
       stockListDetail(this.filterQuery)
           .then((response) => {
             this.loading = false;
diff --git a/src/views/warehouse/IONewOrder.vue b/src/views/warehouse/IONewOrder.vue
index 2f13e62..c32def8 100644
--- a/src/views/warehouse/IONewOrder.vue
+++ b/src/views/warehouse/IONewOrder.vue
@@ -458,8 +458,10 @@ export default {
                 this.idQuery.fromCorpId = row.fromCorpId;
                 this.idQuery.preCheck = row.preCheck;
 
-            } else
+            } else {
+                this.idQuery.preCheck = row.preCheck;
                 this.addOrderVisible = true;
+            }
 
 
         },
diff --git a/src/views/warehouse/IOWaitOrder.vue b/src/views/warehouse/IOWaitOrder.vue
index 686bc21..76e0733 100644
--- a/src/views/warehouse/IOWaitOrder.vue
+++ b/src/views/warehouse/IOWaitOrder.vue
@@ -364,6 +364,7 @@
                 v-on:closeManuDialog="closeManuDialog"
                 :orderId="orderId"
                 :orderAction="billAction"
+                :curLocInv="curLocInv"
             ></selectErpOrder>
         </el-dialog>
 
@@ -460,6 +461,7 @@ export default {
             unitlist: [],
             list: [],
             billAction: null,
+            curLocInv:null,
             detailList: [],
             unitUpdateQuery: {
                 id: "",
@@ -942,6 +944,7 @@ export default {
         importOrder(row) {
             this.orderId = row.id;
             this.billAction = row.action;
+            this.curLocInv = row.locStorageCode;
             this.addDialogVisible = true;
         },
         getBusType() {
diff --git a/src/views/warehouse/addHosOrder.vue b/src/views/warehouse/addHosOrder.vue
index ba8eb87..2df7a82 100644
--- a/src/views/warehouse/addHosOrder.vue
+++ b/src/views/warehouse/addHosOrder.vue
@@ -169,12 +169,12 @@
 
                     <div class="text item" style="margin-top: 6px">
                         <el-checkbox v-model="formData.outChangeEnable"
-                                     :disabled="!curAction.changeEnable">允许出库自动缺量补单
+                                     :disabled="!curAction.changeEnable  || corpOrderIdDisabled">允许出库自动缺量补单
                         </el-checkbox>
 
                         <el-checkbox v-model="formData.preCheck"
-                                     :disabled="corpOrderIdDisabled"
-                        >是否预验收
+                                     :disabled="!curAction.changeEnable  ||corpOrderIdDisabled"
+                        >是否预验收产品
                         </el-checkbox>
                     </div>
 
diff --git a/src/views/warehouse/addOrder.vue b/src/views/warehouse/addOrder.vue
index 4d3ac81..76be935 100644
--- a/src/views/warehouse/addOrder.vue
+++ b/src/views/warehouse/addOrder.vue
@@ -283,6 +283,7 @@ const formJson = {
     locStorageCode: null,
     actDate: new Date(),
     billType: null,
+    preCheck: false,
 };
 
 export default {
diff --git a/src/views/warehouse/stockOrder.vue b/src/views/warehouse/stockOrder.vue
index a7a69ad..6e9e4ed 100644
--- a/src/views/warehouse/stockOrder.vue
+++ b/src/views/warehouse/stockOrder.vue
@@ -483,11 +483,11 @@ export default {
         },
         onSubmit() {
             if (this.actDateRange !== null) {
-                this.filterQuery.startTime = this.actDateRange[0];
-                this.filterQuery.endTime = this.actDateRange[1];
+                this.query.startTime = this.actDateRange[0];
+                this.query.endTime = this.actDateRange[1];
             } else {
-                this.filterQuery.startTime = null;
-                this.filterQuery.endTime = null;
+                this.query.startTime = null;
+                this.query.endTime = null;
             }
 
             this.getList();
diff --git a/src/views/warehouse/stockOrderWaitCheck.vue b/src/views/warehouse/stockOrderWaitCheck.vue
index fb191eb..26b9644 100644
--- a/src/views/warehouse/stockOrderWaitCheck.vue
+++ b/src/views/warehouse/stockOrderWaitCheck.vue
@@ -455,11 +455,11 @@ export default {
         },
         onSubmit() {
             if (this.actDateRange !== null) {
-                this.filterQuery.startTime = this.actDateRange[0];
-                this.filterQuery.endTime = this.actDateRange[1];
+                this.query.startTime = this.actDateRange[0];
+                this.query.endTime = this.actDateRange[1];
             } else {
-                this.filterQuery.startTime = null;
-                this.filterQuery.endTime = null;
+                this.query.startTime = null;
+                this.query.endTime = null;
             }
 
             this.getList();