feat: 第三方明细下载增加字段

src/views/thirdSys/invOrder/thrInvGhOrder.vue

@@ -43,6 +43,11 @@
 
         </el-row>
         <el-row>
+          <el-col :span="8">
+            <el-form-item label="患者信息:">
+              <el-input v-model="filterQuery.sicker" style="width: 90%" placeholder="请输入患者信息" clearable></el-input>
+            </el-form-item>
+          </el-col>
           <el-col :span="8">
             <el-form-item label="单据日期:">
               <el-date-picker
@@ -58,7 +63,23 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
+          <el-col :span="8" >
+            <el-form-item label="收费日期:">
+              <el-date-picker
+                :picker-options="pickerOptions"
+                v-model="chargeDateRange"
+                type="daterange"
+                format="yyyy 年 MM 月 dd 日"
+                value-format="yyyy-MM-dd"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
         </el-row>
+
       </el-form>
 
       <div class="top-right-btn">
@@ -76,9 +97,25 @@
         <el-table-column label="序号" type="index" width="60"></el-table-column>
         <el-table-column label="单据号" prop="billNo"></el-table-column>
         <el-table-column label="单据时间" prop="billDate"></el-table-column>
-        <el-table-column label="出入库类型" prop="mainAction"></el-table-column>
-        <el-table-column label="第三方单据类型" prop="billType"></el-table-column>
+        <el-table-column label="出入库类型" prop="mainAction">
+          <template slot-scope="scope">
+            <el-tag
+              :type="scope.row.mainAction == 'WareHouseOut' ? 'primary' : 'success'"
+              disable-transitions>{{scope.row.mainAction == 'WareHouseOut' ? '出库':'入库'}}</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="第三方单据类型" prop="billType">
+          <template slot-scope="scope">
+            <el-tag
+              :type="scope.row.mainAction == 'WareHouseOut' ? 'primary' : 'success'"
+              disable-transitions>{{scope.row.mainAction == 'WareHouseOut' ? '出库':'入库'}}</el-tag>
+          </template>
+        </el-table-column>
         <el-table-column label="外部系统" prop="thirdSysFk"></el-table-column>
+        <el-table-column label="患者编号" prop="sickerCode"></el-table-column>
+        <el-table-column label="患者姓名" prop="sickerName"></el-table-column>
+        <el-table-column label="收费时间" prop="chargeTime"></el-table-column>
+<!--        <el-table-column label="收费人员" prop="chargeUser"></el-table-column>-->
 <!--        <el-table-column label="单据状态" prop="status"></el-table-column>-->
         <el-table-column
           prop="status"
@@ -201,6 +238,7 @@ export default {
       thisData:null,
       showSearch: true,
       filterQuery: {
+        sicker: "",
         billType: null,
         billNo: "",
         // originType: null,
@@ -225,6 +263,7 @@ export default {
       },
       loading: false,
       actDateRange: [],
+      chargeDateRange: [],
       pickerOptions: {
         shortcuts: [
           {
@@ -318,6 +357,13 @@ export default {
         this.filterQuery.startDate = null;
         this.filterQuery.endDate = null;
       }
+      if (this.chargeDateRange != null) {
+        this.filterQuery.chargeStartDate = this.chargeDateRange[0];
+        this.filterQuery.chargeEndDate = this.chargeDateRange[1];
+      } else {
+        this.filterQuery.chargeStartDate = null;
+        this.filterQuery.chargeEndDate = null;
+      }
       this.loading = true;
       getThrInvOrders(this.filterQuery)
         .then((response) => {
@@ -519,6 +565,11 @@ export default {
      * 手动下载第三方出入库明细
      */
     dlThrInvOrder() {
+      if (this.actDateRange != null) {
+        this.filterQuery.startDate = this.actDateRange[0];
+        this.filterQuery.endDate = this.actDateRange[1];
+      }
+
       this.$confirm("是否确定下载日期范围为：" + this.filterQuery.startDate + "-----" + this.filterQuery.endDate + "的出入库明细？", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",

src/views/thirdSys/invOrder/thrInvPhOrder.vue

@@ -76,8 +76,20 @@
         <el-table-column label="序号" type="index" width="60"></el-table-column>
         <el-table-column label="单据号" prop="billNo"></el-table-column>
         <el-table-column label="单据时间" prop="billDate"></el-table-column>
-        <el-table-column label="出入库类型" prop="mainAction"></el-table-column>
-        <el-table-column label="第三方单据类型" prop="billType"></el-table-column>
+        <el-table-column label="出入库类型" prop="mainAction">
+          <template slot-scope="scope">
+            <el-tag
+              :type="scope.row.mainAction == 'WareHouseOut' ? 'primary' : 'success'"
+              disable-transitions>{{scope.row.mainAction == 'WareHouseOut' ? '出库':'入库'}}</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="第三方单据类型" prop="billType">
+          <template slot-scope="scope">
+            <el-tag
+              :type="scope.row.mainAction == 'WareHouseOut' ? 'primary' : 'success'"
+              disable-transitions>{{scope.row.mainAction == 'WareHouseOut' ? '出库':'入库'}}</el-tag>
+          </template>
+        </el-table-column>
         <el-table-column label="外部系统" prop="thirdSysFk"></el-table-column>
         <!--        <el-table-column label="单据状态" prop="status"></el-table-column>-->
         <el-table-column
@@ -529,6 +541,11 @@ export default {
      * 手动下载第三方出入库明细
      */
     dlThrInvOrder() {
+      if (this.actDateRange != null) {
+        this.filterQuery.startDate = this.actDateRange[0];
+        this.filterQuery.endDate = this.actDateRange[1];
+      }
+
       this.$confirm("是否确定下载日期范围为：" + this.filterQuery.startDate + "-----" + this.filterQuery.endDate + "的出入库明细？", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",