diff --git a/src/router/index.js b/src/router/index.js
index b7cc36e..8c9cc30 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -378,7 +378,7 @@ export const asyncRouterMap = [
             {
                 path: "invWarehouse",
                 component: invWarehouse,
-                name: "仓库信息",
+                name: "仓库字典",
                 icon: "",
                 meta: {
                     authRule: ["basicProduct/invWarehouse"]
@@ -388,7 +388,7 @@ export const asyncRouterMap = [
             {
                 path: "/udiInfo",
                 redirect: "/udiInfo/manage",
-                name: "医疗器械信息",
+                name: "耗材字典",
                 component: Empty,
                 meta: {
                     authRule: ["udiInfo/manage"]
@@ -397,7 +397,7 @@ export const asyncRouterMap = [
 
                     {
                         path: "UdiInfoManage",
-                        name: "医疗器械信息维护",
+                        name: "耗材字典维护",
                         component: UdiInfoManage,
                         meta: {
                             authRule: ["product/UdiInfoManage"]
@@ -406,7 +406,7 @@ export const asyncRouterMap = [
 
                     {
                         path: "udiImport",
-                        name: "医疗器械信息导入",
+                        name: "耗材字典导入",
                         component: UdiInfoImport,
                         meta: {
                             authRule: ["product/udiImport"]
@@ -414,7 +414,7 @@ export const asyncRouterMap = [
                     },
                     {
                         path: "udiinfoExport",
-                        name: "医疗器械信息导出",
+                        name: "耗材字典导出",
                         component: udiInfoExport,
                         meta: {
                             authRule: ["product/udiinfoExport"]
@@ -435,7 +435,7 @@ export const asyncRouterMap = [
             {
                 path: "/basicCorp",
                 redirect: "/basicCorp/manage",
-                name: "供应商信息",
+                name: "往来单位字典",
                 component: Empty,
                 meta: {
                     authRule: ["basicCorp/manage"]
@@ -443,7 +443,7 @@ export const asyncRouterMap = [
                 children: [
                     {
                         path: "basicUnitMaintain",
-                        name: "供应商信息维护",
+                        name: "往来单位信息维护",
                         component: basicUnitMaintain,
                         meta: {
                             authRule: ["basicCorp/basicUnitMaintain"]
@@ -451,7 +451,7 @@ export const asyncRouterMap = [
                     },
                     {
                         path: "corpImport",
-                        name: "供应商信息导入",
+                        name: "往来单位信息导入",
                         component: corpImport,
                         meta: {
                             authRule: ["basicCorp/corpImport"]
@@ -460,7 +460,7 @@ export const asyncRouterMap = [
 
                     {
                         path: "corpExport",
-                        name: "供应商信息导出",
+                        name: "往来单位信息导出",
                         component: corpExport,
                         meta: {
                             authRule: ["basicCorp/corpExport"]
diff --git a/src/views/basic/BussinessTypeLocl.vue b/src/views/basic/BussinessTypeLocl.vue
index 93dbbe3..e624c16 100644
--- a/src/views/basic/BussinessTypeLocl.vue
+++ b/src/views/basic/BussinessTypeLocl.vue
@@ -1,125 +1,125 @@
 <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.action"
-                        placeholder="业务类型"
-                        style="width: 400px"
-                    ></el-input>
-                </el-form-item>
-                <el-form-item class="query-form-item">
-                    <el-select v-model="filterQuery.enabled" placeholder="状态">
-                        <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>
-                        <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-group>
-
-                </el-form-item>
-            </el-form>
+  <div>
+    <el-card>
+      <el-form :inline="true" :model="filterQuery" class="query-form" size="mini">
+        <el-form-item class="query-form-item">
+          <el-input
+              v-model="filterQuery.action"
+              placeholder="业务类型"
+              style="width: 400px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item class="query-form-item">
+          <el-select v-model="filterQuery.enabled" placeholder="状态">
+            <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>
+            <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-group>
 
-            <el-table v-loading="loading" :data="list" style="width: 100%">
-                <el-table-column label="序号" type="index" width="120" fixed></el-table-column>
+        </el-form-item>
+      </el-form>
 
-                <el-table-column label="业务单据类型名称" prop="name" fixed></el-table-column>
-                <el-table-column label="业务单据类型代码" prop="action" fixed></el-table-column>
-                <el-table-column label="第三方单据类型" prop="originAction" fixed></el-table-column>
-                <el-table-column label="单据是否启用" prop="enable" fixed>
-                    <template slot-scope="scope">
-                        <span>{{ enableMap[scope.row.enable] }}</span>
-                    </template>
-                </el-table-column>
-                <el-table-column label="是否寄售" prop="advanceType" fixed>
-                    <template slot-scope="scope">
-                        <span>{{ enableMap[scope.row.advanceType] }}</span>
-                    </template>
-                </el-table-column>
-                <el-table-column label="是否自动补单" prop="advanceType" fixed>
-                    <template slot-scope="scope">
-                        <span>{{ enableMap[scope.row.changeEnable] }}</span>
-                    </template>
-                </el-table-column>
-                <el-table-column label="是否供应商使用" prop="spUse" fixed>
-                    <template slot-scope="scope">
-                        <span>{{ enableMap[scope.row.spUse] }}</span>
-                    </template>
-                </el-table-column>
+      <el-table v-loading="loading" :data="list" style="width: 100%">
+        <el-table-column label="序号" type="index" width="120" fixed></el-table-column>
 
+        <el-table-column label="业务单据类型名称" prop="name" fixed></el-table-column>
+        <el-table-column label="业务单据类型代码" prop="action" fixed></el-table-column>
+        <el-table-column label="第三方单据类型" prop="originAction" fixed></el-table-column>
+        <el-table-column label="单据是否启用" prop="enable" fixed>
+          <template slot-scope="scope">
+            <span>{{ enableMap[scope.row.enable] }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="是否寄售" prop="advanceType" fixed>
+          <template slot-scope="scope">
+            <span>{{ enableMap[scope.row.advanceType] }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="是否自动补单" prop="advanceType" fixed>
+          <template slot-scope="scope">
+            <span>{{ enableMap[scope.row.changeEnable] }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="是否供应商使用" prop="spUse" fixed>
+          <template slot-scope="scope">
+            <span>{{ enableMap[scope.row.spUse] }}</span>
+          </template>
+        </el-table-column>
 
-                <el-table-column label="操作" fixed="right">
-                    <template slot-scope="scope">
-                        <el-button
-                            type="text"
-                            size="small"
-                            @click.native.stop="handleModifyClick(scope.row)"
-                        >编辑
-                        </el-button
-                        >
-                        <el-button
-                            type="text"
-                            size="small"
-                            @click.native.stop="deleteDialog(scope.row)"
-                        >删除
-                        </el-button
-                        >
-                    </template>
-                </el-table-column>
-            </el-table>
 
-            <el-dialog
-                title="新增业务类型关联"
-                :visible.sync="addDialogVisible"
-                width="70%"
-                :close-on-click-modal="false"
-                :close-on-press-escape="false"
-                v-if="addDialogVisible"
+        <el-table-column label="操作" fixed="right">
+          <template slot-scope="scope">
+            <el-button
+                type="text"
+                size="small"
+                @click.native.stop="handleModifyClick(scope.row)"
+            >编辑
+            </el-button
             >
-                <modifyDialog :inputQuery="inputQuery"></modifyDialog>
-                <div style="text-align: center">
-                    <el-button type="primary" size="small" icon="search" @click="onAddSubmit"
-                    >提交
-                    </el-button
-                    >
-                    <el-button type="primary" size="small" icon="search" @click="cancelDialog"
-                    >取消
-                    </el-button
-                    >
-                </div>
-            </el-dialog>
-
-            <el-dialog
-                title="编辑业务类型关联"
-                :visible.sync="modifyDialogVisible"
-                width="70%"
-                :close-on-click-modal="false"
-                :close-on-press-escape="false"
-                v-if="modifyDialogVisible"
+            <el-button
+                type="text"
+                size="small"
+                @click.native.stop="deleteDialog(scope.row)"
+            >删除
+            </el-button
             >
-                <modifyDialog :inputQuery="inputQuery"></modifyDialog>
-                <div style="text-align: center">
-                    <el-button type="primary" size="small" icon="search" @click="onModifySubmit"
-                    >提交
-                    </el-button
-                    >
-                    <el-button type="primary" size="small" icon="search" @click="cancelDialog"
-                    >取消
-                    </el-button
-                    >
-                </div>
-            </el-dialog>
-        </el-card>
-    </div>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <el-dialog
+          title="新增业务类型关联"
+          :visible.sync="addDialogVisible"
+          width="70%"
+          :close-on-click-modal="false"
+          :close-on-press-escape="false"
+          v-if="addDialogVisible"
+      >
+        <modifyDialog :inputQuery="inputQuery"></modifyDialog>
+        <div style="text-align: center">
+          <el-button type="primary" size="small" icon="search" @click="onAddSubmit"
+          >提交
+          </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-card>
+  </div>
 </template>
 <script>
 
@@ -127,178 +127,178 @@ import {getLocalBusType, addLocalBusType, updateLocalBusType, deleteLocalBusType
 import modifyDialog from "./BussinessTypeLoclModify";
 
 export default {
-    data() {
-        return {
-            filterQuery: {
-                enabled: "1",
-                udiwmsType: "",
-                thirdType: "",
-                page: 1,
-                limit: 20,
-            },
-            addDialogVisible: false,
-            modifyDialogVisible: false,
-            list: [],
-            inputQuery: {
-                action: "",
-                name: "",
-                enable: "",
-                remark: "",
-                mainAction: "",
-                thirdSysFk: "",
-                id: "",
-                originAction: null,
-                localAction: null,
-                advanceType: null,
-                changeEnable: null,
-                spUse: null,
-            },
-            enableMap: {
-                true: "是",
-                false: "否",
-            },
+  data() {
+    return {
+      filterQuery: {
+        enabled: "1",
+        udiwmsType: "",
+        thirdType: "",
+        page: 1,
+        limit: 20,
+      },
+      addDialogVisible: false,
+      modifyDialogVisible: false,
+      list: [],
+      inputQuery: {
+        action: "",
+        name: "",
+        enable: "",
+        remark: "",
+        mainAction: "",
+        thirdSysFk: "",
+        id: "",
+        originAction: null,
+        localAction: null,
+        advanceType: null,
+        changeEnable: null,
+        spUse: null,
+      },
+      enableMap: {
+        true: "是",
+        false: "否",
+      },
 
-            total: 0,
-            multipleSelection: [],
-        };
-    },
+      total: 0,
+      multipleSelection: [],
+    };
+  },
 
-    methods: {
-        onReset() {
-            this.$router.push({
-                path: "",
-            });
-            this.filterQuery = {
-                udiwmsType: "",
-                thirdType: "",
-                page: 1,
-                limit: 20,
-            };
-            this.getList();
-        },
-        cancelDialog() {
-            this.modifyDialogVisible = false;
-            this.addDialogVisible = false;
-        },
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        udiwmsType: "",
+        thirdType: "",
+        page: 1,
+        limit: 20,
+      };
+      this.getList();
+    },
+    cancelDialog() {
+      this.modifyDialogVisible = false;
+      this.addDialogVisible = false;
+    },
 
-        getList() {
-            this.loading = true;
-            getLocalBusType(this.filterQuery)
-                .then((response) => {
-                    this.loading = false;
-                    this.list = response.data.list || [];
-                    this.total = response.data.total || 0;
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.list = [];
-                    this.total = 0;
-                });
-        },
+    getList() {
+      this.loading = true;
+      getLocalBusType(this.filterQuery)
+          .then((response) => {
+            this.loading = false;
+            this.list = response.data.list || [];
+            this.total = response.data.total || 0;
+          })
+          .catch(() => {
+            this.loading = false;
+            this.list = [];
+            this.total = 0;
+          });
+    },
 
 
-        onAddSubmit() {
-            addLocalBusType(this.inputQuery)
-                .then((response) => {
-                    this.loading = false;
-                    this.cancelDialog();
-                    this.getList();
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.cancelDialog();
-                });
-        },
+    onAddSubmit() {
+      addLocalBusType(this.inputQuery)
+          .then((response) => {
+            this.loading = false;
+            this.cancelDialog();
+            this.getList();
+          })
+          .catch(() => {
+            this.loading = false;
+            this.cancelDialog();
+          });
+    },
 
-        onModifySubmit() {
-            updateLocalBusType(this.inputQuery)
-                .then((response) => {
-                    this.loading = false;
-                    this.cancelDialog();
-                    this.getList();
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.cancelDialog();
-                });
-        },
+    onModifySubmit() {
+      updateLocalBusType(this.inputQuery)
+          .then((response) => {
+            this.loading = false;
+            this.cancelDialog();
+            this.getList();
+          })
+          .catch(() => {
+            this.loading = false;
+            this.cancelDialog();
+          });
+    },
 
-        handleModifyClick(row) {
-            this.modifyDialogVisible = true;
-            this.inputQuery = {
-                id: row.id,
-                remark: row.remark,
-                action: row.action,
-                name: row.name,
-                enable: row.enable,
-                mainAction: row.mainAction,
-                localAction: row.localAction,
-                thirdSysFk: row.thirdSysFk,
-                originAction: row.originAction,
-                advanceType: row.advanceType,
-                changeEnable: row.changeEnable,
-                spUse: row.spUse,
-            };
-        },
+    handleModifyClick(row) {
+      this.modifyDialogVisible = true;
+      this.inputQuery = {
+        id: row.id,
+        remark: row.remark,
+        action: row.action,
+        name: row.name,
+        enable: row.enable,
+        mainAction: row.mainAction,
+        localAction: row.localAction,
+        thirdSysFk: row.thirdSysFk,
+        originAction: row.originAction,
+        advanceType: row.advanceType,
+        changeEnable: row.changeEnable,
+        spUse: row.spUse,
+      };
+    },
 
-        handleAddClick() {
-            this.addDialogVisible = true;
-            this.inputQuery = {
-                action: "",
-                name: "",
-                enable: "",
-                remark: "",
-                mainAction: "",
-                thirdSysFk: "",
-                id: "",
-                advanceType: null,
-                localAction: null,
-                changeEnable: null,
-            };
-        },
+    handleAddClick() {
+      this.addDialogVisible = true;
+      this.inputQuery = {
+        action: "",
+        name: "",
+        enable: "",
+        remark: "",
+        mainAction: "",
+        thirdSysFk: "",
+        id: "",
+        advanceType: null,
+        localAction: null,
+        changeEnable: null,
+      };
+    },
 
-        deleteDialog(rowId) {
-            this.$confirm("此操作将永久删除该业务类型信息, 是否继续?", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
-            })
-                .then(() => {
-                    this.deleteOrders(rowId);
-                })
-                .catch(() => {
-                });
-        },
+    deleteDialog(rowId) {
+      this.$confirm("此操作将永久删除该业务类型信息, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+          .then(() => {
+            this.deleteOrders(rowId);
+          })
+          .catch(() => {
+          });
+    },
 
-        deleteOrders(data) {
-            this.loading = true;
-            let tquery = {
-                id: data.id + "",
-            };
+    deleteOrders(data) {
+      this.loading = true;
+      let tquery = {
+        id: data.id + "",
+      };
 
-            deleteLocalBusType(tquery)
-                .then((response) => {
-                    this.getList();
-                    if (response.code == 20000) {
-                        this.$message({
-                            type: "success",
-                            message: "删除成功！",
-                        });
-                    } else {
-                        this.$message.error(response.message);
-                    }
-                })
-                .catch(() => {
-                });
-        },
-    },
-    components: {
-        modifyDialog,
-    },
-    mounted() {
-    },
-    created() {
-        this.getList();
+      deleteLocalBusType(tquery)
+          .then((response) => {
+            this.getList();
+            if (response.code == 20000) {
+              this.$message({
+                type: "success",
+                message: "删除成功！",
+              });
+            } else {
+              this.$message.error(response.message);
+            }
+          })
+          .catch(() => {
+          });
     },
+  },
+  components: {
+    modifyDialog,
+  },
+  mounted() {
+  },
+  created() {
+    this.getList();
+  },
 };
 </script>
diff --git a/src/views/basic/BussinessTypeLoclModify.vue b/src/views/basic/BussinessTypeLoclModify.vue
index 6a4e763..c5a821b 100644
--- a/src/views/basic/BussinessTypeLoclModify.vue
+++ b/src/views/basic/BussinessTypeLoclModify.vue
@@ -83,7 +83,10 @@
             </el-col>
             <el-col :span="4" class="el-col">
                 <div class="text item">
-                    <el-checkbox v-model="inputQuery.changeEnable" @change="isChangeOrder" :disabled="!changeEnable">缺量自动补单</el-checkbox>
+                    <el-checkbox v-model="inputQuery.changeEnable" @change="isChangeOrder"
+                                 :disabled="!changeEnable || inputQuery.mainAction">
+                        缺量自动补单
+                    </el-checkbox>
                 </div>
             </el-col>
             <el-col :span="4" class="el-col">
@@ -209,7 +212,7 @@
 <script>
 
 import {getOriginBusType} from "../../api/basic/busOriginType";
-import {getBussinessType} from "../../api/basic/bussinessType";
+import {getBussinessType, getJoinBussinessType} from "../../api/basic/bussinessType";
 import {
     getChangeBusType,
     addChangeBusType,
@@ -263,7 +266,10 @@ export default {
                         if (this.inputQuery.changeEnable) {
                             this.visibleChange = true;
                         }
-                        this.changeEnable = true;
+                        if (this.changeList.length == 0)
+                            this.changeEnable = false;
+                        else
+                            this.changeEnable = true;
 
                     } else {
                         // this.$message.error(response.message);
@@ -283,17 +289,23 @@ export default {
                 })
                 .catch(() => {
                 });
+            this.getBusTypes(null);
+
+        },
+
+        getBusTypes() {
             let query = {
                 enabled: true,
+                filterAction: this.inputQuery.action,
             };
-            getBussinessType(query)
+            getJoinBussinessType(query)
                 .then((response) => {
                     this.codeTypes = response.data.list || [];
                 })
                 .catch(() => {
                 });
-        }
-        ,
+        },
+
 
         addChangeType() {
             this.changeEdit = 0;
@@ -305,6 +317,7 @@ export default {
             this.changeEdit = 1;
             this.editQuery = row;
             this.editChangeTypeVisible = true;
+            this.getBusTypes();
         }
         ,
         hideForm() {
diff --git a/src/views/basic/BussinessTypeModify.vue b/src/views/basic/BussinessTypeModify.vue
index db92364..793b8d0 100644
--- a/src/views/basic/BussinessTypeModify.vue
+++ b/src/views/basic/BussinessTypeModify.vue
@@ -105,8 +105,9 @@
                     <div class="itemTag">
                         <span>当前仓库:&nbsp;</span>
                     </div>
-                    <el-select v-model="inputQuery.storageCode" placeholder="当前仓库信息">
+                    <el-select clearable v-model="inputQuery.storageCode" placeholder="当前仓库信息">
                         <el-option
+
                             v-for="item in storageList"
                             :key="item.name"
                             :label="item.name"
diff --git a/src/views/userManage/param/systemPDFModule.vue b/src/views/userManage/param/systemPDFModule.vue
index 7561694..f83f456 100644
--- a/src/views/userManage/param/systemPDFModule.vue
+++ b/src/views/userManage/param/systemPDFModule.vue
@@ -38,6 +38,7 @@
                             <el-button
                                 type="primary"
                                 size="mini"
+                                :disabled="scope.row.templateType == 2"
                                 @click.native.stop="moduleSelectTemplate(scope.row)"
                             >选择模板
                             </el-button
@@ -46,6 +47,7 @@
                         <p v-if="scope.row.templateName !== null">
                             <el-button
                                 type="primary"
+                                :disabled="scope.row.templateType == 2"
                                 size="mini"
                                 @click.native.stop="moduleSelectTemplate(scope.row)"
                             >{{ scope.row.templateName }}
diff --git a/src/views/warehouse/stockHospOrderNew.vue b/src/views/warehouse/stockHospOrderNew.vue
index 66d5005..ca243c6 100644
--- a/src/views/warehouse/stockHospOrderNew.vue
+++ b/src/views/warehouse/stockHospOrderNew.vue
@@ -791,7 +791,7 @@ export default {
         selectProductFunction(event) {
 
             if (event == null) {
-                this.$refs.inputRef.focus();
+                // this.$refs.inputRef.focus();
             } else {
                 event.target.select();
             }
@@ -886,7 +886,7 @@ export default {
                     }
                 } else {
                     this.$message.warning(response.message);
-                    this.focusNext('inputRef');
+                    // this.focusNext('inputRef');
                     if (this.$isNotBlank(event)) {
                         event.target.select();
                     }
diff --git a/src/views/warehouse/stockOrderNewDistribution.vue b/src/views/warehouse/stockOrderNewDistribution.vue
index a6afd42..2a4ba56 100644
--- a/src/views/warehouse/stockOrderNewDistribution.vue
+++ b/src/views/warehouse/stockOrderNewDistribution.vue
@@ -674,7 +674,7 @@ export default {
         },
         selectProductFunction(event) {
             if (event == null) {
-                this.$refs.inputRef.focus();
+                // this.$refs.inputRef.focus();
             } else event.target.select();
             if (this.$isBlank(event)) {
                 this.code = "";
@@ -745,7 +745,7 @@ export default {
                     }
                 } else {
                     this.$message.warning(response.message);
-                    this.focusNext('inputRef');
+                    // this.focusNext('inputRef');
                     if (this.$isNotBlank(event)) {
                         event.target.select();
                     }