seo

src/components/customerOrg/customerOrgEdit.vue

@@ -19,12 +19,30 @@
                 :disabled="customerOrg.oprStatus ? false : true" />
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="4">
             <el-form-item label="单位简称" prop="shortName">
               <el-input class="enterToTab" v-model="form.shortName" placeholder="请输入单位简称"
                 :disabled="customerOrg.oprStatus ? false : true" />
             </el-form-item>
           </el-col>
+          <el-col :span="2">
+            <el-form-item label="加锁" prop="isLock" label-width="56px">
+              <!--
+              <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.isLock" true-label="Y" false-label="N" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="2">
+            <el-form-item label="启用" prop="isActive" label-width="56px">
+              <!--
+              <el-radio v-model="form.isActive" label="Y">启用</el-radio>
+              <el-radio v-model="form.isActive" label="N">停用</el-radio>              
+              -->
+              <el-checkbox v-model="form.isActive" true-label="Y" false-label="N" />
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="8">
@@ -45,7 +63,14 @@
               </el-select>
             </el-form-item>
           </el-col>
-
+          <el-col :span="8">
+            <el-form-item label="体检类别" prop="medicalTypeId">
+              <el-select v-model="form.medicalTypeId" placeholder="请选择" filterable clearable
+                :style="'width:' + Math.floor((window.pageWidth - 585) / 3) + 'px;'" size="small">
+                <el-option v-for="item in dict.medicalType" :key="item.id" :label="item.displayName" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
           <!--
             <el-form-item label="显示顺序" prop="displayOrder">
               <el-input type="number" v-model="form.displayOrder" />
@@ -58,13 +83,14 @@
             </el-form-item>
             -->
 
+
+        </el-row>
+        <el-row>
           <el-col :span="8">
             <el-form-item label="联系电话" prop="telephone">
               <el-input class="enterToTab" v-model="form.telephone" placeholder="请输入联系电话" />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="8">
             <el-form-item label="传真" prop="fax">
               <el-input class="enterToTab" v-model="form.fax" placeholder="请输入传真" />
@@ -75,24 +101,6 @@
               <el-input class="enterToTab" v-model="form.postalCode" placeholder="请输入邮政编码" />
             </el-form-item>
           </el-col>
-          <el-col :span="4">
-            <el-form-item label="加锁" prop="isLock" label-width="56px">
-              <!--
-              <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" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="4">
-            <el-form-item label="启用" prop="isActive" label-width="56px">
-              <!--
-              <el-radio v-model="form.isActive" label="Y">启用</el-radio>
-              <el-radio v-model="form.isActive" label="N">停用</el-radio>              
-              -->
-              <el-checkbox v-model="form.isActiveBox" @change="changeBox('isActive')" />
-            </el-form-item>
-          </el-col>
         </el-row>
         <el-row>
           <el-col :span="8">
@@ -210,7 +218,7 @@ export default {
         routeUrlorPageName: 'customerOrg', //当前页面归属路由或归属页面权限名称
         privs: [] // 页面权限
       },
-      isActiveBox: false,
+
       customerOrgEditStyle: "height:400px;",
       data: {
         organizationdata: [], //体检中心数据
@@ -235,8 +243,6 @@ export default {
         remark: "",
         isLock: "N",
         isActive: "Y",
-        isLockBox: false,
-        isActiveBox: true,
         medicalCenterId: null,
         creatorName: "",
         creationTime: null,
@@ -282,19 +288,19 @@ export default {
   },
 
   computed: {
-    ...mapState(["customerOrg", "window", "dataTransOpts"]),
+    ...mapState(["customerOrg", "dict", "window", "dataTransOpts"]),
   },
   methods: {
     ...mapMutations(["setData"]), checkPagePriv,
 
-    changeBox(type) {
-      //赋值
-      if (this.form[type + "Box"]) {
-        this.form[type] = "Y";
-      } else {
-        this.form[type] = "N";
-      }
-    },
+    // changeBox(type) {
+    //   //赋值
+    //   if (this.form[type + "Box"]) {
+    //     this.form[type] = "Y";
+    //   } else {
+    //     this.form[type] = "N";
+    //   }
+    // },
 
     //获取单位信息
     getCustomerOrgRd(id) {
@@ -307,16 +313,16 @@ export default {
           this.dataTransOpts.tableS.customer_org.id = res.data.id
           objCopy(res.data, this.form);
 
-          if (res.data.isActive == "Y") {
-            this.form.isActiveBox = true;
-          } else {
-            this.form.isActiveBox = false;
-          }
-          if (res.data.isLock == "Y") {
-            this.form.isLockBox = true;
-          } else {
-            this.form.isLockBox = false;
-          }
+          // if (res.data.isActive == "Y") {
+          //   this.form.isActiveBox = true;
+          // } else {
+          //   this.form.isActiveBox = false;
+          // }
+          // if (res.data.isLock == "Y") {
+          //   this.form.isLockBox = true;
+          // } else {
+          //   this.form.isLockBox = false;
+          // }
         }
       });
     },
@@ -332,6 +338,14 @@ export default {
       getapi("/api/app/customer-org-type/get-all").then((res) => {
         this.data.customerOrgType = res.data;
       });
+
+      //体检类别
+      getapi("/api/app/medical-type/in-filter").then((res) => {
+        if (res.code > -1) {
+          this.dict.medicalType = res.data;
+        }
+      });
+
     },
 
     //更新获取单位树节点数据(局部刷新)

src/utlis/proFunc.js

@@ -179,6 +179,33 @@ function arrayExistObj(arr, key, value) {
 };
 exports.arrayExistObj = arrayExistObj;
 
+//判断数组中 是否存在 某个值的对象记录 如不存在返回 - 1，存在返回相应的 序列
+function arrayExistObjPos(arr, key, value, pos) {
+  let ret = - 1
+  for (let i = pos; i < arr.length; i++) {
+    if (arr[i][key] == value) {
+      ret = i
+      break
+    }
+  }
+  return ret
+};
+exports.arrayExistObjPos = arrayExistObjPos;
+
+//判断数组中 是否存在 某个值的对象记录 如不存在返回 - 1，存在返回相应的 序列
+function arrayExistObjByKeys(arr, keys, values) {
+  let ret = - 1
+  for (let i = 0; i < arr.length; i++) {
+    ret = i
+    keys.forEach((key, index) => {
+      if (arr[i][key] !== values[index]) ret = -1
+    });
+    if (ret == i) break
+  }
+  return ret
+};
+exports.arrayExistObjByKeys = arrayExistObjByKeys;
+
 //判断身份证是否合法
 function checkIDCode(IDCode) {
   // 身份证号码为15位或者18位，15位时全为数字，18位前17位为数字，最后一位是校验位，可能为数字或字符X 

src/views/charge/charge.vue

@@ -75,7 +75,6 @@
                   <el-table-column prop="mobileTelephone" label="手机" width="100" />
                   <el-table-column prop="telephone" label="电话" width="100" />
                   <el-table-column prop="address" label="地址" width="300" />
-
                 </el-table>
               </div>
             </div>
@@ -178,10 +177,12 @@
                         <el-input v-model="scope.row.cardNo" size="small" disabled />
                       </template>
                     </el-table-column>
-                    <el-table-column v-if="query.chargeFlag == 'N'" width="30" align="center">
+                    <el-table-column v-if="query.chargeFlag == 'N'" width="60" align="center">
                       <template slot-scope="scope">
                         <i class="el-icon-search" @click="getCardId(scope.$index)" v-if="scope.row.payModeId == '05'"
                           style="font-size: 24px;color: blue;cursor:pointer;"></i>
+                        <i class="el-icon-s-open" @click="brushCard(scope.$index)" v-if="scope.row.payModeId == '05'"
+                          style="font-size: 24px;color: red;cursor:pointer;"></i>
                       </template>
                     </el-table-column>
                   </el-table>
@@ -332,7 +333,7 @@
 import moment from 'moment';
 import { mapState, mapActions } from "vuex";
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
-import { tcdate, dddw, arrayExistObj, deepCopy } from "../../utlis/proFunc";
+import { tcdate, dddw, arrayExistObj,arrayExistObjPos, deepCopy } from "../../utlis/proFunc";
 
 import PatientRegisterQuery from "../../components/patientRegister/patientRegisterQuery.vue";
 import PatientRegisterRefuseList from "../../components/patientRegister/PatientRegisterRefuseList.vue";
@@ -622,7 +623,7 @@ export default {
             this.asbItemsForFee = res.data;
 
             for (let i = this.asbItemsForFee.length - 1; i >= 0; i--) {
-              if (this.asbItemsForFee[i].isCharge == 'Y' || this.asbItemsForFee[i].payTypeFlag == '1') {
+              if (this.asbItemsForFee[i].isCharge == 'Y' || this.asbItemsForFee[i].payTypeFlag !== '0' ) {
                 this.asbItemsForFee.splice(i, 1);
                 continue;
               }
@@ -668,6 +669,21 @@ export default {
       });
     },
 
+    // 清除选的卡
+    brushCard(index){
+      this.chargePays[index].cardNo = ''      
+      this.chargePays[index].cardRegisterId = ''
+      this.chargePays[index].chargeMoney = 0
+
+      delete this.chargePays[index].discount
+      delete this.chargePays[index].cardBalance
+
+      // 刷新预收金额 及 找零 
+      this.inputMoney()
+
+    },
+    
+
     // 弹出卡号查询窗口
     getCardId(index) {
       console.log('index', index)
@@ -705,10 +721,36 @@ export default {
 
     // 确定选中卡记录
     btnOkCard() {
-      this.chargePays[this.cardSeq].cardNo = this.cardChoosed.cardNo + ' 余：' + this.cardChoosed.cardBalance
+      // 单次收费不允重复同一张卡
+      let lfind = arrayExistObj(this.chargePays,'cardRegisterId',this.cardChoosed.id)
+      if(lfind > -1){
+        this.$message.warning({showClose:true,message:'单次收费不允重复同一张卡！'})
+        return
+      }
+      // 单次收费不允出现不同折扣的充值卡
+      let diffDiscount = false  //默认相同折扣
+      let preDiscount = 100
+      let curDiscount = this.cardChoosed.discount||100
+      this.chargePays.forEach(e => {
+        if(e.payModeId == '05' && e.discount){          
+          if(Number(e.discount) !== Number(curDiscount)){
+            preDiscount = e.discount
+            diffDiscount = true
+          }
+        }
+      });
+      // 多张卡时，出现不同折扣，则返回
+      if(diffDiscount){
+        this.$message.warning({showClose:true,message:`当前所选卡折扣 ${curDiscount} 与 上次所选卡折扣 ${preDiscount} 不同，不可执行此操作`})
+        return
+      }
+      
+      this.chargePays[this.cardSeq].cardNo = this.cardChoosed.cardNo + ' 余：' + this.cardChoosed.cardBalance + ' 折：' + curDiscount
+      this.chargePays[this.cardSeq].discount = curDiscount
+      this.chargePays[this.cardSeq].cardBalance = this.cardChoosed.cardBalance
       this.chargePays[this.cardSeq].cardRegisterId = this.cardChoosed.id
       // 将折扣带回，并触发
-      this.form.discount = this.cardChoosed.discount || 100
+      this.form.discount = curDiscount
       this.discountToDetails()
 
       this.winDialog.queryCard = false
@@ -746,16 +788,21 @@ export default {
 
     //获取收费方式明细
     getChargePayByChargeId(ChargeId) {
+      let curPayModeId = ''
       let lfind = -1;
       getapi(`/api/app/chargepay/getchargepayinchargeid?ChargeId=${ChargeId}`).then(res => {
         if (res.code != - 1) {
           res.data.forEach(e => {
-            lfind = arrayExistObj(this.chargePays, 'payModeId', e.payModeId);
+            if(curPayModeId != e.payModeId) lfind = -1
+            lfind++
+            console.log('lfind',lfind)
+            lfind = arrayExistObjPos(this.chargePays, 'payModeId', e.payModeId,lfind);
             if (lfind > - 1) {
               this.chargePays[lfind].chargeMoney = e.chargeMoney;
               this.chargePays[lfind].cardRegisterId = e.cardRegisterId;
               this.chargePays[lfind].cardNo = e.cardNo;
             }
+            curPayModeId = e.payModeId
           });
         }
       });
@@ -888,6 +935,7 @@ export default {
     //输入收费方式金额
     inputMoney() {
       // 现金 id = 01
+      let err = ''
       let cashTotal = Number(0), unCashTotal = Number(0);
       this.chargePays.forEach(e => {
         console.log('e', e)
@@ -896,7 +944,17 @@ export default {
         } else {
           unCashTotal += Number(e.chargeMoney);
         }
+
+        if(e.payModeId == '05'){
+          if(Number(e.cardBalance) < Number(e.chargeMoney)){
+            err = `会员卡【${e.cardNo}】 余额不足`
+          }
+        }
       });
+      if(err){
+        this.$message.warning({showClose:true,message:err})
+        return
+      }
       this.form.preTotal = cashTotal + unCashTotal
       this.findBalance()
       if (unCashTotal > this.form.total) this.$message.warning(`数据校验失败：输入的非现金金额${unCashTotal}不能超过应收金额${this.form.total}！`);
@@ -968,11 +1026,13 @@ export default {
         if (e.payModeId == '05' && e.chargeMoney) {
           //console.log(e.payModeId,e.chargeMoney,e.cardRegisterId);
           if (!e.cardRegisterId) msg = dddw(this.dict.payMode, "id", e.payModeId, "displayName") + '付费，必需选择会员卡号';
+          if(Number(e.cardBalance) < Number(e.chargeMoney)) msg = `会员卡【${e.cardNo}】 余额不足`
         } else {
           e.cardRegisterId = null;
         }
       });
 
+      /**/
       if (msg) {
         this.$message.warning(msg);
         return;
@@ -989,7 +1049,6 @@ export default {
         return;
       }
       
-
       this.chargePays.forEach(e => {
         if (e.chargeMoney) {
           if (e.payModeId == '01') {