diff --git a/package.json b/package.json
index a0ebfe56..d2de472f 100644
--- a/package.json
+++ b/package.json
@@ -53,6 +53,7 @@
     "jsencrypt": "3.0.0-rc.1",
     "loadsh": "^0.0.4",
     "lodash": "^4.17.21",
+    "moment": "^2.30.1",
     "nprogress": "0.2.0",
     "pinyin": "^2.10.2",
     "qrcodejs2": "^0.0.2",
diff --git a/src/api/thrsys/thrInvOrder.js b/src/api/thrsys/thrInvOrder.js
index fa17b7c4..db054b26 100644
--- a/src/api/thrsys/thrInvOrder.js
+++ b/src/api/thrsys/thrInvOrder.js
@@ -51,6 +51,7 @@ export function delThrInvOrder(query) {
     data: query
   })
 }
+
 /**
  * 生成单据
  * @param query
@@ -63,6 +64,7 @@ export function generateOrder(query) {
     data: query
   })
 }
+
 /**
  * 生成单据
  * @param query
@@ -75,6 +77,7 @@ export function generateGhOrder(query) {
     data: query
   })
 }
+
 /**
  * 刷新单据
  * @param query
@@ -87,6 +90,7 @@ export function refreshBill(query) {
     data: query
   })
 }
+
 /**
  * 刷新单据高耗
  * @param query
@@ -101,4 +105,44 @@ export function refreshGhBill(query) {
 }
 
 
+/**
+ * 下载收费出入库明细
+ * @param query
+ * @returns {AxiosPromise}
+ */
+export function dlThrInvFeeOrder(query) {
+  return axios({
+    url: '/udiwms/thrsys/downloadInvOrder',
+    method: 'post',
+    data: query
+  })
+}
+
+
+/**
+ * 下载高耗出入库明细
+ * @param query
+ * @returns {AxiosPromise}
+ */
+export function dlInvGhOrder(query) {
+  return axios({
+    url: '/udiwms/thrsys/downloadInvGhOrder',
+    method: 'post',
+    data: query
+  })
+}
+
+/**
+ * 下载普耗出入库明细
+ * @param query
+ * @returns {AxiosPromise}
+ */
+export function downloadInvPhOrder(query) {
+  return axios({
+    url: '/udiwms/thrsys/downloadInvPhOrder',
+    method: 'post',
+    data: query
+  })
+}
+
 
diff --git a/src/views/thirdSys/invOrder/thrInvGhOrder.vue b/src/views/thirdSys/invOrder/thrInvGhOrder.vue
index d04ebe9f..c28a9f29 100644
--- a/src/views/thirdSys/invOrder/thrInvGhOrder.vue
+++ b/src/views/thirdSys/invOrder/thrInvGhOrder.vue
@@ -66,6 +66,7 @@
           <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
           <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
           <el-button type="primary" icon="el-icon-search" @click="getList">查询</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="dlThrInvOrder">下载</el-button>
         </el-button-group>
       </div>
 
@@ -177,12 +178,20 @@
   </div>
 </template>
 <script>
-import {delThrInvOrder, getThrInvOrders, getThrInvOrderDetails,delThrInvOrderDetail,refreshGhBill} from "@/api/thrsys/thrInvOrder";
+import {
+  delThrInvOrder,
+  getThrInvOrders,
+  getThrInvOrderDetails,
+  delThrInvOrderDetail,
+  refreshGhBill,
+  dlThrInvFeeOrder, dlInvGhOrder
+} from "@/api/thrsys/thrInvOrder";
 import {getBussinessType} from "@/api/basic/bussinessType";
 import {getOriginBusType} from "@/api/basic/busOriginType";
 import {getBasicThirdSys, filterDetailByKey} from "@/api/basic/basicThirdSys";
 import {selectIp} from "@/api/param/systemParamConfig";
 import thrInvOrderGenerate from "@/views/thirdSys/invOrder/thrInvOrderGenerate";
+import moment from "moment";
 
 export default {
   data() {
@@ -504,6 +513,34 @@ export default {
         this.getList();
       }
     },
+    /**
+     * 手动下载第三方出入库明细
+     */
+    dlThrInvOrder() {
+      this.$confirm("是否确定下载日期范围为：" + this.filterQuery.startDate + "-" + this.filterQuery.endDate + "的出入库明细？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          dlInvGhOrder(this.filterQuery)
+            .then((response) => {
+              this.loading = false;
+              if (response.code == 20000) {
+                this.$message.success("下载成功");
+                this.getList();
+              } else {
+                this.$message.error(response.message);
+              }
+            })
+            .catch(() => {
+              this.loading = false;
+            });
+
+        })
+        .catch(() => {
+        });
+    },
   },
   components: {thrInvOrderGenerate},
   mounted() {
@@ -513,7 +550,7 @@ export default {
     let end = new Date();
     let start = new Date();
     start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-    this.actDateRange = [start, end];
+    this.actDateRange = [moment(start).format('YYYY-MM-DD'), moment(end).format('YYYY-MM-DD')];
   },
 };
 </script>
diff --git a/src/views/thirdSys/invOrder/thrInvOrder.vue b/src/views/thirdSys/invOrder/thrInvOrder.vue
index 11a2a984..79aacabf 100644
--- a/src/views/thirdSys/invOrder/thrInvOrder.vue
+++ b/src/views/thirdSys/invOrder/thrInvOrder.vue
@@ -66,6 +66,7 @@
           <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
           <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
           <el-button type="primary" icon="el-icon-search" @click="getList">查询</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="dlThrInvOrder">下载</el-button>
         </el-button-group>
       </div>
 
@@ -78,7 +79,7 @@
         <el-table-column label="出入库类型" prop="mainAction"></el-table-column>
         <el-table-column label="第三方单据类型" prop="billType"></el-table-column>
         <el-table-column label="外部系统" prop="thirdSysFk"></el-table-column>
-<!--        <el-table-column label="单据状态" prop="status"></el-table-column>-->
+        <!--        <el-table-column label="单据状态" prop="status"></el-table-column>-->
         <el-table-column
           prop="status"
           label="单据状态"
@@ -87,11 +88,12 @@
           <template slot-scope="scope">
             <el-tag
               :type="scope.row.status == '1' ? 'primary' : 'success'"
-              disable-transitions>{{scope.row.status == 0 ? '待生成':'已生成'}}</el-tag>
+              disable-transitions>{{ scope.row.status == 0 ? '待生成' : '已生成' }}
+            </el-tag>
           </template>
         </el-table-column>
 
-        <el-table-column label="异常信息" prop="exMsg"  width="360">
+        <el-table-column label="异常信息" prop="exMsg" width="360">
           <template v-slot="{ row }">
             <el-tooltip class="item" effect="dark" :content="row.exMsg" placement="top">
               <div class="ellipsis-text" :style="{ color: row.exMsg ? 'red' : 'red' } ">{{ row.exMsg }}</div>
@@ -104,13 +106,16 @@
             <el-button type="text" @click.native.stop="deleteDialog(scope.row)"
             >删除
             </el-button>
-            <el-button v-show="scope.row.status == 0 && (scope.row.exMsg === null || scope.row.exMsg === '')" type="text" @click.native.stop="generateBill(scope.row)" STYLE="color:rgb(0,0,255)"
+            <el-button v-show="scope.row.status == 0 && (scope.row.exMsg === null || scope.row.exMsg === '')"
+                       type="text" @click.native.stop="generateBill(scope.row)" STYLE="color:rgb(0,0,255)"
             >生成单据
             </el-button>
-            <el-button v-show="scope.row.status == 1 && (scope.row.exMsg === null || scope.row.exMsg === '')" type="text" @click.native.stop="generateBill(scope.row)" STYLE="color:rgb(0,220,255)"
+            <el-button v-show="scope.row.status == 1 && (scope.row.exMsg === null || scope.row.exMsg === '')"
+                       type="text" @click.native.stop="generateBill(scope.row)" STYLE="color:rgb(0,220,255)"
             >重新生成
             </el-button>
-            <el-button v-show="scope.row.exMsg !== null && scope.row.exMsg !== ''" type="text" @click.native.stop="refreshBill(scope.row)"
+            <el-button v-show="scope.row.exMsg !== null && scope.row.exMsg !== ''" type="text"
+                       @click.native.stop="refreshBill(scope.row)"
             >更新
             </el-button>
           </template>
@@ -130,13 +135,13 @@
         <el-table-column label="物资编码" prop="relId"></el-table-column>
         <el-table-column label="第三方项目编码" prop="thrCode"></el-table-column>
         <el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip="true"></el-table-column>
-<!--        <el-table-column label="DI" prop="nameCode" show-overflow-tooltip="true"></el-table-column>-->
+        <!--        <el-table-column label="DI" prop="nameCode" show-overflow-tooltip="true"></el-table-column>-->
         <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="批次号" prop="batchNo"></el-table-column>
         <el-table-column label="计量单位" prop="measname"></el-table-column>
         <el-table-column label="价格" prop="price"></el-table-column>
-<!--        <el-table-column label="生产日期" prop="productDate"></el-table-column>-->
-<!--        <el-table-column label="失效日期" prop="expireDate"></el-table-column>-->
+        <!--        <el-table-column label="生产日期" prop="productDate"></el-table-column>-->
+        <!--        <el-table-column label="失效日期" prop="expireDate"></el-table-column>-->
 
         <el-table-column label="医疗器械注册备案人" prop="ylqxzcrbarmc"></el-table-column>
         <el-table-column label="注册/备案号" prop="zczbhhzbapzbh"></el-table-column>
@@ -149,7 +154,7 @@
         <el-table-column label="患者名称" prop="sickerName"></el-table-column>
 
         <el-table-column label="操作" width="160">
-          <template slot-scope="scope" >
+          <template slot-scope="scope">
             <el-button type="text" @click.native.stop="deleteDetailDialog(scope.row)"
             >删除
             </el-button>
@@ -176,24 +181,31 @@
       <thrInvOrderGenerate
         :generateOrderDate=thisData
         :originTypes=originTypes
-        :sourceType = 1
+        :sourceType=1
         :closeAddDialog="closeAddDialog">
       </thrInvOrderGenerate>
     </el-dialog>
   </div>
 </template>
 <script>
-import {delThrInvOrder, getThrInvOrders, getThrInvOrderDetails,delThrInvOrderDetail,refreshBill} from "@/api/thrsys/thrInvOrder";
+import {
+  delThrInvOrder,
+  getThrInvOrders,
+  getThrInvOrderDetails,
+  delThrInvOrderDetail,
+  refreshBill, dlThrInvOrder, dlThrInvFeeOrder
+} from "@/api/thrsys/thrInvOrder";
 import {getBussinessType} from "@/api/basic/bussinessType";
 import {getOriginBusType} from "@/api/basic/busOriginType";
 import {getBasicThirdSys, filterDetailByKey} from "@/api/basic/basicThirdSys";
 import {selectIp} from "@/api/param/systemParamConfig";
 import thrInvOrderGenerate from "@/views/thirdSys/invOrder/thrInvOrderGenerate";
+import moment from "moment";
 
 export default {
   data() {
     return {
-      thisData:null,
+      thisData: null,
       showSearch: true,
       filterQuery: {
         billType: null,
@@ -307,7 +319,7 @@ export default {
         });
     },
     handleDetail(row) {
-      if (row ==null) return;
+      if (row == null) return;
       this.jumpSkProject = row.skProject;
       let query = {orderIdFk: row.billNo};
       getThrInvOrderDetails(query)
@@ -324,11 +336,11 @@ export default {
         });
 
     },
-    generateBill(row){
+    generateBill(row) {
       this.thisData = row;
       this.thrInvOrderGenerateVisible = true;
     },
-    refreshBill(row){
+    refreshBill(row) {
       let rQuery = {
         billNo: row.billNo,
       };
@@ -374,7 +386,7 @@ export default {
         .catch(() => {
         });
     },
-    deleteDetailDialog(row){
+    deleteDetailDialog(row) {
       this.$confirm("此操作将永久删除该单据明细行, 是否继续?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -505,20 +517,48 @@ export default {
         this.getList();
       }
     },
-    jump(){
-      if (this.jumpSkProject == 1){
+    jump() {
+      if (this.jumpSkProject == 1) {
         this.$router.push('/thirdSys/destiny/skProject')
-      }else {
+      } else {
         this.$router.push('/basic/product/maintain?vueRouteSource=1')
       }
     },
-    changRed({row}){
+    changRed({row}) {
       if (row.relId == null) { // 变颜色的条件
         return {
           color: "red"  // 这个return的就是样式 可以是color 也可以是backgroundColor
         }
       }
-    }
+    },
+    /**
+     * 手动下载第三方出入库明细
+     */
+    dlThrInvOrder() {
+      this.$confirm("是否确定下载日期范围为：[" + this.filterQuery.startDate + "---" + this.filterQuery.endDate + "]的出入库明细？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          dlThrInvFeeOrder(this.filterQuery)
+            .then((response) => {
+              this.loading = false;
+              if (response.code == 20000) {
+                this.$message.success("下载成功");
+                this.getList();
+              } else {
+                this.$message.error(response.message);
+              }
+            })
+            .catch(() => {
+              this.loading = false;
+            });
+
+        })
+        .catch(() => {
+        });
+    },
   },
   components: {thrInvOrderGenerate},
   mounted() {
@@ -528,7 +568,7 @@ export default {
     let end = new Date();
     let start = new Date();
     start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-    this.actDateRange = [start, end];
+    this.actDateRange = [moment(start).format('YYYY-MM-DD'), moment(end).format('YYYY-MM-DD')];
   },
 };
 </script>
diff --git a/src/views/thirdSys/invOrder/thrInvPhOrder.vue b/src/views/thirdSys/invOrder/thrInvPhOrder.vue
index 401a503c..f92dd42d 100644
--- a/src/views/thirdSys/invOrder/thrInvPhOrder.vue
+++ b/src/views/thirdSys/invOrder/thrInvPhOrder.vue
@@ -66,6 +66,7 @@
           <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
           <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
           <el-button type="primary" icon="el-icon-search" @click="getList">查询</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="dlThrInvOrder">下载</el-button>
         </el-button-group>
       </div>
 
@@ -179,12 +180,20 @@
   </div>
 </template>
 <script>
-import {delThrInvOrder, getThrInvOrders, getThrInvOrderDetails,delThrInvOrderDetail,refreshBill} from "@/api/thrsys/thrInvOrder";
+import {
+  delThrInvOrder,
+  getThrInvOrders,
+  getThrInvOrderDetails,
+  delThrInvOrderDetail,
+  refreshBill,
+  dlInvGhOrder, downloadInvPhOrder
+} from "@/api/thrsys/thrInvOrder";
 import {getBussinessType} from "@/api/basic/bussinessType";
 import {getOriginBusType} from "@/api/basic/busOriginType";
 import {getBasicThirdSys, filterDetailByKey} from "@/api/basic/basicThirdSys";
 import {selectIp} from "@/api/param/systemParamConfig";
 import thrInvOrderGenerate from "@/views/thirdSys/invOrder/thrInvOrderGenerate";
+import moment from "moment";
 
 export default {
   data() {
@@ -514,7 +523,35 @@ export default {
           color: "red"  // 这个return的就是样式 可以是color 也可以是backgroundColor
         }
       }
-    }
+    },
+    /**
+     * 手动下载第三方出入库明细
+     */
+    dlThrInvOrder() {
+      this.$confirm("是否确定下载日期范围为：" + this.filterQuery.startDate + "-" + this.filterQuery.endDate + "的出入库明细？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          downloadInvPhOrder(this.filterQuery)
+            .then((response) => {
+              this.loading = false;
+              if (response.code == 20000) {
+                this.$message.success("下载成功");
+                this.getList();
+              } else {
+                this.$message.error(response.message);
+              }
+            })
+            .catch(() => {
+              this.loading = false;
+            });
+
+        })
+        .catch(() => {
+        });
+    },
   },
   components: {thrInvOrderGenerate},
   mounted() {
@@ -524,7 +561,7 @@ export default {
     let end = new Date();
     let start = new Date();
     start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-    this.actDateRange = [start, end];
+    this.actDateRange = [moment(start).format('YYYY-MM-DD'), moment(end).format('YYYY-MM-DD')];
   },
 };
 </script>