dj

src/components/doctorCheck/CheckItemList.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    
+
     <el-table :data="doctorCheck.checkItemList" style="width: 100%" :height="tableHeight" border highlight-current-row
       @row-click="rowClick" size="small">
       <el-table-column prop="itemName" label="项目" width="220" />
@@ -26,7 +26,7 @@
         </template>
       </el-table-column>
     </el-table>
-   
+
     <!--弹窗-->
     <div>
       <!-- 结果录入模版 -->
@@ -71,7 +71,7 @@ import { arrayExistObj, dddw, deepCopy } from '../../utlis/proFunc'
 
 export default {
   components: {},
-  props: ["isCheckPicture", "registerCheckId"],
+  props: ["isCheckPicture", "registerCheckId","doctor_check_check_charge"],
   data() {
     return {
       resultStatus: [], //结果状态提示数据
@@ -109,7 +109,7 @@ export default {
         start: 0, end: 0
       },
       symbols: [], //特殊符号
-      userId:'',
+      userId: '',
     };
   },
 
@@ -397,7 +397,7 @@ export default {
     },
 
     // 清除结果值
-    btnClear(){
+    btnClear() {
       this.moreResult.result = ''
     },
 
@@ -435,7 +435,10 @@ export default {
         .then(res => {
           if (res.code > -1) {
             this.doctorCheck.RegisterCheckEdit = res.data
-            if(this.doctorCheck.RegisterCheckEdit.completeFlag == '0'){
+            if (res.data.isCharge != 'Y' && this.doctor_check_check_charge == 'Y') {
+              this.$message.warning({showClose:true,message:`该体检人员未缴清费用！`})             
+            }
+            if (this.doctorCheck.RegisterCheckEdit.completeFlag == '0') {
               this.doctorCheck.RegisterCheckEdit.checkDoctorId = this.userId
               this.doctorCheck.RegisterCheckEdit.checkDate = new Date()
             }

src/components/doctorCheck/RegisterCheckList.vue

@@ -156,7 +156,6 @@ export default {
               this.dataTransOpts.tableS.register_check.id = ''
             }
 
-
             this.dataTransOpts.refresh.register_check.S++   //刷新检查医生
             this.dataTransOpts.refresh.register_check_item.M++  //刷新检查明细
 

src/views/doctorCheck/doctorCheck.vue

@@ -33,7 +33,7 @@
 
             <div :style="'width:' + (window.pageWidth - 200 - 110 - 15) + 'px;'">
               <div :style="'margin-left: 2px;width:' + (window.pageWidth - 200 - 110 - 15 - 2) + 'px;'">
-                <CheckItemList :isCheckPicture="isCheckPicture"
+                <CheckItemList :isCheckPicture="isCheckPicture" :doctor_check_check_charge="doctor_check_check_charge"
                   :registerCheckId="dataTransOpts.tableS.register_check.id" />
               </div>
               <div v-if="isCheckPicture" class="demo-image__preview"
@@ -95,6 +95,7 @@ export default {
           isCheckPicture: false, // 是否显示检查图片
         }
       },
+      doctor_check_check_charge:'Y',  // 默认判断收费
     };
   },
 
@@ -154,7 +155,11 @@ export default {
   methods: {
 
     //数据初始化
-    dictInit() {
+    async dictInit() {
+      let sysParmId = "doctor_check_check_charge"
+      let sysParam = await postapi('/api/app/SysParmValue/GetSysParmValueBySysParmId', { sysParmId })
+      this.doctor_check_check_charge = sysParam.data.toUpperCase()
+
       //性别（仅档案用）
       getapi("/api/app/sex").then((res) => {
         if (res.code == 1) {
@@ -350,8 +355,12 @@ export default {
         case 'btnExpPic':   // 导图（图片上传）
         case 'btnSavePic':   // 图片保存
         case 'btnDelImage':   // 图片删除 
-          // console.log('btnFlagName RegisterCheckEdit', btnFlagName, RegisterCheckEdit.completeFlag)
-          if (RegisterCheckEdit.completeFlag && RegisterCheckEdit.completeFlag == '0') ret = false
+          // console.log('btnFlagName RegisterCheckEdit', btnFlagName, RegisterCheckEdit.completeFlag)          
+          if (this.doctor_check_check_charge == 'Y') {
+            if (RegisterCheckEdit.completeFlag && RegisterCheckEdit.completeFlag == '0' && RegisterCheckEdit.isCharge == 'Y') ret = false
+          } else {
+            if (RegisterCheckEdit.completeFlag && RegisterCheckEdit.completeFlag == '0') ret = false
+          }
           break;
         case 'audit':
           if (RegisterCheckEdit.completeFlag && RegisterCheckEdit.completeFlag != '0' && RegisterCheckEdit.isAudit && RegisterCheckEdit.isAudit != 'Y') ret = false
@@ -570,7 +579,7 @@ export default {
 
 
       if (summarys.length == 0) {
-        this.$message.warning({showClose:true,message:'请生成小结！'})
+        this.$message.warning({ showClose: true, message: '请生成小结！' })
         return
       }
 
@@ -588,7 +597,7 @@ export default {
           }
         })
     },
-    
+
 
     //更新检查医生
     updateDoctorCheck(successTip) {