diff --git a/src/api/basic/busChangeType.js b/src/api/basic/busChangeType.js
index 8788771..ae744b6 100644
--- a/src/api/basic/busChangeType.js
+++ b/src/api/basic/busChangeType.js
@@ -8,6 +8,14 @@ export function getChangeBusType(query) {
     });
 }
 
+export function filterAll(query) {
+    return axios({
+        url: "/spms/busTypeChange/filter",
+        method: "get",
+        params: query
+    });
+}
+
 
 export function addChangeBusType(query) {
     return axios({
diff --git a/src/router/index.js b/src/router/index.js
index f0a2c52..c8ae0ae 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -28,6 +28,7 @@ import invWarehouse from "../views/basic/invWarehouse"
 import BussinessType from "../views/basic/BussinessType.vue";
 import BussinessTypeLocl from "../views/basic/BussinessTypeLocl.vue";
 import bussinessTypeThird from "../views/basic/BussinessTypeThird.vue";
+import otherTypeChange from "../views/basic/OtherTypeChange.vue";
 import bussinessTypeChange from "../views/basic/BusTypeChange.vue";
 
 
@@ -357,6 +358,15 @@ export const asyncRouterMap = [
                         }
                     },
 
+                    {
+                        path: "otherTypeChange",
+                        name: "耗材领用设置",
+                        component: otherTypeChange,
+                        meta: {
+                            authRule: ["admin/otherTypeChange"]
+                        }
+                    },
+
 
                 ]
             },
diff --git a/src/views/basic/BusTypeChange.vue b/src/views/basic/BusTypeChange.vue
index 194696a..5447e92 100644
--- a/src/views/basic/BusTypeChange.vue
+++ b/src/views/basic/BusTypeChange.vue
@@ -16,12 +16,6 @@
                         style="width: 200px"
                     ></el-input>
                 </el-form-item>
-                <el-form-item class="query-form-item">
-                    <el-select v-model="filterQuery.type">
-                         <el-option v-for="(item,index) in typeMap" :key="index" :label="item" :value="index">
-                         </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>
@@ -37,21 +31,17 @@
 
             <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="originName"></el-table-column>
-                <el-table-column label="单据类型代码" prop="originAction"></el-table-column>
-                <el-table-column label="目标单据类型" prop="targetBusName"></el-table-column>
-                <el-table-column label="类型" prop="type">
+                <el-table-column label="原单据类型" prop="originName"></el-table-column>
+                <el-table-column label="目标单据类型" prop="targetName"></el-table-column>
+                <el-table-column label="目标当前仓库" prop="locSubInvName"></el-table-column>
+                <el-table-column label="目标往来仓库" prop="defautSubInvName"></el-table-column>
+                <el-table-column label="时间推移（小时）" prop="beforeTime"></el-table-column>
+                <el-table-column label="补单方式" prop="supplementAll">
                     <template slot-scope="scope">
-                        <span>{{ typeMap[scope.row.type] }}</span>
+                        <span>{{ enableMap[scope.row.supplementAll] }}</span>
                     </template>
-
                 </el-table-column>
-                <el-table-column label="状态" prop="enable">
-                    <template slot-scope="scope">
-                        <span>{{ enableMap[scope.row.enable] }}</span>
-                    </template>
-                </el-table-column>
-                <el-table-column label="备注" prop="remark"></el-table-column>
+                <el-table-column label="备注" prop="intro"></el-table-column>
                 <el-table-column label="操作" width="100" fixed="right">
                     <template slot-scope="scope">
                         <el-button
@@ -105,14 +95,10 @@
     </div>
 </template>
 <script>
-import {
-    getBusChange,
-    updateBusChange, delBusChange,
-    insertBusChange
-} from "../../api/basic/busTypeChange";
 
 import modifyDialog from "./BusTypeChangeModify";
 import axios from "axios";
+import {addChangeBusType, filterAll, updateChangeBusType, removeBusChange} from "@/api/basic/busChangeType";
 
 export default {
     data() {
@@ -126,13 +112,8 @@ export default {
             list: [],
             inputQuery: {},
             enableMap: {
-                true: "禁用",
-                false: "启用",
-            },
-            typeMap: {
-                1: "耗材领用",
-                2: "产品申购",
-                3: "采购计划",
+                true: "全量补单",
+                false: "自动补单",
             },
             total: 0,
             loading: false,
@@ -167,7 +148,7 @@ export default {
         },
         getList() {
             this.loading = true;
-            getBusChange(this.filterQuery)
+            filterAll(this.filterQuery)
                 .then((response) => {
                     this.loading = false;
                     this.list = response.data.list || [];
@@ -185,35 +166,34 @@ export default {
         },
 
         onAddSubmit() {
-            if (this.$isBlank(this.inputQuery.originName)) {
-                this.$message.error("单据类型名称不能为空！");
-                return;
-            }
+
+
             if (this.$isBlank(this.inputQuery.originAction)) {
-                this.$message.error("单据类型代码不能为空！");
+                this.$message.error("原单据类型不能为空！");
                 return;
             }
-            if (this.$isBlank(this.inputQuery.targetBusAction)) {
+            if (this.$isBlank(this.inputQuery.action)) {
                 this.$message.error("目标单据类型不能为空！");
                 return;
             }
-            if (this.$isBlank(this.inputQuery.type)) {
-                this.$message.error("请选择设置类型！");
+            if (this.$isBlank(this.inputQuery.locSubInv)) {
+                this.$message.error("目标所在仓库不能为空！");
                 return;
             }
-            if (this.$isBlank(this.inputQuery.enable)) {
-                this.$message.error("请选择启用状态！");
+            if (this.$isBlank(this.inputQuery.action)) {
+                this.$message.error("原单据类型不能为空！");
                 return;
             }
-            if (this.formName == "add") {
 
+            if (this.formName == "add") {
                 let numRegExp = '^[0-9]*$';
                 let numReg = new RegExp(numRegExp);
                 if (numReg.test(this.inputQuery.name)) {
                     this.$message.error("单据类型名称不得为纯数字类型！");
                     return;
                 }
-                insertBusChange(this.inputQuery)
+                this.inputQuery.type = 1;           //默认类型为耗材领用
+                addChangeBusType(this.inputQuery)
                     .then((response) => {
                         if (response.code == 20000) {
                             this.loading = false;
@@ -228,7 +208,7 @@ export default {
                         this.cancelDialog();
                     });
             } else {
-                updateBusChange(this.inputQuery)
+                updateChangeBusType(this.inputQuery)
                     .then((response) => {
                         this.loading = false;
                         this.cancelDialog();
@@ -272,9 +252,13 @@ export default {
                     let query = {
                         id: rowId,
                     }
-                    delBusChange(query)
+                    removeBusChange(query)
                         .then((response) => {
-                            this.getList();
+                            if (response.code == 20000) {
+                                this.$message.success("删除成功！");
+                                this.getList();
+                            } else
+                                this.$message.error(response.message);
                         })
                         .catch(() => {
                         });
diff --git a/src/views/basic/BusTypeChangeModify.vue b/src/views/basic/BusTypeChangeModify.vue
index 4193d41..3a26ad9 100644
--- a/src/views/basic/BusTypeChangeModify.vue
+++ b/src/views/basic/BusTypeChangeModify.vue
@@ -1,116 +1,155 @@
 <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.trim="inputQuery.originName"
-                    ></el-input>
+            <el-col :span="3">
+                <div class="ao-text">
+                    <span>原单据类型：</span>
                 </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.trim="inputQuery.originAction"
-                    ></el-input>
+
+            <el-col :span="7" class="el-col">
+                <el-select v-model="inputQuery.originAction" placeholder="请选择" clearable="true" style="width: 80%">
+                    <el-option
+                        v-for="item in originBusTypes"
+                        :key="item.localAction"
+                        :label="item.localName"
+                        :value="item.localAction">
+                        <span style="float: left">{{ item.localName }}</span>
+                        <span style="float: right; color: #8492a6; font-size: 13px">{{ item.localAction }}</span>
+                    </el-option>
+                </el-select>
+            </el-col>
+
+
+            <el-col :span="3">
+                <div class="ao-text">
+                    <span>目标单据类型：</span>
                 </div>
             </el-col>
+
+            <el-col :span="7" class="el-col">
+                <el-select v-model="inputQuery.action" placeholder="请选择" clearable="true" style="width: 80%">
+                    <el-option
+                        v-for="item in targetBusTypes"
+                        :key="item.localAction"
+                        :label="item.localName"
+                        :value="item.localAction">
+                        <span style="float: left">{{ item.localName }}</span>
+                        <span style="float: right; color: #8492a6; font-size: 13px">{{ item.localAction }}</span>
+                    </el-option>
+                </el-select>
+            </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.targetBusAction" placeholder="请选择" clearable="true">
-                        <el-option
-                            v-for="item in busTypes"
-                            :key="item.localAction"
-                            :label="item.localName"
-                            :value="item.localAction">
-                            <span style="float: left">{{ item.localName }}</span>
-                            <span style="float: right; color: #8492a6; font-size: 13px">{{ item.localAction }}</span>
-                        </el-option>
-                    </el-select>
+
+            <el-col :span="3">
+                <div class="ao-text">
+                    <span>目标所在仓库：</span>
                 </div>
             </el-col>
-            <el-col :span="10" class="el-col">
-                <div class="text item">
-                    <div class="itemTag">
-                        <span>设置类型:&nbsp;</span>
-                    </div>
-                    <el-select
-                        size="small"
-                        :disabled="inputQuery.systemDefault"
-                        v-model="inputQuery.type"
-                        placeholder="设置类型"
-                    >
-                        <el-option label="耗材领用" :value="1"></el-option>
-                        <!--                        <el-option label="产品申购" :value="2"></el-option>-->
-                        <el-option label="采购计划" :value="3"></el-option>
-                    </el-select>
+
+            <el-col :span="7" class="el-col">
+                <el-select v-model="inputQuery.locSubInv" placeholder="目标所在仓库" clearable="true"
+                           @change="invChange" style="width: 80%"
+                           size="small">
+                    <el-option
+                        v-for="item in locInvs"
+                        :key="item.name"
+                        :label="item.name"
+                        :value="item.code">
+                        <span style="float: left">{{ item.name }}</span>
+                    </el-option>
+                </el-select>
+            </el-col>
+
+
+            <el-col :span="3">
+                <div class="ao-text">
+                    <span>目标往来仓库：</span>
                 </div>
             </el-col>
+
+            <el-col :span="7" class="el-col">
+                <el-select v-model="inputQuery.defaultSubInv" placeholder="目标往来仓库" clearable="true" style="width: 80%"
+                           @change="invChange"
+                           size="small">
+                    <el-option
+                        v-for="item in fromInvs"
+                        :key="item.name"
+                        :label="item.name"
+                        :value="item.code">
+                        <span style="float: left">{{ item.name }}</span>
+                    </el-option>
+                </el-select>
+            </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
-                        size="small"
-                        :disabled="inputQuery.systemDefault"
-                        v-model="inputQuery.enable"
-                        placeholder="启用状态"
-                    >
-                        <el-option label="启用" :value="false"></el-option>
-                        <el-option label="禁用" :value="true"></el-option>
-                    </el-select>
+
+            <el-col :span="3">
+                <div class="ao-text">
+                    <span>推移时间(小时)：</span>
                 </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>
+
+            <el-col :span="7" class="el-col">
+                <el-input
+                    style="width: 80%"
+                    size="small"
+                    type="number"
+                    splaceholder="请输入内容"
+                    v-model="inputQuery.beforeTime"
+                ></el-input>
+
+            </el-col>
+            <el-col :span="3">
+                <div class="ao-text">
+                    <span>流转方式：</span>
                 </div>
             </el-col>
+            <el-col :span="7" class="el-col">
+                <el-select v-model="inputQuery.supplementAll" placeholder="流转方式" style="width: 80%">
+                    <el-option label="全量补单" :value="true"></el-option>
+                    <el-option label="自动补单" :value="false"></el-option>
+                </el-select>
+            </el-col>
+
+
         </el-row>
+
+
+        <el-row :gutter="20" class="el-row" type="flex">
+            <el-col :span="3">
+                <div class="ao-text">
+                    <span>备注：</span>
+                </div>
+            </el-col>
+            <el-col :span="7" class="el-col">
+                <el-input
+                    style="width: 80%"
+                    size="small"
+                    splaceholder="请输入内容"
+                    v-model="inputQuery.remark"
+                ></el-input>
+            </el-col>
+        </el-row>
+
         <el-divider></el-divider>
     </div>
 </template>
 
 <script>
 
-import {
-    getBasicThirdSys,
-} from "../../api/basic/basicThirdSys";
 
 import {
-    getLocalBusType, getLocalJoinBusType,
+    getLocalJoinByUser, getLocalJoinBusType,
 } from "../../api/basic/busLocalType";
+import {filterSubAll, filterSubByInv} from "@/api/basic/invSubWarehouse";
 
 export default {
     name: "BusTypeChangeModify",
@@ -127,71 +166,87 @@ export default {
                 enabled: true,
                 isBuType: true,
             },
-            busTypes: [],
+            originBusTypes: [],
+            targetBusTypes: [],
+
+            locInvs: [],
+            fromInvs: [],
+
             isAdd: false,
-            rules: {
-                originName: [
-                    {
-                        required: true,
-                        message: "单据类型名称不能为空",
-                        trigger: "blur"
-                    }
-                ],
-                originAction: [
-                    {
-                        required: true,
-                        message: "单据类型代码不能为空",
-                        trigger: "blur"
-                    }
-                ],
-                targetBusAction: [
-                    {
-                        required: true,
-                        message: "目标单据类型不能为空",
-                        trigger: "blur"
-                    }
-                ],
-                type: [
-                    {
-                        required: true,
-                        message: "请选择设置类型",
-                        trigger: "blur"
-                    }
-                ],
-                enable: [
-                    {
-                        required: true,
-                        message: "请选择启用状态",
-                        trigger: "blur"
-                    }
-                ],
-            },
         }
     },
     methods: {
 
-        getBusType() {
+        getOriginBusType() {
             let query = {
                 enabled: true,
-                corpType: 1,
             };
             getLocalJoinBusType(query)
                 .then((response) => {
-                    this.busTypes = response.data.list || [];
+                    this.originBusTypes = response.data.list || [];
                 })
                 .catch(() => {
                 });
-        }
+        },
+
+
+        getTargetBusType() {
+            let query = {
+                invWarehouseCode: this.inputQuery.locSubInv,
+                enabled: true,
+            };
+            getLocalJoinByUser(query)
+                .then((response) => {
+                    this.targetBusTypes = response.data.list || [];
+                })
+                .catch(() => {
+                });
+        },
+
+        getLocalInv() {
+            let subQuery = {}
+            filterSubAll(subQuery).then((res) => {
+                if (res.code == 20000) {
+                    this.locInvs = res.data;
+                }
+            }).catch((error) => {
+            });
+        },
+
+        invChange(){
+            this.getTargetBusType();
+            this.getFromInv();
+        },
+
+
+        getFromInv() {
+            let subQuery = {
+                code:this.inputQuery.locSubInv,
+            }
+            filterSubByInv(subQuery).then((res) => {
+                if (res.code == 20000) {
+                    this.fromInvs = res.data;
+                }
+            }).catch((error) => {
+            });
+        },
+
+
     },
 
     created() {
 
         if (this.inputQuery.originAction == null) {
             this.isAdd = true;
+        }else {
+            this.getFromInv();
+            this.getTargetBusType();
         }
-        this.getBusType();
-    }
-    ,
+        this.getOriginBusType();
+        this.getLocalInv();
+
+
+    },
 }
 ;
 </script>
diff --git a/src/views/basic/BussinessTypeLoclModify.vue b/src/views/basic/BussinessTypeLoclModify.vue
index 5573d2c..c1a09aa 100644
--- a/src/views/basic/BussinessTypeLoclModify.vue
+++ b/src/views/basic/BussinessTypeLoclModify.vue
@@ -124,21 +124,21 @@
                 </div>
             </el-col>
 
-            <el-col :span="4" class="el-col">
-                <div class="text item">
-                    <el-checkbox v-model="inputQuery.changeEnable" @change="isChangeOrder"
-                                 :disabled="!changeEnable || inputQuery.mainAction=='WareHouseIn' || inputQuery.id == null  || inputQuery.mainAction==null  ||inputQuery.preIn">
-                        自动补单
-                    </el-checkbox>
-                </div>
-            </el-col>
-            <el-col :span="4" class="el-col">
-                <div class="text item">
-                    <el-checkbox v-model="inputQuery.supplementAll"
-                                 :disabled="!inputQuery.changeEnable">全量补单
-                    </el-checkbox>
-                </div>
-            </el-col>
+<!--            <el-col :span="4" class="el-col">-->
+            <!--                <div class="text item">-->
+            <!--                    <el-checkbox v-model="inputQuery.changeEnable" @change="isChangeOrder"-->
+            <!--                                 :disabled="!changeEnable || inputQuery.mainAction=='WareHouseIn' || inputQuery.id == null  || inputQuery.mainAction==null  ||inputQuery.preIn">-->
+            <!--                        自动补单-->
+            <!--                    </el-checkbox>-->
+            <!--                </div>-->
+            <!--            </el-col>-->
+            <!--            <el-col :span="4" class="el-col">-->
+            <!--                <div class="text item">-->
+            <!--                    <el-checkbox v-model="inputQuery.supplementAll"-->
+            <!--                                 :disabled="!inputQuery.changeEnable">全量补单-->
+            <!--                    </el-checkbox>-->
+            <!--                </div>-->
+            <!--            </el-col>-->
 
             <!--            <el-col :span="4" class="el-col">
                             <div class="text item">
diff --git a/src/views/basic/OtherTypeChange.vue b/src/views/basic/OtherTypeChange.vue
new file mode 100644
index 0000000..fad0a2b
--- /dev/null
+++ b/src/views/basic/OtherTypeChange.vue
@@ -0,0 +1,304 @@
+<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.originName"
+                        placeholder="单据类型名称"
+                        style="width: 200px"
+                    ></el-input>
+                </el-form-item>
+                <el-form-item class="query-form-item">
+                    <el-input
+                        v-model="filterQuery.originAction"
+                        placeholder="单据类型代码"
+                        style="width: 200px"
+                    ></el-input>
+                </el-form-item>
+<!--                <el-form-item class="query-form-item">-->
+                <!--                    <el-select v-model="filterQuery.type">-->
+                <!--                        <el-option v-for="(item,index) in typeMap" :key="index" :label="item" :value="index">-->
+                <!--                        </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="search">查询</el-button>
+                        <el-button type="primary" icon="search" @click="handleAddClick"
+                        >新增
+                        </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="originName"></el-table-column>
+                <el-table-column label="领用类型代码" prop="originAction"></el-table-column>
+                <el-table-column label="目标业务单据类型" prop="targetBusName"></el-table-column>
+                <el-table-column label="类型" prop="type">
+                    <template slot-scope="scope">
+                        <span>{{ typeMap[scope.row.type] }}</span>
+                    </template>
+
+                </el-table-column>
+                <el-table-column label="状态" prop="enable">
+                    <template slot-scope="scope">
+                        <span>{{ enableMap[scope.row.enable] }}</span>
+                    </template>
+                </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"
+                            :disabled="scope.row.systemDefault"
+                            @click.native.stop="handleDeleteClick(scope.row)"
+                        >删除
+                        </el-button
+                        >
+                    </template>
+                </el-table-column>
+            </el-table>
+
+            <el-dialog
+                :title="formMap[formName]"
+                :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-pagination
+                :page-size="filterQuery.limit"
+                @current-change="handleCurrentChange"
+                layout="prev, pager, next"
+                :total="total"
+                :current-page="filterQuery.page"
+            ></el-pagination>
+        </el-card>
+    </div>
+</template>
+<script>
+import {
+    getBusChange,
+    updateBusChange, delBusChange,
+    insertBusChange
+} from "../../api/basic/busTypeChange";
+
+import modifyDialog from "./OtherTypeChangeModify";
+import axios from "axios";
+
+export default {
+    data() {
+        return {
+            filterQuery: {
+                name: "",
+                page: 1,
+                limit: 20,
+            },
+            addDialogVisible: false,
+            list: [],
+            inputQuery: {},
+            enableMap: {
+                true: "禁用",
+                false: "启用",
+            },
+            typeMap: {
+                1: "耗材领用",
+                2: "产品申购",
+                3: "采购计划",
+            },
+            total: 0,
+            loading: false,
+            configParms: {},
+            formMap: {
+                add: "新增单据流转设置",
+                update: "编辑单据流转设置",
+            },
+            formName: "add",
+        };
+    },
+
+    methods: {
+        onReset() {
+            this.$router.push({
+                path: "",
+            });
+            this.filterQuery = {
+                name: null,
+                enable: null,
+                page: 1,
+                limit: 20,
+            };
+            this.getList();
+        },
+        cancelDialog() {
+            this.addDialogVisible = false;
+        },
+        search() {
+            this.filterQuery.page = 1;
+            this.getList();
+        },
+        getList() {
+            this.loading = true;
+            getBusChange(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;
+            this.getList();
+        },
+
+        onAddSubmit() {
+            if (this.$isBlank(this.inputQuery.originName)) {
+                this.$message.error("单据类型名称不能为空！");
+                return;
+            }
+            if (this.$isBlank(this.inputQuery.originAction)) {
+                this.$message.error("单据类型代码不能为空！");
+                return;
+            }
+            if (this.$isBlank(this.inputQuery.targetBusAction)) {
+                this.$message.error("目标单据类型不能为空！");
+                return;
+            }
+            // if (this.$isBlank(this.inputQuery.type)) {
+            //     this.$message.error("请选择设置类型！");
+            //     return;
+            // }
+            if (this.$isBlank(this.inputQuery.enable)) {
+                this.$message.error("请选择启用状态！");
+                return;
+            }
+            if (this.formName == "add") {
+
+                let numRegExp = '^[0-9]*$';
+                let numReg = new RegExp(numRegExp);
+                if (numReg.test(this.inputQuery.name)) {
+                    this.$message.error("单据类型名称不得为纯数字类型！");
+                    return;
+                }
+                this.inputQuery.type = 1;           //默认类型为耗材领用
+                insertBusChange(this.inputQuery)
+                    .then((response) => {
+                        if (response.code == 20000) {
+                            this.loading = false;
+                            this.cancelDialog();
+                            this.getList();
+                        } else {
+                            this.$message.error(response.message);
+                        }
+                    })
+                    .catch(() => {
+                        this.loading = false;
+                        this.cancelDialog();
+                    });
+            } else {
+                updateBusChange(this.inputQuery)
+                    .then((response) => {
+                        this.loading = false;
+                        this.cancelDialog();
+                        this.getList();
+                    })
+                    .catch(() => {
+                        this.loading = false;
+                        this.cancelDialog();
+                    });
+            }
+
+
+        },
+
+
+        handleAddClick() {
+            this.inputQuery = {};
+            this.formName = "add";
+            this.addDialogVisible = true;
+        },
+        handleModifyClick(row) {
+
+            this.inputQuery = row;
+            this.formName = "update";
+            this.addDialogVisible = true;
+        },
+
+
+        handleDeleteClick(row) {
+            this.deleteDialog(row.id)
+        },
+
+
+        deleteDialog(rowId) {
+            this.$confirm("此操作将永久删除该单据类型信息, 是否继续?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            })
+                .then(() => {
+                    let query = {
+                        id: rowId,
+                    }
+                    delBusChange(query)
+                        .then((response) => {
+                            this.getList();
+                        })
+                        .catch(() => {
+                        });
+
+
+                })
+                .catch(() => {
+                });
+        },
+
+        thirdSysChange() {
+            this.getList();
+        },
+
+    },
+    components: {
+        modifyDialog,
+    },
+    mounted() {
+    },
+    created() {
+        this.getList();
+
+    },
+};
+</script>
diff --git a/src/views/basic/OtherTypeChangeModify.vue b/src/views/basic/OtherTypeChangeModify.vue
new file mode 100644
index 0000000..48b633d
--- /dev/null
+++ b/src/views/basic/OtherTypeChangeModify.vue
@@ -0,0 +1,224 @@
+<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.trim="inputQuery.originName"
+                    ></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.trim="inputQuery.originAction"
+                    ></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.targetBusAction" placeholder="请选择" clearable="true">
+                        <el-option
+                            v-for="item in busTypes"
+                            :key="item.localAction"
+                            :label="item.localName"
+                            :value="item.localAction">
+                            <span style="float: left">{{ item.localName }}</span>
+                            <span style="float: right; color: #8492a6; font-size: 13px">{{ item.localAction }}</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-select
+                        size="small"
+                        :disabled="inputQuery.systemDefault"
+                        v-model="inputQuery.enable"
+                        placeholder="启用状态"
+                    >
+                        <el-option label="启用" :value="false"></el-option>
+                        <el-option label="禁用" :value="true"></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-select-->
+<!--                        size="small"-->
+<!--                        :disabled="inputQuery.systemDefault"-->
+<!--                        v-model="inputQuery.type"-->
+<!--                        placeholder="设置类型"-->
+<!--                    >-->
+<!--                        <el-option label="耗材领用" :value="1"></el-option>-->
+<!--                        <el-option label="采购计划" :value="3"></el-option>-->
+<!--                    </el-select>-->
+<!--                </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-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, getLocalJoinBusType,
+} from "../../api/basic/busLocalType";
+
+export default {
+    name: "BusTypeChangeModify",
+    props: {
+        inputQuery: {
+            type: Object,
+            required: true,
+        },
+    },
+
+    data() {
+        return {
+            filterQuery: {
+                enabled: true,
+                isBuType: true,
+            },
+            busTypes: [],
+            isAdd: false,
+            rules: {
+                originName: [
+                    {
+                        required: true,
+                        message: "单据类型名称不能为空",
+                        trigger: "blur"
+                    }
+                ],
+                originAction: [
+                    {
+                        required: true,
+                        message: "单据类型代码不能为空",
+                        trigger: "blur"
+                    }
+                ],
+                targetBusAction: [
+                    {
+                        required: true,
+                        message: "目标单据类型不能为空",
+                        trigger: "blur"
+                    }
+                ],
+                // type: [
+                //     {
+                //         required: true,
+                //         message: "请选择设置类型",
+                //         trigger: "blur"
+                //     }
+                // ],
+                enable: [
+                    {
+                        required: true,
+                        message: "请选择启用状态",
+                        trigger: "blur"
+                    }
+                ],
+            },
+        }
+    },
+    methods: {
+
+        getBusType() {
+            let query = {
+                enabled: true,
+                corpType: 1,
+            };
+            getLocalJoinBusType(query)
+                .then((response) => {
+                    this.busTypes = response.data.list || [];
+                })
+                .catch(() => {
+                });
+        }
+    },
+
+    created() {
+
+        if (this.inputQuery.originAction == null) {
+            this.isAdd = true;
+        }
+        this.getBusType();
+    }
+    ,
+}
+;
+</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/UdIInfoSelect.vue b/src/views/basic/UdIInfoSelect.vue
index 9bafd45..0b5752f 100644
--- a/src/views/basic/UdIInfoSelect.vue
+++ b/src/views/basic/UdIInfoSelect.vue
@@ -27,7 +27,7 @@
 
 
                 <el-form-item class="query-form-item">
-                    <el-select v-model="filterQuery.filterType" placeholder="请选择过滤对照条件" >
+                    <el-select v-model="filterQuery.filterType" placeholder="请选择过滤对照条件">
                         <el-option
                             v-for="item in filterList"
                             :key="item.filterType"
@@ -510,7 +510,7 @@
                     <el-col :span="12" class="el-col">
                         <el-form-item prop="name">
                             <el-checkbox v-model="checked" class="text item itemTag"
-                            >启用使用单元
+                            >允许科室多次使用多人份耗材
                             </el-checkbox>
                         </el-form-item>
                     </el-col>
@@ -529,332 +529,334 @@
 </template>
 
 <script>
-    import {
-        getUdiInfos,
-        updateErpProduct,
-        thirdSysDetail,
-    } from "../../api/basic/udiRelevance";
+import {
+    getUdiInfos,
+    updateErpProduct,
+    thirdSysDetail,
+} from "../../api/basic/udiRelevance";
 import {udiUpload} from "../../api/thrsys/smp"
-    import {exportExcel} from "../../api/basic/udiInfoExport"
-    import {selectSysParamByKey} from "../../api/param/systemParamConfig";
-    import {filterByUuid} from "../../api/basic/udiInfo";
+import {exportExcel} from "../../api/basic/udiInfoExport"
+import {selectSysParamByKey} from "../../api/param/systemParamConfig";
+import {filterByUuid} from "../../api/basic/udiInfo";
 
 
-    export default {
-        name: "UdIInfoSelect",
-        props: {
-            selectType: {
-                type: Object,
-                required: true,
-            },
-        },
-        data() {
-            return {
-                filterQuery: {
-                    uuids: [],
-                    ylqxzcrbarmc: "",
-                    cpmctymc: "",
-                    nameCode: "",
-                    page: 1,
-                    limit: 20,
-                    addType: 1,
-                },
-
-                editQuery: null,
-                relevanceEdit: {
-                    id: null,
-                    thirdId: "",
-                    isUseDy: false,
-                },
-                isImport: false,
-                isImportUdi: false,
-                isUploadSmp: false,
-                isImportFile: false,
-                uploadFileUrl: null,
-                checked: false,
-                list: [],
-                detailList: [],
-                sysList: [],
-                total: 0,
-                thirdNo: "",
-                uuid: "111",
-                thirdId: null,
-                relId: "",
-                thisData: {
-                    nameCode: null,
-                    cpmctymc: null,
-                    ggxh: null
-                },
-                multipleSelection: [],
-                editDialogVisible: false,
-                selectUdiDialogVisible: false,
-                selectErpDialogVisible: false,
-                selectLocalVisible: false,
-            };
+export default {
+    name: "UdIInfoSelect",
+    props: {
+        selectType: {
+            type: Object,
+            required: true,
         },
-
-        methods: {
-            onReset() {
-                this.$router.push({
-                    path: "",
-                });
-                this.filterQuery = {
-                    uuids: [],
-                    ylqxzcrbarmc: "",
-                    cpmctymc: "",
-                    nameCode: "",
-                    page: 1,
-                    limit: 20,
-                    addType: 1,
-                };
-                this.getList();
-            },
-            getList() {
-                this.loading = true;
-                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;
-                    });
+    },
+    data() {
+        return {
+            filterQuery: {
+                uuids: [],
+                ylqxzcrbarmc: "",
+                cpmctymc: "",
+                nameCode: "",
+                page: 1,
+                limit: 20,
+                addType: 1,
             },
 
-            getDetailList(detailQuery) {
-                this.loading = true;
-                filterByUuid(detailQuery)
-                    .then((response) => {
-                        this.loading = false;
-                        this.detailList = response.data || [];
-                    })
-                    .catch(() => {
-                        this.loading = false;
-                        this.detailList = [];
-                    });
+            editQuery: null,
+            relevanceEdit: {
+                id: null,
+                thirdId: "",
+                isUseDy: false,
             },
-
-            handleDetail(row) {
-                this.editQuery = row;
-                console.log(row);
+            isImport: false,
+            isImportUdi: false,
+            isUploadSmp: false,
+            isImportFile: false,
+            uploadFileUrl: null,
+            checked: false,
+            list: [],
+            detailList: [],
+            sysList: [],
+            total: 0,
+            thirdNo: "",
+            uuid: "111",
+            thirdId: null,
+            relId: "",
+            thisData: {
+                nameCode: null,
+                cpmctymc: null,
+                ggxh: null
             },
-            selectExport() {
-                var selectData = this.multipleSelection;
-                selectData.forEach((obj) => {
-                    this.filterQuery.uuids.push(obj.uuid);
+            multipleSelection: [],
+            editDialogVisible: false,
+            selectUdiDialogVisible: false,
+            selectErpDialogVisible: false,
+            selectLocalVisible: false,
+        };
+    },
+
+    methods: {
+        onReset() {
+            this.$router.push({
+                path: "",
+            });
+            this.filterQuery = {
+                uuids: [],
+                ylqxzcrbarmc: "",
+                cpmctymc: "",
+                nameCode: "",
+                page: 1,
+                limit: 20,
+                addType: 1,
+            };
+            this.getList();
+        },
+        getList() {
+            this.loading = true;
+            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;
                 });
-                this.allExport();
+        },
 
-            },
-            allExport() {
-                exportExcel(this.filterQuery)
-                    .then((response) => {
-                        if (response.code == 20000) {
-                            this.$message({
-                                type: "success",
-                                message: "导出成功，后台正在生成Json文件，请稍后刷新查看！",
-                            });
-                        } else {
-                            this.$message({
-                                type: "error",
-                                message: response.message,
-                            });
-                        }
-
-                        this.$emit("cancelDialog", true);
-                    })
-                    .catch(() => {
+        getDetailList(detailQuery) {
+            this.loading = true;
+            filterByUuid(detailQuery)
+                .then((response) => {
+                    this.loading = false;
+                    this.detailList = response.data || [];
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.detailList = [];
+                });
+        },
+
+        handleDetail(row) {
+            this.editQuery = row;
+            console.log(row);
+        },
+        selectExport() {
+            var selectData = this.multipleSelection;
+            selectData.forEach((obj) => {
+                this.filterQuery.uuids.push(obj.uuid);
+            });
+            this.allExport();
+
+        },
+        allExport() {
+            exportExcel(this.filterQuery)
+                .then((response) => {
+                    if (response.code == 20000) {
+                        this.$message({
+                            type: "success",
+                            message: "导出成功，后台正在生成Json文件，请稍后刷新查看！",
+                        });
+                    } else {
                         this.$message({
                             type: "error",
-                            message: "上传失败",
+                            message: response.message,
                         });
+                    }
+
+                    this.$emit("cancelDialog", true);
+                })
+                .catch(() => {
+                    this.$message({
+                        type: "error",
+                        message: "上传失败",
                     });
-            },
+                });
+        },
 
-            intentDetail() {
-                this.isImportUdi = false;
-                this.selectUdiDialogVisible = true;
-            },
+        intentDetail() {
+            this.isImportUdi = false;
+            this.selectUdiDialogVisible = true;
+        },
 
-            intentImportErp(val) {
-                this.uuid = val.uuid;
-                this.relId = val.id;
-                this.isImport = true;
-                this.thisData = val;
-                this.selectErpDialogVisible = true;
-            },
-            uploadSMP() {
-                var selectData = this.multipleSelection;
-                selectData.forEach((obj) => {
-                    this.filterQuery.uuids.push(obj.uuid);
-                });
-                this.allUploadSMP();
-            },
+        intentImportErp(val) {
+            this.uuid = val.uuid;
+            this.relId = val.id;
+            this.isImport = true;
+            this.thisData = val;
+            this.selectErpDialogVisible = true;
+        },
+        uploadSMP() {
+            var selectData = this.multipleSelection;
+            selectData.forEach((obj) => {
+                this.filterQuery.uuids.push(obj.uuid);
+            });
+            this.allUploadSMP();
+        },
 
-            allUploadSMP(){
-                udiUpload(this.filterQuery)
-                    .then((response) => {
-                        if (response.code == 20000) {
-                            this.$message({
-                                type: "success",
-                                message: "上传成功！",
-                            });
-                        } else {
-                            this.$message({
-                                type: "error",
-                                message: response.message,
-                            });
-                        }
-                        this.$emit("cancelDialog", true);
-                    })
-                    .catch(() => {
+        allUploadSMP() {
+            udiUpload(this.filterQuery)
+                .then((response) => {
+                    if (response.code == 20000) {
+                        this.$message({
+                            type: "success",
+                            message: "上传成功！",
+                        });
+                    } else {
                         this.$message({
                             type: "error",
-                            message: "上传失败",
+                            message: response.message,
                         });
-                        this.$emit("cancelDialog", true);
+                    }
+                    this.$emit("cancelDialog", true);
+                })
+                .catch(() => {
+                    this.$message({
+                        type: "error",
+                        message: "上传失败",
                     });
-            },
-            handleSelectionChange(val) {
-                console.log("----" + val);
-                this.multipleSelection = val;
-            },
+                    this.$emit("cancelDialog", true);
+                });
+        },
+        handleSelectionChange(val) {
+            console.log("----" + val);
+            this.multipleSelection = val;
+        },
 
-            handleCurrentChange(val) {
-                this.filterQuery.page = val;
-                this.getList();
-            },
-            handleModifyClick(row) {
-                this.editDialogVisible = true;
-                this.editQuery = row;
-                this.relevanceEdit = {
-                    id: row.id,
-                    thirdId: row.thirdId,
-                    isUseDy: row.isUseDy,
-                };
-                this.checked = row.isUseDy == 1;
-
-                let ttquery = {
-                    uuid: row.uuid,
-                    page: 1,
-                    limit: 10,
-                };
-                console.log("this.editQuery.isUseDy = " + this.editQuery.isUseDy);
-
-                this.getDetailList(ttquery);
-                this.getThirdSysDetail();
-            },
-            closeUdi(val) {
-                this.selectUdiDialogVisible = false;
-                this.selectErpDialogVisible = false;
-                this.selectLocalVisible = false;
-                if (val) {
-                    this.getList();
-                }
-            },
-            getThirdSysDetail() {
-                let query = {
-                    id: this.relevanceEdit.id,
-                };
-
-                thirdSysDetail(query)
-                    .then((response) => {
-                        this.loading = false;
-                        this.sysList = response.data.list || [];
-                    })
-                    .catch(() => {
-                        this.loading = false;
-                        this.sysList = [];
-                    });
-            },
-            uploadErpProduct() {
-                updateErpProduct()
-                    .then((response) => {
-                        if (response.code == 20000) {
-                            this.$message({
-                                type: "success",
-                                message: response.data,
-                            });
-                        } else {
-                            this.$message.error(response.message);
-                        }
-                    })
-                    .catch(() => {
-                    });
-            },
+        handleCurrentChange(val) {
+            this.filterQuery.page = val;
+            this.getList();
+        },
+        handleModifyClick(row) {
+            this.editDialogVisible = true;
+            this.editQuery = row;
+            this.relevanceEdit = {
+                id: row.id,
+                thirdId: row.thirdId,
+                isUseDy: row.isUseDy,
+            };
+            this.checked = row.isUseDy == 1;
 
-            closeDialog() {
-                this.selectErpDialogVisible = false;
-                this.selectLocalVisible = false;
-            },
+            let ttquery = {
+                uuid: row.uuid,
+                page: 1,
+                limit: 10,
+            };
+            console.log("this.editQuery.isUseDy = " + this.editQuery.isUseDy);
 
-            selectSysParam() {
-                let query = {
-                    paramKey: "smp_isUploadProuct",
-                };
-                selectSysParamByKey(query).then((response) => {
-                    if (response.code == 20000) {
-                        if (response.data.paramValue == "1") {
-                            this.isUploadSmp = true;
-                        }
-                    }
-                });
-                let query1 = {
-                    paramKey: "upload_pi_file_enabled",
-                };
-                selectSysParamByKey(query1).then((response) => {
-                    if (response.code == 20000) {
-                        if (response.data.paramValue == "1") {
-                            this.isImportFile = true;
-                        }
-                    }
+            this.getDetailList(ttquery);
+            this.getThirdSysDetail();
+        },
+        closeUdi(val) {
+            this.selectUdiDialogVisible = false;
+            this.selectErpDialogVisible = false;
+            this.selectLocalVisible = false;
+            if (val) {
+                this.getList();
+            }
+        },
+        getThirdSysDetail() {
+            let query = {
+                id: this.relevanceEdit.id,
+            };
+
+            thirdSysDetail(query)
+                .then((response) => {
+                    this.loading = false;
+                    this.sysList = response.data.list || [];
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.sysList = [];
                 });
-                let query2 = {
-                    paramKey: "upload_pi_file_url",
-                };
-                selectSysParamByKey(query2).then((response) => {
+        },
+        uploadErpProduct() {
+            updateErpProduct()
+                .then((response) => {
                     if (response.code == 20000) {
-                        this.uploadFileUrl = response.data.paramValue;
+                        this.$message({
+                            type: "success",
+                            message: response.data,
+                        });
+                    } else {
+                        this.$message.error(response.message);
                     }
+                })
+                .catch(() => {
                 });
-            },
         },
-        mounted() {
+
+        closeDialog() {
+            this.selectErpDialogVisible = false;
+            this.selectLocalVisible = false;
         },
-        components: {},
-        created() {
-            this.getList();
-            this.selectSysParam();
+
+        selectSysParam() {
+            let query = {
+                paramKey: "smp_isUploadProuct",
+            };
+            selectSysParamByKey(query).then((response) => {
+                if (response.code == 20000) {
+                    if (response.data.paramValue == "1") {
+                        this.isUploadSmp = true;
+                    }
+                }
+            });
+            let query1 = {
+                paramKey: "upload_pi_file_enabled",
+            };
+            selectSysParamByKey(query1).then((response) => {
+                if (response.code == 20000) {
+                    if (response.data.paramValue == "1") {
+                        this.isImportFile = true;
+                    }
+                }
+            });
+            let query2 = {
+                paramKey: "upload_pi_file_url",
+            };
+            selectSysParamByKey(query2).then((response) => {
+                if (response.code == 20000) {
+                    this.uploadFileUrl = response.data.paramValue;
+                }
+            });
         },
-    };
+    },
+    mounted() {
+    },
+    components: {},
+    created() {
+        this.getList();
+        this.selectSysParam();
+    },
+};
 </script>
 <style scoped>
-    .itemTag {
-        float: left;
-        text-align: left;
-        margin-top: 10px;
-        width: 25%;
-    }
-    .query-form-item {
-        display: block !important;
-        margin-right: 10px;
-        margin-bottom: 5px;
-    }
-    .text {
-        font-size: 13px;
-        font-family: "Microsoft YaHei";
-    }
-
-    .el-row {
-        display: flex;
-        flex-wrap: wrap;
-    }
-
-    .el-col {
-        border-radius: 4px;
-        flex-wrap: wrap;
-    }
+.itemTag {
+    float: left;
+    text-align: left;
+    margin-top: 10px;
+    width: 25%;
+}
+
+.query-form-item {
+    display: block !important;
+    margin-right: 10px;
+    margin-bottom: 5px;
+}
+
+.text {
+    font-size: 13px;
+    font-family: "Microsoft YaHei";
+}
+
+.el-row {
+    display: flex;
+    flex-wrap: wrap;
+}
+
+.el-col {
+    border-radius: 4px;
+    flex-wrap: wrap;
+}
 </style>
diff --git a/src/views/basic/UdiRlDetailDialog.vue b/src/views/basic/UdiRlDetailDialog.vue
index 8a92e61..9b38d7e 100644
--- a/src/views/basic/UdiRlDetailDialog.vue
+++ b/src/views/basic/UdiRlDetailDialog.vue
@@ -385,15 +385,15 @@ export default {
     data() {
         return {
             sysList: [],
-            checked:false,
-            detailList:[],
-            loading:false,
+            checked: false,
+            detailList: [],
+            loading: false,
         }
     },
     methods: {
         getThirdSysDetail() {
             let query = {
-              id: this.editQuery.rlId,
+                id: this.editQuery.rlId,
             };
 
             thirdSysDetail(query)
diff --git a/src/views/business/stockOrderNewSelectProduct.vue b/src/views/business/stockOrderNewSelectProduct.vue
index 9a28e91..ea5a310 100644
--- a/src/views/business/stockOrderNewSelectProduct.vue
+++ b/src/views/business/stockOrderNewSelectProduct.vue
@@ -173,11 +173,16 @@ export default {
             type: Function,
             required: true,
         },
+        purType: {
+            type: Object,
+            required: true,
+        },
     },
 
     data() {
         return {
             listQuery: {
+                purType: null,
                 billNo: "",
                 page: 1,
                 limit: 10,
@@ -368,7 +373,8 @@ export default {
             let tQuery = {
                 datas: ids,
                 stockOrderLists: this.data.stockOrderLists,
-                zczbhhzbapzbh: this.multipleSelection.zczbhhzbapzbh
+                zczbhhzbapzbh: this.multipleSelection.zczbhhzbapzbh,
+                purType: this.purType
             };
             getStockOrderDetailInstrumentById(tQuery).then((response) => {
                 this.loading = false;
diff --git a/src/views/purchase/purApply.vue b/src/views/purchase/purApply.vue
index 1740a12..b753f6a 100644
--- a/src/views/purchase/purApply.vue
+++ b/src/views/purchase/purApply.vue
@@ -46,7 +46,7 @@
                         <span>{{ parseTime(scope.row.billDate, '{y}-{m}-{d}') }}</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="创建人" prop="createByName"></el-table-column>
+                <el-table-column label="申购人" prop="createByName"></el-table-column>
                 <el-table-column label="申购仓库" prop="invName"></el-table-column>
                 <el-table-column label="申购分库" prop="subInvName"></el-table-column>
                 <el-table-column label="申购说明" prop="remark"></el-table-column>
@@ -91,9 +91,13 @@
                 <!-- <el-table-column label="产品编码" prop="productId"></el-table-column> -->
                 <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column>
                 <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
-                <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column>
-                <el-table-column label="计量单位" prop="measname" show-overflow-tooltip="true"></el-table-column>
                 <el-table-column label="申购数量" prop="count"></el-table-column>
+                <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip="true"></el-table-column>
+                <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column>
+                <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" show-overflow-tooltip="true"></el-table-column>
+                <el-table-column label="供应商" prop="supName" show-overflow-tooltip="true"></el-table-column>
+                <!--                <el-table-column label="计量单位" prop="measname" show-overflow-tooltip="true"></el-table-column>-->
+
             </el-table>
         </el-card>
 
diff --git a/src/views/purchase/purApplyEditDiaolog.vue b/src/views/purchase/purApplyEditDiaolog.vue
index 7006835..509a2c4 100644
--- a/src/views/purchase/purApplyEditDiaolog.vue
+++ b/src/views/purchase/purApplyEditDiaolog.vue
@@ -62,7 +62,8 @@
 
                     <el-col :span="7">
                         <el-form-item prop="locStorageCode">
-                            <el-select v-model="formData.locStorageCode" placeholder="当前仓库信息" @change="locInChange" style="width: 50%"
+                            <el-select v-model="formData.locStorageCode" placeholder="当前仓库信息" @change="locInChange"
+                                       style="width: 50%"
                                        clearable>
                                 <el-option
                                     v-for="item in storageList"
@@ -102,7 +103,7 @@
                         </div>
                     </el-col>
                     <el-col :span="7">
-                        <el-form-item >
+                        <el-form-item>
                             <el-input v-model="formData.auditRemark" auto-complete="off" :disabled="true"></el-input>
                         </el-form-item>
                     </el-col>
@@ -148,7 +149,7 @@
                         prop="manufactory"
                         show-overflow-tooltip
                     ></el-table-column>
-                    <el-table-column width="150" label="单据数量">
+                    <el-table-column width="150" label="申购数量">
                         <template slot-scope="scope">
                             <el-input size="small" v-model="scope.row.count"
                                       placeholder="请输入数量" style="width: 80%"
@@ -158,7 +159,26 @@
                                       oninput="value=value.replace(/[^\d]/g,'')"></el-input>
                         </template>
                     </el-table-column>
-
+                    <el-table-column
+                        label="供应商"
+                        prop="supName"
+                        show-overflow-tooltip
+                    ></el-table-column>
+                    <el-table-column
+                        label="注册/备案凭证号"
+                        prop="zczbhhzbapzbh"
+                        show-overflow-tooltip
+                    ></el-table-column>
+                    <el-table-column
+                        label="生产厂家"
+                        prop="manufactory"
+                        show-overflow-tooltip
+                    ></el-table-column>
+                    <el-table-column
+                        label="医疗器械注册人"
+                        prop="ylqxzcrbarmc"
+                        show-overflow-tooltip
+                    ></el-table-column>
                     <el-table-column label="操作" fixed="right" width="150">
                         <template slot-scope="scope">
                             <el-button
@@ -196,6 +216,7 @@
             <stockOrderNewSelectProduct
                 :closeDialog="closeDialogC2"
                 :data="thisData"
+                :purType="1"
             ></stockOrderNewSelectProduct>
         </el-dialog>
     </div>
@@ -234,8 +255,8 @@ export default {
                 billDate: "",
                 remark: "",
                 deptCode: null,
-                locStorageCode:null,
-                invWarehouseCode:null,
+                locStorageCode: null,
+                invWarehouseCode: null,
             },
             formRules: {},
             codeArray: [],
@@ -485,8 +506,8 @@ export default {
                 billDate: "",
                 remark: "",
                 deptCode: null,
-                locStorageCode:null,
-                invWarehouseCode:null,
+                locStorageCode: null,
+                invWarehouseCode: null,
             };
             this.orderEditor = false;
         }
diff --git a/src/views/purchase/purPlan.vue b/src/views/purchase/purPlan.vue
index 2ce032d..91beb0f 100644
--- a/src/views/purchase/purPlan.vue
+++ b/src/views/purchase/purPlan.vue
@@ -30,7 +30,7 @@
                             <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
                             <el-button type="primary" icon="search" @click="onSubmitFind">查询</el-button>
                             <el-button type="primary" icon="search" @click="newDistributionForm()" :loading="loading">
-                                新增单据
+                                新增采购计划
                             </el-button>
                         </el-button-group>
 
@@ -91,9 +91,11 @@
                 <!-- <el-table-column label="产品编码" prop="productId"></el-table-column> -->
                 <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column>
                 <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
-                <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column>
-                <el-table-column label="计量单位" prop="measname" show-overflow-tooltip="true"></el-table-column>
                 <el-table-column label="申购数量" prop="count"></el-table-column>
+                <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip="true"></el-table-column>
+                <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column>
+                <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" show-overflow-tooltip="true"></el-table-column>
+                <el-table-column label="供应商" prop="supName" show-overflow-tooltip="true"></el-table-column>
             </el-table>
         </el-card>
 
diff --git a/src/views/purchase/purPlanAudit.vue b/src/views/purchase/purPlanAudit.vue
index aa98b61..37274b0 100644
--- a/src/views/purchase/purPlanAudit.vue
+++ b/src/views/purchase/purPlanAudit.vue
@@ -43,7 +43,8 @@
                         <span>{{ parseTime(scope.row.billDate, '{y}-{m}-{d}') }}</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="采购员" prop="createByName"></el-table-column>
+                <el-table-column label="创建人" prop="createByName"></el-table-column>
+                <el-table-column label="审核人" prop="auditByName"></el-table-column>
                 <el-table-column label="采购仓库" prop="invName"></el-table-column>
                 <el-table-column label="采购分库" prop="subInvName"></el-table-column>
                 <el-table-column label="采购说明" prop="remark"></el-table-column>
@@ -86,9 +87,11 @@
                 <!-- <el-table-column label="产品编码" prop="productId"></el-table-column> -->
                 <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column>
                 <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
-                <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column>
-                <el-table-column label="计量单位" prop="measname" show-overflow-tooltip="true"></el-table-column>
                 <el-table-column label="申购数量" prop="count"></el-table-column>
+                <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip="true"></el-table-column>
+                <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column>
+                <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" show-overflow-tooltip="true"></el-table-column>
+                <el-table-column label="供应商" prop="supName" show-overflow-tooltip="true"></el-table-column>
             </el-table>
         </el-card>
 
diff --git a/src/views/purchase/purPlanDetailDialog.vue b/src/views/purchase/purPlanDetailDialog.vue
index 8deb7e4..ba1c5b8 100644
--- a/src/views/purchase/purPlanDetailDialog.vue
+++ b/src/views/purchase/purPlanDetailDialog.vue
@@ -87,34 +87,92 @@
                     </el-col>
                     <el-col :span="3">
                         <div class="ao-text">
-                            <span>采购说明：</span>
+                            <span>审核说明：</span>
                         </div>
                     </el-col>
                     <el-col :span="7">
                         <el-form-item prop="billNo">
-                            <el-input v-model="formData.remark" :disabled="true" auto-complete="off" type="textarea"
+                            <el-input v-model="formData.auditRemark" auto-complete="off" type="textarea"
                                       autosize></el-input>
                         </el-form-item>
                     </el-col>
                 </el-row>
-                <el-row>
+                <el-row :gutter="20">
+
                     <el-col :span="3">
                         <div class="ao-text">
-                            <span>审核说明：</span>
+                            <span>采购说明：</span>
                         </div>
                     </el-col>
                     <el-col :span="7">
                         <el-form-item prop="billNo">
-                            <el-input v-model="formData.auditRemark" auto-complete="off" type="textarea"
+                            <el-input v-model="formData.remark" :disabled="true" auto-complete="off" type="textarea"
                                       autosize></el-input>
                         </el-form-item>
                     </el-col>
+                    <el-col :span="3">
+                    </el-col>
+                    <el-col :span="7">
+                        <el-form-item>
+                            <el-checkbox v-model="formData.autoPurchase">是否生成采购入库单</el-checkbox>
+                        </el-form-item>
+                    </el-col>
+
                 </el-row>
+                <el-row :gutter="20" style="margin-top: -10px" v-show="formData.autoPurchase">
+
+
+                    <el-col :span="3">
+                        <div class="ao-text">
+                            <span>入库仓库：</span>
+                        </div>
+                    </el-col>
+
+                    <el-col :span="7">
+                        <el-form-item prop="locStorageCode">
+                            <el-select v-model="formData.targetSubInv" placeholder="入库仓库信息" style="width: 100%"
+
+                                       @change="targetInvChange"
+                                       clearable>
+                                <el-option
+                                    v-for="item in tarSubList"
+                                    :key="item.name"
+                                    :label="item.name"
+                                    :value="item.code">
+                                    <span style="float: left">{{ item.name }}</span>
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+
 
+                    <el-col :span="3">
+                        <div class="ao-text">
+                            <span>入库单据类型：</span>
+                        </div>
+                    </el-col>
+                    <el-col :span="7">
+                        <el-form-item class="query-form-item" prop="targetBillAction">
+                            <el-select v-model="formData.targetBillAction" placeholder="请选择单据类型"
+                                       style="width: 100%"
+                            >
+                                <el-option
+                                    v-for="item in busTypes"
+                                    :key="item.localName"
+                                    :label="item.localName"
+                                    :value="item.localAction">
+                                    <span style="float: left">{{ item.localName }}</span>
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+
+
+                </el-row>
             </el-card>
 
             <el-card>
-                <el-button-group style="display: flex">
+                <!-- <el-button-group style="display: flex">
                     <el-button
                         type="primary"
                         size="small"
@@ -124,7 +182,7 @@
                     >产品录入
                     </el-button
                     >
-                </el-button-group>
+                </el-button-group> -->
 
                 <el-table v-loading="loading" :data="codeArray" style="width: 100%;"
                           :row-class-name="tableRowClassName"
@@ -162,7 +220,7 @@
                         </template>
                     </el-table-column>
 
-                    <el-table-column label="操作" fixed="right" width="150">
+                    <!-- <el-table-column label="操作" fixed="right" width="150">
                         <template slot-scope="scope">
                             <el-button
                                 type="text"
@@ -182,7 +240,7 @@
                             </el-button
                             >
                         </template>
-                    </el-table-column>
+                    </el-table-column> -->
                 </el-table>
             </el-card>
         </el-form>
@@ -199,6 +257,7 @@
             <stockOrderNewSelectProduct
                 :closeDialog="closeDialogC2"
                 :data="thisData"
+                :purType="1"
             ></stockOrderNewSelectProduct>
         </el-dialog>
     </div>
@@ -210,6 +269,7 @@ import stockOrderNewSelectProduct from "../business/stockOrderNewSelectProduct";
 import {auditOrder, delApplyDetail, listApplyDetail} from "@/api/purchase/purPlan";
 import {filterAllByUser} from "@/api/basic/invWarehouse";
 import {filterSubByInv} from "@/api/basic/invSubWarehouse";
+import {getLocalJoinByUser} from "@/api/basic/busLocalType";
 
 export default {
     name: "idQuery",
@@ -244,6 +304,10 @@ export default {
                 locStorageCode: null,
                 invWarehouseCode: null,
                 auditRemark: null,
+                autoPurchase: false,
+                targetInv: 1000,
+                targetSubInv: null,
+                targetBillAction: null,
             },
             formRules: {},
             codeArray: [],
@@ -275,8 +339,10 @@ export default {
             thisData: {},
             storageList: [],
             subInvList: [],
+            tarSubList: [],
             invQueryData: {},
 
+
         };
     },
     components: {
@@ -446,6 +512,38 @@ export default {
                 .catch(() => {
                 });
         },
+
+        findTargetSubInvs() {
+            this.tarSubList = [];
+            let query = {
+                pcode: 1000
+            };
+            filterSubByInv(query)
+                .then((response) => {
+                    this.tarSubList = response.data || [];
+                    if (this.tarSubList != null && this.tarSubList.length == 1) {
+                        this.formData.targetSubInv = this.tarSubList[0].code;
+                        this.targetInvChange();
+                    }
+                })
+                .catch(() => {
+                });
+        },
+        targetInvChange() {
+            let query = {
+                code: this.formData.targetSubInv,
+                enabled: true,
+                spUse: true,
+            };
+            getLocalJoinByUser(query)
+                .then((response) => {
+                    this.busTypes = response.data.list || [];
+                    // this.formData.targetBillAction = this.busTypes[0].localAction;
+                })
+                .catch(() => {
+                });
+        },
+
         locInChange(item) {
             if (this.formData.invWarehouseCode != null) {
                 this.formData.invWarehouseCode = "";
@@ -467,6 +565,7 @@ export default {
             this.query.limit = 100;
             this.query.orderIdFk = this.idQuery.id;
             this.formData = this.idQuery.formData;
+            this.formData.targetInv = 1000;
             this.orderEditor = true;
             this.sValue = this.formData.corpName;
             this.getStockOrderDetailList();
@@ -479,10 +578,16 @@ export default {
                 deptCode: null,
                 locStorageCode: null,
                 invWarehouseCode: null,
+                auditRemark: null,
+                autoPurchase: false,
+                targetInv: 1000,
+                targetSubInv: null,
+                targetBillAction: null,
             };
             this.orderEditor = false;
         }
         this.getStorage();
+        this.findTargetSubInvs();
         this.codeArray = [];
     },
 };
diff --git a/src/views/purchase/purPlanEditDialog.vue b/src/views/purchase/purPlanEditDialog.vue
index e40729d..4d3c60d 100644
--- a/src/views/purchase/purPlanEditDialog.vue
+++ b/src/views/purchase/purPlanEditDialog.vue
@@ -55,25 +55,25 @@
 
                 <el-row :gutter="20" style="margin-top: -10px">
 
-                    <el-col :span="3">
-                        <div class="ao-text">
-                            <span>采购类型：</span>
-                        </div>
-                    </el-col>
-                    <el-col :span="7">
-                        <el-form-item prop="billType">
-                            <el-select v-model="formData.billType" placeholder="请选择采购类型" style="width: 100%"
-                                       clearable>
-                                <el-option
-                                    v-for="item in busTypes"
-                                    :key="item.originAction"
-                                    :label="item.originName"
-                                    :value="item.originAction">
-                                    <span style="float: left">{{ item.originName }}</span>
-                                </el-option>
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
+                    <!--                    <el-col :span="3">-->
+                    <!--                        <div class="ao-text">-->
+                    <!--                            <span>采购类型：</span>-->
+                    <!--                        </div>-->
+                    <!--                    </el-col>-->
+                    <!--                    <el-col :span="7">-->
+                    <!--                        <el-form-item prop="billType">-->
+                    <!--                            <el-select v-model="formData.billType" placeholder="请选择采购类型" style="width: 100%"-->
+                    <!--                                       clearable>-->
+                    <!--                                <el-option-->
+                    <!--                                    v-for="item in busTypes"-->
+                    <!--                                    :key="item.originAction"-->
+                    <!--                                    :label="item.originName"-->
+                    <!--                                    :value="item.originAction">-->
+                    <!--                                    <span style="float: left">{{ item.originName }}</span>-->
+                    <!--                                </el-option>-->
+                    <!--                            </el-select>-->
+                    <!--                        </el-form-item>-->
+                    <!--                    </el-col>-->
 
                     <el-col :span="3">
                         <div class="ao-text">
@@ -107,9 +107,7 @@
                         </el-form-item>
                     </el-col>
 
-                </el-row>
 
-                <el-row :gutter="20" style="margin-top: -10px">
                     <el-col :span="3">
                         <div class="ao-text">
                             <span>采购说明：</span>
@@ -120,34 +118,49 @@
                             <el-input v-model="formData.remark" auto-complete="off" type="textarea" autosize></el-input>
                         </el-form-item>
                     </el-col>
+
+                    <el-col :span="3" v-show="formData.status==4">
+                        <div class="ao-text">
+                            <span>拒绝原因：</span>
+                        </div>
+                    </el-col>
+                    <el-col :span="7" v-show="formData.status==4">
+                        <el-form-item>
+                            <el-input v-model="formData.auditRemark" auto-complete="off" :disabled="true"></el-input>
+                        </el-form-item>
+                    </el-col>
+
                 </el-row>
-                <el-col :span="3" v-show="formData.status==4">
-                       <div class="ao-text">
-                            <span>拒绝原因：</span>
-                        </div>
-                    </el-col>
-                    <el-col :span="7" v-show="formData.status==4">
-                        <el-form-item >
-                            <el-input v-model="formData.auditRemark" auto-complete="off" :disabled="true"></el-input>
-                        </el-form-item>
-                    </el-col>
 
+                <el-row :gutter="20" style="margin-top: -10px">
 
+                </el-row>
             </el-card>
 
             <el-card>
-                <el-button-group style="display: flex">
-                    <el-button
-                        type="primary"
-                        size="small"
-                        @click.native.stop="selectProductFunction()"
-                        style="margin: 0px 60px 10px auto; height: 35px"
-                        :loading="loading"
-                    >产品录入
-                    </el-button
-                    >
-                </el-button-group>
+                <el-row type="flex" justify="end">
+                    <el-button-group style="display: flex">
+
+
+                        <el-button-group style="display: flex;margin-bottom: 15px; margin-right: 50px">
+                            <el-button
+                                type="primary"
+                                @click.native.stop="selectProductFunction()"
+                                :loading="loading"
+                            >产品录入
+                            </el-button
+                            >
+                            <el-button
+                                type="primary"
+                                :loading="loading"
+                            >选入申购单
+                            </el-button
+                            >
+                        </el-button-group>
+
 
+                    </el-button-group>
+                </el-row>
                 <el-table v-loading="loading" :data="codeArray" style="width: 100%;"
                           :row-class-name="tableRowClassName"
                           max-height="300" height="300" ref="multipleTable">
@@ -162,18 +175,7 @@
                         prop="spec"
                         show-overflow-tooltip
                     ></el-table-column>
-
-                    <el-table-column
-                        label="计量单位"
-                        prop="measname"
-                        show-overflow-tooltip
-                    ></el-table-column>
-                    <el-table-column
-                        label="生产厂家"
-                        prop="manufactory"
-                        show-overflow-tooltip
-                    ></el-table-column>
-                    <el-table-column width="150" label="单据数量">
+                    <el-table-column width="150" label="申购数量">
                         <template slot-scope="scope">
                             <el-input size="small" v-model="scope.row.count"
                                       placeholder="请输入数量" style="width: 80%"
@@ -183,6 +185,33 @@
                                       oninput="value=value.replace(/[^\d]/g,'')"></el-input>
                         </template>
                     </el-table-column>
+                    <!--                    <el-table-column-->
+                    <!--                        label="计量单位"-->
+                    <!--                        prop="measname"-->
+                    <!--                        show-overflow-tooltip-->
+                    <!--                    ></el-table-column>-->
+                    <el-table-column
+                        label="供应商"
+                        prop="supName"
+                        show-overflow-tooltip
+                    ></el-table-column>
+                    <el-table-column
+                        label="注册/备案凭证号"
+                        prop="zczbhhzbapzbh"
+                        show-overflow-tooltip
+                    ></el-table-column>
+                    <el-table-column
+                        label="生产厂家"
+                        prop="manufactory"
+                        show-overflow-tooltip
+                    ></el-table-column>
+                    <el-table-column
+                        label="医疗器械注册人"
+                        prop="ylqxzcrbarmc"
+                        show-overflow-tooltip
+                    ></el-table-column>
+
+
 
                     <el-table-column label="操作" fixed="right" width="150">
                         <template slot-scope="scope">
@@ -220,6 +249,7 @@
         >
             <stockOrderNewSelectProduct
                 :closeDialog="closeDialogC2"
+                :purType="1"
                 :data="thisData"
             ></stockOrderNewSelectProduct>
         </el-dialog>
@@ -303,6 +333,7 @@ export default {
     },
     methods: {
         saveOrder(status) {
+
             this.$refs["dataForm"].validate(valid => {
                 if (valid) {
                     if (this.codeArray.length < 1) {
@@ -310,6 +341,19 @@ export default {
                         return;
                     }
                     if (status === '2') {
+
+                        if (this.formData.billDate == "" || this.formData.billDate == null) {
+                            return this.$message.error("单据日期不能为空！");
+                        }
+                        // if (this.formData.billType == "" || this.formData.billType == null) {
+                        //     return this.$message.error("采购类型不能为空！");
+                        // }
+                        if (this.formData.locStorageCode == "" || this.formData.locStorageCode == null) {
+                            return this.$message.error("采购仓库不能为空！");
+                        }
+                        if (this.formData.invWarehouseCode == "" || this.formData.invWarehouseCode == null) {
+                            return this.$message.error("采购分库不能为空！");
+                        }
                         for (let i = 0; i < this.codeArray.length; i++) {
                             if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count == "0") {
                                 return this.$message.error('单据数量不能为0');
diff --git a/src/views/purchase/purPlanSearch.vue b/src/views/purchase/purPlanSearch.vue
index c67827b..467c825 100644
--- a/src/views/purchase/purPlanSearch.vue
+++ b/src/views/purchase/purPlanSearch.vue
@@ -43,7 +43,8 @@
                         <span>{{ parseTime(scope.row.billDate, '{y}-{m}-{d}') }}</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="采购员" prop="createByName"></el-table-column>
+                <el-table-column label="创建人" prop="createByName"></el-table-column>
+                <el-table-column label="审核人" prop="auditByName"></el-table-column>
                 <el-table-column label="采购仓库" prop="invName"></el-table-column>
                 <el-table-column label="采购分库" prop="subInvName"></el-table-column>
                 <el-table-column label="采购说明" prop="remark"></el-table-column>
@@ -85,9 +86,11 @@
                 <!-- <el-table-column label="产品编码" prop="productId"></el-table-column> -->
                 <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column>
                 <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
-                <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column>
-                <el-table-column label="计量单位" prop="measname" show-overflow-tooltip="true"></el-table-column>
                 <el-table-column label="申购数量" prop="count"></el-table-column>
+                <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip="true"></el-table-column>
+                <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column>
+                <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" show-overflow-tooltip="true"></el-table-column>
+                <el-table-column label="供应商" prop="supName" show-overflow-tooltip="true"></el-table-column>
             </el-table>
         </el-card>
 
diff --git a/src/views/purchase/pureApplyAudit.vue b/src/views/purchase/pureApplyAudit.vue
index 473a86d..e28b7ef 100644
--- a/src/views/purchase/pureApplyAudit.vue
+++ b/src/views/purchase/pureApplyAudit.vue
@@ -52,7 +52,8 @@
                         <span>{{ parseTime(scope.row.billDate, '{y}-{m}-{d}') }}</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="创建人" prop="createByName"></el-table-column>
+                <el-table-column label="申购人" prop="createByName"></el-table-column>
+                <el-table-column label="审核人" prop="auditByName"></el-table-column>
                 <el-table-column label="申购仓库" prop="invName"></el-table-column>
                 <el-table-column label="申购分库" prop="subInvName"></el-table-column>
                 <el-table-column label="申购说明" prop="remark"></el-table-column>
@@ -95,9 +96,11 @@
                 <!-- <el-table-column label="产品编码" prop="productId"></el-table-column> -->
                 <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column>
                 <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
-                <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column>
-                <el-table-column label="计量单位" prop="measname" show-overflow-tooltip="true"></el-table-column>
                 <el-table-column label="申购数量" prop="count"></el-table-column>
+                <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip="true"></el-table-column>
+                <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column>
+                <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" show-overflow-tooltip="true"></el-table-column>
+                <el-table-column label="供应商" prop="supName" show-overflow-tooltip="true"></el-table-column>
             </el-table>
         </el-card>
 
diff --git a/src/views/purchase/pureApplyDetailDialog.vue b/src/views/purchase/pureApplyDetailDialog.vue
index e58f9ca..d4afd11 100644
--- a/src/views/purchase/pureApplyDetailDialog.vue
+++ b/src/views/purchase/pureApplyDetailDialog.vue
@@ -89,35 +89,47 @@
                     </el-col>
 
 
+                    <!--          <el-col :span="3">-->
+                    <!--            <div class="ao-text">-->
+                    <!--              <span>当前仓库：</span>-->
+                    <!--            </div>-->
+                    <!--          </el-col>-->
+
+                    <!--          <el-col :span="7">-->
+                    <!--            <el-form-item prop="targetInv">-->
+                    <!--              <el-select v-model="formData.targetInv" placeholder="当前仓库信息" @change="locInChange"-->
+                    <!--                         style="width: 50%"-->
+                    <!--                         clearable>-->
+                    <!--                <el-option-->
+                    <!--                    v-for="item in targetInvList"-->
+                    <!--                    :key="item.name"-->
+                    <!--                    :label="item.name"-->
+                    <!--                    :value="item.code">-->
+                    <!--                  <span style="float: left">{{ item.name }}</span>-->
+                    <!--                </el-option>-->
+                    <!--              </el-select>-->
+                    <!--              <el-select v-model="formData.targetSubInv" placeholder="当前分库信息" style="width: 50%"-->
+                    <!--                         clearable>-->
+                    <!--                <el-option-->
+                    <!--                    v-for="item in targetSubInvList"-->
+                    <!--                    :key="item.name"-->
+                    <!--                    :label="item.name"-->
+                    <!--                    :value="item.code">-->
+                    <!--                  <span style="float: left">{{ item.name }}</span>-->
+                    <!--                </el-option>-->
+                    <!--              </el-select>-->
+                    <!--            </el-form-item>-->
+                    <!--          </el-col>-->
                     <el-col :span="3">
                         <div class="ao-text">
-                            <span>当前仓库：</span>
+                            <span>申购说明：</span>
                         </div>
                     </el-col>
-
                     <el-col :span="7">
-                        <el-form-item prop="targetInv">
-                            <el-select v-model="formData.targetInv" placeholder="当前仓库信息" @change="locInChange"
-                                       style="width: 50%"
-                                       clearable>
-                                <el-option
-                                    v-for="item in targetInvList"
-                                    :key="item.name"
-                                    :label="item.name"
-                                    :value="item.code">
-                                    <span style="float: left">{{ item.name }}</span>
-                                </el-option>
-                            </el-select>
-                            <el-select v-model="formData.targetSubInv" placeholder="当前分库信息" style="width: 50%"
-                                       clearable>
-                                <el-option
-                                    v-for="item in targetSubInvList"
-                                    :key="item.name"
-                                    :label="item.name"
-                                    :value="item.code">
-                                    <span style="float: left">{{ item.name }}</span>
-                                </el-option>
-                            </el-select>
+                        <el-form-item prop="billNo">
+                            <el-input v-model="formData.remark" auto-complete="off" type="textarea"
+                                      disabled
+                                      autosize></el-input>
                         </el-form-item>
                     </el-col>
 
@@ -128,25 +140,25 @@
                 <el-row :gutter="20" style="margin-top: -10px">
 
 
-                    <el-col :span="3">
-                        <div class="ao-text">
-                            <span>生成采购计划：</span>
-                        </div>
-                    </el-col>
-                    <el-col :span="7">
-                        <el-form-item prop="billType">
-                            <el-select v-model="formData.targetBillType" placeholder="请选择采购类型" style="width: 100%"
-                                       clearable>
-                                <el-option
-                                    v-for="item in busTypes"
-                                    :key="item.originAction"
-                                    :label="item.originName"
-                                    :value="item.originAction">
-                                    <span style="float: left">{{ item.originName }}</span>
-                                </el-option>
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
+                    <!--                    <el-col :span="3">-->
+                    <!--                        <div class="ao-text">-->
+                    <!--                            <span>生成采购计划：</span>-->
+                    <!--                        </div>-->
+                    <!--                    </el-col>-->
+                    <!--                    <el-col :span="7">-->
+                    <!--                        <el-form-item prop="billType">-->
+                    <!--                            <el-select v-model="formData.targetBillType" placeholder="请选择采购类型" style="width: 100%"-->
+                    <!--                                       clearable>-->
+                    <!--                                <el-option-->
+                    <!--                                    v-for="item in busTypes"-->
+                    <!--                                    :key="item.originAction"-->
+                    <!--                                    :label="item.originName"-->
+                    <!--                                    :value="item.originAction">-->
+                    <!--                                    <span style="float: left">{{ item.originName }}</span>-->
+                    <!--                                </el-option>-->
+                    <!--                            </el-select>-->
+                    <!--                        </el-form-item>-->
+                    <!--                    </el-col>-->
 
                     <el-col :span="3">
                         <div class="ao-text">
@@ -159,6 +171,14 @@
                                       autosize></el-input>
                         </el-form-item>
                     </el-col>
+
+                    <el-col :span="2">
+                    </el-col>
+                    <el-col :span="7">
+                        <el-form-item>
+                            <el-checkbox v-model="formData.audtoPlan">是否生成采购计划</el-checkbox>
+                        </el-form-item>
+                    </el-col>
                 </el-row>
 
 
@@ -180,10 +200,11 @@
                         prop="spec"
                         show-overflow-tooltip
                     ></el-table-column>
-
+                    <el-table-column width="150" label="单据数量" prop="count">
+                    </el-table-column>
                     <el-table-column
-                        label="计量单位"
-                        prop="measname"
+                        label="注册/备案凭证号"
+                        prop="zczbhhzbapzbh"
                         show-overflow-tooltip
                     ></el-table-column>
                     <el-table-column
@@ -191,10 +212,14 @@
                         prop="manufactory"
                         show-overflow-tooltip
                     ></el-table-column>
-                    <el-table-column width="150" label="单据数量" prop="count">
-                    </el-table-column>
+                    <el-table-column
+                        label="医疗器械注册人"
+                        prop="ylqxzcrbarmc"
+                        show-overflow-tooltip
+                    ></el-table-column>
 
-                    <el-table-column label="操作" fixed="right" width="150">
+
+                    <!-- <el-table-column label="操作" fixed="right" width="150">
                         <template slot-scope="scope">
                             <el-button
                                 type="text"
@@ -214,7 +239,7 @@
                             </el-button
                             >
                         </template>
-                    </el-table-column>
+                    </el-table-column> -->
                 </el-table>
             </el-card>
         </el-form>
@@ -230,6 +255,7 @@
         >
             <stockOrderNewSelectProduct
                 :closeDialog="closeDialogC2"
+                :purType="1"
                 :data="thisData"
             ></stockOrderNewSelectProduct>
         </el-dialog>
@@ -281,7 +307,8 @@ export default {
                 targetInv: null,
                 targetSubInv: null,
                 targetBillType: null,
-                auditRemark:"",
+                auditRemark: "",
+                audtoPlan: false,
             },
             formRules: {},
             codeArray: [],
diff --git a/src/views/purchase/pureApplySearch.vue b/src/views/purchase/pureApplySearch.vue
index a4e3b7b..e647b66 100644
--- a/src/views/purchase/pureApplySearch.vue
+++ b/src/views/purchase/pureApplySearch.vue
@@ -52,6 +52,7 @@
                     </template>
                 </el-table-column>
                 <el-table-column label="创建人" prop="createByName"></el-table-column>
+                <el-table-column label="审核人" prop="auditByName"></el-table-column>
                 <el-table-column label="申购仓库" prop="invName"></el-table-column>
                 <el-table-column label="申购分库" prop="subInvName"></el-table-column>
                 <el-table-column label="申购说明" prop="remark"></el-table-column>
@@ -93,12 +94,15 @@
                 <!-- <el-table-column label="产品编码" prop="productId"></el-table-column> -->
                 <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column>
                 <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
-                <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column>
-                <el-table-column label="计量单位" prop="measname" show-overflow-tooltip="true"></el-table-column>
                 <el-table-column label="申购数量" prop="count"></el-table-column>
+                <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip="true"></el-table-column>
+                <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column>
+                <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" show-overflow-tooltip="true"></el-table-column>
+                <el-table-column label="供应商" prop="supName" show-overflow-tooltip="true"></el-table-column>
             </el-table>
         </el-card>
 
+
         <el-dialog
             :title="formMap[formName]"
             :visible.sync="newSpDistributionVisible"