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/registerDialog9504.vue

           medical_insurance_card: '',
           name: '',
           gender: '',
-          certificates: 1,
+          certificates: '',
           p_type:'',
           sick_type:'',
           diagnosis:'',
           id_card: '',
           register: '',
           doctor: '',
-          id_card_type: 1,
+          id_card_type: '',
           department: '',
           registration_fee: '',
           medical_expenses: '',
         if (value != 4){
           this.form.registration_fee = 10
           this.form.medical_expenses = 0
+        }else{
+          this.form.registration_fee = 0
+          this.form.medical_expenses = 0
         }
       },
       handleSelect(val) {
         // this.form.birthday = patientInfo.birthday
         // this.form.id_card = patientInfo.id_card_no
         // this.form.social_type = patientInfo.health_care_type
-        // this.form.id_card_type = 1
+        this.form.id_card_type = 1
+        this.form.certificates = 1
+
         // if( this.form.social_type == 0){
         //   this.form.social_type = ""
         //

src/xt_pages/outpatientRegistration/index.vue

         <div class="position">
             <bread-crumb :crumbs='crumbs'></bread-crumb>
         </div>
-        <div v-if="this.$store.getters.xt_user.org_id == 9504" class="app-container">
+        <div v-if="this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 0" class="app-container">
             <div class="nameTitle">患者基本信息:</div>
             <div class="formMain">
                 <el-form class="basicForm" :model="form" :rules="rules2" ref="form" label-width="100px">
                     <el-form-item class="specialFormItem" label="医保卡号：">
                         <div style="display:flex;">
                             <el-input v-model="form.medicalInsuranceCard"></el-input>
-                            <el-button style="margin-left:10px;" type="primary" @click="reading">读卡</el-button>
+                            <el-button style="margin-left:10px;" type="primary" @click="readingSZ">读卡</el-button>
                         </div>
                     </el-form-item>
 
             </div>
             <div class="nameTitle">患者挂号信息:</div>
             <div class="formMain">
-                <el-form class="basicForm" :model="form" :rules="rules" ref="form" label-width="100px">
-                    <el-form-item label="挂号类型：" prop="register" :validate-event="is_Name">
-                        <el-select v-model="form.register" placeholder="请选择">
+                <el-form class="basicForm" :model="form" :rules="rules2" ref="form" label-width="100px">
+                    <el-form-item label="挂号类型：" prop="register" :validate-event="is_Name" >
+                        <el-select v-model="form.register" placeholder="请选择" @change="changeReg">
                             <el-option
-                                    v-for="item in register"
+                                    v-for="item in his_registers"
                                     :key="item.value"
                                     :label="item.label"
                                     :value="item.value">
                         </el-select>
                     </el-form-item>
 
-
-
-                    <el-form-item label="医疗类别：">
+                    <el-form-item label="医疗类别：" :validate-event="is_Name"  prop="medicalCare" >
                         <el-select v-model="form.medicalCare" placeholder="请选择">
                             <el-option
                                     v-for="(item,index) in medical_care"
                     </el-form-item>
 
                     <el-form-item label="挂号费：">
-                        <el-input v-model.number="form.registrationFee"></el-input>
+                        <el-input v-model="form.registrationFee" readonly></el-input>
                     </el-form-item>
                     <el-form-item label="诊疗费：">
-                        <el-input v-model.number="form.medicalExpenses"></el-input>
+                        <el-input v-model="form.medicalExpenses" readonly></el-input>
                     </el-form-item>
                     <el-form-item label="合计：">
                         <el-input v-model.number="total" readonly></el-input>
                     <el-form-item label="挂号类型：" prop="register" :validate-event="is_Name">
                         <el-select v-model="form.register" placeholder="请选择">
                             <el-option
-                                    v-for="item in register"
+                                    v-for="item in his_registers"
                                     :key="item.value"
                                     :label="item.label"
                                     :value="item.value">
             value: 7,
             label: '生育保险'
           }],
-        register: [{
+        his_registers: [{
           value: 1,
           label: '普通'
         }, {
           birthday: [{ required: true, message: '患者出生日期不能为空', trigger: 'blur' }],
           certificates: [{ required: true, message: '证件类型不能为空', trigger: 'change' }],
           id_card_type: [{ required: true, message: '读卡类型不能为空', trigger: 'change' }],
+          medicalCare: [{ required: true, message: '医疗类别不能为空', trigger: 'change' }],
 
 
         },
       }
     },
     methods: {
+      changeReg(){
+        console.log(this.form.register)
+        if(this.form.register != 4){
+          this.form.registrationFee = 10
+        }else{
+          this.form.registrationFee = 0
+
+        }
+      },
       handleSelect(val) {
         this.form.id = val.id
         this.form.name = val.name
             cb([])
           }
         })
+      }, readingSZ() {
+        var that = this
+        if (this.form.id_card_type.length == 0 || this.form.id_card_type == 0) {
+          this.$message.error("请先选择读卡类型")
+          return
+        }
+        let params = {
+          'id_card_type': this.form.id_card_type,
+
+        }
+        axios.get('http://127.0.0.1:9532/sz/api/readcard', {
+          params: params
+        })
+          .then(function (response) {
+            if (response.data.state == 0) {
+              that.$message.error(response.data.msg)
+              return false
+            } else {
+              var patient = response.data.data.patient
+              if (that.form.id_card_type == 1) {
+                that.form.id = patient.id
+                that.form.name = patient.name
+                that.form.sex = patient.gender
+                that.form.age = patient.age
+                that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}')
+                that.form.phone = patient.phone
+                that.form.id_card = patient.id_card_no
+                that.form.medicalInsuranceCard = response.data.data.health_card_no
+              } else if (that.form.id_card_type == 2) {
+                this.form.id = patient.id
+                that.form.name = patient.name
+                that.form.sex = patient.gender
+                that.form.age = patient.age
+                that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}')
+                that.form.phone = patient.phone
+                that.form.id_card = patient.id_card_no
+              }
+              that.$message({message: '读卡成功', type: 'success'})
+
+            }
+          })
+          .catch(function (error) {
+
+          });
+
       },
+
       reading(medicalInsuranceCard) {
         var that = this
         if (this.form.id_card_type.length == 0 || this.form.id_card_type == 0) {
           return
         }
 
-        if (this.form.doctor == '') {
-          this.$message.error('医生不能为空')
-          this.is_Name = true
-          return
-        }
+        // if (this.form.doctor == '') {
+        //   this.$message.error('医生不能为空')
+        //   this.is_Name = true
+        //   return
+        // }
 
         if (this.form.department == '') {
           this.$message.error('科室不能为空')
           return
         }
 
-        if (this.form.p_type == '') {
-          this.$message.error('处方类型不能为空')
-          this.is_Name = true
-          return
-        }
+        // if (this.form.p_type == '') {
+        //   this.$message.error('处方类型不能为空')
+        //   this.is_Name = true
+        //   return
+        // }
 
         this.$refs[formName].validate((valid) => {
           if (valid) {
               params['admin_user_id'] = this.$store.getters.xt_user.user.id
             this.loadingone = true
 
-            if (this.$store.getters.xt_user.org_id == 9504) {
+            if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 0) {
               var that = this
               axios.get('http://127.0.0.1:9532/sz/api/register/get', {
                 params: params

src/xt_pages/outpatientRegistration/registrationHistory.vue

         <div class="position">
             <bread-crumb :crumbs='crumbs'></bread-crumb>
         </div>
-        <div class="app-container">
+        <div v-if="this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 0" class="app-container">
+            <div class="cell clearfix">
+                <!-- <el-input style="width: 180px;" v-model.trim="search_input" class="filter-item"/> -->
+                <el-autocomplete
+                        style="margin:16px 5px"
+                        popper-class="my-autocomplete"
+                        v-model.trim="search_input"
+                        :fetch-suggestions="querySearchAsync"
+                        :trigger-on-focus="false"
+                        placeholder="病人名字或者透析号"
+                        @select="handleSelect"
+                >
+                    <i class="el-icon-search el-input__icon" slot="suffix"> </i>
+                    <template slot-scope="{ item }">
+                        <div class="name">{{ item.name }}</div>
+                    </template>
+                </el-autocomplete>
+                <el-button style="margin-right:10px;" class="filter-item" type="primary" icon="el-icon-search" @click="searchAction">搜索</el-button>
+                <!-- <el-date-picker
+                v-model="value1"
+                @change="changeTime"
+                style="margin-right:10px;"
+                type="daterange"
+                range-separator="-"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期">
+                </el-date-picker> -->
+                <el-date-picker type="datetime" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
+                                placeholder="选择时间" v-model="start_time" style="width:200px"
+                                @change="changeStart"
+                >
+                </el-date-picker> -
+                <el-date-picker type="datetime" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
+                                placeholder="选择时间" v-model="end_time" style="width:200px"
+                                @change="changeEnd"
+                >
+                </el-date-picker>
+                <label class="title"><span class="name">挂号类型</span> : </label>
+                <el-select v-model="register_type" placeholder="请选择" style="width:150px;" @change="changeRegister">
+                    <el-option
+                            v-for="item in register"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                    </el-option>
+                </el-select>
+            </div>
+            <el-table :data="tableData" border style="width: 100%;" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
+                <el-table-column align="center" type="index" label="序号" width="60">
+                </el-table-column>
+                <el-table-column align="center" prop="name" label="时间" width="100">
+                    <template slot-scope="scope">{{getTime(scope.row.ctime,"{y}-{m}-{d} {h}:{i}:{s}")}}</template>
+                </el-table-column>
+                <el-table-column align="center" prop="dialysis_no" label="姓名" width="80">
+                    <template slot-scope="scope">{{scope.row.name }}</template>
+                </el-table-column>
+                <el-table-column align="center" prop="name" label="科室" width="80">
+                    <template slot-scope="scope">{{getDepartMent(scope.row.departments)}}</template>
+                </el-table-column>
+                <el-table-column align="center" prop="name" label="挂号类型" width="90">
+                    <template slot-scope="scope">
+                        <span v-if="scope.row.register_type == 1">普通</span>
+                        <span v-if="scope.row.register_type == 2">主治</span>
+                        <span v-if="scope.row.register_type == 3">主任</span>
+                        <span v-if="scope.row.register_type == 4">免收诊金</span>
+                        <span v-if="scope.row.register_type == 5">专家</span>
+                    </template>
+                </el-table-column>
+                <el-table-column align="center" prop="name" label="就诊号" width="80">
+                    <template slot-scope="scope">
+                        {{scope.row.number}}
+                    </template>
+                </el-table-column>
+                <el-table-column align="center" prop="name" label="证件号" width='180'>
+                    <template slot-scope="scope">{{ scope.row.id_card_no }}</template>
+                </el-table-column>
+                <el-table-column align="center" label="社保类型">
+                    <template slot-scope="scope">{{getMedicalTreatment(scope.row.social_type)}}</template>
+                </el-table-column>
+                <el-table-column align="center" prop="name" label="医生" width="80">
+                    <template slot-scope="scope">{{getDoctor(scope.row.doctor) }}</template>
+                </el-table-column>
+                <el-table-column align="center" prop="name" label="挂号费" width="70">
+                    <template slot-scope="scope">{{ scope.row.register_cost }}</template>
+                </el-table-column>
+                <el-table-column align="center" prop="name" label="诊疗费" width="70">
+                    <template slot-scope="scope">{{ scope.row.treatment_cost }}</template>
+                </el-table-column>
+                <el-table-column align="center" prop="name" label="工本费" width="70">
+                    <template slot-scope="scope">{{ scope.row.cost_of_production }}</template>
+                </el-table-column>
+                <el-table-column align="center" prop="name" label="结算类型" width="70">
+                    <template slot-scope="scope">{{getBanlance(scope.row.balance_accounts_type) }}</template>
+                </el-table-column>
+                <el-table-column align="center" prop="name" label="操作人" width="70">
+                    <template slot-scope="scope">{{creator}}</template>
+                </el-table-column>
+                <el-table-column align="center" prop="name" label="操作" width="180">
+                    <template slot-scope="scope">
+                        <!--<el-button size="mini" type="primary" v-if=" scope.row.record_date < startUnix" :disabled="true">已过号</el-button>-->
+                        <el-button size="mini" type="primary"  v-if="scope.row.status == 1" @click ="toReturnSZPatient(scope.row)">退号</el-button>
+                        <el-button size="mini" type="primary"  :disabled="true" v-if="scope.row.status == 0" >已退号</el-button>
+
+                        <!--<el-button size="mini" type="primary" v-if="scope.row.record_date == startUnix && scope.row.is_return == 2" :disabled="true">已退号</el-button>-->
+                        <!--<el-button size="mini" type="primary" v-if="scope.row.record_date == startUnix && scope.row.is_return == 3" :disabled="true">已就诊</el-button>-->
+                        <!--<el-button size="mini" type="primary" @click="open(scope.row)">详情</el-button>-->
+                    </template>
+                </el-table-column>
+            </el-table>
+
+            <el-pagination
+                    @size-change="handleSizeChange"
+                    @current-change="handleCurrentChange"
+                    :page-sizes="[10, 50, 100]"
+                    :page-size="10"
+                    background
+                    style="margin-top:20px;float: right"
+                    layout="total, sizes, prev, pager, next, jumper"
+                    :total="total"
+            >
+            </el-pagination>
+            <el-dialog
+                    title="挂号历史详情"
+                    :visible.sync="dialogVisible"
+                    width="1100px"
+                    :before-close="handleClose">
+                <div>
+                    <div class="formMain">
+                        <el-form class="basicForm" :model="form"  ref="form"  label-width="130px">
+                            <el-form-item label="患者姓名："  prop="name">
+                                <div>{{ form.name }}</div>
+                            </el-form-item>
+
+                            <el-form-item label="性别：" prop="gender">
+                                <div v-if="form.gender == 1">男</div>
+                                <div v-if="form.gender == 2">女</div>
+                            </el-form-item>
+
+                            <el-form-item label="年龄：" prop="age">
+                                <div>{{ form.age }}</div>
+                            </el-form-item>
+
+
+                            <el-form-item label="出生日期：" prop="birthday">
+                                <div>{{ getTime(form.birthday,"{y}-{m}-{d}") }}</div>
+                            </el-form-item>
+
+                            <el-form-item label="手机号码：" prop="phone">
+                                <div>{{ form.phone }}</div>
+                            </el-form-item>
+
+
+                            <el-form-item label="医疗类别：">
+                                <div>{{ getDictionaryDataConfig(form.medical_treatment_type) }}</div>
+                            </el-form-item>
+
+
+                            <el-form-item label="证件类型：">
+                                <div>{{ getCertificates(form.id_type) }}</div>
+                            </el-form-item>
+
+                            <el-form-item label="证件号码：" prop="idCard">
+                                {{ form.id_card_no }}
+                            </el-form-item>
+
+
+                            <el-form-item label="结算类型：">
+                                {{ getSettlement(form.balance_accounts_type) }}
+                            </el-form-item>
+
+
+                            <el-form-item label="社保类型：">
+                                <div>{{ getMedicalCare(form.social_type) }}</div>
+                            </el-form-item>
+                            <el-form-item class="specialFormItem" style="width:66.5%;" label="医保卡号：">
+                                <div>{{ form.medical_insurance_number }}</div>
+                            </el-form-item>
+                            <el-form-item label="挂号类型："  prop="register"  :validate-event="is_Name">
+                                <div>{{ getRegister(form.register_type) }}</div>
+                            </el-form-item>
+                            <el-form-item label="医生："  prop="doctor" :validate-event="is_Name" >
+                                <div>{{ getDoctor(form.doctor) }}</div>
+                            </el-form-item>
+                            <el-form-item label="科室："  prop="department" :validate-event="is_Name">
+                                <div>{{ getDepartMent(form.departments) }}</div>
+                            </el-form-item>
+                            <!-- <el-form-item label="是否需要工本费：">
+                              <div v-if="form.is_need_cost_of_production == 1">是</div>
+                              <div v-else>否</div>
+                            </el-form-item> -->
+
+                            <el-form-item label="挂号费：">
+                                <div>{{ form.register_cost }}</div>
+                            </el-form-item>
+                            <el-form-item label="诊疗费：">
+                                <div>{{ form.treatment_cost }}</div>
+                            </el-form-item>
+                            <el-form-item label="工本费：">
+                                <div>{{ form.cost_of_production }}</div>
+                            </el-form-item>
+                            <el-form-item label="合计：">
+                                <div>{{ form.total }}</div>
+                            </el-form-item>
+                            <el-form-item>
+                                <!-- <el-input v-model="form.name"></el-input> -->
+                            </el-form-item>
+                        </el-form>
+                    </div>
+                </div>
+                <span slot="footer" class="dialog-footer">
+                <el-button @click="dialogVisible = false">取 消</el-button>
+                <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+              </span>
+            </el-dialog>
+        </div>
+
+        <div v-else class="app-container">
             <div class="cell clearfix">
                 <!-- <el-input style="width: 180px;" v-model.trim="search_input" class="filter-item"/> -->
                 <el-autocomplete
 import { getHisPatientHistory,changePatient,getHisPatient } from "@/api/project/project"
 import { uParseTime } from "@/utils/tools";
 import { getDictionaryDataConfig } from '@/utils/data'
+import axios from 'axios'
 
 export default {
     components:{
                 return uParseTime(value, temp);
             }
             return "";
-        },
-        toReturnPatient(id){
+        },  toReturnSZPatient(val){
+        var that = this
+        this.$confirm('是否退号', '退号', {
+          confirmButtonText: '确 定',
+          cancelButtonText: '取 消',
+          type: 'warning'
+        }).then(() => {
+          axios.get('http://127.0.0.1:9532/sz/api/refundnumber/get', {
+            params: {
+              order_id: 0,
+              record_time: this.getTime(val.record_date,"{y}-{m}-{d}"),
+              admin_user_id: this.$store.getters.xt_user.user.id,
+              patient_id: val.patient_id
+            }
+          })
+            .then(function(response) {
+              if (response.data.state == 0) {
+                that.$message.error(response.data.msg)
+                return false
+              } else {
+                if (response.data.data.failed_code == -10) {
+                  that.$message.error(response.data.data.msg)
+
+                } else {
+                  this.getlist()
+                  that.$message({ message: '退号成功', type: 'success' })
+                }
+              }
+            })
+            .catch(function(error) {
+            })
+        }).catch(() => {
+        })
+      },
+
+      toReturnPatient(id){
           this.$confirm("确认退号吗?", "退号", {
           confirmButtonText: "确 定",
           cancelButtonText: "取 消",