Merge branch 'master' of http://192.168.1.222:3000/zhoufan/RMYY_CallCenter_UI

CallCenterWeb.UI/RMYY/src/components/workOrder/information/addOrEditInfOrder.vue

@@ -225,8 +225,8 @@
           </el-row>
           <el-row v-if="orderTypeSzData.indexOf(worktypeInfo3) !== -1">
             <el-col v-if="patientMsgAll[currentIndex]" :span="12">
-              <el-form-item label="患者姓名" required>
-                <el-input v-model="patientMsgAll[currentIndex].name" placeholder="请输入患者姓名" />
+              <el-form-item label="患者姓名" prop="patientName">
+                <el-input v-model="patientMsgAll[currentIndex].name" @change="patientNameChange" placeholder="请输入患者姓名" />
               </el-form-item>
             </el-col>
             <el-col v-if="patientMsgAll[currentIndex]" :span="12">
@@ -235,17 +235,17 @@
               </el-form-item>
             </el-col>
             <el-col v-if="patientMsgAll[currentIndex]" :span="12">
-              <el-form-item label="身份证号" required>
+              <el-form-item label="身份证号" prop="patientIdCard">
                 <el-input v-model="patientMsgAll[currentIndex].shenfenzheng" @change="changeIdCard" placeholder="请输入身份证号" />
               </el-form-item>
             </el-col>
             <el-col v-if="patientMsgAll[currentIndex]" :span="12">
-              <el-form-item label="年龄" required>
-                <el-input-number v-model="patientMsgAll[currentIndex].F_nl" :min="1" />
+              <el-form-item label="年龄"  prop="patientNl">
+                <el-input-number v-model="patientMsgAll[currentIndex].F_nl" :min="1"  @change="patientNlChange"/>
               </el-form-item>
             </el-col>
             <el-col v-if="patientMsgAll[currentIndex]" :span="12">
-              <el-form-item label="性别" prop="F_Sex">
+              <el-form-item label="性别">
                 <el-radio-group v-model="patientMsgAll[currentIndex].F_Sex">
                   <el-radio label="0">男</el-radio>
                   <el-radio label="1">女</el-radio>
@@ -265,15 +265,15 @@
           </el-row>
           <el-row v-if="orderTypeSzData.indexOf(worktypeInfo3) !== -1">
             <el-col v-if="patientMsgAll[currentIndex]" :span="12">
-              <el-form-item label="接诊院区" required>
-                <el-select v-model="patientMsgAll[currentIndex].jzyq" placeholder="请选择接诊院区" clearable>
+              <el-form-item label="接诊院区"  prop="patientGzyq">
+                <el-select v-model="patientMsgAll[currentIndex].jzyq" placeholder="请选择接诊院区" @change="patientGzyqChange" clearable>
                   <el-option v-for="(item,index) in hospitalDataLists" :key="index" :value="item.T_Woid"
                     :label="item.T_Woname" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col v-if="patientMsgAll[currentIndex]" :span="12">
-              <el-form-item label="接诊科室" required prop="jzks">
+              <el-form-item label="接诊科室" prop="jzks">
                 <el-input v-model="patientMsgAll[currentIndex].jzks" @change="jzksChange" placeholder="请输入接诊科室" clearable />
               </el-form-item>
             </el-col>
@@ -662,6 +662,34 @@
               trigger: 'blur'
             }
           ],
+          patientGzyq:[
+          {
+              required: true,
+              message: '请选择接诊院区',
+              trigger: 'blur'
+            }
+          ],
+          patientName:[
+          {
+              required: true,
+              message: '请输入患者姓名',
+              trigger: 'blur'
+            }
+          ],
+          patientIdCard:[
+          {
+              required: true,
+              message: '请输入身份证号',
+              trigger: 'blur'
+            }
+          ],
+          patientNl:[
+          {
+              required: true,
+              message: '请输入患者年龄',
+              trigger: 'blur'
+            }
+          ],
           F_hzdh: [
             // {
             //   required: true,
@@ -673,6 +701,10 @@
         F_Type2: '',
         ruleForm: {
           jzks:'',
+          patientName:'',
+          patientIdCard:'',
+          patientNl:'',
+          patientGzyq:'',
           F_CallID: '',
           F_ID: '',
           F_Type1: '', // 工单类别
@@ -975,10 +1007,12 @@
         })
       },
       changeIdCard(e){
-
+        this.ruleForm.patientIdCard = e
         if (e.length === 15 || e.length === 18) {
           this.patientMsgAll[this.currentIndex].F_nl = this.getIdCardAge(e)
           this.patientMsgAll[this.currentIndex].F_Sex = this.getIdCardSex(e)
+          this.ruleForm.patientNl =  this.getIdCardAge(e)
+          this.ruleForm.F_Sex =  this.getIdCardAge(e)
         } else {
           this.$message.error('身份证号位数不正确')
         }
@@ -1053,6 +1087,19 @@
         console.log('jzksChange',e)
         this.ruleForm.jzks = e
       },
+      patientNameChange(e){
+        console.log(e)
+        this.ruleForm.patientName = e
+      },
+      patientIdCardChange(e){
+        this.ruleForm.patientIdCard = e
+      },
+      patientNlChange(e){
+        this.ruleForm.patientNl = e
+      },
+      patientGzyqChange(e){
+        this.ruleForm.patientGzyq = e
+      },
       changePatient(index, data) {
         this.currentIndex = index
       },
@@ -1344,6 +1391,12 @@
                 }];
                 console.log(res)
                 this.ruleForm.jzks = res.F_Jzks
+                this.ruleForm.patientName = res.F_FullName
+                this.ruleForm.patientIdCard = decrypt(res.F_IDNumberShow)
+                this.ruleForm.patientNl = res.F_nl
+                this.ruleForm.patientGzyq = res.F_JzYq
+                
+
                 this.patientMsgAll = [{
                   name: res.F_FullName,
                   tel: res.F_hzdh,
@@ -1757,6 +1810,12 @@
         this.ruleForm.F_FullName = ''
         this.ruleForm.F_IDNumber = ''
         this.ruleForm.F_AppointmentTime = ''
+
+        this.ruleForm.patientName = '' // 处理意见
+        this.ruleForm.patientIdCard = ''
+        this.ruleForm.patientNl = ''
+        this.ruleForm.patientGzyq = ''
+        this.ruleForm.jzks = ''
       },
       // 工单类型切换清空
       resetOrderType() {