修改

src/views/allcase/report/checkout.vue

@@ -17,7 +17,7 @@
         </div>
         <div class="checkout-cont-infor-title cont-textbold">年龄:</div>
         <div class="checkout-cont-infor-list">
-          <span>{{ dataObj.Nl }}</span>
+          <span>{{ dataObj.NL }}</span>
         </div>
         <div class="checkout-cont-infor-title cont-textbold">病区:</div>
         <div class="checkout-cont-infor-list">
@@ -31,11 +31,11 @@
       <div class="checkout-cont-infortop checkout-cont-inforbotm">
         <div class="checkout-cont-infor-title cont-textbold">采集时间:</div>
         <div class="checkout-cont-infor-list">
-          <span>{{ dataObj.cjsj }}</span>
+          <span>{{ dataObj.CJSJ }}</span>
         </div>
         <div class="checkout-cont-infor-title cont-textbold">接收时间:</div>
         <div class="checkout-cont-infor-list">
-          <span>{{ dataObj.jssj }}</span>
+          <span>{{ dataObj.JSSJ }}</span>
         </div>
         <div class="checkout-cont-infor-title cont-textbold">审查目的:</div>
         <div class="checkout-cont-infor-list">
@@ -53,7 +53,7 @@
         </div>
         <div class="checkout-cont-infor-title cont-textbold">申请人:</div>
         <div class="checkout-cont-infor-list">
-          <span>{{ dataObj.sjys }}</span>
+          <span>{{ dataObj.SJYS }}</span>
         </div>
       </div>
 

src/views/data/query/adviceSearch.vue

@@ -11,7 +11,7 @@
               <!-- fieldList -->
               <el-option label="且" :value="0" />
               <el-option label="或者" :value="1" />
-              <el-option label="不包含" :value="2" />
+              <!-- <el-option label="不包含" :value="2" /> -->
             </el-select>
             <span v-if="index != 0" class="pind10" />
             <el-select v-model="item.key" class="width150" filterable placeholder="请选择" @change="funSelect(index)">
@@ -416,43 +416,61 @@ export default {
     funExport() {
       //查询
       let pramse = {
-        limit: this.paginationData.pageSize,
+        page_size: this.paginationData.pageSize,
         page: this.paginationData.currentPage, //是当前页数 默认是0 。普通检索的参数是
       };
-      this.formData.seniorList.forEach(item => {
-        if (item.key == 'AAA28') {
-          pramse.AAA28 = item.value;
-        }
-        if (item.key == 'YZQX') {
-          pramse.YZQX = item.value;
-        }
-        if (item.key == 'BRKS') {
-          pramse.BRKS = item.value;
-        }
-        if (item.key == 'KZKS') {
-          pramse.KZKS = item.value;
-        }
-        if (item.key == 'YZMC') {
-          pramse.YZMC = item.value;
+
+      // 处理 field  字段等于空的时候
+      let fieldArr = [];
+      this.formData1.seniorList.forEach((item, index) => {
+        if (item.key != '') {
+          fieldArr.push(item);
         }
       });
-      pramse.start = this.formData.startTime;
-      pramse.end = this.formData.endTime;
-
-      pramse.AAA29_start = this.formData1.AAA29_start;
-      pramse.AAA29_end = this.formData1.AAA29_end;
+      if (fieldArr != '' && fieldArr != null) {
+        pramse.field = fieldArr;
+      }
+      if (this.formData1.startTime) {
+        pramse.AAC01_start = this.formData1.startTime;
+      }
+      if (this.formData1.endTime) {
+        pramse.AAC01_end = this.formData1.endTime;
+      }
+      if (this.formData1.AAC04_start) {
+        pramse.AAC04_start = this.formData1.AAC04_start;
+      }
+      if (this.formData1.AAC04_end) {
+        pramse.AAC04_end = this.formData1.AAC04_end;
+      }
+      if (this.formData1.AAA29_start) {
+        pramse.AAA29_start = this.formData1.AAA29_start;
+      }
+      if (this.formData1.AAA29_end) {
+        pramse.AAA29_end = this.formData1.AAA29_end;
+      }
+      if (this.formData1.KZSJ_start) {
+        pramse.KZSJ_start = this.formData1.KZSJ_start;
+      }
+      if (this.formData1.KZSJ_end) {
+        pramse.KZSJ_end = this.formData1.KZSJ_end;
+      }
 
-      pramse.KZSJ_start = this.formData1.KZSJ_start;
-      pramse.KZSJ_end = this.formData1.KZSJ_end;
+      const { ageType1, ageType2 } = this.formData1;
+      if (this.formData1.AAA04_start) {
+        pramse.AAA04_start = { type: ageType1, value: this.formData1.AAA04_start };
+      }
+      if (this.formData1.AAA04_end) {
+        pramse.AAA04_end = { type: ageType2, value: this.formData1.AAA04_end };
+      }
 
       let fileName = '医嘱列表';
-      let httpUrl = '/doctorAdviceExport';
+      let httpUrl = '/bass/yz/serachExport';
 
       this.funExeclPost(fileName, pramse, httpUrl, 'xlsx');
     },
     funExeclPost(fileName, pramse, httpUrl, format) {
       //导出
-      let httpUrls = '/api' + httpUrl;
+      let httpUrls = httpUrl;
       downloadFile(httpUrls, pramse, format, fileName).then(res => {
         console.error('111', res);
       });