Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/xt_pages/outpatientCharges/components/chargeDialog.vue

@@ -20,6 +20,16 @@
         <el-input type="number" v-model="form.private_price" :disabled="true"></el-input>
       </el-form-item>
 
+      <el-form-item label="个账支出：" prop="age" :validate-event="is_Name" style="width:33%;">
+        <el-input type="number" v-model="form.acc_pay" :disabled="true"></el-input>
+      </el-form-item>
+
+
+      <el-form-item label="个人现金支出：" prop="age" :validate-event="is_Name" style="width:33%;">
+        <el-input type="number" v-model="form.psn_pay" :disabled="true"></el-input>
+      </el-form-item>
+
+
 
       <el-form-item label="支付方式：" style="width:100%;">
         <!-- <el-select v-model="form.pay_way" placeholder="请选择">
@@ -112,7 +122,10 @@
           total:0,
           fapiao_code:"",
           fapiao_number:"",
-          order:null
+          order:null,
+          acct_pay:'',
+          psn_pay:'',
+
 
 
         },
@@ -141,7 +154,9 @@
           reality_price:'',
           found_price:'',
           fapiao_code:"",
-          fapiao_number:""
+          fapiao_number:"",
+          acct_pay:"",
+          psn_pay:"",
         },
 
       }
@@ -174,6 +189,9 @@
         this.form.total = total + this.form.medical_insurance_price
         this.form.discount_price = 0.0
         this.form.preferential_price = 0.0
+        this.form.acct_pay = this.order.acct_pay
+        this.form.psn_pay = this.order.psn_cash_pay
+
 
         this.form.fapiao_code =""
         this.form.fapiao_number = ""

src/xt_pages/outpatientCharges/components/prescriptionTable.vue

@@ -267,13 +267,9 @@
     }, methods:  {
 
       getName(id){
-        console.log("!!!!!!!!!")
-
         let  name = ""
         for(let i = 0; i  < this.manufacturers.length; i++){
-          console.log(this.manufacturers[i].manufacturer_name)
           if(id == this.manufacturers[i].id){
-            console.log("!!!!!!!!!")
             name =  this.manufacturers[i].manufacturer_name
           }
         }

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -18,7 +18,6 @@
             :editable="false"
             style="width: 100%;"
             type="date"
-            :picker-options="pickerOptions"
             placeholder="选择开始时间"
             align="right"
             format="yyyy-MM-dd"
@@ -261,12 +260,8 @@
                             value-format="yyyy-MM-dd HH:mm:ss">
                         </el-date-picker>
                       </el-form-item>
-
-
                     </el-form>
-
                   </div>
-
                   <p class="centerRightTitle">人员信息</p>
                   <div style="display:flex;justify-content: space-between;line-height:30px;">
                     <span style="font-size:14px;">人员编码:{{ patientInfo.dialysis_no }}</span>
@@ -277,8 +272,6 @@
                     <li style="width:50%;">性别：{{ patientInfo.gender == 1 ? '男' : '女' }}</li>
                     <li style="width:50%;">年龄：{{ patientInfo.age }}</li>
                     <li style="width:50%;">电话：{{ patientInfo.phone }}</li>
-
-
                   </ul>
                   <p class="centerRightTitle" style="padding-top: 10px;">诊断信息</p>
                   <div style="display:flex;justify-content: space-between;line-height:30px;">
@@ -288,7 +281,6 @@
                     <li style="width:50%;">医生：{{ info.doctor }}</li>
                     <li style="width:50%;">科室：{{ info.departments }}</li>
                     <!--<li style="width:100%;">总费用：{{ getTotal() }}</li>-->
-
                     <li style="width:100%;">判断结果：{{ info.diagnosis }}</li>
                     <li style="width:100%;">是否有传染病：</li>
                     <li style="width:100%;">血压：</li>
@@ -694,13 +686,17 @@ export default {
       register: [
         { value: 11, label: '普通门诊' },
         { value: 14, label: '门诊特殊病' },
+        { value: '9922', label: '家庭通道' },
         { value: '1111', label: '精一' },
+        { value: '1112', label: '精二' },
         { value: '1112', label: '精二' }
+
       ],
 
       registerThree: [
         { value: 11, label: '普通门诊' },
         { value: 14, label: '门诊特殊病' },
+        { value: '9922', label: '家庭通道' },
         { value: '1111', label: '精一' },
         { value: '1112', label: '精二' },
         { value: '9933', label: '门诊特殊病(9933)' },
@@ -711,6 +707,7 @@ export default {
       register_two: [
         { value: '11', label: '普通门诊' },
         { value: '14', label: '门诊特殊病' },
+        { value: '9922', label: '家庭通道' },
         { value: '9933', label: '门诊特殊病(9933)' },
         { value: '990602', label: '门诊特殊病(990602)' },
         { value: '1402', label: '门诊特殊病(1402)' }
@@ -3442,13 +3439,19 @@ export default {
           break
         case 1112:
           return '精二' + '处方' + index
+          break
         case 9933:
           return '门诊特殊病(9933)' + '处方' + index
+          break
         case 990602:
           return '门诊特殊病(990602)' + '处方' + index
+          break
         case 1402:
           return '门诊特殊病(1402)' + '处方' + index
           break
+        case 9922:
+          return '家庭通道' + '处方' + index
+          break
       }
     }, unique_four(array) {
       // res用来存储结果

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -534,7 +534,9 @@
           { value: 11, label: '普通门诊' },
           { value: 14, label: '门诊特殊病' },
           { value: 1111, label: '精一' },
-          { value: 1112, label: '精二' }
+          { value: 1112, label: '精二' },
+          { value: 9922, label: '家庭通道' },
+
 
 
         ],
@@ -2127,7 +2129,6 @@
           return false
         }
       }, open_three() {
-        console.log(this.prescriptions)
         for (let i = 0; i < this.prescriptions.length; i++) {
           for (let b = 0; b < this.prescriptions[i].advices.length; b++) {
             if (this.prescriptions[i].advices[b].prescribing_number == 0 || this.prescriptions[i].advices[b].prescribing_number == '') {