Просмотр исходного кода

样品弃置与保存与lis对接 / 样本弃置与保存页面调整

shenqilong 9 месяцев назад
Родитель
Сommit
c7e2905751

+ 2 - 24
src/api/platform/sample/sample.js

@@ -8,34 +8,12 @@ import { BUSINESS_BASE_URL } from '@/api/baseUrl'
 export function getSampleList (params) {
 export function getSampleList (params) {
   return request({
   return request({
     // url: BUSINESS_BASE_URL() + '/SampleProcess/getSampleList',
     // url: BUSINESS_BASE_URL() + '/SampleProcess/getSampleList',
-    url: '/jyxt/SampleProcess/getSampleList',
-    method: 'post',
-    data: params
-  })
-}
-/**
- * 保存
- * @param {*} params
- */
-export function SaveSample (params) {
-  return request({
-    url: BUSINESS_BASE_URL() + '/SampleProcess/SaveSample',
+    url: '/jyxt/SampleProcess/GetSampleList',
     method: 'post',
     method: 'post',
     data: params
     data: params
   })
   })
 }
 }
 
 
-/**
- * 弃置
- * @param {*} params
- */
-export function DestorySample (params) {
-  return request({
-    url: BUSINESS_BASE_URL() + '/SampleProcess/DestorySample',
-    method: 'post',
-    data: params
-  })
-}
 
 
 /**
 /**
  * 获取配置
  * 获取配置
@@ -43,7 +21,7 @@ export function DestorySample (params) {
  */
  */
 export function getGroupConfig (params) {
 export function getGroupConfig (params) {
   return request({
   return request({
-    url: BUSINESS_BASE_URL() + '/SampleProcess/getGroupConfig',
+    url: '/jyxt/SampleProcess/GetGroupConfig',
     method: 'get',
     method: 'get',
     data: params
     data: params
   })
   })

+ 1 - 5
src/utils/request.js

@@ -79,7 +79,6 @@ let requestCount = 0
  */
  */
 service.interceptors.request.use(
 service.interceptors.request.use(
   async (config) => {
   async (config) => {
-    console.log('config===>', config)
     if (!config.baseURL) {
     if (!config.baseURL) {
       config.baseURL = BASE_API(parseInt(requestCount / 5, 10))
       config.baseURL = BASE_API(parseInt(requestCount / 5, 10))
       if (MULTIPLE_DOMAIN) {
       if (MULTIPLE_DOMAIN) {
@@ -90,12 +89,9 @@ service.interceptors.request.use(
     }
     }
     if (config.gateway) {
     if (config.gateway) {
       config.baseURL = BASE_GATEWAY_API()
       config.baseURL = BASE_GATEWAY_API()
-      console.log(BASE_GATEWAY_API());
-
     }
     }
-    if (config.url == '/jyxt/SampleProcess/getSampleList') {
-      console.log('aaaaa');
 
 
+    if (config.url?.includes('/jyxt/SampleProcess') && process.env.NODE_ENV === 'development') {
       config.baseURL = ''
       config.baseURL = ''
     }
     }
 
 

+ 88 - 145
src/views/component/sampleDisposalRecords/sampleDisposalRecordsbc.vue

@@ -39,6 +39,12 @@
           </el-input>
           </el-input>
         </el-form-item>
         </el-form-item>
       </el-col>
       </el-col>
+      <el-col :span="4">
+        <el-form-item label="医嘱">
+          <el-input v-model="formSearch.yizhu" placeholder="请输入" clearable>
+          </el-input>
+        </el-form-item>
+      </el-col>
       <el-col :span="4">
       <el-col :span="4">
         <el-form-item label="查询日期">
         <el-form-item label="查询日期">
           <el-date-picker
           <el-date-picker
@@ -52,7 +58,7 @@
           />
           />
         </el-form-item>
         </el-form-item>
       </el-col>
       </el-col>
-      <el-col :span="7"> </el-col>
+      <el-col :span="3"> </el-col>
       <el-col :span="1">
       <el-col :span="1">
         <el-button type="primary" size="mini" plain @click="searchClick">
         <el-button type="primary" size="mini" plain @click="searchClick">
           查询
           查询
@@ -97,11 +103,16 @@
             prop="TEST_ORDER_NAME"
             prop="TEST_ORDER_NAME"
           >
           >
           </el-table-column>
           </el-table-column>
-          <el-table-column
-            :reserve-selection="true"
-            label="保存时间"
-            prop="SAVE_DATE"
-          >
+          <el-table-column :reserve-selection="true" label="保存时间">
+            <template slot-scope="scope">
+              {{
+                scope.row.SAVE_DATE.substring(0, 4) +
+                '-' +
+                scope.row.SAVE_DATE.substring(4, 6) +
+                '-' +
+                scope.row.SAVE_DATE.substring(6, 8)
+              }}
+            </template>
           </el-table-column>
           </el-table-column>
         </el-table>
         </el-table>
         <el-pagination
         <el-pagination
@@ -123,12 +134,15 @@
           <el-table-column label="外键" prop="parentId" />
           <el-table-column label="外键" prop="parentId" />
           <el-table-column label="状态" prop="shiFouGuoShen" />
           <el-table-column label="状态" prop="shiFouGuoShen" />
           <el-table-column label="专业组" prop="qiTa" />
           <el-table-column label="专业组" prop="qiTa" />
+          <el-table-column label="专业组code" prop="zhuanYeZuCode" />
           <el-table-column label="保存时间" prop="baoCunShiJian" />
           <el-table-column label="保存时间" prop="baoCunShiJian" />
-          <el-table-column label="保存部门" prop="bianZhiBuMen" />
+          <el-table-column label="编制部门" prop="bianZhiBuMen" />
           <el-table-column label="保存人" prop="bianZhiRen" />
           <el-table-column label="保存人" prop="bianZhiRen" />
           <el-table-column label="保存数量" prop="heJi" />
           <el-table-column label="保存数量" prop="heJi" />
           <el-table-column label="保存期" prop="quanXie" />
           <el-table-column label="保存期" prop="quanXie" />
           <el-table-column label="截至日期" prop="naoJiYe" />
           <el-table-column label="截至日期" prop="naoJiYe" />
+          <el-table-column label="保存条码号" prop="tiaoMaHao" />
+          <el-table-column label="编制时间" prop="bianZhiShiJian" />
         </el-table>
         </el-table>
       </el-col>
       </el-col>
     </el-row>
     </el-row>
@@ -157,6 +171,7 @@ export default {
         group: {},
         group: {},
         tiaomahao: '',
         tiaomahao: '',
         xingming: '',
         xingming: '',
+        yizhu: '',
         chaxunrqi: this.getFormattedDate(new Date())
         chaxunrqi: this.getFormattedDate(new Date())
       },
       },
       configList: [],
       configList: [],
@@ -169,7 +184,11 @@ export default {
       },
       },
       multipleSelection: [],
       multipleSelection: [],
       isRead: false,
       isRead: false,
-      isdisabled: false
+      isdisabled: false,
+      formSearchOld: {
+        group: {},
+        chaxunrqi: ''
+      }
     }
     }
   },
   },
   created() {
   created() {
@@ -195,10 +214,6 @@ export default {
           if (value[0].id) {
           if (value[0].id) {
             //修改
             //修改
             this.isdisabled = true
             this.isdisabled = true
-            this.formSearch.group = this.configList.find((item) => {
-              return (item.GROUPNAME = value[0].qiTa)
-            })
-            this.formSearch.chaxunrqi = value[0].baoCunShiJian
           }
           }
         }
         }
       },
       },
@@ -215,7 +230,7 @@ export default {
     isdisabled: {
     isdisabled: {
       handler(value, old) {
       handler(value, old) {
         if (value) {
         if (value) {
-          this.searchClick()
+          this.getConfigList()
         }
         }
       }
       }
     }
     }
@@ -223,32 +238,25 @@ export default {
   mounted() {},
   mounted() {},
   methods: {
   methods: {
     //获取配置信息
     //获取配置信息
-    getConfigList() {
-      this.configList = getSampleList()
-      // this.configList = [
-      //   {
-      //     SAVEDAY: '7',
-      //     GROUPNAME: '茂源生化',
-      //     GROUPCODE: 'G002',
-      //     SORTID: '001'
-      //   },
-      //   {
-      //     SAVEDAY: '14',
-      //     GROUPNAME: '茂源免疫',
-      //     GROUPCODE: 'G004',
-      //     SORTID: '002'
-      //   },
-      //   {
-      //     SAVEDAY: '7',
-      //     GROUPNAME: '茂源临检',
-      //     GROUPCODE: 'G032',
-      //     SORTID: '003'
-      //   }
-      // ]
+    async getConfigList() {
+      await getGroupConfig()
+        .then((res) => {
+          this.configList = res.data
+          if (this.isdisabled) {
+            this.formSearch.group = this.configList.find((item) => {
+              return (item.GROUPCODE = this.sumData[0].zhuanYeZuCode)
+            })
+            this.formSearch.chaxunrqi = this.sumData[0].baoCunShiJian
+            this.searchClick()
+          }
+        })
+        .catch((error) => {
+          reject(error)
+        })
     },
     },
     //获取lis信息
     //获取lis信息
     async searchClick() {
     async searchClick() {
-      if (!this.formSearch.group) {
+      if (!this.formSearch.group?.GROUPCODE) {
         this.$message({
         this.$message({
           message: '请选择专业组',
           message: '请选择专业组',
           type: 'warning'
           type: 'warning'
@@ -265,140 +273,75 @@ export default {
       this.requestPage.limit = 10
       this.requestPage.limit = 10
       this.requestPage.pageNo = 1
       this.requestPage.pageNo = 1
 
 
-      this.lisData = await getSampleList([
+      await getSampleList([
         {
         {
-          STATE: '1',
+          STATE: this.isdisabled ? '1,2' : '1', //编辑 1,2   添加 1
           SAVE_DATE: this.formSearch.chaxunrqi.replace(/-/g, ''),
           SAVE_DATE: this.formSearch.chaxunrqi.replace(/-/g, ''),
           DESTROY_DATE: '',
           DESTROY_DATE: '',
           GROUPCODE: this.formSearch.group.GROUPCODE,
           GROUPCODE: this.formSearch.group.GROUPCODE,
           INSPECTION_ID: this.formSearch.tiaomahao,
           INSPECTION_ID: this.formSearch.tiaomahao,
           PATIENT_NAME: this.formSearch.xingming,
           PATIENT_NAME: this.formSearch.xingming,
-          TEST_ORDER_NAME: ''
+          TEST_ORDER_NAME: this.formSearch.yizhu
         }
         }
       ])
       ])
-      // this.lisData = [
-      //   {
-      //     TEST_ORDER_NAME: '血常规11',
-      //     INSPECTION_ID: '20250720G03640621',
-      //     STATE: '1',
-      //     PATIENT_NAME: '赵春香11',
-      //     SAVE_DATE: '20250720',
-      //     DESTROY_DATE: '20250727'
-      //   },
-      //   {
-      //     TEST_ORDER_NAME: '血常规22',
-      //     INSPECTION_ID: '20250720G03640622',
-      //     STATE: '1',
-      //     PATIENT_NAME: '赵春香22',
-      //     SAVE_DATE: '20250720',
-      //     DESTROY_DATE: '20250727'
-      //   },
-      //   {
-      //     TEST_ORDER_NAME: '血常规33',
-      //     INSPECTION_ID: '20250720G03640623',
-      //     STATE: '1',
-      //     PATIENT_NAME: '赵春香33',
-      //     SAVE_DATE: '20250720',
-      //     DESTROY_DATE: '20250727'
-      //   },
-      //   {
-      //     TEST_ORDER_NAME: '血常规33',
-      //     INSPECTION_ID: '20250720G03640624',
-      //     STATE: '1',
-      //     PATIENT_NAME: '赵春香33',
-      //     SAVE_DATE: '20250720',
-      //     DESTROY_DATE: '20250727'
-      //   },
-      //   {
-      //     TEST_ORDER_NAME: '血常规33',
-      //     INSPECTION_ID: '20250720G03640625',
-      //     STATE: '1',
-      //     PATIENT_NAME: '赵春香33',
-      //     SAVE_DATE: '20250720',
-      //     DESTROY_DATE: '20250727'
-      //   },
-      //   {
-      //     TEST_ORDER_NAME: '血常规33',
-      //     INSPECTION_ID: '20250720G03640626',
-      //     STATE: '1',
-      //     PATIENT_NAME: '赵春香33',
-      //     SAVE_DATE: '20250720',
-      //     DESTROY_DATE: '20250727'
-      //   },
-      //   {
-      //     TEST_ORDER_NAME: '血常规33',
-      //     INSPECTION_ID: '20250720G03640627',
-      //     STATE: '1',
-      //     PATIENT_NAME: '赵春香33',
-      //     SAVE_DATE: '20250720',
-      //     DESTROY_DATE: '20250727'
-      //   },
-      //   {
-      //     TEST_ORDER_NAME: '血常规33',
-      //     INSPECTION_ID: '20250720G03640628',
-      //     STATE: '1',
-      //     PATIENT_NAME: '赵春香33',
-      //     SAVE_DATE: '20250720',
-      //     DESTROY_DATE: '20250727'
-      //   },
-      //   {
-      //     TEST_ORDER_NAME: '血常规33',
-      //     INSPECTION_ID: '20250720G03640629',
-      //     STATE: '1',
-      //     PATIENT_NAME: '赵春香33',
-      //     SAVE_DATE: '20250720',
-      //     DESTROY_DATE: '20250727'
-      //   },
-      //   {
-      //     TEST_ORDER_NAME: '血常规33',
-      //     INSPECTION_ID: '20250720G03640630',
-      //     STATE: '1',
-      //     PATIENT_NAME: '赵春香33',
-      //     SAVE_DATE: '20250720',
-      //     DESTROY_DATE: '20250727'
-      //   },
-      //   {
-      //     TEST_ORDER_NAME: '血常规33',
-      //     INSPECTION_ID: '20250720G03640631',
-      //     STATE: '1',
-      //     PATIENT_NAME: '赵春香33',
-      //     SAVE_DATE: '20250720',
-      //     DESTROY_DATE: '20250727'
-      //   },
-      //   {
-      //     TEST_ORDER_NAME: '血常规33',
-      //     INSPECTION_ID: '20250720G03640632',
-      //     STATE: '1',
-      //     PATIENT_NAME: '赵春香33',
-      //     SAVE_DATE: '20250720',
-      //     DESTROY_DATE: '20250727'
-      //   }
-      // ]
+        .then((res) => {
+          this.lisData = res.data
+          if (
+            this.formSearchOld.group != this.formSearch.group ||
+            this.formSearchOld.chaxunrqi != this.formSearch.chaxunrqi
+          ) {
+            this.$refs.listable.clearSelection()
+            this.multipleSelection = []
+          }
+          this.formSearchOld.group = this.formSearch.group
+          this.formSearchOld.chaxunrqi = this.formSearch.chaxunrqi
+        })
+        .catch((error) => {
+          reject(error)
+        })
+
       this.sumData[0].heJi = this.multipleSelection.length
       this.sumData[0].heJi = this.multipleSelection.length
-      this.sumData[0].qiTa = this.formSearch.group.GROUPNAME
+      this.sumData[0].qiTa = this.formSearch.group?.GROUPNAME
+      this.sumData[0].zhuanYeZuCode = this.formSearch.group.GROUPCODE
       this.sumData[0].baoCunShiJian = this.formSearch.chaxunrqi
       this.sumData[0].baoCunShiJian = this.formSearch.chaxunrqi
       this.sumData[0].quanXie = this.formSearch.group.SAVEDAY
       this.sumData[0].quanXie = this.formSearch.group.SAVEDAY
       this.sumData[0].naoJiYe = this.addNumDay(
       this.sumData[0].naoJiYe = this.addNumDay(
         this.formSearch.chaxunrqi,
         this.formSearch.chaxunrqi,
         Number(this.formSearch.group.SAVEDAY || 0)
         Number(this.formSearch.group.SAVEDAY || 0)
       )
       )
+      this.sumData[0].tiaoMaHao = this.multipleSelection
+        .map((obj, index) => {
+          return obj.INSPECTION_ID
+        })
+        .join(',')
     },
     },
 
 
     handleSelectionChange(val) {
     handleSelectionChange(val) {
       this.multipleSelection = val
       this.multipleSelection = val
       // console.log(this.multipleSelection)
       // console.log(this.multipleSelection)
       this.sumData[0].heJi = this.multipleSelection.length
       this.sumData[0].heJi = this.multipleSelection.length
+      this.sumData[0].tiaoMaHao = this.multipleSelection
+        .map((obj, index) => {
+          return obj.INSPECTION_ID
+        })
+        .join(',')
     },
     },
     //全选事件
     //全选事件
     handleSelectAll(selection) {
     handleSelectAll(selection) {
-      this.lisData.forEach((row) => {
-        const select = this.$refs.listable.selection.find((select) => {
-          return select.INSPECTION_ID === row.INSPECTION_ID
+      console.log(this.multipleSelection.length)
+
+      if (this.multipleSelection.length > 0) {
+        this.lisData.forEach((row) => {
+          const select = this.$refs.listable.selection.find((select) => {
+            return select.INSPECTION_ID === row.INSPECTION_ID
+          })
+          if (!select) {
+            this.$refs.listable.toggleRowSelection(row)
+          }
         })
         })
-        if (!select) {
-          this.$refs.listable.toggleRowSelection(row, true)
-        }
-      })
+      } else {
+        this.$refs.listable.clearSelection()
+      }
     },
     },
     // 当前页码改变
     // 当前页码改变
     handleCurrentChange(val) {
     handleCurrentChange(val) {

+ 89 - 99
src/views/component/sampleDisposalRecords/sampleDisposalRecordsqz.vue

@@ -39,6 +39,12 @@
           </el-input>
           </el-input>
         </el-form-item>
         </el-form-item>
       </el-col>
       </el-col>
+      <el-col :span="4">
+        <el-form-item label="医嘱">
+          <el-input v-model="formSearch.yizhu" placeholder="请输入" clearable>
+          </el-input>
+        </el-form-item>
+      </el-col>
       <el-col :span="4">
       <el-col :span="4">
         <el-form-item label="查询日期">
         <el-form-item label="查询日期">
           <el-date-picker
           <el-date-picker
@@ -52,7 +58,7 @@
           />
           />
         </el-form-item>
         </el-form-item>
       </el-col>
       </el-col>
-      <el-col :span="7"> </el-col>
+      <el-col :span="3"> </el-col>
       <el-col :span="1">
       <el-col :span="1">
         <el-button type="primary" size="mini" plain @click="searchClick">
         <el-button type="primary" size="mini" plain @click="searchClick">
           查询
           查询
@@ -70,6 +76,7 @@
           @selection-change="handleSelectionChange"
           @selection-change="handleSelectionChange"
         >
         >
           <el-table-column
           <el-table-column
+            v-if="!isread"
             :reserve-selection="true"
             :reserve-selection="true"
             type="selection"
             type="selection"
             width="55"
             width="55"
@@ -97,11 +104,16 @@
             prop="TEST_ORDER_NAME"
             prop="TEST_ORDER_NAME"
           >
           >
           </el-table-column>
           </el-table-column>
-          <el-table-column
-            :reserve-selection="true"
-            label="保存时间"
-            prop="SAVE_DATE"
-          >
+          <el-table-column :reserve-selection="true" label="保存时间">
+            <template slot-scope="scope">
+              {{
+                scope.row.SAVE_DATE.substring(0, 4) +
+                '-' +
+                scope.row.SAVE_DATE.substring(4, 6) +
+                '-' +
+                scope.row.SAVE_DATE.substring(6, 8)
+              }}
+            </template>
           </el-table-column>
           </el-table-column>
         </el-table>
         </el-table>
         <el-pagination
         <el-pagination
@@ -123,15 +135,16 @@
           <el-table-column label="外键" prop="parentId" />
           <el-table-column label="外键" prop="parentId" />
           <el-table-column label="状态" prop="shiFouGuoShen" />
           <el-table-column label="状态" prop="shiFouGuoShen" />
           <el-table-column label="专业组" prop="qiTa" />
           <el-table-column label="专业组" prop="qiTa" />
+          <el-table-column label="专业组code" prop="zhuanYeZuCode" />
           <el-table-column label="保存时间" prop="baoCunShiJian" />
           <el-table-column label="保存时间" prop="baoCunShiJian" />
-          <el-table-column label="保存部门" prop="bianZhiBuMen" />
+          <el-table-column label="编制部门" prop="bianZhiBuMen" />
           <el-table-column label="保存人" prop="bianZhiRen" />
           <el-table-column label="保存人" prop="bianZhiRen" />
           <el-table-column label="保存数量" prop="heJi" />
           <el-table-column label="保存数量" prop="heJi" />
           <el-table-column label="保存期" prop="quanXie" />
           <el-table-column label="保存期" prop="quanXie" />
           <el-table-column label="截至日期" prop="naoJiYe" />
           <el-table-column label="截至日期" prop="naoJiYe" />
-          <el-table-column label="弃置时间" prop="chuLiShiJian" />
-          <el-table-column label="弃置数量" prop="chuLiShuLiang" />
-          <el-table-column label="处理人" prop="chuLiZhe" />
+          <el-table-column label="保存条码号" prop="tiaoMaHao" />
+          <el-table-column label="编制时间" prop="bianZhiShiJian" />
+          <el-table-column label="弃置条码号" prop="qiZhiTiaoMaHao" />
         </el-table>
         </el-table>
       </el-col>
       </el-col>
     </el-row>
     </el-row>
@@ -175,9 +188,13 @@ export default {
         pageNo: 1
         pageNo: 1
       },
       },
       multipleSelection: [],
       multipleSelection: [],
-      isRead: false,
       isdisabled: false,
       isdisabled: false,
-      yiqizhishuliang: 0
+      isread: false,
+      yiqizhishuliang: 0,
+      formSearchOld: {
+        group: {},
+        chaxunrqi: ''
+      }
     }
     }
   },
   },
   created() {
   created() {
@@ -200,11 +217,9 @@ export default {
           this.sumData = value
           this.sumData = value
           if (value[0].id) {
           if (value[0].id) {
             this.isdisabled = true
             this.isdisabled = true
-            //弃置
-            this.formSearch.group = this.configList.find((item) => {
-              return (item.GROUPNAME = value[0].qiTa)
-            })
-            this.formSearch.chaxunrqi = value[0].naoJiYe
+            if (this.bizKey) {
+              this.isread = true
+            }
           }
           }
         }
         }
       },
       },
@@ -221,8 +236,7 @@ export default {
     isdisabled: {
     isdisabled: {
       handler(value, old) {
       handler(value, old) {
         if (value) {
         if (value) {
-          this.searchClick()
-          this.yiqizhishuliang = Number(this.sumData[0].chuLiShuLiang || 0)
+          this.getConfigList()
         }
         }
       }
       }
     }
     }
@@ -230,32 +244,28 @@ export default {
   mounted() {},
   mounted() {},
   methods: {
   methods: {
     //获取配置信息
     //获取配置信息
-    getConfigList() {
-      // this.configList = getSampleList()
-      this.configList = [
-        {
-          SAVEDAY: '7',
-          GROUPNAME: '茂源生化',
-          GROUPCODE: 'G002',
-          SORTID: '001'
-        },
-        {
-          SAVEDAY: '14',
-          GROUPNAME: '茂源免疫',
-          GROUPCODE: 'G004',
-          SORTID: '002'
-        },
-        {
-          SAVEDAY: '7',
-          GROUPNAME: '茂源临检',
-          GROUPCODE: 'G032',
-          SORTID: '003'
-        }
-      ]
+    async getConfigList() {
+      await getGroupConfig()
+        .then((res) => {
+          this.configList = res.data
+          if (this.isdisabled) {
+            //弃置
+            this.formSearch.group = this.configList.find((item) => {
+              return (item.GROUPCODE = this.sumData[0].zhuanYeZuCode)
+            })
+            this.formSearch.chaxunrqi = this.sumData[0].baoCunShiJian
+            this.searchClick()
+            this.yiqizhishuliang = Number(this.sumData[0].chuLiShuLiang || 0)
+            this.formSearch.chaxunrqi = this.sumData[0].naoJiYe
+          }
+        })
+        .catch((error) => {
+          reject(error)
+        })
     },
     },
     //获取lis信息
     //获取lis信息
     async searchClick() {
     async searchClick() {
-      if (!this.formSearch.group) {
+      if (!this.formSearch.group?.GROUPCODE) {
         this.$message({
         this.$message({
           message: '请选择专业组',
           message: '请选择专业组',
           type: 'warning'
           type: 'warning'
@@ -271,58 +281,43 @@ export default {
       }
       }
       this.requestPage.limit = 10
       this.requestPage.limit = 10
       this.requestPage.pageNo = 1
       this.requestPage.pageNo = 1
-      // this.lisData = await getSampleList([
-      //   {
-      //     STATE: '1',
-      //     SAVE_DATE: this.formSearch.chaxunrqi.replace(/-/g, ''),
-      //     DESTROY_DATE: '',
-      //     GROUPCODE: this.formSearch.group.GROUPCODE,
-      //     INSPECTION_ID: this.formSearch.tiaomahao,
-      //     PATIENT_NAME: this.formSearch.xingming,
-      //     TEST_ORDER_NAME: ''
-      //   }
-      // ])
-      this.lisData = [
-        {
-          TEST_ORDER_NAME: '血常规11',
-          INSPECTION_ID: '20250720G03640621',
-          STATE: '1',
-          PATIENT_NAME: '赵春香11',
-          SAVE_DATE: '20250720',
-          DESTROY_DATE: '20250727'
-        },
-        {
-          TEST_ORDER_NAME: '血常规22',
-          INSPECTION_ID: '20250720G03640622',
-          STATE: '1',
-          PATIENT_NAME: '赵春香22',
-          SAVE_DATE: '20250720',
-          DESTROY_DATE: '20250727'
-        },
+
+      await getSampleList([
         {
         {
-          TEST_ORDER_NAME: '血常规33',
-          INSPECTION_ID: '20250720G03640623',
-          STATE: '1',
-          PATIENT_NAME: '赵春香33',
-          SAVE_DATE: '20250720',
-          DESTROY_DATE: '20250727'
+          STATE: this.isread ? '2,4' : '2', //查阅 2,4   弃置 2
+          SAVE_DATE: this.formSearch.chaxunrqi.replace(/-/g, ''),
+          DESTROY_DATE: '',
+          GROUPCODE: this.formSearch.group.GROUPCODE,
+          INSPECTION_ID: this.formSearch.tiaomahao,
+          PATIENT_NAME: this.formSearch.xingming,
+          TEST_ORDER_NAME: this.formSearch.yizhu
         }
         }
-      ]
-
-      // if (this.bizKey !== '查阅') {
-      //   this.sumData[0].chuLiShuLiang =
-      //     Number(this.yiqizhishuliang) +
-      //     Number(this.multipleSelection.length || 0)
-      // } else {
-      //   this.sumData[0].chuLiShuLiang = Number(this.yiqizhishuliang)
-      // }
+      ])
+        .then((res) => {
+          this.lisData = res.data
+          if (
+            this.formSearchOld.group != this.formSearch.group ||
+            this.formSearchOld.chaxunrqi != this.formSearch.chaxunrqi
+          ) {
+            this.multipleSelection = []
+          }
+          this.formSearchOld.group = this.formSearch.group
+          this.formSearchOld.chaxunrqi = this.formSearch.chaxunrqi
+        })
+        .catch((error) => {
+          reject(error)
+        })
     },
     },
     handleSelectionChange(val) {
     handleSelectionChange(val) {
       this.multipleSelection = val
       this.multipleSelection = val
       // console.log(this.multipleSelection)
       // console.log(this.multipleSelection)
       this.sumData[0].chuLiShuLiang =
       this.sumData[0].chuLiShuLiang =
         this.yiqizhishuliang + this.multipleSelection.length
         this.yiqizhishuliang + this.multipleSelection.length
-
+      this.sumData[0].qiZhiTiaoMaHao = this.multipleSelection
+        .map((obj, index) => {
+          return obj.INSPECTION_ID
+        })
+        .join(',')
       this.sumData[0].shiFouGuoShen =
       this.sumData[0].shiFouGuoShen =
         Number(this.sumData[0].heJi || 0) >
         Number(this.sumData[0].heJi || 0) >
         Number(this.sumData[0].chuLiShuLiang || 0)
         Number(this.sumData[0].chuLiShuLiang || 0)
@@ -330,21 +325,16 @@ export default {
           : '已弃置'
           : '已弃置'
     },
     },
     //全选事件
     //全选事件
+    //全选事件
     handleSelectAll(selection) {
     handleSelectAll(selection) {
-      console.log(selection)
-
-      if (selection) {
-        this.$refs.listable.clearSelection()
-      } else {
-        this.lisData.forEach((row) => {
-          const select = this.$refs.listable.selection.find((select) => {
-            return select.INSPECTION_ID === row.INSPECTION_ID
-          })
-          if (!select) {
-            this.$refs.listable.toggleRowSelection(row, true)
-          }
+      this.lisData.forEach((row) => {
+        const select = this.$refs.listable.selection.find((select) => {
+          return select.INSPECTION_ID === row.INSPECTION_ID
         })
         })
-      }
+        if (!select) {
+          this.$refs.listable.toggleRowSelection(row, true)
+        }
+      })
     },
     },
     // 当前页码改变
     // 当前页码改变
     handleCurrentChange(val) {
     handleCurrentChange(val) {

+ 20 - 7
vue.config.js

@@ -56,17 +56,17 @@ module.exports = {
   // 根据你的实际情况更改这里
   // 根据你的实际情况更改这里
   publicPath,
   publicPath,
   lintOnSave: false,
   lintOnSave: false,
-  devServer: {
-    publicPath, // 和 publicPath 保持一致
-    port,
-    disableHostCheck: process.env.NODE_ENV === 'development' // 关闭 host check,方便使用 ngrok 之类的内网转发工具
-  },
+  // devServer: {
+  //   publicPath, // 和 publicPath 保持一致
+  //   port,
+  //   disableHostCheck: process.env.NODE_ENV === 'development' // 关闭 host check,方便使用 ngrok 之类的内网转发工具
+  // },
   css: {
   css: {
     loaderOptions: {
     loaderOptions: {
       // 设置 scss 公用变量文件
       // 设置 scss 公用变量文件
       sass: {
       sass: {
         /* sass-loader 9.0+写法*/
         /* sass-loader 9.0+写法*/
-        additionalData(content, loaderContext) {
+        additionalData (content, loaderContext) {
           const { resourcePath, rootContext } = loaderContext
           const { resourcePath, rootContext } = loaderContext
           const relativePath = path.relative(rootContext, resourcePath)
           const relativePath = path.relative(rootContext, resourcePath)
           if (
           if (
@@ -233,5 +233,18 @@ module.exports = {
       localeDir: 'locales',
       localeDir: 'locales',
       enableInSFC: true
       enableInSFC: true
     }
     }
-  }
+  },
+
+  // 开发服务器
+  devServer: {
+    port, // 修改启动端口号
+    disableHostCheck: process.env.NODE_ENV === 'development',
+    proxy: {
+      '/jyxt': { // 请求相对路径以 /user 开头的,才会走这里的配置
+        target: 'http://192.168.2.107:8090', // 这个就是后端地址
+        changeOrigin: true
+      }
+    }
+  },
+
 }
 }