charge

src/components/customerOrg/customerOrgEdit.vue

@@ -123,7 +123,7 @@
         </el-row>
         <el-row>
           <el-col :span="5">
-            <el-form-item label="创建者">
+            <el-form-item label="创建人员">
               <el-input v-model="form.creatorName" size="small" disabled />
             </el-form-item>
           </el-col>
@@ -133,7 +133,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="5">
-            <el-form-item label="修改者">
+            <el-form-item label="修改人员">
               <el-input v-model="form.creatorName" size="small" disabled />
             </el-form-item>
           </el-col>
@@ -239,18 +239,10 @@ export default {
 
     changeBox(type) {
       //赋值
-      if (type == 'isActive') {
-        if (this.form.isActiveBox) {
-          this.form.isActive = 'Y';
-        } else {
-          this.form.isActive = 'N';
-        }
-      } else {
-        if (this.form.isLockBox) {
-          this.form.isLock = 'Y';
-        } else {
-          this.form.isLock = 'N';
-        }
+      if(this.form[type + 'Box']){
+        this.form[type] = 'Y';
+      }else{
+        this.form[type] = 'N';
       }
     },
 

src/components/patientRegister/PatientRegisterEdit.vue

@@ -196,14 +196,20 @@
               </el-col>
               <el-col :span="5">
                 <el-form-item label="是否VIP" prop="isVip">
+                  <!--
                   <el-radio v-model="form.isVip" label="Y">是</el-radio>
                   <el-radio v-model="form.isVip" label="N">否</el-radio>
+                  -->
+                  <el-checkbox v-model="form.isVipBox" @change="changeBox('isVip')" />
                 </el-form-item>
               </el-col>
               <el-col :span="5">
                 <el-form-item label="电话随访" prop="isPhoneFollow">
+                  <!--
                   <el-radio v-model="form.isPhoneFollow" label="Y">是</el-radio>
                   <el-radio v-model="form.isPhoneFollow" label="N">否</el-radio>
+                  -->
+                  <el-checkbox v-model="form.isPhoneFollowBox" @change="changeBox('isPhoneFollow')" />
                 </el-form-item>
               </el-col>
               <el-col :span="3">
@@ -212,6 +218,7 @@
                   <el-radio v-model="form.isNameHide" label="Y">是</el-radio>
                   <el-radio v-model="form.isNameHide" label="N">否</el-radio>
                   -->
+                  <el-checkbox v-model="form.isNameHideBox" @change="changeBox('isNameHide')" />
                 </el-form-item>
               </el-col>
               <el-col :span="3">
@@ -220,6 +227,7 @@
                   <el-radio v-model="form.isLock" label="Y">是</el-radio>
                   <el-radio v-model="form.isLock" label="N">否</el-radio>
                    -->
+                   <el-checkbox v-model="form.isLockBox" @change="changeBox('isLock')" />
                 </el-form-item>
               </el-col>
               <el-col :span="3">
@@ -305,7 +313,7 @@
           </el-image>
         </div>
         <div>
-          <PatientRegisterItem :patientRegisterForm="form" />
+          <PatientRegisterItem :patientRegisterForm="form" :payTypeFlag="payTypeFlag"/>
         </div>
       </div>
       <div style="margin-left: 10px;width:110px;">
@@ -338,16 +346,16 @@
         </div>
 
         <div style="margin-top: 30px;">
-          <el-button type="primary" class="btnClass" @click="guidePrint('0001', false)">全个人支付</el-button>
+          <el-button type="primary" class="btnClass" @click="payTypeFlag ='0'">全个人支付</el-button>
         </div>
         <div class="btn">
-          <el-button type="primary" class="btnClass" @click="guidePrint('0001', false)">全单位支付</el-button>
+          <el-button type="primary" class="btnClass" @click="payTypeFlag ='1'">全单位支付</el-button>
         </div>
         <div class="btn">
-          <el-button type="primary" class="btnClass" @click="guidePrint('0001', false)">全赠送</el-button>
+          <el-button type="primary" class="btnClass" @click="payTypeFlag ='2'">全赠送</el-button>
         </div>
         <div class="btn">
-          <el-button type="success" class="btnClass" @click="guidePrint('0001', false)">收费</el-button>
+          <el-button type="success" class="btnClass" @click="toCharge(form.patientRegisterNo)">收费</el-button>
         </div>
       </div>
     </div>
@@ -449,7 +457,7 @@ import { mapState } from "vuex";
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
 import mm from "../../utlis/mm";
 
-import { objCopy, setNull, dddw, parseID, birthdayToAge } from "../../utlis/proFunc";
+import { objCopy, setNull, dddw, parseID, birthdayToAge,deepCopy } from "../../utlis/proFunc";
 import Camera from "./Camera.vue";
 import PatientRegisterItem from "./PatientRegisterItem.vue";
 import LisRequest from "./LisRequest.vue";
@@ -466,6 +474,7 @@ export default {
     return {
       apiurl: mm.apiurl,
       brushTimes: 0,
+      payTypeFlag:'',
       form: {
         id: "", //id
         patientId: "00000000-0000-0000-0000-000000000000", //档案号ID 选择了档案就传档案号，未选就传00000-0000...
@@ -509,6 +518,10 @@ export default {
         creationTime: "",
         lastModificationTime: "",
         lastModifierId: null,
+        isVipBox: false, //vip客户
+        isNameHideBox: false, //隐藏姓名
+        isPhoneFollowBox: false, //电话随访
+        isLockBox: false, //是否锁住
       }, //单位 记录 目前新增与更新是一致
 
       defaultNull: [
@@ -546,6 +559,7 @@ export default {
   //挂载完成
   mounted() {
     objCopy(this.formInitData, this.form);
+    this.initBox();
   },
 
   computed: {
@@ -635,12 +649,48 @@ export default {
       return moment(new Date(date)).format(forMat);
     },
 
+    changeBox(type) {
+      //赋值
+      if(this.form[type + 'Box']){
+        this.form[type] = 'Y';
+      }else{
+        this.form[type] = 'N';
+      }
+    },
+   
+    initBox(){
+      if(this.form.isVip == 'Y'){
+        this.form.isVipBox = true;
+      }else{
+        this.form.isVipBox = false;
+      }
+
+      if(this.form.isNameHide == 'Y'){
+        this.form.isNameHideBox = true;
+      }else{
+        this.form.isNameHideBox = false;
+      }
+
+      if(this.form.isPhoneFollow == 'Y'){
+        this.form.isPhoneFollowBox = true;
+      }else{
+        this.form.isPhoneFollowBox = false;
+      }
+
+      if(this.form.isLock == 'Y'){
+        this.form.isLockBox = true;
+      }else{
+        this.form.isLockBox = false;
+      }
+
+    },
+
     //提交
     Onsubmit(formName, msgTip) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
           //赋值
-          let body = { ...this.form };
+          let body = deepCopy(this.form);
 
           delete body.id;
           delete body.patientRegisterNo;
@@ -652,6 +702,10 @@ export default {
           delete body.creationTime;
           delete body.lastModificationTime;
           delete body.lastModifierId;
+          delete body.isVipBox;
+          delete body.isNameHideBox;
+          delete body.isPhoneFollowBox;
+          delete body.isLockBox;
 
           setNull(body, this.defaultNull);
 
@@ -930,6 +984,12 @@ export default {
       this.brushTimes++;
       this.patientRegister.lisRequestVisble = true;
     },
+
+    toCharge(patientRegisterNo){
+      this.patientRegister.patientRegisterRd.patientRegisterNo = patientRegisterNo;
+      this.$router.push({ path: "/charge" });
+    },
+    
   },
 
   //监听事件
@@ -941,6 +1001,7 @@ export default {
       if (newVal != oldVal) {
         console.log('this.editTimes', this.editTimes)
         objCopy(this.formInitData, this.form);
+        this.initBox();
         //console.log('this.form',this.form)
       }
     },

src/components/patientRegister/PatientRegisterItem.vue

@@ -92,7 +92,7 @@
           </el-table-column>
           <el-table-column label="实收价格" prop="chargePrice" width="70">
             <template slot-scope="scope">
-              <el-input type="number" v-model="patientRegister.patientRegisterAbs[scope.$index].chargePrice" size="small"
+              <el-input type="number" v-model="scope.row.chargePrice" size="small"
                 @input="changePrice(scope.$index)" @blur="onSubmit('')" />
             </template>
           </el-table-column>
@@ -137,7 +137,7 @@ import { mapState, mapActions } from "vuex";
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
 import { arrayFilter, arrayReduce, arrayExistObj, dddw } from "../../utlis/proFunc";
 export default {
-  props: ["patientRegisterForm"],
+  props: ["patientRegisterForm","payTypeFlag"],
   data() {
     return {
       itemType: [], //项目类别
@@ -813,6 +813,16 @@ export default {
       }
     },
 
+    //按钮更新支付方式
+    "payTypeFlag"(newVal, oldVal) {
+      if (newVal != oldVal && newVal != '') {
+        this.patientRegister.patientRegisterAbs.forEach(e =>{
+          e.payTypeFlag = newVal;
+          return e;
+        });
+        this.onSubmit('调整支付方式');
+      }
+    },
   },
 };
 </script>

src/views/charge/charge.vue

@@ -316,11 +316,17 @@ export default {
 
   created() {
     this.dictInit();
+    this.query.patientRegisterNo = this.patientRegister.patientRegisterRd.patientRegisterNo;    
   },
 
   //挂载完成
   mounted() {
-    this.Query();
+    if(this.query.patientRegisterNo){
+      this.Query('patientRegisterNo');
+    }else{
+      this.Query();
+    }
+    
   },
 
   computed: {