From 0b9bdc65a1d68b9d28b025140760e87a3a41e3f8 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Sun, 5 Sep 2021 10:08:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/thrsys/thrCorpsImport.js              |   9 +
 src/api/thrsys/thrInvProductsImport.js        |   8 +
 src/api/thrsys/thrProductsImport.js           |   8 +
 src/views/thrsys/ThrCorpsImport.vue           |  29 +--
 src/views/thrsys/ThrCorpsImportDetail.vue     | 164 +++++++++++++++++
 src/views/thrsys/ThrInvProductsImport.vue     |  40 +++--
 .../thrsys/ThrInvProductsImportDetail.vue     | 165 ++++++++++++++++++
 src/views/thrsys/ThrOrderImport.vue           |  36 ++--
 src/views/thrsys/ThrOrderImportDetail.vue     | 161 +++++++++++++++++
 src/views/thrsys/ThrProductsImport.vue        |  56 ++++--
 src/views/thrsys/ThrProductsImportDetail.vue  | 162 +++++++++++++++++
 11 files changed, 782 insertions(+), 56 deletions(-)
 create mode 100644 src/views/thrsys/ThrCorpsImportDetail.vue
 create mode 100644 src/views/thrsys/ThrInvProductsImportDetail.vue
 create mode 100644 src/views/thrsys/ThrOrderImportDetail.vue
 create mode 100644 src/views/thrsys/ThrProductsImportDetail.vue

diff --git a/src/api/thrsys/thrCorpsImport.js b/src/api/thrsys/thrCorpsImport.js
index 19967ba..a4ee48f 100644
--- a/src/api/thrsys/thrCorpsImport.js
+++ b/src/api/thrsys/thrCorpsImport.js
@@ -8,6 +8,15 @@ export function filterLog(query) {
         params: query
     });
 }
+
+export function filterDetail(query) {
+    return axios({
+        url: "/udiwms/thrCorp/importLog/filterDetail",
+        method: "get",
+        params: query
+    });
+}
+
 export function deleteLog(query) {
     return axios({
         url: "/udiwms/thrCorp/importLog/deleteLog",
diff --git a/src/api/thrsys/thrInvProductsImport.js b/src/api/thrsys/thrInvProductsImport.js
index 97c8cfe..dbbb26d 100644
--- a/src/api/thrsys/thrInvProductsImport.js
+++ b/src/api/thrsys/thrInvProductsImport.js
@@ -8,6 +8,14 @@ export function filterLog(query) {
         params: query
     });
 }
+
+export function filterDetail(query) {
+    return axios({
+        url: "/udiwms/thrInvProducts/importLog/filterDetail",
+        method: "get",
+        params: query
+    });
+}
 export function deleteLog(query) {
     return axios({
         url: "/udiwms/thrInvProducts/importLog/deleteLog",
diff --git a/src/api/thrsys/thrProductsImport.js b/src/api/thrsys/thrProductsImport.js
index 8e33c21..b9e5c39 100644
--- a/src/api/thrsys/thrProductsImport.js
+++ b/src/api/thrsys/thrProductsImport.js
@@ -8,6 +8,14 @@ export function filterLog(query) {
         params: query
     });
 }
+export function filterDetail(query) {
+    return axios({
+        url: "/udiwms/thrProducts/importLog/filterDetail",
+        method: "get",
+        params: query
+    });
+}
+
 export function deleteLog(query) {
     return axios({
         url: "/udiwms/thrProducts/importLog/deleteLog",
diff --git a/src/views/thrsys/ThrCorpsImport.vue b/src/views/thrsys/ThrCorpsImport.vue
index e31ed20..8ce7260 100644
--- a/src/views/thrsys/ThrCorpsImport.vue
+++ b/src/views/thrsys/ThrCorpsImport.vue
@@ -95,13 +95,13 @@
             </el-table-column>
             <el-table-column label="操作" fixed="right" width="160">
                 <template slot-scope="scope">
-                    <!--<el-button-->
-                    <!--type="text"-->
-                    <!--size="small"-->
-                    <!--@click.native.stop="handleDetailClick(scope.row)"-->
-                    <!--&gt;详情-->
-                    <!--</el-button-->
-                    <!--&gt;-->
+                    <el-button
+                        type="text"
+                        size="small"
+                        @click.native.stop="handleDetailClick(scope.row)"
+                    >详情
+                    </el-button
+                    >
                     <el-button
                         type="text"
                         size="small"
@@ -112,7 +112,16 @@
                 </template>
             </el-table-column>
         </el-table>
-
+        <el-dialog
+            title="导入往来单位详情"
+            :visible.sync="udiImportDetailVisible"
+            width="85%"
+            v-if="udiImportDetailVisible"
+        >
+            <thrCorpsImportDetail
+                :currentRow="currentRow"
+            ></thrCorpsImportDetail>
+        </el-dialog>
 
         <el-pagination
             :page-size="filterQuery.limit"
@@ -124,11 +133,11 @@
 </template>
 
 <script>
-    import axios from "axios";
     import {filterLog, deleteLog} from "../../api/thrsys/thrCorpsImport";
     import {getBasicThirdSys, filterDetailByKey} from "../../api/basic/basicThirdSys";
     import {downloadAll} from "../../api/thrsys/thrCorps";
     import {selectIp} from "../../api/param/systemParamConfig";
+    import thrCorpsImportDetail from "./ThrCorpsImportDetail";
 
     export default {
         data() {
@@ -332,7 +341,7 @@
 
         mounted() {
         },
-        components: {},
+        components: {thrCorpsImportDetail},
         created() {
             this.getBasicThirdSys();
             // this.getList();
diff --git a/src/views/thrsys/ThrCorpsImportDetail.vue b/src/views/thrsys/ThrCorpsImportDetail.vue
new file mode 100644
index 0000000..5777547
--- /dev/null
+++ b/src/views/thrsys/ThrCorpsImportDetail.vue
@@ -0,0 +1,164 @@
+<template>
+    <div>
+        <el-card>
+            <el-form :inline="true" :model="query" size="mini">
+                <el-row>
+                    <el-form-item class="query-form-item">
+                        <el-input
+                            v-model="filterQuery.unitId"
+                            placeholder="往来单位编码"
+                            clearable
+                        ></el-input>
+                    </el-form-item>
+                    <el-form-item class="query-form-item">
+                        <el-input
+                            v-model="filterQuery.name"
+                            placeholder="往来单位"
+                            clearable
+                        ></el-input>
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button-group style="display:flex;">
+                            <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
+                            <el-button type="primary" icon="search" @click="getList">查询</el-button>
+                        </el-button-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="往来单位ID" prop="id" width="100" show-overflow-tooltip></el-table-column>
+                <el-table-column label="往来单位" prop="name" show-overflow-tooltip></el-table-column>
+                <el-table-column label="拼音简写" prop="spell" width="100" show-overflow-tooltip></el-table-column>
+                <el-table-column label="地址" prop="addr" show-overflow-tooltip></el-table-column>
+                <el-table-column label="社会信用号" prop="creditNo" width="140" show-overflow-tooltip></el-table-column>
+                <el-table-column label="联系人" prop="contact" width="100" show-overflow-tooltip></el-table-column>
+                <el-table-column label="联系电话" prop="mobile" show-overflow-tooltip></el-table-column>
+            </el-table>
+            <el-pagination
+                :page-size="filterQuery.limit"
+                @current-change="handleCurrentChange"
+                layout="prev, pager, next"
+                :total="total"
+            ></el-pagination>
+
+        </el-card>
+    </div>
+</template>
+
+<script>
+    import {
+        filterDetail,
+    } from "../../api/thrsys/thrCorpsImport";
+
+    export default {
+        name: "ThrCorpsImportDetail",
+        props: {
+            currentRow: {
+                type: Object,
+                required: true,
+            },
+
+        },
+        data() {
+            return {
+                filterQuery: {
+                    genKey: null,
+                    unitId: null,
+                    name: null,
+                    status: null,
+                    page: 1,
+                    limit: 10,
+                },
+                list: [],
+                detailList: [],
+                total: 0,
+                status: {
+                    0: "未处理",
+                    1: "处理失败",
+                    2: "处理成功"
+                },
+            };
+        },
+
+        methods: {
+            onReset() {
+                this.$router.push({
+                    path: "",
+                });
+                this.filterQuery = {
+                    genKey: null,
+                    unitId: null,
+                    name: null,
+                    status: null,
+                    page: 1,
+                    limit: 10,
+                };
+                this.getList();
+            },
+            getList() {
+                this.loading = true;
+                console.log(" this.genKey = " + this.currentRow)
+                this.filterQuery.genKey = this.currentRow.genKey;
+                filterDetail(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;
+                    });
+            },
+            statusFilterType(status) {
+                const statusMap = {
+                    0: "warning",
+                    1: "danger",
+                    2: "success",
+                };
+                return statusMap[status];
+            },
+            handleCurrentChange(val) {
+                this.filterQuery.page = val;
+                this.getList();
+            },
+        },
+        mounted() {
+        },
+        created() {
+            this.getList();
+        },
+        filters: {},
+    };
+</script>
+<style>
+    .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;
+
+    }
+
+    .el-col {
+        border-radius: 4px;
+        flex-wrap: wrap;
+    }
+</style>
diff --git a/src/views/thrsys/ThrInvProductsImport.vue b/src/views/thrsys/ThrInvProductsImport.vue
index 035c915..c602a43 100644
--- a/src/views/thrsys/ThrInvProductsImport.vue
+++ b/src/views/thrsys/ThrInvProductsImport.vue
@@ -95,13 +95,13 @@
             </el-table-column>
             <el-table-column label="操作" fixed="right" width="160">
                 <template slot-scope="scope">
-                    <!--<el-button-->
-                    <!--type="text"-->
-                    <!--size="small"-->
-                    <!--@click.native.stop="handleDetailClick(scope.row)"-->
-                    <!--&gt;详情-->
-                    <!--</el-button-->
-                    <!--&gt;-->
+                    <el-button
+                        type="text"
+                        size="small"
+                        @click.native.stop="handleDetailClick(scope.row)"
+                    >详情
+                    </el-button
+                    >
                     <el-button
                         type="text"
                         size="small"
@@ -113,6 +113,16 @@
             </el-table-column>
         </el-table>
 
+        <el-dialog
+            title="导入库存产品信息详情详情"
+            :visible.sync="udiImportDetailVisible"
+            width="85%"
+            v-if="udiImportDetailVisible"
+        >
+            <thrInvProductsImportDetail
+                :currentRow="currentRow"
+            ></thrInvProductsImportDetail>
+        </el-dialog>
 
         <el-pagination
             :page-size="filterQuery.limit"
@@ -126,8 +136,9 @@
 <script>
     import {filterLog, deleteLog} from "../../api/thrsys/thrInvProductsImport";
     import {getBasicThirdSys, filterDetailByKey} from "../../api/basic/basicThirdSys";
-    import {downloadAll} from "../../api/thrsys/thrCorps";
+    import {downloadAll} from "../../api/thrsys/thrInvProducts";
     import {selectIp} from "../../api/param/systemParamConfig";
+    import thrInvProductsImportDetail from "./ThrInvProductsImportDetail";
 
     export default {
         data() {
@@ -282,9 +293,10 @@
                 if (response.code != 20000) {
                     this.$message.error(response.message);
                 } else {
-                    console.log(files[0] + "\n" + this.fileList[0] + "\n" + fileList[0]);
+                    // console.log(files[0] + "\n" + this.fileList[0] + "\n" + fileList[0]);
                     this.$message.success("文件上传成功,请稍后刷新查看！");
                 }
+                this.getList();
             },
             statusFilterType(status) {
                 const statusMap = {
@@ -298,7 +310,7 @@
             getThirdSysDetail() {
                 let query = {
                     thirdSysFk: this.filterQuery.thirdSysFk,
-                    key: "corpUrl",
+                    key: "invPiUrl",
                 };
                 filterDetailByKey(query)
                     .then((response) => {
@@ -312,14 +324,16 @@
             },
             downloadDatas() {
                 let query = {
-                    thirdSysFk: this.filterQuery.thirdSys
+                    thirdSysFk: this.filterQuery.thirdSysFk
                 };
                 downloadAll(query).then((response) => {
                     if (response.code == 20000) {
                         this.$message.success(response.data);
+                        this.getList();
                     } else {
                         this.$message.error(response.message);
                     }
+
                 });
 
             },
@@ -327,10 +341,10 @@
 
         mounted() {
         },
-        components: {},
+        components: {thrInvProductsImportDetail},
         created() {
             this.getBasicThirdSys();
-            // this.getList();
+            this.getList();
         },
     };
 </script>
diff --git a/src/views/thrsys/ThrInvProductsImportDetail.vue b/src/views/thrsys/ThrInvProductsImportDetail.vue
new file mode 100644
index 0000000..53f35b7
--- /dev/null
+++ b/src/views/thrsys/ThrInvProductsImportDetail.vue
@@ -0,0 +1,165 @@
+<template>
+    <div>
+        <el-card>
+            <el-form :inline="true" :model="query" size="mini">
+                <el-row>
+                    <el-form-item class="query-form-item">
+                        <el-input
+                            v-model="filterQuery.inventoryCode" clearable
+                            placeholder="存货编码"
+                        ></el-input>
+                    </el-form-item>
+                    <el-form-item class="query-form-item">
+                        <el-input
+                            v-model="filterQuery.inventoryName" clearable
+                            placeholder="存货名称"
+                        ></el-input>
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button-group style="display:flex;">
+                            <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
+                            <el-button type="primary" icon="search" @click="getList">查询</el-button>
+                        </el-button-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="产品编码" prop="inventoryCode" show-overflow-tooltip></el-table-column>
+                <el-table-column label="产品名称" prop="inventoryName" show-overflow-tooltip></el-table-column>
+                <el-table-column label="规格型号" prop="spec" show-overflow-tooltip></el-table-column>
+                <el-table-column label="批次号" prop="batchNo" show-overflow-tooltip></el-table-column>
+                <el-table-column label="仓位" prop="warehouseName" show-overflow-tooltip></el-table-column>
+                <el-table-column label="货位" prop="spaceName" show-overflow-tooltip></el-table-column>
+                <el-table-column label="注册证号" prop="registerCertNo" show-overflow-tooltip></el-table-column>
+                <el-table-column label="生产日期" prop="manufacturingDate" show-overflow-tooltip></el-table-column>
+                <el-table-column label="失效日期" prop="expirationDate" show-overflow-tooltip></el-table-column>
+                <el-table-column label="数量" prop="count" show-overflow-tooltip></el-table-column>
+            </el-table>
+            <el-pagination
+                :page-size="filterQuery.limit"
+                @current-change="handleCurrentChange"
+                layout="prev, pager, next"
+                :total="total"
+            ></el-pagination>
+
+        </el-card>
+    </div>
+</template>
+
+<script>
+    import {
+        filterDetail,
+    } from "../../api/thrsys/thrInvProductsImport";
+
+    export default {
+        name: "ThrInvProductsImportDetail",
+        props: {
+            currentRow: {
+                type: Object,
+                required: true,
+            },
+
+        },
+        data() {
+            return {
+                filterQuery: {
+                    genKey: null,
+                    inventoryCode: null,
+                    inventoryName: null,
+                    status: null,
+                    page: 1,
+                    limit: 10,
+                },
+                list: [],
+                detailList: [],
+                total: 0,
+                status: {
+                    0: "未处理",
+                    1: "处理失败",
+                    2: "处理成功"
+                },
+            };
+        },
+
+        methods: {
+            onReset() {
+                this.$router.push({
+                    path: "",
+                });
+                this.filterQuery = {
+                    genKey: null,
+                    inventoryCode: null,
+                    inventoryName: null,
+                    status: null,
+                    page: 1,
+                    limit: 10,
+                };
+                this.getList();
+            },
+            getList() {
+                this.loading = true;
+                console.log(" this.genKey = " + this.currentRow)
+                this.filterQuery.genKey = this.currentRow.genKey;
+                filterDetail(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;
+                    });
+            },
+            statusFilterType(status) {
+                const statusMap = {
+                    0: "warning",
+                    1: "danger",
+                    2: "success",
+                };
+                return statusMap[status];
+            },
+            handleCurrentChange(val) {
+                this.filterQuery.page = val;
+                this.getList();
+            },
+        },
+        mounted() {
+        },
+        created() {
+            this.getList();
+        },
+        filters: {},
+    };
+</script>
+<style>
+    .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;
+
+    }
+
+    .el-col {
+        border-radius: 4px;
+        flex-wrap: wrap;
+    }
+</style>
diff --git a/src/views/thrsys/ThrOrderImport.vue b/src/views/thrsys/ThrOrderImport.vue
index 5f9c304..4813be1 100644
--- a/src/views/thrsys/ThrOrderImport.vue
+++ b/src/views/thrsys/ThrOrderImport.vue
@@ -107,13 +107,13 @@
             </el-table-column>
             <el-table-column label="操作" fixed="right" width="160">
                 <template slot-scope="scope">
-                    <!--<el-button-->
-                    <!--type="text"-->
-                    <!--size="small"-->
-                    <!--@click.native.stop="handleDetailClick(scope.row)"-->
-                    <!--&gt;详情-->
-                    <!--</el-button-->
-                    <!--&gt;-->
+                    <el-button
+                    type="text"
+                    size="small"
+                    @click.native.stop="handleDetailClick(scope.row)"
+                    >详情
+                    </el-button
+                    >
                     <el-button
                         type="text"
                         size="small"
@@ -124,7 +124,16 @@
                 </template>
             </el-table-column>
         </el-table>
-
+        <el-dialog
+            title="导入订单详情"
+            :visible.sync="udiImportDetailVisible"
+            width="85%"
+            v-if="udiImportDetailVisible"
+        >
+            <thrOrderImportDetail
+                :currentRow="currentRow"
+            ></thrOrderImportDetail>
+        </el-dialog>
 
         <el-pagination
             :page-size="filterQuery.limit"
@@ -141,6 +150,7 @@
     import {getBasicThirdSys, filterDetailByKey} from "../../api/basic/basicThirdSys";
     import {downloadAll} from "../../api/thrsys/thrOrder";
     import {getBussinessType} from "../../api/basic/bussinessType";
+    import thrOrderImportDetail from "./ThrOrderImportDetail";
 
     export default {
         data() {
@@ -212,9 +222,6 @@
                     });
             },
 
-            genInCode() {
-                this.selectBasicUdiVisible = true;
-            },
             handleDetailClick(row) {
                 this.currentRow = row;
                 console.log(this.currentRow.genKey)
@@ -285,8 +292,9 @@
                 if (response.code != 20000) {
                     this.$message.error(response.message);
                 } else {
-                    console.log(files[0] + "\n" + this.fileList[0] + "\n" + fileList[0]);
+                    // console.log(files[0] + "\n" + this.fileList[0] + "\n" + fileList[0]);
                     this.$message.success("文件上传成功,请稍后刷新查看！");
+                    this.getList();
                 }
             },
             statusFilterType(status) {
@@ -343,11 +351,11 @@
 
         mounted() {
         },
-        components: {},
+        components: {thrOrderImportDetail},
         created() {
             this.getBasicThirdSys();
             this.getBusType();
-            // this.getList();
+            this.getList();
         },
     };
 </script>
diff --git a/src/views/thrsys/ThrOrderImportDetail.vue b/src/views/thrsys/ThrOrderImportDetail.vue
new file mode 100644
index 0000000..6fe95bf
--- /dev/null
+++ b/src/views/thrsys/ThrOrderImportDetail.vue
@@ -0,0 +1,161 @@
+<template>
+    <div>
+        <el-card>
+            <el-form :inline="true" :model="query" size="mini">
+                <el-row>
+                    <el-form-item class="query-form-item">
+                        <el-input v-model="filterQuery.billNo" placeholder="UDI编码"></el-input>
+                    </el-form-item>
+
+                    <el-form-item>
+                        <el-button-group style="display:flex;">
+                            <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
+                            <el-button type="primary" icon="search" @click="getList">查询</el-button>
+                        </el-button-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="单据号" prop="billNo"></el-table-column>
+                <el-table-column label="往来单位ID" prop="corpId"
+                                 show-overflow-tooltip="true"></el-table-column>
+                <el-table-column label="往来单位" prop="corpName"
+                                 show-overflow-tooltip="true"></el-table-column>
+                <el-table-column label="单据类型" prop="billType" show-overflow-tooltip="true"></el-table-column>
+                <el-table-column label="单据状态" prop="billFlag" width="80" show-overflow-tooltip="true"></el-table-column>
+                <el-table-column label="单据日期" prop="billdate" show-overflow-tooltip="true"></el-table-column>
+                <el-table-column label="产品编码" prop="productId" show-overflow-tooltip="true"></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="batchNo" show-overflow-tooltip="true"></el-table-column>
+                <el-table-column label="生产日期" prop="productDate" show-overflow-tooltip="true"></el-table-column>
+                <el-table-column label="失效日期" prop="expireDate" show-overflow-tooltip="true"></el-table-column>
+                <el-table-column label="单据数量" prop="reCount" show-overflow-tooltip="true"></el-table-column>
+                <el-table-column label="实际数量" prop="count" show-overflow-tooltip="true"></el-table-column>
+            </el-table>
+            <el-pagination
+                :page-size="filterQuery.limit"
+                @current-change="handleCurrentChange"
+                layout="prev, pager, next"
+                :total="total"
+            ></el-pagination>
+
+        </el-card>
+    </div>
+</template>
+
+<script>
+    import {
+        filterDetail,
+    } from "../../api/thrsys/thrOrderImport";
+
+    export default {
+        name: "ThrOrderImportDetail",
+        props: {
+            currentRow: {
+                type: Object,
+                required: true,
+            },
+
+        },
+        data() {
+            return {
+                filterQuery: {
+                    genKey: null,
+                    billNo: null,
+                    status: null,
+                    page: 1,
+                    limit: 10,
+                },
+                list: [],
+                detailList: [],
+                total: 0,
+                status: {
+                    0: "未处理",
+                    1: "处理失败",
+                    2: "处理成功"
+                },
+            };
+        },
+
+        methods: {
+            onReset() {
+                this.$router.push({
+                    path: "",
+                });
+                this.filterQuery = {
+                    genKey: null,
+                    billNo: null,
+                    status: null,
+                    page: 1,
+                    limit: 10,
+                };
+                this.getList();
+            },
+            getList() {
+                this.loading = true;
+                console.log(" this.genKey = " + this.currentRow)
+                this.filterQuery.genKey = this.currentRow.genKey;
+                filterDetail(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;
+                    });
+            },
+            statusFilterType(status) {
+                const statusMap = {
+                    0: "warning",
+                    1: "danger",
+                    2: "success",
+                };
+                return statusMap[status];
+            },
+            handleCurrentChange(val) {
+                this.filterQuery.page = val;
+                this.getList();
+            },
+        },
+        mounted() {
+        },
+        created() {
+            this.getList();
+        },
+        filters: {},
+    };
+</script>
+<style>
+    .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;
+
+    }
+
+    .el-col {
+        border-radius: 4px;
+        flex-wrap: wrap;
+    }
+</style>
diff --git a/src/views/thrsys/ThrProductsImport.vue b/src/views/thrsys/ThrProductsImport.vue
index 7cca5da..f58e9ac 100644
--- a/src/views/thrsys/ThrProductsImport.vue
+++ b/src/views/thrsys/ThrProductsImport.vue
@@ -94,13 +94,13 @@
             </el-table-column>
             <el-table-column label="操作" fixed="right" width="160">
                 <template slot-scope="scope">
-                    <!--<el-button-->
-                    <!--type="text"-->
-                    <!--size="small"-->
-                    <!--@click.native.stop="handleDetailClick(scope.row)"-->
-                    <!--&gt;详情-->
-                    <!--</el-button-->
-                    <!--&gt;-->
+                    <el-button
+                        type="text"
+                        size="small"
+                        @click.native.stop="handleDetailClick(scope.row)"
+                    >详情
+                    </el-button
+                    >
                     <el-button
                         type="text"
                         size="small"
@@ -117,6 +117,18 @@
             layout="prev, pager, next"
             :total="total"
         ></el-pagination>
+
+        <el-dialog
+            title="导入产品信息详情详情"
+            :visible.sync="udiImportDetailVisible"
+            width="85%"
+            v-if="udiImportDetailVisible"
+        >
+            <thrProductsImportDetail
+                :currentRow="currentRow"
+            ></thrProductsImportDetail>
+        </el-dialog>
+
     </div>
 </template>
 
@@ -125,6 +137,7 @@
     import {getBasicThirdSys, filterDetailByKey} from "../../api/basic/basicThirdSys";
     import {downloadAll} from "../../api/thrsys/thrProducts";
     import {selectIp} from "../../api/param/systemParamConfig";
+    import thrProductsImportDetail from "./ThrProductsImportDetail";
 
     export default {
         data() {
@@ -306,24 +319,29 @@
 
             },
             downloadDatas() {
-                let query = {
-                    thirdSysFk: this.filterQuery.thirdSysFk
-                };
-                downloadAll(query).then((response) => {
-                    if (response.code == 20000) {
-                        this.$message.success(response.data);
-                        this.getList()
-                    } else {
-                        this.$message.error(response.message);
-                    }
+                this.$confirm("此操作从第三方系统下载全部信息, 是否继续?", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning",
+                }).then(() => {
+                    let query = {
+                        thirdSysFk: this.filterQuery.thirdSysFk
+                    };
+                    downloadAll(query).then((response) => {
+                        if (response.code == 20000) {
+                            this.$message.success(response.data);
+                            this.getList()
+                        } else {
+                            this.$message.error(response.message);
+                        }
+                    });
                 });
-
             },
         },
 
         mounted() {
         },
-        components: {},
+        components: {thrProductsImportDetail},
         created() {
             this.getBasicThirdSys();
             this.getList();
diff --git a/src/views/thrsys/ThrProductsImportDetail.vue b/src/views/thrsys/ThrProductsImportDetail.vue
new file mode 100644
index 0000000..29a1b12
--- /dev/null
+++ b/src/views/thrsys/ThrProductsImportDetail.vue
@@ -0,0 +1,162 @@
+<template>
+    <div>
+        <el-card>
+            <el-form :inline="true" :model="query" size="mini">
+                <el-row>
+                    <el-form-item class="query-form-item">
+                        <el-input
+                            v-model="filterQuery.code"
+                            placeholder="产品编码"
+                        ></el-input>
+                    </el-form-item>
+                    <el-form-item class="query-form-item">
+                        <el-input
+                            v-model="filterQuery.name"
+                            placeholder="产品名称"
+                        ></el-input>
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button-group style="display:flex;">
+                            <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
+                            <el-button type="primary" icon="search" @click="getList">查询</el-button>
+                        </el-button-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="产品编码" prop="code"></el-table-column>
+                <el-table-column label="产品名称" prop="name" show-overflow-tooltip></el-table-column>
+                <el-table-column label="规格型号" 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="registerNo" show-overflow-tooltip></el-table-column>
+                <el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip></el-table-column>
+            </el-table>
+            <el-pagination
+                :page-size="filterQuery.limit"
+                @current-change="handleCurrentChange"
+                layout="prev, pager, next"
+                :total="total"
+            ></el-pagination>
+
+        </el-card>
+    </div>
+</template>
+
+<script>
+    import {
+        filterDetail,
+    } from "../../api/thrsys/thrProductsImport";
+
+    export default {
+        name: "ThrProductsImportDetail",
+        props: {
+            currentRow: {
+                type: Object,
+                required: true,
+            },
+
+        },
+        data() {
+            return {
+                filterQuery: {
+                    genKey: null,
+                    code: null,
+                    name: "",
+                    status: null,
+                    page: 1,
+                    limit: 10,
+                },
+                list: [],
+                detailList: [],
+                total: 0,
+                status: {
+                    0: "未处理",
+                    1: "处理失败",
+                    2: "处理成功"
+                },
+            };
+        },
+
+        methods: {
+            onReset() {
+                this.$router.push({
+                    path: "",
+                });
+                this.filterQuery = {
+                    genKey: null,
+                    code: null,
+                    name: "",
+                    status: null,
+                    page: 1,
+                    limit: 10,
+                };
+                this.getList();
+            },
+            getList() {
+                this.loading = true;
+                console.log(" this.genKey = " + this.currentRow)
+                this.filterQuery.genKey = this.currentRow.genKey;
+                filterDetail(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;
+                    });
+            },
+            statusFilterType(status) {
+                const statusMap = {
+                    0: "warning",
+                    1: "danger",
+                    2: "success",
+                };
+                return statusMap[status];
+            },
+            handleCurrentChange(val) {
+                this.filterQuery.page = val;
+                this.getList();
+            },
+        },
+
+        mounted() {
+        },
+        created() {
+            this.getList();
+        },
+        filters: {},
+    };
+</script>
+<style>
+    .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;
+
+    }
+
+    .el-col {
+        border-radius: 4px;
+        flex-wrap: wrap;
+    }
+</style>