门诊项目转入 可以修改日期。

src/components/inpatient/WeiGuiFeiYongFenXi.vue

@@ -298,8 +298,6 @@ export default {
     watch(
       () => props.init,
       () => {
-        huanZheXinXi.value.deptCode = props.patient.deptCode
-        huanZheXinXi.value.inpatientNo = props.patient.inpatientNo
         genXingShuJu()
       }
     )
@@ -307,6 +305,8 @@ export default {
     ctx.emit('open', false)
 
     const genXingShuJu = () => {
+      huanZheXinXi.value.deptCode = props.patient.deptCode
+      huanZheXinXi.value.inpatientNo = props.patient.inpatientNo
       if (huanZheXinXi.value.inpatientNo === '') {
         qingKong()
         ctx.emit('open', true)
@@ -314,11 +314,11 @@ export default {
           ElMessage.warning({
             message: '请输入住院号',
           })
-        }, 1000)
+        }, 10)
       } else {
-        huanZheXinXi.value.inpatientNo = props.patient.inpatientNo
         chaXunWeiGuiClick()
       }
+      console.log(huanZheXinXi.value)
     }
 
     const chaoZuoZhiNan = ref(false)
@@ -349,12 +349,10 @@ export default {
         weiPiPei.value.currentPage = 1
         weiPiPei.value.pageSize = 15
         weiPiPei.value.data = res.weiPiPei
-        console.log(res)
 
         if ((weiPiPei.value.data.length > 0 && huanZheXinXi.value.default === '') || weiGuiFeiYong.value.data.length > 0) {
+          console.log(1)
           ctx.emit('open', true)
-        } else {
-          //console.log(1)
         }
 
         if (weiPiPei.value.data.length === 0 && weiGuiFeiYong.value.data.length > 0) {

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

@@ -56,9 +56,9 @@
 import { ref, watch } from 'vue'
 import { costState } from '@/utils/computed'
 import store from '@/store'
-import { getChargeCode, xiangMuTuiFei, weiGuiFeiYongFenXi } from '@/api/yibao/xiang-mu-lu-ru'
+import { getChargeCode, xiangMuTuiFei } from '@/api/yibao/xiang-mu-lu-ru'
 import WeiGuiFeiYongFenXi from '@/components/inpatient/WeiGuiFeiYongFenXi.vue'
-import { ElMessage, ElMessageBox, ElNotification } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
 export default {
   components: { WeiGuiFeiYongFenXi },
   name: 'huanZheFeiYong',
@@ -85,14 +85,6 @@ export default {
       () => {
         cptTableDataHuanZheFeiYong.value = props.init.records
         fenYe.value.total = typeof props.init.total === 'undefined' ? 0 : props.init.total
-        if (props.patient.inpatientNo === weiGuiJiBenXinXi.value.inpatientNo) {
-          return
-        } else {
-          weiGuiJiBenXinXi.value.inpatientNo = props.patient.inpatientNo
-          weiGuiJiBenXinXi.value.admissTimes = props.patient.admissTimes
-          weiGuiJiBenXinXi.value.name = props.patient.name
-          weiGuiTuiFeiFenXiDialogOpen()
-        }
       }
     )
 
@@ -171,6 +163,7 @@ export default {
     const weiGuiTuiFeiFenXiDialogOpen = () => {
       weiGuiTuiFeiInit.value += 1
       weiGuiJiBenXinXi.value.deptCode = store.state.user.info.deptCode
+      weiGuiJiBenXinXi.value.inpatientNo = typeof props.patient.inpatientNo === 'undefined' ? '' : props.patient.inpatientNo
     }
 
     const weiGuiTuiFeiOpenDialog = (val) => {

src/views/clinic/TransferInOfExpenses.vue

@@ -103,7 +103,7 @@
           </el-descriptions-item>
         </el-descriptions>
       </div>
-      <el-divider></el-divider>
+      收费日期：<el-date-picker type="datetime" v-model="chargeDate"></el-date-picker>
       <div style="width: 100%">
         <div style="float: left; width: 45%">
           <el-table :height="windowHeight" highlight-current-row :data="mzXinXiList" @selection-change="mzSelectChecked" ref="multipleTable">
@@ -204,6 +204,7 @@ import { cptSex } from '@/utils/computed'
 import store from '@/store'
 import { computed } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
+import { formatDatetime } from '../../utils/date'
 export default {
   name: 'TransferInOfExpenses',
   setup() {
@@ -212,9 +213,9 @@ export default {
 
     //查询条件
     //住院号
-    const inpatientNo = ref('')
+    const inpatientNo = ref('016868')
     //机制号
-    const serialNo = ref('')
+    const serialNo = ref('11516328')
     //是否查看历史记录
     const liShiFlag = ref(0)
     //收费代码
@@ -340,6 +341,11 @@ export default {
     }
     //点击保存触发的事件
     const baoCunClick = () => {
+      console.log(chargeDate.value)
+      if (chargeDate.value === null) {
+        chargeDate.value = new Date()
+      }
+      huanZheXinXi.value.chargeDate = formatDatetime(chargeDate.value)
       if (typeof huanZheXinXi.value.inpatientNo === 'undefined') {
         ElMessage({
           type: 'warning',
@@ -360,13 +366,20 @@ export default {
         return
       }
       huanZheXinXi.value.list = zyXinXiList.value
+
+      if (huanZheXinXi.value.chargeDate === '') {
+        return ElMessage.error({
+          message: '请选择日期',
+        })
+      }
       for (let i = 0; mzXinXiList.value.length; i++) {
         if (huanZheXinXi.value.name !== mzXinXiList.value[i].patientName) {
           return ElMessageBox.confirm('', '提示', {
             cancelButtonText: '取消',
             confirmButtonText: '确定',
+            dangerouslyUseHTMLString: true,
             type: 'warning',
-            message: '门诊病人姓名【' + mzXinXiList.value[i].patientName + '】住院病人姓名【' + huanZheXinXi.value.name + '】不一致,是否继续？',
+            message: `门诊病人姓名【'   ${mzXinXiList.value[i].patientName}  '】住院病人姓名【'  ${huanZheXinXi.value.name}  '】不一致,是否继续？<br>收费日期：${huanZheXinXi.value.chargeDate}`,
           })
             .then(() => {
               huanZheXinXi.value.reqExecUnit = store.state.user.info.deptCode
@@ -378,6 +391,23 @@ export default {
             .catch(() => {})
         }
       }
+      if (huanZheXinXi.value.name !== mzXinXiList.value[i].patientName) {
+        return ElMessageBox.confirm('', '提示', {
+          cancelButtonText: '取消',
+          confirmButtonText: '确定',
+          dangerouslyUseHTMLString: true,
+          type: 'warning',
+          message: `收费日期：${huanZheXinXi.value.chargeDate}`,
+        })
+          .then(() => {
+            huanZheXinXi.value.reqExecUnit = store.state.user.info.deptCode
+            baoCunHuanZheZhuYuanFeiYong(huanZheXinXi.value).then((res) => {
+              zyXinXiList.value = []
+              mzXinXiList.value = []
+            })
+          })
+          .catch(() => {})
+      }
     }
     //项目名称 数组
     const entryNameList = ref([])
@@ -391,6 +421,8 @@ export default {
       }
     }
 
+    const chargeDate = ref(new Date())
+
     //门诊合计
     return {
       inpatientNo,
@@ -421,6 +453,7 @@ export default {
       remoteMethodEntryName,
       entryNameList,
       huanZheFeiYongZongHe,
+      chargeDate,
     }
   },
 }

src/views/medical-insurance/inpatient/InHospFeeUpload.vue

@@ -389,7 +389,6 @@ export default {
     const weiGui = ref()
 
     const weiGuiTuiFeiFenXiDialogOpen = (val) => {
-      console.log(val)
       weiGuiTuiFeiInit.value += 1
       weiGuiJiBenXinXi.value.deptCode = ''
       weiGuiJiBenXinXi.value.inpatientNo = val ? patient.value.inpatientNo : ''