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

src/xt_pages/hospitalStation/components/chargeDialog.vue

         <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.acct_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="请选择">
     </el-form>
 
     <span slot="footer" class="dialog-footer">
-    <el-button v-loading="loadingtwo" @click="cancel('formValue')">取 消</el-button>
-    <el-button v-loading="loadingtwo" type="primary" @click="confirm('formValue')">确 定</el-button>
+    <el-button @click="cancel('formValue')">取 消</el-button>
+    <el-button type="primary" @click="confirm('formValue')">确 定</el-button>
   </span>
   </el-dialog>
 
           found_price:'',
           total:0,
           fapiao_code:"",
-          fapiao_number:""
+          fapiao_number:"",
+          order:null,
+          acct_pay:'',
+          psn_pay:'',
 
 
         },
           reality_price:'',
           found_price:'',
           fapiao_code:"",
-          fapiao_number:""
+          fapiao_number:"",
+          acct_pay:"",
+          psn_pay:"",
         },
 
       }
     },
     methods: {
       show: function (total,order) {
-        this.total = total;
-        this.form.private_price = total;
-        this.form.pay_price = total;
-        this.form.total = total + this.form.medical_insurance_price;
-        this.form.discount_price = 0.0;
-        this.form.preferential_price = 0.0;
-        this.form.fapiao_code ="";
-        this.form.fapiao_number = "";
-        if(order&&order.id > 0){
-          this.total = order.medfee_sumamt;
-          this.form.private_price = order.medfee_sumamt;
-          this.form.pay_price = order.medfee_sumamt;
+        this.form.total = total
+        this.form.private_price = total
+        this.form.pay_price = total
+        this.form.total = total + this.form.medical_insurance_price
+        this.form.discount_price = 0.0
+        this.form.preferential_price = 0.0
+
+        this.form.fapiao_code =""
+        this.form.fapiao_number = ""
+        this.order = order
+
+        if(this.order && this.order.id > 0){
+          this.form.acct_pay = this.order.acct_pay
+          this.form.psn_pay = this.order.psn_cash_pay
+          this.form.total = this.order.medfee_sumamt
+          this.form.pay_price = this.order.medfee_sumamt
+          this.form.medical_insurance_price = this.order.fund_pay_sumamt
+          this.form.private_price =  this.order.psn_part_amt
         }
+
         this.visibility = true
 
       }, hide: function () {

src/xt_pages/hospitalStation/outpatientChargesManagement.vue

           this.$message.error('请先到医生工作站开处方再来结算')
           return
         }
-
-        this.$refs.charge.show(this.getSettleTotal(),this.order)
+        console.log(this.order)
+        this.$refs.charge.show(this.settle_total,this.order)
 
       } else if (index == 4) {
         if (this.hisPatientInfo.balance_accounts_type == 2) {
       return arr.filter((arr) => !res.has(arr.id_card_no) && res.set(arr.id_card_no, 1))
     },
     handleCurrentChange(val) {
+      console.log(val)
       this.curPrescriptions = {}
       this.curMonthPrescriptions = {}
       this.prescriptions = []

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

           </el-button>
         </div>
         <div>
-          <el-table :data="patientTableData" :height="tableHeight" border style="width: 100%;"
+          <el-table  :data="patientTableData" :height="tableHeight" border style="width: 100%;"
                     :row-style="{ color: '#303133' }"
 
                     :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
               </template>
             </el-table-column>
           </el-table>
+
+<!--          <el-table v-else :data="monthChargePatientTableData" :height="tableHeight" border style="width: 100%;"-->
+<!--                    :row-style="{ color: '#303133' }"-->
+
+<!--                    :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"-->
+<!--                    highlight-current-row ref="tab"-->
+<!--                    @current-change="handleCurrentChange">-->
+<!--            <el-table-column align="center" prop="name" label="姓名" wdith='89'>-->
+<!--              <template slot-scope="scope">{{ scope.row.name }}</template>-->
+<!--            </el-table-column>-->
+<!--            <el-table-column align="center" prop="name" label="就诊号" width="110">-->
+<!--              <template slot-scope="scope">{{ scope.row.number ? scope.row.number : '' }}-->
+<!--              </template>-->
+<!--            </el-table-column>-->
+<!--          </el-table>-->
+
         </div>
       </div>
 
   },
   data() {
     return {
+      monthChargePatientTableData:[],
       invoiceVisible:false,
       invoiceParams:null,
       temp_med_type: '',
         { value: '1112', label: '精二' },
         { value: '9933', label: '门诊特殊病(9933)' },
         { value: '990602', label: '门诊特殊病(990602)' },
-        { value: '1402', label: '门诊特殊病(1402)' }
+        { value: '1402', label: '门诊特殊病(1402)' },
+        { value: '0', label: '自费' }
+
 
       ],
       register_two: [
         { value: '9922', label: '家庭通道' },
         { value: '9933', label: '门诊特殊病(9933)' },
         { value: '990602', label: '门诊特殊病(990602)' },
-        { value: '1402', label: '门诊特殊病(1402)' }
+        { value: '1402', label: '门诊特殊病(1402)' },
+        { value: '0', label: '自费' }
 
       ],
       loading: false,
                   })
 
                 } else {
-                  that.changeRadioAndPatient(2)
                   that.radio = 2
+                  that.changeRadioAndPatient(2)
                   that.$refs.charge.hide()
                   that.loadingtwo = false
                   that.state = '已收费'
                     }).catch(() => {
                     })
                   } else {
+
                     that.changeRadio(1)
                     that.$refs.register9504.hide()
                     that.$message({ message: '挂号成功', type: 'success' })
                   })
 
                 } else {
+                  that.radio = 1
                   that.changeRadioAndPatient(1)
                   that.$message({ message: '挂号成功', type: 'success', duration: 5000 })
                   that.$refs.register.hide()
       if (this.activeName == 'first') {
         this.getPatientList()
       } else if (this.activeName == 'second') {
-
-
-
-
-
-
-
-
-
-
         const params = {
           'record_date': this.record_date,
           'patient_id': this.patientInfo.id,
       this.getPatientList()
     },
     changeRadioAndPatient(id) {
+      this.radio = id
       let params = {
         'record_date': this.record_date
       }
         num = num.substring(0)
       }
       return parseFloat(num).toFixed(decimal)
+    },getMonthChargePatientList(){
+      let params = {
+        'record_date': this.record_date,
+        'start_time':this.other_start_time,
+        'end_time':this.other_end_time,
+      }
+      getChargeHisPatientList(params).then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg)
+          return false
+        } else {
+          this.hisPatientDatas = []
+
+        }
+      })
+
     },
     //患者列表
     getPatientList() {
         case 9922:
           return '家庭通道' + '处方' + index
           break
+        case 0:
+          return '自费' + '处方' + index
+          break
       }
     }, unique_four(array) {
       // res用来存储结果
             this.hisPatientInfo = response.data.data.his_info
             this.info = response.data.data.info
             this.order = response.data.data.order
-            this.p_type = ''
-            this.sick_type = ''
-            this.diagnosis = []
-            this.sick_history = ''
-            this.form.diagnosis = []
-            if (this.info.id > 0) {
-              this.form.p_type = response.data.data.info.register_type
-              this.form.sick_type = response.data.data.info.sick_type
-              if (response.data.data.info.diagnosis.length == 0) {
-                this.form.diagnosis = []
-              } else {
-                for (let i = 0; i < response.data.data.info.diagnosis.split(',').length; i++) {
-                  this.form.diagnosis.push(parseInt(response.data.data.info.diagnosis.split(',')[i]))
-                }
-              }
-              this.sick_history = this.info.sick_history
-              if (this.info.register_type == 0) {
-                this.form.p_type = ''
-              }
-
-              if (this.info.sick_type == 0) {
-                this.form.sick_type = ''
-              }
-            } else {
-              this.form.p_type = 14
-              this.form.sick_type = this.sick[0].id
-              if (response.data.data.last_info.diagnoses.length == 0) {
-                this.form.diagnosis = []
-              } else {
-                for (let i = 0; i < response.data.data.last_info.diagnosis.split(',').length; i++) {
-                  this.form.diagnosis.push(parseInt(response.data.data.last_info.diagnosis.split(',')[i]))
-                }
-              }
-
-              this.sick_history = ''
-            }
             this.addtions_charge = response.data.data.addtions_charge
             this.setMonthPrescription(response.data.data.month_prescriptions)
-
-
-
           }
         })
 

src/xt_pages/outpatientCharges/statementPrint.vue

         >
       </template>
 
-      <div class='dialysisPage' style="padding-top:40px;" v-if="paramsObj.balance_accounts_type != 2">
+      <div class='dialysisPage' style="padding-top:40px;">
         <div v-if="org_id == 9990 || org_id == 10138 || org_id == 9504 || org_id == 10028 || org_id == 0 || org_id == 4 || org_id == 10278">
           <printTwo :info="info" v-if="org_id == 9990"></printTwo>
           <printThree :info="info" :paramsObj="paramsObj" :balanceAccounts="balanceAccounts" v-if="org_id == 10138 || org_id == 0 || org_id == 4 || org_id == 10278"></printThree>
         <printOne :info="info" v-else></printOne>
       </div>
 
-    <div class='dialysisPage' style="padding-top:40px;" v-else>
-      <print-six :info="info" ></print-six>
-    </div>
   </div>
 </template>
 

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

           { value: 1111, label: '精一' },
           { value: 1112, label: '精二' },
           { value: 9922, label: '家庭通道' },
+          { value: 9933, label: '门诊特殊病(9933)' },
+          { value: 990602, label: '门诊特殊病(990602)' },
+          { value: 1402, label: '门诊特殊病(1402)' },
+          { value: 0, label: '自费' }