Merge branch 'master' into 'master'

优化药品追溯码相关

See merge request lighter/vue-intergration-platform!168

src/views/yp-codg/YpCodgInfo.vue

@@ -22,7 +22,7 @@
             <el-table-column prop="delvOpter" label="配送操作员" width="70"/>
             <el-table-column prop="drugProdname" label="药品商品名称" width="240" show-overflow-tooltip/>
             <el-table-column prop="drugSpec" label="药品规格" width="160" show-overflow-tooltip/>
-            <el-table-column prop="drugDosform" label="药品剂型" width="80"/>
+            <el-table-column prop="drugDosform" label="药品剂型" width="130"/>
             <el-table-column prop="manuBchno" label="生产批次号" width="100"/>
             <el-table-column prop="manuDate" label="生产日期" width="140"/>
             <el-table-column prop="expyEnd" label="有效期止" width="140"/>
@@ -40,7 +40,7 @@
             <el-table-column prop="minPrepunt" label="最小制剂单位" width="90"/>
             <el-table-column prop="crteTime" label="数据创建时间" width="140"/>
             <el-table-column prop="updtTime" label="数据更新时间" width="140"/>
-            <el-table-column prop="regName" label="注册名称" width="170"/>
+            <el-table-column prop="regName" label="注册名称" width="170" show-overflow-tooltip/>
             <el-table-column prop="valiFlag" label="有效标志" width="70"/>
             <el-table-column prop="valiFlagName" label="是否有效" width="70"/>
             <el-table-column prop="upldStas" label="上传状态" width="70"/>

src/views/yp-codg/YpCodgMatch.vue

@@ -45,19 +45,21 @@
                     <el-button v-else type="primary" size="small">其他</el-button>
                   </template>
                 </el-table-column>
-                <el-table-column prop="patientId" label="病人ID" width="120" />
-                <el-table-column prop="name" label="病人姓名" width="120" />
+                <el-table-column prop="patientId" label="病人ID" width="100" />
+                <el-table-column prop="name" label="病人姓名" width="100" />
                 <el-table-column prop="times" label="病人就诊次数" width="100" />
-                <el-table-column prop="serialNo" label="流水号" width="120"/>
+                <el-table-column prop="serialNo" label="流水号" width="100"/>
                 <el-table-column prop="deptName" label="科室" width="180"/>
-                <el-table-column prop="orderNo" label="处方号" width="100">
+                <el-table-column prop="orderNo" label="处方号" width="80">
                   <template #default="scope">
                     <el-button v-if="scope.row.drugFlag === '2' || scope.row.drugFlag === '3' " type="danger" size="small">
                       {{ scope.row.orderNo }}</el-button>
                     <el-button v-else type="primary" size="small">{{scope.row.orderNo}}</el-button>
                   </template>
                 </el-table-column>
-                <el-table-column prop="chargeDate" label="缴费时间" width="180"/>
+                <el-table-column prop="chargeDate" label="缴费时间" width="150"/>
+                <el-table-column prop="setlId" label="结算ID" width="120"/>
+                <el-table-column prop="mdtrtId" label="就诊ID" width="120"/>
                 <el-table-column fixed="right" label="操作" min-width="180" width="180" header-align="center" align="center">
                   <template #default="scope">
                     <el-button type="primary" size="small" @click="matchCodgForCf(scope.row)">配药

src/views/yp-codg/YpCodgUpload.vue

@@ -46,7 +46,7 @@
       <el-select
         v-model="ztFlag"
         placeholder="请选择销售类型"
-        style="width: 140px; margin-left: 3px"
+        style="width: 120px; margin-left: 3px"
         @change="queryItem"
       >
         <el-option
@@ -88,7 +88,7 @@
       <el-select
         v-model="retFlag"
         placeholder="请选择上传状态"
-        style="width: 140px; margin-left: 3px"
+        style="width: 120px; margin-left: 3px"
       >
         <el-option
           v-for="item in retOptions"
@@ -98,6 +98,8 @@
         >
         </el-option>
       </el-select>
+      <el-switch v-model="isFee" inline-prompt active-text="全部" inactive-text="医保结算" active-value="N" inactive-value="Y"
+                 style="--el-switch-on-color: #13ce66; --el-switch-off-color: #ff4949; margin-left: 3px"/>
       <el-divider direction="vertical" />
       <el-button
         type="primary"
@@ -1189,6 +1191,7 @@ const editableTabsValue = ref("ypInvinfo");
 const start = formatDate(shortcuts[0].value[0]);
 const end = formatDate(shortcuts[0].value[0]);
 const dateRange = ref([]);
+const isFee = ref('N')
 const soldOptions = [
   { value: "3", label: "销售" },
   { value: "4", label: "销售退货" },
@@ -1199,6 +1202,7 @@ const queryData = ref({
   docuNo: "",
   patNo: "",
   setlId: "",
+  setlType: "",
   chargeCode: "",
   invChgType: "",
   groupNo: "",
@@ -1445,6 +1449,7 @@ const queryCodgSelinfoUpload = () => {
   queryData.value.patNo = keyCode.value;
   queryData.value.groupNo = uploadGroupNoYf.value;
   queryData.value.setlId = setlId.value;
+  queryData.value.setlType = isFee.value;
   queryData.value.type = ztFlag.value;
   queryData.value.uploadFlag = retFlag.value;
   selectYpSelinfoDetail(queryData.value)
@@ -1506,6 +1511,7 @@ const queryCodgSelinfoUploadResult = () => {
   queryData.value.patNo = keyCode.value;
   queryData.value.groupNo = uploadGroupNoYf.value;
   queryData.value.setlId = setlId.value;
+  queryData.value.setlType = isFee.value;
   queryData.value.type = ztFlag.value;
   queryData.value.uploadFlag = retFlag.value;
   selectYpSelinfoResult(queryData.value)

src/views/yp-codg/YpInMatch.vue

@@ -163,7 +163,7 @@
       </template>
     </el-dialog>
   </div>
-  <el-dialog v-model="showYpCodgInfo" :close-on-click-modal="false" :before-close="handleClose"
+  <el-dialog v-model="showYpCodgInfo" :close-on-click-modal="false" :before-close="handleClose" top="8vh"
              :close-on-press-escape="false" :title="ypCodgInfoName" width="80%" destroy-on-close>
     <YpCodgInfo :ypCodgDetail="ypCodgDetail"/>
   </el-dialog>
@@ -362,6 +362,7 @@ const saveDownloadCodg = () => {
       showClose: true,
     })
     dialogFormDownload.value = false
+    queryYpCodgLine()
   })
 }
 

src/views/yp-codg/YpMzCodgMatch.vue

@@ -1,17 +1,18 @@
 <template>
   <div class="layout_container">
     <header>
-      <el-input v-model="codgTotal" class="w-50 m-2" style="width: 200px" >
-        <template #prepend>处方发药总数量</template>
+      <el-input v-model="codgTotal" class="w-50 m-2" style="width: 200px" disabled>
+        <template #prepend><span style="color: #d71345;font-weight: bolder">处方发药总数量</span></template>
       </el-input>
-      <el-input v-model="quantityJc" class="w-50 m-2" style="width: 200px" >
-        <template #prepend>追溯码检查数量</template>
+      <el-input v-model="quantityJc" class="w-50 m-2" style="width: 200px" disabled>
+        <template #prepend><span style="color: #d71345;font-weight: bolder">追溯码检查数量</span></template>
       </el-input>
       <el-divider direction="vertical" />
       <el-button type="primary" icon="Search" @click="checkBarList" style="margin-left: 5px">检查</el-button>
       <el-button type="danger" icon="Remove" @click="drugBarRepeat" style="margin-left: 5px">去重</el-button>
       <el-button type="warning" icon="Filter" @click="matchCodgData" style="margin-left: 5px">匹配</el-button>
       <el-button type="success" icon="Select" @click="saveMatchCodgData" style="margin-left: 5px" v-if="confirmFlag !== 1">保存</el-button>
+      <el-button type="danger" v-show="setlText" disabled :icon="Star"><span style="font-size: 14px">医保病人</span></el-button>
     </header>
     <div class="layout_display_flex_y">
       <div class="layout_flex_1-y">
@@ -38,7 +39,7 @@
         <el-row :gutter="5">
           <el-col :span="3">
             <el-divider content-position="left">追溯码采集信息</el-divider>
-            <el-input ref="inputRef" v-model="codgLine" type="textarea" rows="36"/>
+            <el-input v-model="codgLine" type="textarea" rows="36"/>
           </el-col>
           <el-col :span="3">
             <el-divider content-position="left">追溯码检查信息</el-divider>
@@ -85,14 +86,15 @@ import {
 } from "@/api/yp-codg/yp-codg-match.js";
 import {isEmpty} from "xe-utils";
 import {ElMessage, ElMessageBox} from "element-plus";
+import {Star} from "@element-plus/icons-vue";
 
 const mzCfData = ref([])
 const mzCfDetail = ref([])
+const setlText = ref(false)
 const codgLine = ref('')
 const codgTotal = ref(0)
 // 处方匹配的追溯码信息
 const codgInfo = ref([])
-const inputRef = ref(null)
 const confirmFlag = ref(0)
 const emit = defineEmits(['close', 'closeYpMzCodgMatch'])
 
@@ -105,8 +107,8 @@ const props = defineProps({
 onMounted( () => {
   nextTick(() => {
     mzCfData.value = props.ypMzCfData
-    inputRef.value?.focus()
     confirmFlag.value = props.ypMzCfData.confirmFlag
+    setlText.value = props.ypMzCfData.setlId
     queryMzCfDetail()
     queryMzDrugCodgMatch()
   })
@@ -114,6 +116,7 @@ onMounted( () => {
 watch(() => props.ypMzCfData, () => {
   mzCfData.value = props.ypMzCfData
   confirmFlag.value = props.ypMzCfData.confirmFlag
+  setlText.value = props.ypMzCfData.setlId
 })
 
 const queryMzCfDetail = () => {