提交merge1.3

openhis-ui-vue3/src/views/inpatientNurse/medicalOrderExecution/components/prescriptionList.vue

@@ -226,12 +226,8 @@
 
 <script setup>
 import { getPrescriptionList, adviceExecute, adviceCancel, adviceNoExecute } from './api';
-<<<<<<< HEAD
-import { patientInfoList } from '../store/patient.js';
-=======
 import { patientInfoList } from '../../components/store/patient.js';
 import { lotNumberMatch } from '@/api/public';
->>>>>>> v1.3
 import { formatDate, formatDateStr } from '@/utils/index';
 import { ref, getCurrentInstance, nextTick } from 'vue';
 
@@ -465,27 +461,6 @@ function handleNoExecute() {
   });
 }
 
-<<<<<<< HEAD
-// 不执行
-function handleNoExecute() {
-  let list = getSelectRows();
-  list = list.map((item) => {
-    return {
-      requestId: item.requestId,
-      encounterId: item.encounterId,
-      patientId: item.patientId,
-      adviceTable: item.adviceTable,
-      executeTimes: item.executeTimes,
-    };
-  });
-  console.log(list, 'list');
-  adviceNoExecute({ adviceExecuteDetailList: list }).then((res) => {
-    if (res.code == 200) {
-      handleGetPrescription();
-    }
-  });
-}
-
 // 取消执行
 function handleCancel() {
   let list = getSelectRows();
@@ -500,22 +475,6 @@ function handleCancel() {
       })
     );
   });
-=======
-// 取消执行
-function handleCancel() {
-  let list = getSelectRows();
-  let producerIds = [];
-  list.forEach((item) => {
-    producerIds.push(
-      ...item.procedureIds.map((value) => {
-        return {
-          procedureId: value,
-          therapyEnum: item.therapyEnum,
-        };
-      })
-    );
-  });
->>>>>>> v1.3
   adviceCancel({ adviceExecuteDetailList: producerIds }).then((res) => {
     if (res.code == 200) {
       handleGetPrescription();
@@ -564,18 +523,6 @@ function getDateRange(startDate, endDate) {
 
 function handleRateChange(value, date, time, row, rateItem) {
   // 拼接当前选中时间
-<<<<<<< HEAD
-  let tiemStr = row.year + '-' + date + ' ' + time + ':00';
-  let index = row.executeTimes.indexOf(tiemStr);
-  debugger;
-  if (value) {
-    row.executeTimes.push(tiemStr);
-    row.procedureIds.push(rateItem.producerId);
-  } else {
-    row.executeTimes.splice(row.executeTimes.indexOf(tiemStr), 1);
-    row.procedureIds.splice(row.executeTimes.indexOf(rateItem.producerId), 1);
-  }
-=======
   let timeStr = row.year + '-' + date + ' ' + time + ':00';
   let timeIndex = row.executeTimes.indexOf(timeStr);
 
@@ -606,7 +553,6 @@ function handleRateChange(value, date, time, row, rateItem) {
   nextTick(() => {
     checkAndToggleRowSelection(row);
   });
->>>>>>> v1.3
 }
 
 function handelSwicthChange(value) {