耗材添加规格修改为单位 新增 descriptions 规格

src/components/inpatient/XiangMuLuRu.vue

@@ -23,7 +23,7 @@
               <div>4、录入类型：该费用是怎么产生，护士录入，医嘱，医技</div>
               <div>
                 5、费用状态：未退-代表该费用没有被退，已退-代表费用是退费数据，被退-代表那些正的被退了
-                <span style="color: red">（该条件只对在本系统中有效,如果无效请点击退费匹配 (退费匹配就在本页面的关闭旁边)，或选择全部）</span><br />
+                <span style="color: red">（该条件只对在本系统中有效,如果无效请点击退费匹配 (退费匹配就在本页面的关闭旁边)，或选择全部）</span><br/>
               </div>
               <div>6、点击查询即可查询费用（如提示没有数据，请检查搜索的条件）</div>
             </el-collapse-item>
@@ -52,7 +52,8 @@
         <el-tabs v-model="xmlrTabs">
           <el-tab-pane label="已录入项目" name="ylrxm">
             项目名称：
-            <el-select v-model="patient.chargeCode" :remote-method="remoteMethodChargeCode" clearable filterable remote @blur="patient.chargeCode = $event.target.value.trim()">
+            <el-select v-model="patient.chargeCode" :remote-method="remoteMethodChargeCode" clearable filterable remote
+                       @blur="patient.chargeCode = $event.target.value.trim()">
               <el-option v-for="item in chargeCodeNameData" :key="item.code" :label="item.name" :value="item.code">
                 <span style="color: #8492a6; font-size: 12px">{{ item.code }}</span>
                 <el-divider direction="vertical"></el-divider>
@@ -60,23 +61,23 @@
               </el-option>
             </el-select>
             医嘱号:
-            <el-input v-model="patient.actOrderNo" clearable placeholder="医嘱号" style="width: 120px" />
+            <el-input v-model="patient.actOrderNo" clearable placeholder="医嘱号" style="width: 120px"/>
             录入日期：
             <el-date-picker
-              v-model="dateRange"
-              :shortcuts="shortcuts"
-              end-placeholder="结束日期"
-              placeholder="选择日期"
-              range-separator="至"
-              start-placeholder="开始日期"
-              style="width: 280px"
-              type="daterange"
+                v-model="dateRange"
+                :shortcuts="shortcuts"
+                end-placeholder="结束日期"
+                placeholder="选择日期"
+                range-separator="至"
+                start-placeholder="开始日期"
+                style="width: 280px"
+                type="daterange"
             ></el-date-picker>
             <el-button
-              :icon="riQiPaiXu === 'DESC' ? 'el-icon-caret-bottom' : 'el-icon-caret-top'"
-              type="success"
-              @click="riQiPaiXu === 'DESC' ? (riQiPaiXu = 'ASC') : (riQiPaiXu = 'DESC')"
-              >{{ riQiPaiXu === 'DESC' ? '日期降序' : '日期升序' }}
+                :icon="riQiPaiXu === 'DESC' ? 'el-icon-caret-bottom' : 'el-icon-caret-top'"
+                type="success"
+                @click="riQiPaiXu === 'DESC' ? (riQiPaiXu = 'ASC') : (riQiPaiXu = 'DESC')"
+            >{{ riQiPaiXu === 'DESC' ? '日期降序' : '日期升序' }}
             </el-button>
             <el-select v-model="feiYongLeiXingCode" style="width: 70px">
               <el-option v-for="item in feiYongLeiXing" :key="item.code" :label="item.name" :value="item.code">
@@ -101,8 +102,11 @@
             </el-select>
             <el-button icon="el-icon-search" type="primary" @click="queryFeiYong">查询</el-button>
             <el-button icon="el-icon-delete-solid" type="danger" @click="xiangMuTuiFeiClick">退费</el-button>
-            <el-button v-if="store.state.user.info.roles.findIndex((i) => i === 1 || i === 8) > -1" type="warning" @click="sheZhiWeiYiVBao">设为医保 </el-button>
-            <el-table :data="cptTableDataHuanZheFeiYong" :height="tableHeight" class="eltable" highlight-current-row stripe @selection-change="handleSelectionChange">
+            <el-button v-if="store.state.user.info.roles.findIndex((i) => i === 1 || i === 8) > -1" type="warning"
+                       @click="sheZhiWeiYiVBao">设为医保
+            </el-button>
+            <el-table :data="cptTableDataHuanZheFeiYong" :height="tableHeight" class="eltable" highlight-current-row
+                      stripe @selection-change="handleSelectionChange">
               <el-table-column style="width: 100px" type="selection"></el-table-column>
               <el-table-column label="流水号" prop="detailSn" width="70px"></el-table-column>
               <el-table-column label="医嘱号" prop="orderNo" width="70px"></el-table-column>
@@ -123,11 +127,11 @@
               <el-table-column label="账单码" prop="billItemName"></el-table-column>
               <el-table-column label="是否退费" prop="tuiFeiFlag">
                 <template #default="scope">
-                  <span v-if="scope.row.oriDetailSn === -1" style="color: red">已退费 <br /> </span>
+                  <span v-if="scope.row.oriDetailSn === -1" style="color: red">已退费 <br/> </span>
                   <span v-if="scope.row.oriDetailSn > 0"
-                    ><span style="color: #e6a23c">退费数据</span> <br />
+                  ><span style="color: #e6a23c">退费数据</span> <br/>
                     <span style="color: teal">
-                      原流水号为 <br />
+                      原流水号为 <br/>
                       【 {{ scope.row.oriDetailSn }} 】
                     </span>
                   </span>
@@ -136,13 +140,13 @@
               <el-table-column v-if="quanXian.indexOf(1) > -1 || quanXian.indexOf(35) > -1" label="撤销退费">
                 <template #default="scope">
                   <el-popconfirm
-                    v-if="scope.row.oriDetailSn !== -1 && scope.row.transFlagYb === '0' && (quanXian.indexOf(1) > -1 || quanXian.indexOf(35) > -1)"
-                    cancel-button-text="取消"
-                    confirm-button-text="确认"
-                    icon="el-icon-info"
-                    iconColor="red"
-                    title="是否删除该数据"
-                    @confirm="cheXiaoTuiFeiClick(scope.$index, scope.row)"
+                      v-if="scope.row.oriDetailSn !== -1 && scope.row.transFlagYb === '0' && (quanXian.indexOf(1) > -1 || quanXian.indexOf(35) > -1)"
+                      cancel-button-text="取消"
+                      confirm-button-text="确认"
+                      icon="el-icon-info"
+                      iconColor="red"
+                      title="是否删除该数据"
+                      @confirm="cheXiaoTuiFeiClick(scope.$index, scope.row)"
                   >
                     <template #reference>
                       <el-button type="danger">撤销</el-button>
@@ -152,14 +156,14 @@
               </el-table-column>
             </el-table>
             <el-pagination
-              :current-page="patient.currentPage"
-              :page-size="patient.pageSize"
-              :page-sizes="[20, 30, 40, 50]"
-              :total="total"
-              layout="total, sizes, prev, pager, next, jumper"
-              style="margin-top: 5px"
-              @size-change="handleSizeChange"
-              @current-change="handleCurrentChange"
+                :current-page="patient.currentPage"
+                :page-size="patient.pageSize"
+                :page-sizes="[20, 30, 40, 50]"
+                :total="total"
+                layout="total, sizes, prev, pager, next, jumper"
+                style="margin-top: 5px"
+                @size-change="handleSizeChange"
+                @current-change="handleCurrentChange"
             ></el-pagination>
           </el-tab-pane>
           <!-- 项目录入 -->
@@ -185,7 +189,8 @@
                   </el-col>
                   <el-col :span="24">
                     <!-- 这个下面查看录入的项目 -->
-                    <el-table :data="muBanNeiRongData" :height="tableHeight - 27" class="eltable" highlight-current-row stripe style="margin-top: 10px">
+                    <el-table :data="muBanNeiRongData" :height="tableHeight - 27" class="eltable" highlight-current-row
+                              stripe style="margin-top: 10px">
                       <el-table-column label="录入信息">
                         <el-table-column label="录入时间">
                           <template #default>
@@ -197,7 +202,8 @@
                         <el-table-column label="执行科室" prop="deptCode">
                           <template #default="scope">
                             <el-select v-model="scope.row.deptCode" filterable style="width: 90%">
-                              <el-option v-for="item in deptData" :key="item.code" :label="item.name" :value="item.code">
+                              <el-option v-for="item in deptData" :key="item.code" :label="item.name"
+                                         :value="item.code">
                                 <span style="color: #8492a6; font-size: 12px">{{ item.code }}</span>
                                 <el-divider direction="vertical"></el-divider>
                                 <span>{{ item.name }}</span></el-option
@@ -209,7 +215,8 @@
                         <el-table-column label="数量" prop="amount" width="130">
                           <template #default="scope">
                             <!--precision 限制输入的精度 0 就是不带任何一位小数点  -->
-                            <el-input-number v-model="scope.row.amount" :min="0" :precision="1" style="width: 120px"></el-input-number>
+                            <el-input-number v-model="scope.row.amount" :min="0" :precision="1"
+                                             style="width: 120px"></el-input-number>
                           </template>
                         </el-table-column>
                       </el-table-column>
@@ -236,12 +243,13 @@
           <el-row>
             <el-col :span="24">
               搜索：
-              <el-select v-model="chargePyCode" :remote-method="rmChargePyCode" clearable default-first-option filterable remote @change="getDanGeXiangMu">
+              <el-select v-model="chargePyCode" :remote-method="rmChargePyCode" clearable default-first-option
+                         filterable remote @change="getDanGeXiangMu">
                 <el-option
-                  v-for="item in xiangMuData.slice((danGeXiangMuCurrentPage - 1) * 20, danGeXiangMuCurrentPage * 20)"
-                  :key="item.chargeCode"
-                  :label="item.chargeName"
-                  :value="item.chargeCode"
+                    v-for="item in xiangMuData.slice((danGeXiangMuCurrentPage - 1) * 20, danGeXiangMuCurrentPage * 20)"
+                    :key="item.chargeCode"
+                    :label="item.chargeName"
+                    :value="item.chargeCode"
                 >
                   <span style="color: #8492a6; font-size: 12px">{{ item.chargeCode }}</span>
                   <el-divider direction="vertical"></el-divider>
@@ -252,14 +260,14 @@
                   <span style="color: #e6a23c"> {{ item.chargeAmount }} 元</span>
                 </el-option>
                 <el-pagination
-                  :current-page="danGeXiangMuCurrentPage"
-                  :page-size="20"
-                  :pager-count="5"
-                  :total="xiangMuData.length"
-                  layout=" prev, pager, next,total"
-                  small
-                  style="margin-top: 5px"
-                  @current-change="danGeXiangMuCurrentChange"
+                    :current-page="danGeXiangMuCurrentPage"
+                    :page-size="20"
+                    :pager-count="5"
+                    :total="xiangMuData.length"
+                    layout=" prev, pager, next,total"
+                    small
+                    style="margin-top: 5px"
+                    @current-change="danGeXiangMuCurrentChange"
                 ></el-pagination>
               </el-select>
               <el-button type="success" @click="danGeXiangMuBaoCun">保存</el-button>
@@ -268,7 +276,7 @@
               <el-table :data="danGeLuRuXiangMu" class="eltable">
                 <el-table-column label="项目代码" prop="chargeCodeMx"></el-table-column>
                 <el-table-column label="项目名称" prop="chargeName"></el-table-column>
-                <el-table-column label="规格" prop="spec"></el-table-column>
+                <el-table-column label="单位" prop="spec"></el-table-column>
                 <el-table-column label="执行科室" prop="deptCode">
                   <template #default="scope">
                     <el-select v-model="scope.row.deptCode" filterable style="width: 90%">
@@ -294,6 +302,7 @@
                   </template>
                 </el-table-column>
                 <el-table-column label="账单码" prop="billItemName"></el-table-column>
+                <el-table-column label="规格" show-overflow-tooltip prop="descriptions"></el-table-column>
                 <el-table-column label="删除">
                   <template #default="scope">
                     <el-button @click="danGeLuRuXiangMu.splice(scope.$index, 1)">删除</el-button>
@@ -322,7 +331,8 @@
               <el-input v-model="cunMuBanPojo.dept" disabled></el-input>
             </el-col>
             <el-col :span="12">
-              <el-button icon="el-icon-upload" style="margin-top: 10px" type="primary" @click="baoCunMuBan">保存 </el-button>
+              <el-button icon="el-icon-upload" style="margin-top: 10px" type="primary" @click="baoCunMuBan">保存
+              </el-button>
             </el-col>
           </el-row>
         </el-dialog>
@@ -333,8 +343,8 @@
 
 <script name="xiangMuLuRu" setup>
 import store from '@/store'
-import { costState, cptSex } from '@/utils/computed'
-import { shortcuts } from '@/data/shortcuts'
+import {costState, cptSex} from '@/utils/computed'
+import {shortcuts} from '@/data/shortcuts'
 import {
   cheXiaoTuiFei,
   getChargeCode,
@@ -347,15 +357,15 @@ import {
   xiangMuTuiFei,
   xiuGaiZiFeiBiaoZhi,
 } from '@/api/yibao/xiang-mu-lu-ru'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { getDateRangeFormatDate, getDatetime } from '@/utils/date'
-import { clone } from '@/utils/clone'
-import { getPatientInfo } from '@/api/yibao/patient'
-import { feiYongLeiXing, tuiFeiLeiXin, yiZhuTuiFeiLeiXing } from '@/data/index'
+import {ElMessage, ElMessageBox} from 'element-plus'
+import {getDateRangeFormatDate, getDatetime} from '@/utils/date'
+import {clone} from '@/utils/clone'
+import {getPatientInfo} from '@/api/yibao/patient'
+import {feiYongLeiXing, tuiFeiLeiXin, yiZhuTuiFeiLeiXing} from '@/data/index'
 import HuoQuMuBan from '@/components/med-tec-mod/HuoQuMuBan.vue'
-import { getDept } from '@/api/public-api'
-import { baseinfo } from '@/data/inpatient'
-import { listIsBlank } from '@/utils/blank-utils'
+import {getDept} from '@/api/public-api'
+import {baseinfo} from '@/data/inpatient'
+import {listIsBlank} from '@/utils/blank-utils'
 
 const props = defineProps({
   init: {
@@ -408,13 +418,13 @@ const jinRuPanDuanSFXieDaiHuanZheXinXi = () => {
     inputErrorMessage: '患者住院号不能为空 (∩•̀ω•́)⊃-*⋆',
     type: 'warning',
   })
-    .then(({ value }) => {
-      inpatientNo.value = value
-      chaXunHuanZheXinXi()
-    })
-    .catch(() => {
-      guanBiDialog()
-    })
+      .then(({value}) => {
+        inpatientNo.value = value
+        chaXunHuanZheXinXi()
+      })
+      .catch(() => {
+        guanBiDialog()
+      })
 }
 
 /**
@@ -422,25 +432,25 @@ const jinRuPanDuanSFXieDaiHuanZheXinXi = () => {
  */
 const chaXunHuanZheXinXi = () => {
   getPatientInfo(inpatientNo.value)
-    .then((res) => {
-      patient.value = res
-      patient.value.currentPage = 1
-      patient.value.pageSize = 40
-      patient.value.total = 0
-      patient.value.orderNo = 0
-      patient.value.deptCode = store.state.user.info.deptCode
-      queryFeiYong()
-      if (patient.value.ward === store.state.user.info.deptCode) {
-        panDuanSFTongGuoBingShiJinRu.value = true
-      } else {
-        xmlrTabs.value = 'ylrxm'
-        panDuanSFTongGuoBingShiJinRu.value = false
-      }
-    })
-    .catch(() => {
-      patient.value = {}
-      jinRuPanDuanSFXieDaiHuanZheXinXi()
-    })
+      .then((res) => {
+        patient.value = res
+        patient.value.currentPage = 1
+        patient.value.pageSize = 40
+        patient.value.total = 0
+        patient.value.orderNo = 0
+        patient.value.deptCode = store.state.user.info.deptCode
+        queryFeiYong()
+        if (patient.value.ward === store.state.user.info.deptCode) {
+          panDuanSFTongGuoBingShiJinRu.value = true
+        } else {
+          xmlrTabs.value = 'ylrxm'
+          panDuanSFTongGuoBingShiJinRu.value = false
+        }
+      })
+      .catch(() => {
+        patient.value = {}
+        jinRuPanDuanSFXieDaiHuanZheXinXi()
+      })
 }
 
 const total = ref(0)
@@ -456,19 +466,19 @@ const queryFeiYong = () => {
   patient.value.currentPage = 1
   patient.value.total = 0
   getHuanZheFeiYong(patient.value)
-    .then((res) => {
-      tableDataHuanZheFeiYong.value = res
-      cptTableDataHuanZheFeiYong.value = res.records
-      total.value = res.total
-      if (patient.value.admissWard === store.state.user.info.deptCode) {
-        panDuanSFTongGuoBingShiJinRu.value = true
-      }
-    })
-    .catch(() => {
-      tableDataHuanZheFeiYong.value = []
-      cptTableDataHuanZheFeiYong.value = []
-      patient.value.total = 0
-    })
+      .then((res) => {
+        tableDataHuanZheFeiYong.value = res
+        cptTableDataHuanZheFeiYong.value = res.records
+        total.value = res.total
+        if (patient.value.admissWard === store.state.user.info.deptCode) {
+          panDuanSFTongGuoBingShiJinRu.value = true
+        }
+      })
+      .catch(() => {
+        tableDataHuanZheFeiYong.value = []
+        cptTableDataHuanZheFeiYong.value = []
+        patient.value.total = 0
+      })
 }
 
 const handleQueryFeiYong = () => {
@@ -479,18 +489,18 @@ const handleQueryFeiYong = () => {
   patient.value.feiYongLeiXingCode = feiYongLeiXingCode.value
   patient.value.total = total.value
   getHuanZheFeiYong(patient.value)
-    .then((res) => {
-      tableDataHuanZheFeiYong.value = res
-      cptTableDataHuanZheFeiYong.value = res.records
-      if (patient.value.admissWard === store.state.user.info.deptCode) {
-        panDuanSFTongGuoBingShiJinRu.value = true
-      }
-    })
-    .catch(() => {
-      tableDataHuanZheFeiYong.value = []
-      cptTableDataHuanZheFeiYong.value = []
-      patient.value.total = 0
-    })
+      .then((res) => {
+        tableDataHuanZheFeiYong.value = res
+        cptTableDataHuanZheFeiYong.value = res.records
+        if (patient.value.admissWard === store.state.user.info.deptCode) {
+          panDuanSFTongGuoBingShiJinRu.value = true
+        }
+      })
+      .catch(() => {
+        tableDataHuanZheFeiYong.value = []
+        cptTableDataHuanZheFeiYong.value = []
+        patient.value.total = 0
+      })
 }
 
 /**
@@ -544,21 +554,22 @@ const xiangMuTuiFeiClick = () => {
     }
     if (patient.value.list.length > 0) {
       ElMessageBox.confirm(
-        `退费数量为：<span style='color:red'>【${chargeAmount}】</span> ，总价格为：<span style='color:#E6A23C'>【${chargeFee.toFixed(2)}】</span>`,
-        '请认真核对',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning',
-          dangerouslyUseHTMLString: true,
-        }
+          `退费数量为：<span style='color:red'>【${chargeAmount}】</span> ，总价格为：<span style='color:#E6A23C'>【${chargeFee.toFixed(2)}】</span>`,
+          '请认真核对',
+          {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning',
+            dangerouslyUseHTMLString: true,
+          }
       )
-        .then(() => {
-          xiangMuTuiFei(patient.value).then((res) => {
-            queryFeiYong()
+          .then(() => {
+            xiangMuTuiFei(patient.value).then((res) => {
+              queryFeiYong()
+            })
+          })
+          .catch(() => {
           })
-        })
-        .catch(() => {})
     } else {
       ElMessage.warning({
         message: '请先选择退费数据',
@@ -574,7 +585,8 @@ const xiangMuTuiFeiClick = () => {
 }
 
 const cheXiaoTuiFeiClick = (index, row) => {
-  cheXiaoTuiFei(row.inpatientNo, row.admissTimes, row.ledgerSn, row.detailSn).then(() => {})
+  cheXiaoTuiFei(row.inpatientNo, row.admissTimes, row.ledgerSn, row.detailSn).then(() => {
+  })
 }
 
 //////////////////////////////////// 以上全部是 已录入项目 //////////////////////////////////////////////////////////////////////////////
@@ -731,13 +743,14 @@ const shangChuanXiangMu = () => {
     cancelButtonText: '取消',
     confirmButtonText: '确定',
   })
-    .then(() => {
-      xiangMuFeiYongShangChuan(shangChuanFeiYong).then(() => {
-        muBanNeiRongData.value = []
-        muBanCode = []
+      .then(() => {
+        xiangMuFeiYongShangChuan(shangChuanFeiYong).then(() => {
+          muBanNeiRongData.value = []
+          muBanCode = []
+        })
+      })
+      .catch(() => {
       })
-    })
-    .catch(() => {})
 }
 
 // 上面就是上传 项目
@@ -834,10 +847,11 @@ const sheZhiWeiYiVBao = () => {
     cancelButtonText: '取消',
     type: 'warning',
   })
-    .then(() => {
-      xiuGaiZiFeiBiaoZhi(patient.value)
-    })
-    .catch(() => {})
+      .then(() => {
+        xiuGaiZiFeiBiaoZhi(patient.value)
+      })
+      .catch(() => {
+      })
 }
 </script>
 

src/components/med-tec-mod/YiJiXiangMuLuRu.vue

@@ -40,19 +40,20 @@
           <el-table-column label="是否自费" width="130">
             <template #default="scope">
               <el-switch
-                v-model="scope.row.ybSelfFlag"
-                :active-value="1"
-                :inactive-value="0"
-                active-color="#ff4949"
-                active-text="自费"
-                inactive-color="#13ce66"
-                inactive-text="医保"
+                  v-model="scope.row.ybSelfFlag"
+                  :active-value="1"
+                  :inactive-value="0"
+                  active-color="#ff4949"
+                  active-text="自费"
+                  inactive-color="#13ce66"
+                  inactive-text="医保"
               ></el-switch>
             </template>
           </el-table-column>
           <el-table-column label="医生" width="70px">
             <template #default="scope">
-              <el-select v-model="scope.row.doctorCode" :remote-method="remoteMethodRenYuan" clearable filterable remote style="width: 100px">
+              <el-select v-model="scope.row.doctorCode" :remote-method="remoteMethodRenYuan" clearable filterable remote
+                         style="width: 100px">
                 <el-option v-for="item in renYuanList" :key="item.code" :label="item.name" :value="item.code">
                   <span style="color: #8492a6; font-size: 12px">{{ item.code }}</span>
                   <el-divider direction="vertical"></el-divider>
@@ -78,7 +79,8 @@
           <el-table-column label="数量" prop="amount" width="130">
             <template #default="scope">
               <!--precision 限制输入的精度 0 就是不带任何一位小数点  -->
-              <el-input-number v-model="scope.row.amount" :min="0" :precision="1" style="width: 120px"></el-input-number>
+              <el-input-number v-model="scope.row.amount" :min="0" :precision="1"
+                               style="width: 120px"></el-input-number>
             </template>
           </el-table-column>
         </el-table-column>
@@ -102,23 +104,23 @@
       <el-button type="primary" @click="rmChargePyCode">查询</el-button>
       <el-divider direction="vertical"></el-divider>
       <el-switch
-        v-model="xiangMuHuoYaoPinFlag"
-        :active-value="1"
-        :inactive-value="0"
-        active-color="#409EFF"
-        active-text="药品"
-        inactive-color="#13ce66"
-        inactive-text="项目"
+          v-model="xiangMuHuoYaoPinFlag"
+          :active-value="1"
+          :inactive-value="0"
+          active-color="#409EFF"
+          active-text="药品"
+          inactive-color="#13ce66"
+          inactive-text="项目"
       ></el-switch>
       <el-divider direction="vertical"></el-divider>
       <el-table
-        :data="
+          :data="
           xiangMuHuoYaoPinShuJu.data.slice(
             (xiangMuHuoYaoPinShuJu.currentPage - 1) * xiangMuHuoYaoPinShuJu.pageSize,
             xiangMuHuoYaoPinShuJu.currentPage * xiangMuHuoYaoPinShuJu.pageSize
           )
         "
-        :height="tableHeight / 1.2"
+          :height="tableHeight / 1.2"
       >
         <el-table-column label="操作" width="40">
           <template #default="scope">
@@ -129,7 +131,7 @@
         <el-table-column label="项目名称" prop="chargeName"></el-table-column>
         <el-table-column label="国家编码" prop="nationalCode"></el-table-column>
         <el-table-column label="国家名称" prop="nationalName"></el-table-column>
-        <el-table-column label="规格" prop="spec"></el-table-column>
+        <el-table-column label="单位" prop="spec"></el-table-column>
         <el-table-column label="执行科室" prop="deptCode">
           <template #default="scope">
             <el-select v-model="scope.row.deptCode" filterable style="width: 90%">
@@ -153,17 +155,18 @@
           </template>
         </el-table-column>
         <el-table-column label="账单码" prop="billItemName"></el-table-column>
+        <el-table-column label="规格" prop="descriptions" show-overflow-tooltip></el-table-column>
         <el-table-column v-if="xiangMuHuoYaoPinFlag === 1" label="库存" prop="stockAmount"></el-table-column>
         <el-table-column v-if="xiangMuHuoYaoPinFlag === 1" label="医保类型" prop="yblx"></el-table-column>
       </el-table>
       <el-pagination
-        :current-page="xiangMuHuoYaoPinShuJu.currentPage"
-        :page-size="xiangMuHuoYaoPinShuJu.pageSize"
-        :total="xiangMuHuoYaoPinShuJu.data.length"
-        background
-        layout="total, sizes, prev, pager, next, jumper"
-        @size-change="xinZhengSizeChange"
-        @current-change="xinZhengCurrentChange"
+          :current-page="xiangMuHuoYaoPinShuJu.currentPage"
+          :page-size="xiangMuHuoYaoPinShuJu.pageSize"
+          :total="xiangMuHuoYaoPinShuJu.data.length"
+          background
+          layout="total, sizes, prev, pager, next, jumper"
+          @size-change="xinZhengSizeChange"
+          @current-change="xinZhengCurrentChange"
       >
       </el-pagination>
     </el-dialog>
@@ -191,13 +194,22 @@
 </template>
 
 <script>
-import { computed, onMounted, ref, watch } from 'vue'
-import { getBingQuDuiYingKeShi, getDept, getMuBanXinXi, getPyCode, getWard, queryDanGeXiangMu, shangChuanMuBan, xiangMuFeiYongShangChuan } from '@/api/yibao/xiang-mu-lu-ru'
-import { getRenYuan } from '../../api/public-api.js'
+import {computed, onMounted, ref, watch} from 'vue'
+import {
+  getBingQuDuiYingKeShi,
+  getDept,
+  getMuBanXinXi,
+  getPyCode,
+  getWard,
+  queryDanGeXiangMu,
+  shangChuanMuBan,
+  xiangMuFeiYongShangChuan
+} from '@/api/yibao/xiang-mu-lu-ru'
+import {getRenYuan} from '../../api/public-api.js'
 import store from '@/store'
-import { getDatetime } from '@/utils/date'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { clone } from '@/utils/clone'
+import {getDatetime} from '@/utils/date'
+import {ElMessage, ElMessageBox} from 'element-plus'
+import {clone} from '@/utils/clone'
 import HuoQuMuBan from './HuoQuMuBan.vue'
 
 export default {
@@ -284,13 +296,14 @@ export default {
         cancelButtonText: '取消',
         confirmButtonText: '确定',
       })
-        .then(() => {
-          xiangMuFeiYongShangChuan(shangChuanFeiYong).then(() => {
-            feiYongShuJu.value = []
-            chargeCode.value = []
+          .then(() => {
+            xiangMuFeiYongShangChuan(shangChuanFeiYong).then(() => {
+              feiYongShuJu.value = []
+              chargeCode.value = []
+            })
+          })
+          .catch(() => {
           })
-        })
-        .catch(() => {})
     }
 
     const shanChuXiangMuClick = (val) => {
@@ -357,15 +370,15 @@ export default {
     })
 
     watch(
-      () => props.patient,
-      () => {
-        // 这里刚好是反着的
-        queryWard.value = props.patient.admissDept
-        getBingQuDuiYingKeShiChange()
-        setTimeout(() => {
-          queryDept.value = props.patient.zkWard
-        }, 100)
-      }
+        () => props.patient,
+        () => {
+          // 这里刚好是反着的
+          queryWard.value = props.patient.admissDept
+          getBingQuDuiYingKeShiChange()
+          setTimeout(() => {
+            queryDept.value = props.patient.zkWard
+          }, 100)
+        }
     )
     // 以下是保存模板
     const baoCunMuBanDialog = ref(false)
@@ -437,10 +450,10 @@ export default {
     }
 
     watch(
-      () => xiangMuHuoYaoPinFlag.value,
-      () => {
-        xiangMuHuoYaoPinShuJu.value.data = []
-      }
+        () => xiangMuHuoYaoPinFlag.value,
+        () => {
+          xiangMuHuoYaoPinShuJu.value.data = []
+        }
     )
     const renYuanList = ref([])
 

src/views/hospitalization/zhu-yuan-yi-sheng/yi-zhu-lu-ru/YiZhuLuRu.vue

@@ -44,7 +44,7 @@
       <el-tag effect="dark" type="danger">停止</el-tag>
       <el-divider direction="vertical"></el-divider>
       <el-button icon="Plus" type="primary" @click="addYiZhuClick"> 添加</el-button>
-      <el-button :disabled="xuanZhongDeShuJu.length === 0" type="warning" @click="点击批量停止;">批量停止</el-button>
+      <el-button type="warning" :disabled="xuanZhongDeShuJu.length === 0" @click="clickBatchStop">批量停止</el-button>
       <el-divider direction="vertical"></el-divider>
       <el-button :disabled="xuanZhongDeShuJu.length === 0" type="success" @click="dianJiFuZhuXuanZhongYiZhu">复制选中医嘱
       </el-button>
@@ -121,7 +121,8 @@
               操作
               <template #dropdown>
                 <el-dropdown-menu>
-                  <el-dropdown-item :disabled="scope.row.statusFlag === '5'" @click="dianJiYiZhuChaoZuo(scope.row, 1)">
+                  <el-dropdown-item :disabled="scope.row.statusFlag === '5'"
+                                    @click="dianJiYiZhuChaoZuo(scope.row, 1,'无')">
                     <span v-if="scope.row.emergencyFlag === '1'">取消紧急</span>
                     <span v-else>设为紧急</span>
                   </el-dropdown-item>
@@ -294,7 +295,7 @@ const addYiZhuClick = () => {
 }
 
 const dianJiYiZhuChaoZuo = ({actOrderNo, orderName}, flag, name) => {
-  chaoZuoBiaoZhi.value = flag
+  chaoZuoBiaoZhi = flag
   yiZhuHao.value = actOrderNo
   if (flag === 1) {
     zhiXingChaoZuo()
@@ -309,12 +310,12 @@ const dianJiYiZhuChaoZuo = ({actOrderNo, orderName}, flag, name) => {
 }
 
 const zhiXingChaoZuo = () => {
-  if (chaoZuoBiaoZhi.value === 90) {
+  if (chaoZuoBiaoZhi === 90) {
     let data = {
       actOrderNoList: [],
       endTime: tingZhiRiQi.value,
     }
-    xuanZhongDeShuJu.value.forEach((item) => {
+    xuanZhongDeShuJu.value.forEach(item => {
       data.actOrderNoList.push(item.actOrderNo)
     })
     piLiangXiuGaiTingZhiShiJian(data).then((res) => {
@@ -325,21 +326,21 @@ const zhiXingChaoZuo = () => {
     // 这里 是因为停止医嘱和撤销医嘱中 时间和撤销原因用的是同一个
     // 方法 所以需要使用到不同的提交内容
     let data = ''
-    if (chaoZuoBiaoZhi.value === 2) {
-      data = content.value
-    } else if (chaoZuoBiaoZhi.value === 3) {
+    if (chaoZuoBiaoZhi === 2) {
+      data = content
+    } else if (chaoZuoBiaoZhi === 3) {
       data = tingZhiRiQi.value
     }
-    yiZhuChaoZuo(yiZhuHao.value, chaoZuoBiaoZhi.value, data).then((res) => {
+    yiZhuChaoZuo(yiZhuHao.value, chaoZuoBiaoZhi, data).then((res) => {
       handleCurrentChange(yiZhuPage.value.currentPage)
       yiZhuChaoZuoDialog = false
-      content.value = ''
+      content = ''
     })
   }
 }
 
 let yiZhuChaoZuoDialog = $ref(false)
-let content = ref('')
+let content = $ref('')
 const tingZhiRiQi = ref('')
 /**
  * 医嘱操作状态 1-设为紧急 2-撤销 3-停止  90-批量停止
@@ -446,8 +447,9 @@ function getYiZhuFlag(val) {
 /**
  * 点击批量停止
  */
-const 点击批量停止 = () => {
+const clickBatchStop = () => {
   yiZhuChaoZuoDialog = true
+  chaoZuoBiaoZhi = 90
   yiZhuChaoZuoBiaoTi = '批量停止'
 }