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

@@ -1,38 +1,43 @@
 <template>
-  <el-dialog width="854px" title="收费单" :visible.sync="visibility" :close-on-click-modal="isClose"
+  <el-dialog width="854px" title="收费单" class="chargeDialog" :visible.sync="visibility" :close-on-click-modal="isClose"
              :close-on-press-escape="isClose">
 
     <el-form :model="form"  ref="formValue" label-width="100px">
 
-      <el-form-item label="日期：">
+      <el-form-item label="日期：" style="width:100%;">
         <div>{{record_date}}</div>
       </el-form-item>
 
-
-      <el-form-item label="医保：" prop="name" :validate-event="is_Name">
-        <el-input type="number" v-model="form.medical_insurance_price"></el-input>
+      <el-form-item label="总计：" prop="name" :validate-event="is_Name" style="width:33%;">
+        <el-input type="number" v-model="form.total" :disabled="true"></el-input>
+      </el-form-item>
+      <el-form-item label="医保：" prop="name" :validate-event="is_Name" style="width:33%;">
+        <el-input type="number" v-model="form.medical_insurance_price" :disabled="true"></el-input>
       </el-form-item>
 
 
-      <el-form-item label="自费：" prop="age" :validate-event="is_Name">
-        <el-input type="number" v-model="form.private_price"></el-input>
+      <el-form-item label="自费：" prop="age" :validate-event="is_Name" style="width:33%;">
+        <el-input type="number" v-model="form.private_price" :disabled="true"></el-input>
       </el-form-item>
 
 
-      <el-form-item label="支付方式：">
-        <el-select v-model="form.pay_way" placeholder="请选择">
+      <el-form-item label="支付方式：" style="width:100%;">
+        <!-- <el-select v-model="form.pay_way" placeholder="请选择">
           <el-option
             v-for="(item,index) in payWays"
             :key="index"
             :label="item.label"
             :value="item.value">
           </el-option>
-        </el-select>
+        </el-select> -->
+        <el-radio-group v-model="form.pay_way">
+          <el-radio :label="index" v-for="(item,index) in payWays" :key="index">{{ item.label }}</el-radio>
+        </el-radio-group>
       </el-form-item>
 
 
       <el-form-item label="付款金额：" prop="id_card" :validate-event="is_Name">
-        <el-input type="number" v-model="form.pay_price"></el-input>
+        <el-input type="number" v-model="form.pay_price" :disabled="true"></el-input>
       </el-form-item>
 
 
@@ -82,7 +87,7 @@
       return {
         record_date:'',
         form: {
-          medical_insurance_price:'',
+          medical_insurance_price:0,
           private_price:'',
           pay_way:'',
           pay_price:'',
@@ -91,6 +96,7 @@
           preferential_price:'',
           reality_price:'',
           found_price:'',
+          total:0,
 
         },
         payWays: [
@@ -144,6 +150,7 @@
         this.total = total
         this.form.private_price = total
         this.form.pay_price = total
+        this.form.total = total + this.form.medical_insurance_price
 
         this.visibility = true
 
@@ -189,6 +196,14 @@
   }
 </script>
 
-<style scoped>
-
+<style lang="scss" scoped>
+.chargeDialog{
+  .el-form{
+    display: flex;
+    flex-wrap: wrap;
+  }
+  .el-form-item{
+    width:50%;
+  }
+}
 </style>

src/xt_pages/outpatientCharges/components/registerDialog.vue

@@ -1,14 +1,14 @@
 <template>
-  <el-dialog width="854px" :title="titles" :visible.sync="visibility" :close-on-click-modal="isClose"
+  <el-dialog width="854px" class="registerDialog" :title="titles" :visible.sync="visibility" :close-on-click-modal="isClose"
              :close-on-press-escape="isClose">
 
     <el-form :model="form"  :rules="rules"  ref="formValue"  label-width="100px">
       <el-form-item label="患者姓名："  prop="name" :validate-event="is_Name">
-         <el-input  v-model="form.name"></el-input>
+         <el-input  v-model="form.name" :disabled="true"></el-input>
       </el-form-item>
 
       <el-form-item label="性别：" prop="gender" :validate-event="is_Name">
-        <el-select v-model="form.gender" placeholder="请选择">
+        <el-select v-model="form.gender" placeholder="请选择" style="width:100%;">
           <el-option
             v-for="item in sex"
             :key="item.value"
@@ -24,7 +24,7 @@
 
 
       <el-form-item label="出生日期：" prop="birthday" :validate-event="is_Name">
-        <el-date-picker v-model="form.birthday" type="date" @change="getBirthday" placeholder="选择日期"></el-date-picker>
+        <el-date-picker v-model="form.birthday" type="date" @change="getBirthday" placeholder="选择日期" style="width:100%;"></el-date-picker>
       </el-form-item>
 
       <el-form-item label="手机号码：" prop="phone">
@@ -33,7 +33,7 @@
 
 
       <el-form-item label="医疗类别：">
-        <el-select v-model="form.medical_care" placeholder="请选择">
+        <el-select v-model="form.medical_care" placeholder="请选择" style="width:100%;">
           <el-option
             v-for="(item,index) in getDictionaryDataConfig('system','social_type')"
             :key="index"
@@ -45,7 +45,7 @@
 
 
       <el-form-item label="证件类型：">
-        <el-select v-model="form.certificates" placeholder="请选择">
+        <el-select v-model="form.certificates" placeholder="请选择"  style="width:100%;">
           <el-option
             v-for="item in certificates"
             :key="item.value"
@@ -61,7 +61,7 @@
 
 
       <el-form-item label="结算类型：">
-        <el-select v-model="form.settlement_value" placeholder="请选择">
+        <el-select v-model="form.settlement_value" placeholder="请选择" style="width:100%;">
           <el-option
             v-for="item in settlement"
             :key="item.value"
@@ -73,7 +73,7 @@
 
 
       <el-form-item label="社保类型：">
-        <el-select v-model="form.social_type" placeholder="请选择">
+        <el-select v-model="form.social_type" placeholder="请选择" style="width:100%;">
           <el-option
             v-for="item in medicalCare"
             :key="item.value"
@@ -89,7 +89,7 @@
       </el-form-item>
 
       <el-form-item label="挂号类型："  prop="register_type"  :validate-event="is_Name">
-        <el-select v-model="form.register_type"  placeholder="请选择">
+        <el-select v-model="form.register_type"  placeholder="请选择" style="width:100%;">
           <el-option
             v-for="item in register"
             :key="item.value"
@@ -108,7 +108,7 @@
 
     <span slot="footer" class="dialog-footer">
     <el-button  @click="cancel('formValue')">取 消</el-button>
-    <el-button  type="primary" @click="confirm('formValue')">保 存</el-button>
+    <el-button  type="primary" @click="confirm('formValue')">挂 号</el-button>
   </span>
   </el-dialog>
 
@@ -317,6 +317,14 @@
   }
 </script>
 
-<style scoped>
-
+<style lang="scss" scoped>
+.registerDialog{
+  .el-form{
+    display: flex;
+    flex-wrap: wrap;
+  }
+  .el-form-item{
+    width:50%;
+  }
+}
 </style>

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -55,7 +55,7 @@
                      v-if="this.hisPatientInfo && this.hisPatientInfo.id == 0"
                      type="primary">挂号
           </el-button>
-          <el-button v-loading="loadingtwo" v-if="this.info.prescription_status == 1" size="small"
+          <el-button v-loading="loadingtwo" size="small"
                      @click="open(4)"
                      type="primary">收费
           </el-button>
@@ -214,7 +214,7 @@
                        :addtions_charge="addtions_charge"></additionalCharges>
 
     <register-dialog ref='register' v-on:confirm="confirm" v-on:cancel="cancel"></register-dialog>
-  <charge-dialog ref='charge' v-on:confirm="chargeConfirm" v-on:cancel="chargeCancel"></charge-dialog>
+    <charge-dialog ref='charge' v-on:confirm="chargeConfirm" v-on:cancel="chargeCancel"></charge-dialog>
     <el-dialog
       class="centerDialog"
       width="900px"
@@ -352,6 +352,7 @@
             this.$refs.register.hide()
             return false
           } else {
+            this.getPatientList()
             this.$message({message: '挂号成功', type: 'success'})
             this.$refs.register.hide()
             this.loadingone = false
@@ -362,6 +363,7 @@
 
 
       }, cancel() {
+        
         this.$refs.register.hide()
 
 

src/xt_pages/outpatientDoctorStation/components/deskRecord.vue

@@ -50,26 +50,6 @@
       <el-form-item label="家庭住址: " prop="name">
         <el-input v-model="patientInfo.home_address" placeholder="" :disabled="true"></el-input>
       </el-form-item>
-      <el-form-item label="疾病类型: " prop="name">
-        <el-select v-model="case_history.sick" style="width:100%;" placeholder="请选择">
-         <el-option
-                v-for="(item,index) in sick"
-                :key="index"
-                :label="item.class_name"
-                :value="item.id">
-           </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="诊断: " prop="name">
-         <el-select style="width:100%;" v-model="case_history.diagnose" placeholder="">
-              <el-option
-                v-for="(item,index) in diagnoses"
-                :key="index"
-                :label="item.class_name"
-                :value="item.id">
-              </el-option>
-        </el-select>
-      </el-form-item>
       <el-form-item label="过敏史: " prop="name">
         <el-input v-model="patientInfo.home_address" placeholder=""></el-input>
       </el-form-item>
@@ -97,7 +77,26 @@
     </el-form>
     <div class="mainTitle">病历信息：</div>
     <el-form class="recordForm" :model="case_history" ref="form" label-width="80px">
-     
+     <el-form-item label="疾病类型: " prop="name" style="width:49%;">
+        <el-select v-model="case_history.sick" style="width:100%;" placeholder="请选择">
+          <el-option
+            v-for="(item,index) in sick"
+            :key="index"
+            :label="item.class_name"
+            :value="item.id">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="诊断: " prop="name" style="width:49%;">
+        <el-select style="width:100%;" v-model="case_history.diagnose" placeholder="">
+          <el-option
+            v-for="(item,index) in diagnoses"
+            :key="index"
+            :label="item.class_name"
+            :value="item.id">
+          </el-option>
+        </el-select>
+      </el-form-item>
 
       <el-form-item label="发病日期: " prop="name" style="width:49%;">
         <el-date-picker