diff --git a/src/views/basic/UdiInfoManage.vue b/src/views/basic/UdiInfoManage.vue
index f052bc3..091a9b2 100644
--- a/src/views/basic/UdiInfoManage.vue
+++ b/src/views/basic/UdiInfoManage.vue
@@ -14,18 +14,21 @@
             <el-row>
                 <el-form-item class="query-form-item">
                     <el-input
+                        clearable
                         v-model="filterQuery.cpmctymc"
                         placeholder="产品通用名"
                     ></el-input>
                 </el-form-item>
                 <el-form-item class="query-form-item">
                     <el-input
+                        clearable
                         v-model="filterQuery.ggxh"
                         placeholder="规格型号"
                     ></el-input>
                 </el-form-item>
                 <el-form-item class="query-form-item">
                     <el-input
+                        clearable
                         v-model="filterQuery.cpms"
                         placeholder="产品描述"
                     ></el-input>
@@ -33,7 +36,7 @@
                 <el-form-item class="query-form-item">
                     <el-input
                         v-model="filterQuery.zczbhhzbapzbh"
-                        placeholder="注册/备案号"
+                        placeholder="注册/备案凭证号"
                     ></el-input>
                 </el-form-item>
             </el-row>
@@ -41,18 +44,21 @@
             <el-row>
                 <el-form-item class="query-form-item">
                     <el-input
+                        clearable
                         v-model="filterQuery.ylqxzcrbarmc"
-                        placeholder="注册/备案人"
+                        placeholder="医疗器械注册人"
                     ></el-input>
                 </el-form-item>
                 <el-form-item class="query-form-item">
                     <el-input
+                        clearable
                         v-model="filterQuery.manufactory"
                         placeholder="生产企业"
                     ></el-input>
                 </el-form-item>
                 <el-form-item class="query-form-item">
                     <el-input
+                        clearable
                         v-model="filterQuery.thirdId"
                         placeholder="第三方产品编码"
                     ></el-input>
diff --git a/src/views/sys/bindPlatform.vue b/src/views/sys/bindPlatform.vue
index 9cb9d6d..159fb97 100644
--- a/src/views/sys/bindPlatform.vue
+++ b/src/views/sys/bindPlatform.vue
@@ -5,14 +5,6 @@
                 <el-form-item class="query-form-item">
                     <el-input v-model="query.key" style="width: 300px;" placeholder="搜索"></el-input>
                 </el-form-item>
-                <el-form-item class="query-form-item">
-                    <el-select v-model="query.corpType" placeholder="往来单位类型">
-                        <el-option label="全部" value=""></el-option>
-                        <el-option label="客户" value="1"></el-option>
-                        <el-option label="供应商" value="2"></el-option>
-                        <el-option label="特殊往来" value="4"></el-option>
-                    </el-select>
-                </el-form-item>
                 <el-form-item>
                     <el-button-group>
                         <el-button
@@ -42,11 +34,6 @@
             <el-table-column label="序号" type="index" fixed></el-table-column>
             <el-table-column label="往来单位编码" prop="unitId" fixed></el-table-column>
             <el-table-column label="往来单位名称" prop="corpName" fixed></el-table-column>
-            <el-table-column label="往来单位类型" prop="coryType" fixed>
-                <template slot-scope="scope">
-                    <span>{{ coryTypeArr[scope.row.corpType] }}</span>
-                </template>
-            </el-table-column>
             <el-table-column label="拼音码" prop="pinyinCode" fixed></el-table-column>
             <el-table-column label="医院客户名称" prop="platformName" fixed></el-table-column>
             <el-table-column label="操作" fixed="right">
@@ -218,256 +205,334 @@
 </template>
 
 <script>
-import {
-    getUnbindUnitMaintain,
-    getUnitMaintain,
-    addUnit,
-    modifyUnit
-} from "../../api/receipts/unitMaintain";
-import {
-    getPlatform,
-    linkPlatform,
-    getLinkPlatformList,
-    unbindPlatform,
-    getTargetActions
-} from "../../api/auth/platform";
-import {getBusTypeByUser} from "@/api/warehouse/BusRole";
+    import {
+        getUnbindUnitMaintain,
+        getUnitMaintain,
+        addUnit,
+        modifyUnit
+    } from "../../api/receipts/unitMaintain";
+    import {
+        getPlatform,
+        linkPlatform,
+        getLinkPlatformList,
+        unbindPlatform,
+        getTargetActions
+    } from "../../api/auth/platform";
+    import {getBusTypeByUser} from "@/api/warehouse/BusRole";
 
-export default {
-    data() {
-        return {
-            query: {
-                key: "",
-                coryType: null,
-                customerId: this.$store.getters.customerId,
-                page: 1,
-                limit: 20
-            },
-            editLogin: {
-                id: null,
-                corpName: null,
-                platformId: null,
-                platformUsername: null,
-                platformPassword: null,
-                appid: null,
-                appKey: null,
-                sceretKey: null,
-                sourceAction: null,
-                targetAction: null
-            },
-            editPlatfromQuery: {
-                id: null,
-                name: null,
-                host: null
-            },
-            loading: false,
-            editLoginVisible: false,
+    export default {
+        data() {
+            return {
+                query: {
+                    key: "",
+                    coryType: null,
+                    customerId: this.$store.getters.customerId,
+                    page: 1,
+                    limit: 20
+                },
+                editLogin: {
+                    id: null,
+                    corpName: null,
+                    platformId: null,
+                    platformUsername: null,
+                    platformPassword: null,
+                    appid: null,
+                    appKey: null,
+                    sceretKey: null,
+                    sourceAction: null,
+                    targetAction: null
+                },
+                editPlatfromQuery: {
+                    id: null,
+                    name: null,
+                    host: null
+                },
+                loading: false,
+                editLoginVisible: false,
+
+                checked: false,
+                editDialogVisible: false,
+                list: [],
+                total: 0,
+                multipleSelection: [],
+                platformList: [],
+                corpNamesList: [],
+                bussinessTypes: [],
+                targetActions: [],
+                platformRules: {
+                    corpName: [
+                        {required: true, message: "请选择往来单位", trigger: "change"}
+                    ],
+                    platformId: [
+                        {required: true, message: "请选择自助平台", trigger: "change"}
+                    ],
+                    platformUsername: [
+                        {required: true, message: "请输入账号", trigger: "change"}
+                    ],
+                    platformPassword: [
+                        {required: true, message: "请输入密码", trigger: "change"}
+                    ],
+                    sourceAction: [
+                        {required: true, message: "请选择本地单据类型", trigger: "change"}
+                    ],
+                    targetAction: [
+                        {required: true, message: "请选择目标单据类型", trigger: "change"}
+                    ]
 
-            checked: false,
-            editDialogVisible: false,
-            list: [],
-            total: 0,
-            multipleSelection: [],
-            platformList: [],
-            corpNamesList: [],
-            bussinessTypes: [],
-            targetActions: [],
-            platformRules: {
-                corpName: [
-                    {required: true, message: "请选择往来单位", trigger: "change"}
-                ],
-                platformId: [
-                    {required: true, message: "请选择自助平台", trigger: "change"}
-                ],
-                platformUsername: [
-                    {required: true, message: "请输入账号", trigger: "change"}
-                ],
-                platformPassword: [
-                    {required: true, message: "请输入密码", trigger: "change"}
-                ],
-                sourceAction: [
-                    {required: true, message: "请选择本地单据类型", trigger: "change"}
-                ],
-                targetAction: [
-                    {required: true, message: "请选择目标单据类型", trigger: "change"}
+                },
+                editType: 0,
+                corpTypeList: [
+                    {
+                        value: 1,
+                        label: "客户"
+                    },
+                    {
+                        value: 2,
+                        label: "供应商"
+                    },
+                    {
+                        value: 4,
+                        label: "特殊往来"
+                    }
                 ]
+            };
+        },
 
+        methods: {
+            onReset() {
+                this.$router.push({
+                    path: ""
+                });
+                this.query = {
+                    key: "",
+                    coryType: null,
+                    customerId: this.$store.getters.customerId,
+                    page: 1,
+                    limit: 20
+                };
+                this.getList();
             },
-            editType: 0,
-            corpTypeList: [
-                {
-                    value: 1,
-                    label: "客户"
-                },
-                {
-                    value: 2,
-                    label: "供应商"
-                },
-                {
-                    value: 4,
-                    label: "特殊往来"
+            getList() {
+                this.loading = true;
+                getLinkPlatformList(this.query).then((res) => {
+                    this.loading = false;
+                    this.list = res.data || [];
+                }).catch(() => {
+                    this.loading = false;
+                    this.list = [];
+                });
+            },
+            cancelDialog() {
+                this.editLoginVisible = false;
+            },
+            handleModifyClick(row) {
+                if (row.platformId != null) {
+                    //已经绑定过
+                    this.$confirm("是否需要重新关联自助平台?", "提示", {
+                        confirmButtonText: "确定",
+                        cancelButtonText: "取消",
+                        type: "warning"
+                    }).then(() => {
+                        this.editType = 2;
+                        this.editLoginVisible = true;
+                        this.editLogin = row;
+                        this.editDialogVisible = true;
+                        this.getUnitMaintain();
+                        this.getPlatformList();
+                        this.getLocalBussinessType();
+                        this.getTargetActions(row.platformId);
+                    }).catch(() => {
+                    });
+                } else {
+                    this.editType = 2;
+                    this.editLoginVisible = true;
+                    this.editLogin = row;
                 }
-            ],
-            coryTypeArr: {
-                1: "客户",
-                2: "供应商",
-                4: "特殊往来"
-            }
-        };
-    },
+            },
+            handleAddClick() {
+                this.editType = 0;
+                this.editLoginVisible = true;
+                this.editDialogVisible = false;
 
-    methods: {
-        onReset() {
-            this.$router.push({
-                path: ""
-            });
-            this.query = {
-                key: "",
-                coryType: null,
-                customerId: this.$store.getters.customerId,
-                page: 1,
-                limit: 20
-            };
-            this.getList();
-        },
-        getList() {
-            this.loading = true;
-            getLinkPlatformList(this.query).then((res) => {
-                this.loading = false;
-                this.list = res.data || [];
-            }).catch(() => {
-                this.loading = false;
-                this.list = [];
-            });
-        },
-        cancelDialog() {
-            this.editLoginVisible = false;
-        },
-        handleModifyClick(row) {
-            if (row.platformId != null) {
-                //已经绑定过
-                this.$confirm("是否需要重新关联自助平台?", "提示", {
+                //清空表单数据
+                this.editLogin = {
+                    id: null,
+                    corpName: null,
+                    platformId: null,
+                    platformUsername: null,
+                    platformPassword: null,
+                    appid: null,
+                    appKey: null,
+                    sceretKey: null,
+                    sourceAction: null,
+                    targetAction: null
+                };
+                this.getLocalBussinessType();
+                this.getUnitMaintain();
+                this.getPlatformList();
+            },
+            change() {
+            },
+            getUnitMaintain() {
+                let unitQuery = {
+                    customerId: this.$store.getters.customerId,
+                    corpType: 1,
+                    page: 1,
+                    limit: 20
+                };
+                getUnitMaintain(unitQuery)
+                    .then((response) => {
+                        this.corpNamesList = response.data.list || [];
+                    })
+                    .catch(() => {
+                        this.loading = false;
+                    });
+            },
+            //获取自助平台数据
+            getPlatformList() {
+                this.loading = true;
+                getPlatform().then((response) => {
+                    this.loading = false;
+                    this.platformList = response.data.list || [];
+                }).catch(() => {
+                    this.loading = false;
+                    this.platformList = [];
+                });
+            },
+            intentPlatform(value) {
+                this.editPlatfromQuery.id = value;
+                //拉取对应平台的单据类型
+                this.getTargetActions(value);
+            },
+            getTargetActions(platformId) {
+                this.targetActions = [];
+                let query = {
+                    platformId: platformId
+                };
+                getTargetActions(query).then((res) => {
+                    this.targetActions = res.data.list || [];
+                }).catch((error) => {
+                    this.$message.error("获取自助平台单据类型失败");
+                });
+            },
+            getLocalBussinessType() {
+                let tQuery = {};
+                getBusTypeByUser(tQuery).then((res) => {
+                    this.bussinessTypes = res.data.list || [];
+                }).catch((error) => {
+                    this.$message.error(error.message);
+                });
+            },
+            //获取往来单位集合
+            formSubmit() {
+                this.$refs["editQuery"].validate((valid) => {
+                    if (valid) {
+                        if (this.editType == 0) {
+                            addUnit(this.editQuery)
+                                .then((response) => {
+                                    if (response.code == 20000) {
+                                        this.getList();
+                                        this.$message({
+                                            type: "success",
+                                            message: "添加成功"
+                                        });
+                                        this.cancelDialog();
+                                    } else {
+                                        this.$message.error(response.message);
+                                    }
+                                })
+                                .catch(() => {
+                                });
+                        } else {
+                            modifyUnit(this.editQuery)
+                                .then((response) => {
+                                    if (response.code == 20000) {
+                                        this.getList();
+                                        this.$message({
+                                            type: "success",
+                                            message: "修改成功"
+                                        });
+                                        this.cancelDialog();
+                                    } else {
+                                        this.$message.error(response.message);
+                                    }
+                                })
+                                .catch(() => {
+                                });
+                        }
+                    }
+                });
+            },
+            unbindDialog(row) {
+                this.$confirm("此操作将解除绑定, 是否继续?", "提示", {
                     confirmButtonText: "确定",
                     cancelButtonText: "取消",
                     type: "warning"
                 }).then(() => {
-                    this.editType = 2;
-                    this.editLoginVisible = true;
-                    this.editLogin = row;
-                    this.editDialogVisible = true;
-                    this.getUnitMaintain();
-                    this.getPlatformList();
-                    this.getLocalBussinessType();
-                    this.getTargetActions(row.platformId);
+                    this.loading = true;
+                    console.log(row)
+                    let query = {
+                        corpId: row.id
+                    };
+                    unbindPlatform(query).then((res) => {
+                        this.loading = false;
+                        this.getList();
+                        this.$message.success("解绑成功");
+                    }).catch((error) => {
+                        this.loading = false;
+                        this.$message.error("解绑失败");
+                    });
                 }).catch(() => {
                 });
-            } else {
-                this.editType = 2;
-                this.editLoginVisible = true;
-                this.editLogin = row;
-            }
-        },
-        handleAddClick() {
-            this.editType = 0;
-            this.editLoginVisible = true;
-            this.editDialogVisible = false;
+            },
+            linkSubmit() {
+                //判断此用户是否已经添加过
+                let corpId = this.editLogin.corpName;
+                if (!this.editDialogVisible) {
+                    let corpNameTemp = null;
+                    this.corpNamesList.forEach(item => {
+                        if (item.id == this.editLogin.corpName) {
+                            corpNameTemp = item.name;
+                            corpId = item.id;
+                            return;
+                        }
+                    });
 
-            //清空表单数据
-            this.editLogin = {
-                id: null,
-                corpName: null,
-                platformId: null,
-                platformUsername: null,
-                platformPassword: null,
-                appid: null,
-                appKey: null,
-                sceretKey: null,
-                sourceAction: null,
-                targetAction: null
-            };
-            this.getLocalBussinessType();
-            this.getUnitMaintain();
-            this.getPlatformList();
-        },
-        change() {
-        },
-        getUnitMaintain() {
-            let unitQuery = {
-                customerId: this.$store.getters.customerId,
-                page: 1,
-                limit: 20
-            };
-            getUnitMaintain(unitQuery)
-                .then((response) => {
-                    this.corpNamesList = response.data.list || [];
-                })
-                .catch(() => {
-                    this.loading = false;
-                });
-        },
-        //获取自助平台数据
-        getPlatformList() {
-            this.loading = true;
-            getPlatform().then((response) => {
-                this.loading = false;
-                this.platformList = response.data.list || [];
-            }).catch(() => {
-                this.loading = false;
-                this.platformList = [];
-            });
-        },
-        intentPlatform(value) {
-            this.editPlatfromQuery.id = value;
-            //拉取对应平台的单据类型
-            this.getTargetActions(value);
-        },
-        getTargetActions(platformId) {
-            this.targetActions = [];
-            let query = {
-                platformId: platformId
-            };
-            getTargetActions(query).then((res) => {
-                this.targetActions = res.data.list || [];
-            }).catch((error) => {
-                this.$message.error("获取自助平台单据类型失败");
-            });
-        },
-        getLocalBussinessType() {
-            let tQuery = {};
-            getBusTypeByUser(tQuery).then((res) => {
-                this.bussinessTypes = res.data.list || [];
-            }).catch((error) => {
-                this.$message.error(error.message);
-            });
-        },
-        //获取往来单位集合
-        formSubmit() {
-            this.$refs["editQuery"].validate((valid) => {
-                if (valid) {
-                    if (this.editType == 0) {
-                        addUnit(this.editQuery)
-                            .then((response) => {
-                                if (response.code == 20000) {
-                                    this.getList();
-                                    this.$message({
-                                        type: "success",
-                                        message: "添加成功"
-                                    });
-                                    this.cancelDialog();
-                                } else {
-                                    this.$message.error(response.message);
-                                }
-                            })
-                            .catch(() => {
-                            });
-                    } else {
-                        modifyUnit(this.editQuery)
+                    let flag = false;
+                    //此时为添加
+                    this.list.forEach(item => {
+                        if (item.corpName == corpNameTemp) {
+                            flag = true;
+                            return;
+                        }
+                    });
+
+                    if (flag) {
+                        this.$message.error('“' + corpNameTemp + '”' + " 已经关联");
+                        return;
+                    }
+
+                } else {
+                    let corpNameTemp = null;
+                    this.corpNamesList.forEach(item => {
+                        if (item.name == this.editLogin.corpName) {
+                            corpNameTemp = item.name;
+                            corpId = item.id;
+                            return;
+                        }
+                    });
+                }
+
+                this.$refs["editLogin"].validate((valid) => {
+                    if (valid) {
+                        this.editLogin.id = corpId;
+                        linkPlatform(this.editLogin)
                             .then((response) => {
                                 if (response.code == 20000) {
                                     this.getList();
                                     this.$message({
                                         type: "success",
-                                        message: "修改成功"
+                                        message: "关联成功"
                                     });
                                     this.cancelDialog();
                                 } else {
@@ -477,70 +542,25 @@ export default {
                             .catch(() => {
                             });
                     }
-                }
-            });
-        },
-        unbindDialog(row) {
-            this.$confirm("此操作将解除绑定, 是否继续?", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning"
-            }).then(() => {
-                this.loading = true;
-                console.log(row)
-                let query = {
-                    corpId: row.id
-                };
-                unbindPlatform(query).then((res) => {
-                    this.loading = false;
-                    this.getList();
-                    this.$message.success("解绑成功");
-                }).catch((error) => {
-                    this.loading = false;
-                    this.$message.error("解绑失败");
                 });
-            }).catch(() => {
-            });
-        },
-        linkSubmit() {
-            this.$refs["editLogin"].validate((valid) => {
-                if (valid) {
-                    this.editLogin.id = this.editLogin.corpName;
-                    linkPlatform(this.editLogin)
-                        .then((response) => {
-                            if (response.code == 20000) {
-                                this.getList();
-                                this.$message({
-                                    type: "success",
-                                    message: "关联成功"
-                                });
-                                this.cancelDialog();
-                            } else {
-                                this.$message.error(response.message);
-                            }
-                        })
-                        .catch(() => {
-                        });
-                }
-            });
-        },
-        exportTxt() {
+            },
+            exportTxt() {
+            },
+            handleSelectionChange(val) {
+                this.multipleSelection = val;
+            },
+            handleCurrentChange(val) {
+                this.query.page = val;
+                this.getList();
+            }
         },
-        handleSelectionChange(val) {
-            this.multipleSelection = val;
+        mounted() {
         },
-        handleCurrentChange(val) {
-            this.query.page = val;
+        created() {
             this.getList();
+            this.getPlatformList();
         }
-    },
-    mounted() {
-    },
-    created() {
-        this.getList();
-        this.getPlatformList();
-    }
-};
+    };
 </script>
 
 <style>
diff --git a/src/views/warehouse/InvProducts.vue b/src/views/warehouse/InvProducts.vue
index c7b0b47..5892199 100644
--- a/src/views/warehouse/InvProducts.vue
+++ b/src/views/warehouse/InvProducts.vue
@@ -1,69 +1,70 @@
 <template>
     <div>
-        <el-form :inline="true" :model="filterQuery" class="query-form" size="mini">
-            <el-row>
-                <el-form-item class="query-form-item">
-                    <el-input v-model="filterQuery.nameCode" placeholder="最小销售产品标识" :clearable="true"></el-input>
-                </el-form-item>
-                <el-form-item class="query-form-item">
-                    <el-input v-model="filterQuery.cpmctymc" placeholder="产品名称" :clearable="true"></el-input>
-                </el-form-item>
-                <el-form-item class="query-form-item">
-                    <el-input v-model="filterQuery.ggxh" placeholder="规格型号" :clearable="true"></el-input>
-                </el-form-item>
-                <el-form-item class="query-form-item">
-                    <el-input v-model="filterQuery.batchNo" placeholder="批次号" :clearable="true"></el-input>
-                </el-form-item>
-            </el-row>
-            <el-row>
-                <el-form-item class="query-form-item">
-                    <el-input v-model="filterQuery.manufactory" placeholder="生产厂家" :clearable="true"></el-input>
-                </el-form-item>
-                <el-form-item class="query-form-item">
-                    <el-input v-model="filterQuery.zczbhhzbapzbh" placeholder="注册/备案证号" :clearable="true"></el-input>
-                </el-form-item>
-                <el-form-item>
-                    <el-button-group>
-                        <el-button
-                            type="primary"
-                            icon="el-icon-refresh"
-                            @click="onReset"
-                        ></el-button>
-                        <el-button type="primary" icon="search" @click="onSubmit"
-                        >查询
-                        </el-button
-                        >
-                    </el-button-group>
-                </el-form-item>
-            </el-row>
-        </el-form>
-
-        <el-table v-loading="loading" :data="list" style="width: 100%">
-            <el-table-column label="序号" type="index"></el-table-column>
-            <el-table-column label="产品名称" width="200" prop="productsName"></el-table-column>
-            <el-table-column label="产品标识" width="150" prop="nameCode"></el-table-column>
-            <el-table-column label="规格型号" width="240" prop="ggxh"></el-table-column>
-            <el-table-column label="批次号" prop="batchNo"></el-table-column>
-            <el-table-column label="生产日期" prop="productionDate"></el-table-column>
-            <el-table-column label="失效日期" prop="expireDate"></el-table-column>
-            <el-table-column label="入库数量" prop="inCount"></el-table-column>
-            <el-table-column label="出库数量" prop="outCount"></el-table-column>
-            <el-table-column label="结余数量" prop="reCount"></el-table-column>
-            <el-table-column label="注册/备案证号" width="180" prop="zczbhhzbapzbh"></el-table-column>
-            <el-table-column label="生产厂家" width="200" prop="manufactory"></el-table-column>
-            <el-table-column label="操作" width="80" fixed="right">
-                <template slot-scope="scope">
-                    <el-button
-                        type="text"
-                        size="small"
-                        @click.native.stop="intentDetail(scope.row)"
-                    >详情
-                    </el-button
-                    >
-                </template>
-            </el-table-column>
-        </el-table>
+       <el-card>
+           <el-form :inline="true" :model="filterQuery" size="mini">
+               <el-row style="width: 100%;">
+                   <el-form-item class="query-form-item">
+                       <el-input v-model="filterQuery.nameCode" placeholder="最小销售产品标识" :clearable="true"></el-input>
+                   </el-form-item>
+                   <el-form-item class="query-form-item">
+                       <el-input v-model="filterQuery.cpmctymc" placeholder="产品名称" :clearable="true"></el-input>
+                   </el-form-item>
+                   <el-form-item class="query-form-item">
+                       <el-input v-model="filterQuery.ggxh" placeholder="规格型号" :clearable="true"></el-input>
+                   </el-form-item>
+                   <el-form-item class="query-form-item">
+                       <el-input v-model="filterQuery.batchNo" placeholder="批次号" :clearable="true"></el-input>
+                   </el-form-item>
+               </el-row>
+               <el-row style="width: 100%;">
+                   <el-form-item class="query-form-item">
+                       <el-input v-model="filterQuery.manufactory" placeholder="生产厂家" :clearable="true"></el-input>
+                   </el-form-item>
+                   <el-form-item class="query-form-item">
+                       <el-input v-model="filterQuery.zczbhhzbapzbh" placeholder="注册/备案证号" :clearable="true"></el-input>
+                   </el-form-item>
+                   <el-form-item>
+                       <el-button-group>
+                           <el-button
+                               type="primary"
+                               icon="el-icon-refresh"
+                               @click="onReset"
+                           ></el-button>
+                           <el-button type="primary" icon="search" @click="onSubmit"
+                           >查询
+                           </el-button
+                           >
+                       </el-button-group>
+                   </el-form-item>
+               </el-row>
+           </el-form>
 
+           <el-table v-loading="loading" :data="list" style="width: 100%">
+               <el-table-column label="序号" type="index"></el-table-column>
+               <el-table-column label="产品名称" width="200" prop="productsName"></el-table-column>
+               <el-table-column label="产品标识" width="150" prop="nameCode"></el-table-column>
+               <el-table-column label="规格型号" width="240" prop="ggxh"></el-table-column>
+               <el-table-column label="批次号" prop="batchNo"></el-table-column>
+               <el-table-column label="生产日期" prop="productionDate"></el-table-column>
+               <el-table-column label="失效日期" prop="expireDate"></el-table-column>
+               <el-table-column label="入库数量" prop="inCount"></el-table-column>
+               <el-table-column label="出库数量" prop="outCount"></el-table-column>
+               <el-table-column label="结余数量" prop="reCount"></el-table-column>
+               <el-table-column label="注册/备案证号" width="180" prop="zczbhhzbapzbh"></el-table-column>
+               <el-table-column label="生产厂家" width="200" prop="manufactory"></el-table-column>
+               <el-table-column label="操作" width="80" fixed="right">
+                   <template slot-scope="scope">
+                       <el-button
+                           type="text"
+                           size="small"
+                           @click.native.stop="intentDetail(scope.row)"
+                       >详情
+                       </el-button
+                       >
+                   </template>
+               </el-table-column>
+           </el-table>
+       </el-card>
 
         <el-dialog
             title="库存详情"
diff --git a/src/views/warehouse/stockOrderDelSearch.vue b/src/views/warehouse/stockOrderDelSearch.vue
index 3a9d3e5..ed9df41 100644
--- a/src/views/warehouse/stockOrderDelSearch.vue
+++ b/src/views/warehouse/stockOrderDelSearch.vue
@@ -147,7 +147,7 @@
                 <el-table-column label="生产日期" width="120" prop="produceDate"></el-table-column>
                 <el-table-column label="失效日期" width="120" prop="expireDate"></el-table-column>
                 <el-table-column label="数量" width="100" prop="count"></el-table-column>
-                <el-table-column label="价格" width="120" prop="price">
+                <el-table-column label="单价" width="120" prop="price">
                     <template slot-scope="scope">
                         <el-input :disabled="scope.$index !== currentCheckIndex" v-model="scope.row.price"
                                   placeholder="请输入"></el-input>
@@ -271,596 +271,600 @@
 </template>
 
 <script>
-import {
-    stockOrderList, stockOrderDetail,
-    deleteStockOrderById, deleteStockOrderDetailById,
-    copyStockOrderDetail, uploadStockOrderDetail,
-    supplementOrder, updateStockOrderDetail
-} from "../../api/warehouse/stockOrder";
-import stockOrderDistribution from "./stockOrderDistribution";
-import stockOrderQRCodeDetail from "./stockOrderQRCodeDetail";
-import stockQRCodeExport from "./stockQRCodeExport";
-import draggable from "vuedraggable";
-import { inspectionStockOrderPDFFromTemplateFile, stockOrderPDFFromTemplateFile } from "../../api/itextpdf/itextpdf";
-import store from "../../store";
-import {getBusTypeByUser} from "../../api/warehouse/BusRole"
-import { filterAllByUser } from "@/api/basic/invWarehouse";
-import StockOrderEdit from "@/views/warehouse/stockOrderEdit";
-import {updateSpms} from "@/api/warehouse/order";
+    import {
+        stockOrderList, stockOrderDetail,
+        deleteStockOrderById, deleteStockOrderDetailById,
+        copyStockOrderDetail, uploadStockOrderDetail,
+        supplementOrder, updateStockOrderDetail
+    } from "../../api/warehouse/stockOrder";
+    import stockOrderDistribution from "./stockOrderDistribution";
+    import stockOrderQRCodeDetail from "./stockOrderQRCodeDetail";
+    import stockQRCodeExport from "./stockQRCodeExport";
+    import draggable from "vuedraggable";
+    import {inspectionStockOrderPDFFromTemplateFile, stockOrderPDFFromTemplateFile} from "../../api/itextpdf/itextpdf";
+    import store from "../../store";
+    import {getBusTypeByUser} from "../../api/warehouse/BusRole"
+    import {filterAllByUser} from "@/api/basic/invWarehouse";
+    import StockOrderEdit from "@/views/warehouse/stockOrderEdit";
+    import {updateSpms} from "@/api/warehouse/order";
 
-export default {
-    name: "stockOrderDelSearch",
-    data() {
-        return {
-            query: {
-                action: null,
-                corpName: null,
-                locStorageCode: null,
-                startTime: "",
-                endTime: "",
-                orderId: "",
-                status: 3,
-                page: 1,
-                limit: 10
+    export default {
+        name: "stockOrderDelSearch",
+        data() {
+            return {
+                query: {
+                    action: null,
+                    corpName: null,
+                    locStorageCode: null,
+                    startTime: "",
+                    endTime: "",
+                    orderId: "",
+                    status: 3,
+                    page: 1,
+                    limit: 10
+                },
+                detailQuery: {
+                    orderIdFk: "",
+                    orderId: "",
+                    page: 1,
+                    limit: 20
+                },
+                busTypes: [],
+                list: [],
+                detailList: [],
+                currentCheckIndex: -1,
+                multipId: [],
+                batchForm: {
+                    secSalesListNo: "",
+                    firstSalesInvNo: "",
+                    secSalesInvNo: "",
+                    invoiceDate: ""
+                },
+                salesListNoFormVisible: false,
+                firstSalesInvNoFormVisible: false,
+                secSalesInvNoFormVisible: false,
+                formLabelWidth: "150px",
+                total: 0,
+                detailTotal: 0,
+                storageList: [],
+                loading: false,
+                detailLoading: false,
+                idQuery: {
+                    id: ""
+                },
+                distributionVisible: false,
+                detailFormRules: {
+                    batchNo: [
+                        {required: true, message: "请输入批次号", trigger: "blur"}
+                    ],
+                    productDate: [
+                        {required: true, message: "请输入生产日期", trigger: "blur"}
+                    ],
+                    expireDate: [
+                        {required: true, message: "请输入失效日期", trigger: "blur"}
+                    ],
+                    sweepCount: [
+                        {required: true, message: "请输入扫码数量", trigger: "blur"}
+                    ]
+                },
+                sourceMap: {
+                    "1": "web端新增单据",
+                    "2": "第三方系统",
+                    "3": "扫码单据转换"
+                },
+                isSp: store.getters.customerId,
+                detailFormVisible: false,
+                stockOrderEditVisible: false,
+                detailFormData: {},
+                detailFormLoading: false,
+                haveDistributionVisible: true,
+                qrcodeDetailVisible: false,
+                qrcodeExportVisible: false,
+                actDateRange: [],
+                pickerOptions: {
+                    shortcuts: [
+                        {
+                            text: "最近一周",
+                            onClick(picker) {
+                                const end = new Date();
+                                const start = new Date();
+                                start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+                                picker.$emit("pick", [start, end]);
+                            }
+                        },
+                        {
+                            text: "最近一个月",
+                            onClick(picker) {
+                                const end = new Date();
+                                const start = new Date();
+                                start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+                                picker.$emit("pick", [start, end]);
+                            }
+                        },
+                        {
+                            text: "最近三个月",
+                            onClick(picker) {
+                                const end = new Date();
+                                const start = new Date();
+                                start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+                                picker.$emit("pick", [start, end]);
+                            }
+                        }
+                    ]
+                }
+            };
+        },
+        methods: {
+            onReset() {
+                this.$router.push({
+                    path: ""
+                });
+                this.query = {
+                    orderId: "",
+                    status: 4,
+                    startTime: "",
+                    endTime: "",
+                    page: 1,
+                    limit: 10
+                };
+                this.getList();
+                this.haveDistributionVisible = true;
+                this.actDateRange = [];
             },
-            detailQuery: {
-                orderIdFk: "",
-                orderId: "",
-                page: 1,
-                limit: 20
+            onSubmit() {
+                if (this.actDateRange !== null) {
+                    this.query.startTime = this.actDateRange[0];
+                    this.query.endTime = this.actDateRange[1];
+                } else {
+                    this.query.startTime = null;
+                    this.query.endTime = null;
+                }
+                this.getList();
+                if (this.query.status === "202" || this.query.status === "502") {
+                    this.haveDistributionVisible = true;
+                } else {
+                    this.haveDistributionVisible = false;
+                }
             },
-            busTypes: [],
-            list: [],
-            detailList: [],
-            currentCheckIndex: -1,
-            multipId: [],
-            batchForm: {
-                secSalesListNo: "",
-                firstSalesInvNo: "",
-                secSalesInvNo: "",
-                invoiceDate: ""
+            handleCurrentChange(val) {
+                this.query.page = val;
+                this.getList();
             },
-            salesListNoFormVisible: false,
-            firstSalesInvNoFormVisible: false,
-            secSalesInvNoFormVisible: false,
-            formLabelWidth: "150px",
-            total: 0,
-            detailTotal: 0,
-            storageList: [],
-            loading: false,
-            detailLoading: false,
-            idQuery: {
-                id: ""
+            handleEdit(index, row) {
+                this.currentCheckIndex = index;
             },
-            distributionVisible: false,
-            detailFormRules: {
-                batchNo: [
-                    { required: true, message: "请输入批次号", trigger: "blur" }
-                ],
-                productDate: [
-                    { required: true, message: "请输入生产日期", trigger: "blur" }
-                ],
-                expireDate: [
-                    { required: true, message: "请输入失效日期", trigger: "blur" }
-                ],
-                sweepCount: [
-                    { required: true, message: "请输入扫码数量", trigger: "blur" }
-                ]
+            handleSave(index, row) {
+                this.currentCheckIndex = -1;
+                updateStockOrderDetail(row).then((res) => {
+                    if (res.code == 20000) {
+                        this.$message.success(res.data);
+                    }
+                });
             },
-            sourceMap: {
-                "1": "web端新增单据",
-                "2": "第三方系统",
-                "3": "扫码单据转换"
+            changeFun(row) {
+                let _this = this;
+                _this.multipId = []; //每次改动重置ID
+                row.forEach((item) => {
+                    _this.multipId.push(item.id);
+                });
             },
-            isSp: store.getters.customerId,
-            detailFormVisible: false,
-            stockOrderEditVisible: false,
-            detailFormData: {},
-            detailFormLoading: false,
-            haveDistributionVisible: true,
-            qrcodeDetailVisible: false,
-            qrcodeExportVisible: false,
-            actDateRange: [],
-            pickerOptions: {
-                shortcuts: [
-                    {
-                        text: "最近一周",
-                        onClick(picker) {
-                            const end = new Date();
-                            const start = new Date();
-                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-                            picker.$emit("pick", [start, end]);
-                        }
-                    },
-                    {
-                        text: "最近一个月",
-                        onClick(picker) {
-                            const end = new Date();
-                            const start = new Date();
-                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
-                            picker.$emit("pick", [start, end]);
-                        }
-                    },
-                    {
-                        text: "最近三个月",
-                        onClick(picker) {
-                            const end = new Date();
-                            const start = new Date();
-                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
-                            picker.$emit("pick", [start, end]);
-                        }
-                    }
-                ]
-            }
-        };
-    },
-    methods: {
-        onReset() {
-            this.$router.push({
-                path: ""
-            });
-            this.query = {
-                orderId: "",
-                status: 4,
-                startTime: "",
-                endTime: "",
-                page: 1,
-                limit: 10
-            };
-            this.getList();
-            this.haveDistributionVisible = true;
-            this.actDateRange = [];
-        },
-        onSubmit() {
-            if (this.actDateRange !== null) {
-                this.query.startTime = this.actDateRange[0];
-                this.query.endTime = this.actDateRange[1];
-            } else {
-                this.query.startTime = null;
-                this.query.endTime = null;
-            }
-            this.getList();
-            if (this.query.status === "202" || this.query.status === "502") {
-                this.haveDistributionVisible = true;
-            } else {
-                this.haveDistributionVisible = false;
-            }
-        },
-        handleCurrentChange(val) {
-            this.query.page = val;
-            this.getList();
-        },
-        handleEdit(index, row) {
-            this.currentCheckIndex = index;
-        },
-        handleSave(index, row) {
-            this.currentCheckIndex = -1;
-            updateStockOrderDetail(row).then((res) => {
-                if (res.code == 20000) {
-                    this.$message.success(res.data);
-                }
-            });
-        },
-        changeFun(row) {
-            let _this = this;
-            _this.multipId = []; //每次改动重置ID
-            row.forEach((item) => {
-                _this.multipId.push(item.id);
-            });
-        },
-        batchSetParams(flag, type) {
-            if (flag == "1" && type == "salesListNo") {
-                this.salesListNoFormVisible = false;
-                this.detailList.forEach(data => {
-                    this.multipId.forEach(id => {
-                        if (data.id == id) {
-                            data.secSalesListNo = this.batchForm.secSalesListNo;
-                            //更新到数据库
-                            updateStockOrderDetail(data);
-                        }
+            batchSetParams(flag, type) {
+                if (flag == "1" && type == "salesListNo") {
+                    this.salesListNoFormVisible = false;
+                    this.detailList.forEach(data => {
+                        this.multipId.forEach(id => {
+                            if (data.id == id) {
+                                data.secSalesListNo = this.batchForm.secSalesListNo;
+                                //更新到数据库
+                                updateStockOrderDetail(data);
+                            }
+                        });
                     });
-                });
-                Object.keys(this.batchForm).forEach(key => this.batchForm[key] = "");
-            } else if (flag == "1" && type == "firstSalesInvNo") {
-                this.firstSalesInvNoFormVisible = false;
-                this.detailList.forEach(data => {
-                    this.multipId.forEach(id => {
-                        if (data.id == id) {
-                            data.firstSalesInvNo = this.batchForm.firstSalesInvNo;
-                            //更新到数据库
-                            updateStockOrderDetail(data);
-                        }
+                    Object.keys(this.batchForm).forEach(key => this.batchForm[key] = "");
+                } else if (flag == "1" && type == "firstSalesInvNo") {
+                    this.firstSalesInvNoFormVisible = false;
+                    this.detailList.forEach(data => {
+                        this.multipId.forEach(id => {
+                            if (data.id == id) {
+                                data.firstSalesInvNo = this.batchForm.firstSalesInvNo;
+                                //更新到数据库
+                                updateStockOrderDetail(data);
+                            }
+                        });
                     });
-                });
-                Object.keys(this.batchForm).forEach(key => this.batchForm[key] = "");
-            } else if (flag == "1" && type == "secSalesInvNo") {
-                this.secSalesInvNoFormVisible = false;
-                this.detailList.forEach(data => {
-                    this.multipId.forEach(id => {
-                        if (data.id == id) {
-                            data.secSalesInvNo = this.batchForm.secSalesInvNo;
-                            data.invoiceDate = this.batchForm.invoiceDate;
-                            //更新到数据库
-                            updateStockOrderDetail(data);
-                        }
+                    Object.keys(this.batchForm).forEach(key => this.batchForm[key] = "");
+                } else if (flag == "1" && type == "secSalesInvNo") {
+                    this.secSalesInvNoFormVisible = false;
+                    this.detailList.forEach(data => {
+                        this.multipId.forEach(id => {
+                            if (data.id == id) {
+                                data.secSalesInvNo = this.batchForm.secSalesInvNo;
+                                data.invoiceDate = this.batchForm.invoiceDate;
+                                //更新到数据库
+                                updateStockOrderDetail(data);
+                            }
+                        });
                     });
-                });
-                Object.keys(this.batchForm).forEach(key => this.batchForm[key] = "");
-            } else {
-                if (this.multipId.length == 0) {
-                    this.$message.warning("请选择数据");
+                    Object.keys(this.batchForm).forEach(key => this.batchForm[key] = "");
                 } else {
-                    switch (type) {
-                        case "salesListNo":
-                            this.salesListNoFormVisible = true;
-                            return;
-                        case "firstSalesInvNo":
-                            this.firstSalesInvNoFormVisible = true;
-                            return;
-                        case "secSalesInvNo":
-                            this.secSalesInvNoFormVisible = true;
-                            return;
-                        default:
-                            return;
+                    if (this.multipId.length == 0) {
+                        this.$message.warning("请选择数据");
+                    } else {
+                        switch (type) {
+                            case "salesListNo":
+                                this.salesListNoFormVisible = true;
+                                return;
+                            case "firstSalesInvNo":
+                                this.firstSalesInvNoFormVisible = true;
+                                return;
+                            case "secSalesInvNo":
+                                this.secSalesInvNoFormVisible = true;
+                                return;
+                            default:
+                                return;
+                        }
                     }
                 }
-            }
-        },
-        detailHandleCurrentChange(val) {
-            this.query.page = val;
-            this.getStockOrderDetailList();
-        },
-        // 刷新表单
-        resetForm() {
-            if (this.$refs["dataForm"]) {
-                // 清空验证信息表单
-                this.$refs["dataForm"].clearValidate();
-                // 刷新表单
-                this.$refs["dataForm"].resetFields();
-                this.getList();
-            }
-        },
-        getList() {
-            this.loading = true;
-            this.query.corpId = store.getters.customerId;
-            stockOrderList(this.query)
-                .then(response => {
-                    this.loading = false;
-                    this.list = response.data.list || [];
-                    this.detailList = [];
-                    this.total = response.data.total || 0;
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.list = [];
-                    this.total = 0;
-                    this.detailList = [];
-                });
-        },
-        distributionForm(index, row) {
-            this.idQuery.id = "";
-            if (this.$isNotBlank(row.id)) {
-                this.idQuery.id = row.id;
-                this.idQuery.formData = row;
-                this.distributionVisible = true;
-            }
-        },
-        closeDialog(type) {
-            this.distributionVisible = false;
-            this.getList();
-            if (this.$isNotBlank(type)) {
-                this.detailList = [];
-            }
-        },
-        printQRCodeText(row) {
-            this.idQuery.id = "";
-            if (this.$isNotBlank(row.id)) {
-                this.idQuery.id = row.id;
-                this.idQuery.formData = row;
-                this.qrcodeExportVisible = true;
-            }
-        },
-        printOrder(row) {
-            let tQuery = { queryId: row.orderId };
-            this.loading = true;
-            inspectionStockOrderPDFFromTemplateFile(tQuery).then((response) => {
-                if (response.code === 20000) {
-                    tQuery = {
-                        orderId: row.orderId
-                    };
-                    stockOrderPDFFromTemplateFile(tQuery).then((response) => {
-                        //将pdf文件转换为url。
-                        const binaryData = [];
-                        binaryData.push(response);
-                        //获取blob链接。
-                        let url = window.URL.createObjectURL(
-                            new Blob(binaryData, { type: "application/pdf" })
-                        );
-                        this.loading = false;
-                        window.open(url);//打开新标签页，预览pdf。
-                    }).catch(() => {
-                        this.loading = false;
-                    });
-                } else {
-                    this.loading = false;
-                    this.$message.error(response.message);
+            },
+            detailHandleCurrentChange(val) {
+                this.query.page = val;
+                this.getStockOrderDetailList();
+            },
+            // 刷新表单
+            resetForm() {
+                if (this.$refs["dataForm"]) {
+                    // 清空验证信息表单
+                    this.$refs["dataForm"].clearValidate();
+                    // 刷新表单
+                    this.$refs["dataForm"].resetFields();
+                    this.getList();
                 }
-            }).catch(() => {
-                this.loading = false;
-            });
-        },
-        closeQRCodeExportDialog() {
-            this.qrcodeExportVisible = false;
-            this.getList();
-        },
-        qrcodeDetail(row) {
-            this.idQuery.id = "";
-            if (this.$isNotBlank(row.id)) {
-                this.idQuery.id = row.id;
-                this.idQuery.formData = row;
-                this.qrcodeDetailVisible = true;
-            }
-        },
-        closeQRCodeDetailDialog() {
-            this.qrcodeDetailVisible = false;
-            this.getList();
-        },
-        getStockOrderDetailList(row) {
-            if (this.$isNotBlank(row)) {
-                this.detailQuery.orderId = row.orderId;
-            }
-            this.detailLoading = true;
-            stockOrderDetail(this.detailQuery)
-                .then((response) => {
-                    this.detailLoading = false;
-                    this.detailList = response.data || [];
-                })
-                .catch(() => {
-                    this.detailLoading = false;
-                    this.detailList = [];
-                });
-        },
-        deleteStockOrder(row) {
-            this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning"
-            }).then(() => {
+            },
+            getList() {
                 this.loading = true;
-                deleteStockOrderById({ id: row.id })
+                this.query.corpId = store.getters.customerId;
+                stockOrderList(this.query)
                     .then(response => {
                         this.loading = false;
-                        if (response.code === 20000) {
-                            this.$message.success(response.data);
-                            this.getList();
-                            this.detailList = [];
-                        } else {
-                            this.$message.error(response.message);
-                        }
+                        this.list = response.data.list || [];
+                        this.detailList = [];
+                        this.total = response.data.total || 0;
                     })
                     .catch(() => {
                         this.loading = false;
+                        this.list = [];
+                        this.total = 0;
+                        this.detailList = [];
                     });
-            }).catch(() => {
-
-            });
-        },
-        copyDetail(row) {
-            this.$confirm("是否复制该记录?", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning"
-            }).then(() => {
+            },
+            distributionForm(index, row) {
+                this.idQuery.id = "";
+                if (this.$isNotBlank(row.id)) {
+                    this.idQuery.id = row.id;
+                    this.idQuery.formData = row;
+                    this.distributionVisible = true;
+                }
+            },
+            closeDialog(type) {
+                this.distributionVisible = false;
+                this.getList();
+                if (this.$isNotBlank(type)) {
+                    this.detailList = [];
+                }
+            },
+            printQRCodeText(row) {
+                this.idQuery.id = "";
+                if (this.$isNotBlank(row.id)) {
+                    this.idQuery.id = row.id;
+                    this.idQuery.formData = row;
+                    this.qrcodeExportVisible = true;
+                }
+            },
+            printOrder(row) {
                 let tQuery = {
-                    id: row.id
+                    queryId: row.orderId,
+                    moduleId: 4
                 };
+                this.loading = true;
+                inspectionStockOrderPDFFromTemplateFile(tQuery).then((response) => {
+                    if (response.code === 20000) {
+                        tQuery = {
+                            orderId: row.orderId,
+                            moduleId: 4
+                        };
+                        stockOrderPDFFromTemplateFile(tQuery).then((response) => {
+                            //将pdf文件转换为url。
+                            const binaryData = [];
+                            binaryData.push(response);
+                            //获取blob链接。
+                            let url = window.URL.createObjectURL(
+                                new Blob(binaryData, {type: "application/pdf"})
+                            );
+                            this.loading = false;
+                            window.open(url);//打开新标签页，预览pdf。
+                        }).catch(() => {
+                            this.loading = false;
+                        });
+                    } else {
+                        this.loading = false;
+                        this.$message.error(response.message);
+                    }
+                }).catch(() => {
+                    this.loading = false;
+                });
+            },
+            closeQRCodeExportDialog() {
+                this.qrcodeExportVisible = false;
+                this.getList();
+            },
+            qrcodeDetail(row) {
+                this.idQuery.id = "";
+                if (this.$isNotBlank(row.id)) {
+                    this.idQuery.id = row.id;
+                    this.idQuery.formData = row;
+                    this.qrcodeDetailVisible = true;
+                }
+            },
+            closeQRCodeDetailDialog() {
+                this.qrcodeDetailVisible = false;
+                this.getList();
+            },
+            getStockOrderDetailList(row) {
+                if (this.$isNotBlank(row)) {
+                    this.detailQuery.orderId = row.orderId;
+                }
                 this.detailLoading = true;
-                copyStockOrderDetail(tQuery)
+                stockOrderDetail(this.detailQuery)
                     .then((response) => {
                         this.detailLoading = false;
-                        if (response.code === 20000) {
-                            this.$message.success("复制成功");
-                            this.getStockOrderDetailList();
-                        } else {
-                            this.$message.error(response.message);
-                        }
-                    });
-            }).catch(() => {
-            });
-        },
-        deleteStockOrderDetail(row) {
-            this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning"
-            }).then(() => {
-                this.detailLoading = true;
-                deleteStockOrderDetailById({ id: row.id })
-                    .then(response => {
-                        this.detailLoading = false;
-                        if (response.code === 20000) {
-                            this.$message.success(response.data);
-                            this.getStockOrderDetailList();
-                        } else {
-                            this.$message.error(response.message);
-                        }
+                        this.detailList = response.data || [];
                     })
                     .catch(() => {
                         this.detailLoading = false;
+                        this.detailList = [];
                     });
-            }).catch(() => {
+            },
+            deleteStockOrder(row) {
+                this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning"
+                }).then(() => {
+                    this.loading = true;
+                    deleteStockOrderById({id: row.id})
+                        .then(response => {
+                            this.loading = false;
+                            if (response.code === 20000) {
+                                this.$message.success(response.data);
+                                this.getList();
+                                this.detailList = [];
+                            } else {
+                                this.$message.error(response.message);
+                            }
+                        })
+                        .catch(() => {
+                            this.loading = false;
+                        });
+                }).catch(() => {
 
-            });
-        },
-        // 显示表单
-        handleDetailForm(index, row) {
-            this.stockOrderEditVisible = true;
-        },
-        hideDetailForm() {
-            // 更改值
-            this.detailFormVisible = !this.detailFormVisible;
-            return true;
-        },
-        getActionName(action) {
-            for (let i = 0; i < this.busTypes.length; i++) {
-                if (this.busTypes[i].action === action) {
-                    return this.busTypes[i].name;
-                }
-            }
-        },
-        getBusType() {
-            let query = {};
-            getBusTypeByUser(query).then((res) => {
-                this.busTypes = res.data.list || [];
-                this.filterQuery.billAction = this.busTypes[0].action;
-                console.log(this.busTypes)
-            }).catch((error) => {
-            });
-        },
-        submitUploadDetail() {
-            this.$refs["dataForm"].validate(valid => {
-                if (valid) {
+                });
+            },
+            copyDetail(row) {
+                this.$confirm("是否复制该记录?", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning"
+                }).then(() => {
+                    let tQuery = {
+                        id: row.id
+                    };
                     this.detailLoading = true;
-                    let tQuery = this.detailFormData;
-                    uploadStockOrderDetail(tQuery).then((response) => {
-                        this.detailLoading = false;
-                        if (response.code === 20000) {
-                            this.$message.success("修改完成");
-                            this.hideDetailForm();
-                            this.getStockOrderDetailList();
+                    copyStockOrderDetail(tQuery)
+                        .then((response) => {
+                            this.detailLoading = false;
+                            if (response.code === 20000) {
+                                this.$message.success("复制成功");
+                                this.getStockOrderDetailList();
+                            } else {
+                                this.$message.error(response.message);
+                            }
+                        });
+                }).catch(() => {
+                });
+            },
+            deleteStockOrderDetail(row) {
+                this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning"
+                }).then(() => {
+                    this.detailLoading = true;
+                    deleteStockOrderDetailById({id: row.id})
+                        .then(response => {
+                            this.detailLoading = false;
+                            if (response.code === 20000) {
+                                this.$message.success(response.data);
+                                this.getStockOrderDetailList();
+                            } else {
+                                this.$message.error(response.message);
+                            }
+                        })
+                        .catch(() => {
+                            this.detailLoading = false;
+                        });
+                }).catch(() => {
+
+                });
+            },
+            // 显示表单
+            handleDetailForm(index, row) {
+                this.stockOrderEditVisible = true;
+            },
+            hideDetailForm() {
+                // 更改值
+                this.detailFormVisible = !this.detailFormVisible;
+                return true;
+            },
+            getActionName(action) {
+                for (let i = 0; i < this.busTypes.length; i++) {
+                    if (this.busTypes[i].action === action) {
+                        return this.busTypes[i].name;
+                    }
+                }
+            },
+            getBusType() {
+                let query = {};
+                getBusTypeByUser(query).then((res) => {
+                    this.busTypes = res.data.list || [];
+                    this.filterQuery.billAction = this.busTypes[0].action;
+                    console.log(this.busTypes)
+                }).catch((error) => {
+                });
+            },
+            submitUploadDetail() {
+                this.$refs["dataForm"].validate(valid => {
+                    if (valid) {
+                        this.detailLoading = true;
+                        let tQuery = this.detailFormData;
+                        uploadStockOrderDetail(tQuery).then((response) => {
+                            this.detailLoading = false;
+                            if (response.code === 20000) {
+                                this.$message.success("修改完成");
+                                this.hideDetailForm();
+                                this.getStockOrderDetailList();
+                            } else {
+                                this.$alert(response.message, "提示", {
+                                    confirmButtonText: "确定",
+                                    type: "warning",
+                                    closeOnClickModal: true,
+                                    callback: action => {
+                                        this.$refs.inputRef.focus();
+                                    }
+                                });
+                            }
+                        });
+                    }
+                });
+            },
+            getStorageName(code) {
+                for (let i = 0; i < this.storageList.length; i++) {
+                    if (this.storageList[i].code === code) {
+                        return this.storageList[i].name;
+                    }
+                }
+            },
+            getStorage() {
+                this.storageList = [];
+                filterAllByUser()
+                    .then((response) => {
+                        this.storageList = response.data || [];
+                    })
+                    .catch(() => {
+                    });
+            },
+            supplementOrder(row) {
+                this.$confirm("是否确认补单?", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning",
+                    center: true
+                }).then(() => {
+                    this.$message({
+                        type: "success",
+                        message: "补单成功!"
+                    });
+                    row.enableSupplementOrder = false;
+                    //补单
+                    let orderQuery = {
+                        orderId: row.orderId
+                    };
+                    supplementOrder(orderQuery);
+                }).catch(() => {
+                    this.$message({
+                        type: "info",
+                        message: "取消补单"
+                    });
+                });
+            },
+            uploadSpms(row) {
+                let orderIds = [];
+                orderIds.push(row.orderId);
+                let query = {orderIds: orderIds};
+                row.uploadStatus = 1;
+                updateSpms(query)
+                    .then((response) => {
+                        if (response.code == 20000) {
+                            this.$message.success(response.data);
+                            this.getList();
                         } else {
-                            this.$alert(response.message, "提示", {
-                                confirmButtonText: "确定",
-                                type: "warning",
-                                closeOnClickModal: true,
-                                callback: action => {
-                                    this.$refs.inputRef.focus();
-                                }
-                            });
+                            this.$message.error(response.message);
                         }
+                    })
+                    .catch(() => {
                     });
-                }
-            });
-        },
-        getStorageName(code) {
-            for (let i = 0; i < this.storageList.length; i++) {
-                if (this.storageList[i].code === code) {
-                    return this.storageList[i].name;
-                }
             }
         },
-        getStorage() {
-            this.storageList = [];
-            filterAllByUser()
-                .then((response) => {
-                    this.storageList = response.data || [];
-                })
-                .catch(() => {
-                });
+        components: {
+            draggable,
+            stockOrderDistribution,
+            stockOrderQRCodeDetail,
+            stockQRCodeExport,
+            StockOrderEdit
         },
-        supplementOrder(row) {
-            this.$confirm("是否确认补单?", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
-                center: true
-            }).then(() => {
-                this.$message({
-                    type: "success",
-                    message: "补单成功!"
-                });
-                row.enableSupplementOrder = false;
-                //补单
-                let orderQuery = {
-                    orderId: row.orderId
+        filters: {
+            statusFilterType(status) {
+                const statusMap = {
+                    0: "gray",
+                    1: "success"
                 };
-                supplementOrder(orderQuery);
-            }).catch(() => {
-                this.$message({
-                    type: "info",
-                    message: "取消补单"
-                });
-            });
-        },
-        uploadSpms(row) {
-            let orderIds = [];
-            orderIds.push(row.orderId);
-            let query = {orderIds: orderIds};
-            row.uploadStatus = 1;
-            updateSpms(query)
-                .then((response) => {
-                    if (response.code == 20000) {
-                        this.$message.success(response.data);
-                        this.getList();
-                    } else {
-                        this.$message.error(response.message);
-                    }
-                })
-                .catch(() => {
-                });
-        }
-    },
-    components: {
-        draggable,
-        stockOrderDistribution,
-        stockOrderQRCodeDetail,
-        stockQRCodeExport,
-        StockOrderEdit
-    },
-    filters: {
-        statusFilterType(status) {
-            const statusMap = {
-                0: "gray",
-                1: "success"
-            };
-            return statusMap[status];
-        },
-        statusFilterName(status) {
-            const statusMap = {
-                "1": "草稿",
-                "2": "未配货",
-                "3": "已完成",
-                "4": "已校验",
-                "5": "已核对"
-            };
-            return statusMap[status];
+                return statusMap[status];
+            },
+            statusFilterName(status) {
+                const statusMap = {
+                    "1": "草稿",
+                    "2": "未配货",
+                    "3": "已完成",
+                    "4": "已校验",
+                    "5": "已核对"
+                };
+                return statusMap[status];
+            },
+            typeFilterName(type) {
+                const typeMap = {
+                    1: "预入库",
+                    2: "普通采购"
+                };
+                return typeMap[type];
+            }
         },
-        typeFilterName(type) {
-            const typeMap = {
-                1: "预入库",
-                2: "普通采购"
-            };
-            return typeMap[type];
+        created() {
+            this.getStorage();
+            this.getBusType();
+            let end = new Date();
+            let start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+            this.actDateRange = [start, end];
+            this.getList();
         }
-    },
-    created() {
-        this.getStorage();
-        this.getBusType();
-        let end = new Date();
-        let start = new Date();
-        start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-        this.actDateRange = [start, end];
-        this.getList();
-    }
-};
+    };
 </script>
 
 <style scoped>
 
-.el-dialog {
-    display: flex;
-    flex-direction: column;
-    margin: 0 !important;
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    transform: translate(-50%, -50%);
-}
+    .el-dialog {
+        display: flex;
+        flex-direction: column;
+        margin: 0 !important;
+        position: absolute;
+        top: 50%;
+        left: 50%;
+        transform: translate(-50%, -50%);
+    }
 
-.el-dialog .el-dialog__body {
-    flex: 1;
-    overflow: auto;
-}
+    .el-dialog .el-dialog__body {
+        flex: 1;
+        overflow: auto;
+    }
 
 </style>