menzhen

CallCenterWeb.UI/RMYY/src/components/button/orderList.vue

@@ -113,7 +113,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogStatus.dialog_zhipai = false">取 消</el-button>
-        <el-button v-loading.fullscreen.lock="loading" type="primary" @click="submitForm('transferForm')">确 定</el-button>
+        <el-button type="primary" @click="submitForm('transferForm')">确 定</el-button>
       </div>
     </el-dialog>
     <!-- 综合调度指派 -->
@@ -161,7 +161,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogStatus.dialog_zhdd_zhipai = false">取 消</el-button>
-        <el-button v-loading.fullscreen.lock="loading" type="primary" @click="submitForm('zhddtransferForm')">确 定</el-button>
+        <el-button type="primary" @click="submitForm('zhddtransferForm')">确 定</el-button>
       </div>
     </el-dialog>
     <!-- 咨询预约处理 -->
@@ -504,12 +504,6 @@
                 <el-button type="primary" icon="el-icon-close" circle @click="removeItem(index)" />
               </el-form-item>
             </el-col>
-            <!-- <el-col :span="11">
-              <el-form-item prop="num">
-                <el-input style="width: 180px" v-model="item.F_ReceiveUser" placeholder="科室交接人"></el-input>
-                <el-button type="primary" icon="el-icon-close" circle @click="removeItem(index)" />
-              </el-form-item>
-            </el-col> -->
           </el-row>
         </el-row>
         <el-form-item label="科室交接人" v-if="dealWorkForm.isabnormal === '1' && bbtags.indexOf('急查标本') >= 0">
@@ -567,12 +561,6 @@
                 <el-button type="primary" icon="el-icon-close" circle @click="removeItemEdit(index)" />
               </el-form-item>
             </el-col>
-            <!-- <el-col :span="11">
-              <el-form-item prop="num">
-                <el-input style="width: 180px" v-model="item.F_ReceiveUser" placeholder="科室交接人"></el-input>
-                <el-button type="primary" icon="el-icon-close" circle @click="removeItemEdit(index)" />
-              </el-form-item>
-            </el-col> -->
           </el-row>
         </el-row>
         <el-form-item label="科室交接人" v-if="dealEditWorkForm.isabnormal === '1' && bbtags.indexOf('急查标本') >= 0">
@@ -653,7 +641,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogStatus.dialog_ywzx_cuidan = false">取 消</el-button>
-        <el-button v-loading.fullscreen.lock="loading" type="primary" @click="submitForm('cuidanForm')">确 定</el-button>
+        <el-button type="primary" @click="submitForm('cuidanForm')">确 定</el-button>
       </div>
     </el-dialog>
     <el-dialog :visible.sync="dialogStatus.dialog_ywzx_cuidanOL" title="催单">
@@ -665,7 +653,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogStatus.dialog_ywzx_cuidanOL = false">取 消</el-button>
-        <el-button v-loading.fullscreen.lock="loading" type="primary" @click="submitForm('cuidanQLForm')">确 定</el-button>
+        <el-button type="primary" @click="submitForm('cuidanQLForm')">确 定</el-button>
       </div>
     </el-dialog>
     <!-- 完成 -->
@@ -700,7 +688,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogStatus.dialog_dispatch_zhuanpai = false">取 消</el-button>
-        <el-button v-loading.fullscreen.lock="loading" type="primary" @click="submitForm('dispatchtransferForm')">确 定</el-button>
+        <el-button type="primary" @click="submitForm('dispatchtransferForm')">确 定</el-button>
       </div>
     </el-dialog>
     <el-dialog :visible.sync="dialogImgVisible" title="查看图片" width="50%" append-to-body>
@@ -1872,9 +1860,7 @@
         this.imgrepairUrl = url;
       },
       submitForm(formName) {
-        // console.log(this.dispatchhaocaiarrError)
-        // return;
-        this.loading = true //打开loading
+        // this.loading = true //打开loading
         if (formName === "transferForm"){
           this.transferForm.datetime = this.getNowDate()
         }

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

@@ -54,26 +54,18 @@
           <el-row v-if="worktypeInfo3 === 'huizhen'">
             <el-col :span="12">
               <el-form-item label="所属医院" prop="F_Yqname">
-                <el-select placeholder="请选择所属医院" v-model="ruleForm.F_Yqname">
+                <el-select placeholder="请选择所属医院" v-model="ruleForm.F_Yqname" filterable clearable>
                   <el-option v-for="(item,index) in coperDataLists" :key="index" :value="item.F_YqName" :label="item.F_YqName"></el-option>
                 </el-select>
-                <!-- <el-input
-                  v-model="ruleForm.F_Yqname"
-                  placeholder="请输入所属医院"
-                /> -->
               </el-form-item>
             </el-col>
           </el-row>
           <el-row v-if="worktypeInfo3 === 'menzhen'">
             <el-col :span="12">
               <el-form-item label="医联体单位" prop="F_Yqname">
-                <el-select placeholder="请选择医联体单位" v-model="ruleForm.F_Yqname">
+                <el-select placeholder="请选择医联体单位" v-model="ruleForm.F_Yqname" filterable clearable>
                   <el-option v-for="(item,index) in coperDataLists" :key="index" :value="item.F_YqName" :label="item.F_YqName"></el-option>
                 </el-select>
-                <!-- <el-input
-                  v-model="ruleForm.F_Yqname"
-                  placeholder="请输入医联体单位"
-                /> -->
               </el-form-item>
             </el-col>
           </el-row>
@@ -200,7 +192,7 @@
           </el-row>
           <el-row v-if="worktypeInfo3 === 'menzhen'">
             <el-col :span="12" v-if="patientMsgAll[currentIndex]">
-              <el-form-item label="患者姓名">
+              <el-form-item label="患者姓名" required>
                 <el-input
                   v-model="patientMsgAll[currentIndex].name"
                   placeholder="请输入患者姓名"
@@ -208,7 +200,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12" v-if="patientMsgAll[currentIndex]">
-              <el-form-item label="患者电话">
+              <el-form-item label="患者电话" required>
                 <el-input
                   v-model="patientMsgAll[currentIndex].tel"
                   placeholder="请输入患者电话"
@@ -216,7 +208,22 @@
               </el-form-item>
             </el-col>
             <el-col :span="12" v-if="patientMsgAll[currentIndex]">
-              <el-form-item label="接诊院区">
+              <el-form-item label="年龄" required>
+                <el-input-number v-model="patientMsgAll[currentIndex].F_nl" :min="1"></el-input-number>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12" v-if="patientMsgAll[currentIndex]">
+              <el-form-item label="性别" prop="F_Sex">
+                <el-radio-group v-model="patientMsgAll[currentIndex].F_Sex">
+                  <el-radio label="0">男</el-radio>
+                  <el-radio label="1">女</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row v-if="worktypeInfo3 === 'menzhen'">
+            <el-col :span="12" v-if="patientMsgAll[currentIndex]">
+              <el-form-item label="接诊院区" required>
                 <el-select placeholder="请选择接诊院区" clearable v-model="patientMsgAll[currentIndex].jzyq">
                   <el-option v-for="(item,index) in hospitalDataLists" :key="index" :value="item.T_Woid" :label="item.T_Woname"></el-option>
                 </el-select>
@@ -226,28 +233,36 @@
           <el-row v-if="worktypeInfo3 === 'menzhen'">
             <el-col :span="12">
               <el-form-item label="双向转诊单">
-                <el-radio-group v-model="ruleForm.F_sxzzd">
+                <el-radio-group v-model="patientMsgAll[currentIndex].F_sxzzd">
                   <el-radio label="1">有</el-radio>
                   <el-radio label="0">无</el-radio>
                 </el-radio-group>
               </el-form-item>
             </el-col>
+            <el-col :span="12">
+              <el-form-item label="是否已挂号">
+                <el-radio-group v-model="patientMsgAll[currentIndex].F_sfgh">
+                  <el-radio label="0">否</el-radio>
+                  <el-radio label="1">是</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row v-if="worktypeInfo3 === 'menzhen'">
             <el-col :span="12">
               <el-form-item label="来院方式">
-                <el-radio-group v-model="ruleForm.F_lyfs">
+                <el-radio-group v-model="patientMsgAll[currentIndex].F_lyfs">
                   <el-radio label="0">自行</el-radio>
                   <el-radio label="1">派车</el-radio>
                 </el-radio-group>
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row v-if="worktypeInfo3 === 'menzhen' && ruleForm.F_lyfs =='1'">
+          <el-row v-if="worktypeInfo3 === 'menzhen' && patientMsgAll[currentIndex].F_lyfs =='1'">
             <el-col :span="12">
               <el-form-item label="" prop="F_pcdd">
                 <el-input
-                  v-model="ruleForm.F_pcdd"
+                  v-model="patientMsgAll[currentIndex].F_pcdd"
                   placeholder="请输入派车地点"
                 />
               </el-form-item>
@@ -255,17 +270,17 @@
             <el-col :span="12">
               <el-form-item label="" prop="F_sbxq">
                 <el-input
-                  v-model="ruleForm.F_sbxq"
+                  v-model="patientMsgAll[currentIndex].F_sbxq"
                   placeholder="请输入设备需求"
                 />
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row v-if="worktypeInfo3 === 'menzhen' && ruleForm.F_lyfs =='1'">
+          <el-row v-if="worktypeInfo3 === 'menzhen' && patientMsgAll[currentIndex].F_lyfs =='1'">
             <el-col :span="12">
               <el-form-item label="" prop="F_ryxq">
                 <el-input
-                  v-model="ruleForm.F_ryxq"
+                  v-model="patientMsgAll[currentIndex].F_ryxq"
                   placeholder="请输入人员需求"
                 />
               </el-form-item>
@@ -273,20 +288,38 @@
           </el-row>
           <el-row v-if="worktypeInfo3 === 'menzhen'">
             <el-col :span="12">
-              <el-form-item label="就诊时间" prop="F_jzsj">
+              <el-form-item label="就诊时间" prop="F_jzrq">
                 <el-date-picker
                   style="width: 100%;"
-                  v-model="ruleForm.F_jzsj"
-                  type="datetime"
-                  placeholder="请选择就诊时间"
-                  value-format="yyyy-MM-dd HH:mm:ss"
+                  v-model="patientMsgAll[currentIndex].F_jzrq"
+                  type="date"
+                  placeholder="请选择就诊日期"
+                  value-format="yyyy-MM-dd"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-select style="width: 100%;" v-model="patientMsgAll[currentIndex].F_jzsjd" clearable placeholder="请选择时间段">
+                <el-option value="08:00:00" label="上午"></el-option>
+                <el-option value="13:00:00" label="下午"></el-option>
+                <el-option value="17:00:00" label="急诊"></el-option>
+              </el-select>
+            </el-col>
+          </el-row>
+          <el-row v-if="worktypeInfo3 === 'menzhen'" >
+            <el-col :span="24">
+              <el-form-item label="就诊需求" required>
+                <el-input
+                  v-model="patientMsgAll[currentIndex].F_WorkOrderContents"
+                  type="textarea"
+                  placeholder="请详细描述来院患者姓名、就诊科室、症状等信息"
                 />
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row v-if="worktypeInfo3 === 'huizhen' || worktypeInfo3 === 'menzhen'" >
+          <el-row v-if="worktypeInfo3 === 'huizhen'" >
             <el-col :span="24">
-              <el-form-item label="就诊需求" prop="F_WorkOrderContents">
+              <el-form-item label="就诊需求">
                 <el-input
                   v-model="ruleForm.F_WorkOrderContents"
                   type="textarea"
@@ -378,7 +411,7 @@
           </el-row>
           <el-row v-if="worktypeInfo3 !== 'huizhen' && worktypeInfo3 !== 'menzhen'">
             <el-col :span="24">
-              <el-form-item label="工单内容" prop="F_WorkOrderContents">
+              <el-form-item label="工单内容">
                 <el-input
                   v-model="ruleForm.F_WorkOrderContents"
                   type="textarea"
@@ -557,13 +590,25 @@ export default {
       hospitalDataLists:[],
       coperDataLists:[],
       isshowmen:'1',
-      // patientArrData:['患者1'],
       patientMsgAll:[
       {
         name:"",
         tel:"",
-        jzyq:""
+        jzyq:"",
+        F_nl:"",
+        F_Sex:"0",
+        F_sxzzd:'1',
+        F_lyfs:'0',//来院方式
+        F_pcdd:'',
+        F_sbxq:'',
+        F_ryxq:'',
+        F_jzsj:'',//就诊时间
+        F_sfgh:'0',//是否挂号
+        F_jzrq:'',
+        F_jzsjd:'',
+        F_WorkOrderContents:'',
       }],
+      timevalue:'',
       zpdptname: '',
       zppername: '',
       typeid: 1,
@@ -637,20 +682,6 @@ export default {
             trigger: 'blur'
           }
         ],
-        F_ComplaintDept: [
-          {
-            // required: true,
-            // message: '请选择',
-            // trigger: 'change'
-          }
-        ],
-        F_ComplaintUser: [
-          {
-            // required: true,
-            // message: '请选择人员',
-            // trigger: 'change'
-          }
-        ]
       },
       F_Type2: '',
       ruleForm: {
@@ -679,25 +710,24 @@ export default {
         clid: '',
         cont: '',
         EmergencyTypes: '一般',
-        // F_ComplaintSource: 4010,
         F_ComplaintDept: '',
         F_ComplaintUser: '',
         F_WorkOrderContents: '', // 工单内容
         F_DealOpinions: '', // 处理意见
         F_IDNumberShow: '',
         F_CusAddressShow: '',
-        F_Yqname:'',
-        F_hzdh:'',
-        F_nl:'',
+        F_Yqname:'',//合作院区
+        F_hzdh:'',//患者电话
+        F_nl:'',//患者年龄
         F_sfjhz:'0',//是否急会诊
+        F_sqhzks:'',//申请会诊科室
+        F_sqhzsj:'',//申请会诊时间
+        F_sxzzd:'1',//双向转诊单
+        F_lyfs:'0',//来院方式
         F_pcdd:'',
         F_sbxq:'',
         F_ryxq:'',
-        F_sqhzks:'',
-        F_sxzzd:'1',//双向转诊单
-        F_sqhzsj:'',
-        F_jzsj:'',
-        F_lyfs:'0',//来院方式
+        F_jzsj:'',//就诊时间
       },
       relationarr: [],
       worktypeInfo: '',
@@ -783,7 +813,7 @@ export default {
     ])
   },
   created() {
-    // this.callinNum = '1117778'
+    // this.callinNum = '666'
     if (this.callinNum) {
       this.ruleForm.F_Phon = this.callinNum
       this.getOldMsg() // 老患者信息
@@ -806,7 +836,7 @@ export default {
     getCoperyq(){
       const params = {
         pageindex: 1, // 第几页
-        pagesise: 100, // 每页几条信息
+        pagesize: 1000000, // 每页几条信息
       };
       getCooperateList(params).then(res=>{
         this.coperDataLists = res.rows;
@@ -828,7 +858,19 @@ export default {
       this.patientMsgAll.push({
         name:'',
         tel:'',
-        jzyq:''
+        jzyq:'',
+        F_nl:"",
+        F_Sex:"0",
+        F_sxzzd:'1',//双向转诊单
+        F_lyfs:'0',//来院方式
+        F_sfgh:'0',
+        F_pcdd:'',
+        F_sbxq:'',
+        F_ryxq:'',
+        F_jzsj:'',
+        F_jzrq:'',
+        F_jzsjd:'',
+        F_WorkOrderContents:''
       })
       if(this.dynamicTags.length>1){
         this.currentIndex = this.dynamicTags.length-1
@@ -1083,10 +1125,32 @@ export default {
               this.ruleForm.EmergencyTypes = res.F_EmergencyTypes
               // 门会诊开始
               this.currentIndex = 0
+              var sjdstr = ''
+              if(res.jzsjd == '上午'){
+                sjdstr = '08:00:00'
+              }
+              if(res.jzsjd == '下午'){
+                sjdstr = '13:00:00'
+              }
+              if(res.jzsjd == '急诊'){
+                sjdstr = '17:00:00'
+              }
               this.patientMsgAll = [{
                 name: res.F_FullName,
                 tel: res.F_hzdh,
-                jzyq: res.F_JzYq
+                jzyq: res.F_JzYq,
+                F_nl: res.F_nl,
+                F_Sex: res.F_Sex.toString(),
+                F_sxzzd: res.F_sxzzd.toString(),//双向转诊单
+                F_lyfs:res.F_lyfs.toString(),//来院方式
+                F_sfgh:res.F_sfgh.toString(),
+                F_pcdd:res.F_pcdd,
+                F_sbxq:res.F_sbxq,
+                F_ryxq:res.F_ryxq,
+                F_jzsj:res.jzrq + " "+sjdstr,
+                F_jzrq:res.jzrq,
+                F_jzsjd:sjdstr,
+                F_WorkOrderContents:res.F_WorkOrderContents
               }]
               this.ruleForm.F_Yqname = res.F_ssyy
               if(res.F_sxzzd != null){
@@ -1098,7 +1162,12 @@ export default {
               this.ruleForm.F_pcdd = res.F_pcdd
               this.ruleForm.F_sbxq = res.F_sbxq
               this.ruleForm.F_ryxq = res.F_ryxq
-              this.ruleForm.F_jzsj = res.F_jzsj
+              this.ruleForm.F_jzrq = res.jzrq
+              this.ruleForm.F_jzsjd = sjdstr
+              this.ruleForm.F_jzsj = res.jzrq + " "+sjdstr
+              if(res.F_sfgh != null){
+                this.ruleForm.F_sfgh = res.F_sfgh.toString()
+              }
               if(res.F_sfjhz != null){
                 this.ruleForm.F_sfjhz = res.F_sfjhz.toString()
               }
@@ -1159,24 +1228,75 @@ export default {
       // }
       if(this.worktypeInfo3 == 'menzhen'){
         this.ruleForm.F_sfjhz = ''
-        if(this.ruleForm.F_lyfs == '0'){
-          this.ruleForm.F_pcdd = ''
-          this.ruleForm.F_sbxq = ''
-          this.ruleForm.F_ryxq = ''
+        if(this.patientMsgAll[this.currentIndex].F_lyfs == '0'){
+          this.patientMsgAll[this.currentIndex].F_pcdd = ''
+          this.patientMsgAll[this.currentIndex].F_sbxq = ''
+          this.patientMsgAll[this.currentIndex].F_ryxq = ''
         }
-        const indexnum = this.patientMsgAll.findIndex((o) => {
-          return !o.name || !o.tel || !o.jzyq
+        var noindex = 1
+        this.patientMsgAll.forEach((o) => {
+          console.log(o)
+          if(!o.name){
+            noindex = 0
+            this.$message.error('请填入患者姓名')
+            return
+          }
+          if(!o.tel){
+            noindex = 0
+            this.$message.error('请填入患者电话')
+            return
+          }
+          if(!o.F_nl){
+            noindex = 0
+            this.$message.error('请填入年龄')
+            return
+          }
+          if(!o.jzyq){
+            noindex = 0
+            this.$message.error('请选择接诊院区')
+            return
+          }
+          if(o.F_lyfs == '1'){
+            if(!o.F_pcdd){
+              noindex = 0
+              this.$message.error('请填入派车地点')
+              return
+            }
+            if(!o.F_sbxq){
+              noindex = 0
+              this.$message.error('请填入设备需求')
+              return
+            }
+            if(!o.F_ryxq){
+              noindex = 0
+              this.$message.error('请填入人员需求')
+              return
+            }
+          }
+          if(!o.F_WorkOrderContents){
+            noindex = 0
+            this.$message.error('请填入就诊需求')
+            return
+          }
         })
-        if (indexnum >= 0) {
-          this.$message.error('请填入对应患者信息')
+        if(noindex == 0){
           return
         }
+        this.patientMsgAll.findIndex((item)=>{
+          item.F_jzsj = item.F_jzrq + " " + item.F_jzsjd
+          delete item.F_jzrq
+          delete item.F_jzsjd
+        })
       }
       if(this.worktypeInfo3 == 'huizhen'){
         this.ruleForm.F_lyfs = ''
         this.ruleForm.F_sxzzd = ''
         this.patientMsgAll = []
       }
+      if(this.worktypeInfo3 == 'menzhen'){
+        delete this.ruleForm.F_Sex
+        delete this.ruleForm.F_nl
+      }
       await this.clickEye()
       this.$refs.ruleForm.validate((valid) => {
         if (valid) {

CallCenterWeb.UI/RMYY/src/views/orderManage/components/askdetail.vue

@@ -51,19 +51,33 @@
               <tr>
                 <th>联系电话:</th>
                 <td>{{ orderDetailData.F_Phon }}<i style="color: #55aaff;" v-show="orderDetailData.F_Phon&&clickbefore==0" class="el-icon-view" @click="clickEye"></i></td>
-                <th>家庭住址:</th>
-                <td colspan="3">{{ orderDetailData.F_CusAddress || "-" }}</td>
+                <th>患者姓名:</th>
+                <td>{{ orderDetailData.F_FullName || "-" }}</td>
               </tr>
-              <tr>
+              <tr v-show="isMen == false && isHui == false">
                 <th>与患者关系:</th>
                 <td>{{ orderDetailData.F_Relationship || "-" }}</td>
-                <th>患者姓名:</th>
-                <td>{{ orderDetailData.F_FullName || "-" }}</td>
                 <th>身份证号:</th>
                 <td>{{ orderDetailData.F_IDNumber || "-" }}</td>
+                <th>家庭住址:</th>
+                <td>{{ orderDetailData.F_CusAddress || "-" }}</td>
               </tr>
               <!-- 门诊开始 -->
               <tr v-show="isMen">
+                <th>患者电话:</th>
+                <td>{{ orderDetailData.F_hzdh || '-' }}</td>
+                <th>接诊院区:</th>
+                <td>{{ orderDetailData.jzyqname || '-' }}</td>
+                <th>就诊时间:</th>
+                <td>{{ orderDetailData.jzrq || '-'}} {{ orderDetailData.jzsjd }}</td>
+              </tr>
+              <tr v-show="isMen">
+                <th>患者年龄:</th>
+                <td>{{ orderDetailData.F_nl || '-' }}</td>
+                <th>是否已挂号:</th>
+                <td>{{ orderDetailData.F_sfgh == 0?'否':'是' }}</td>
+              </tr>
+              <tr v-show="isMen">
                 <th>医联体单位:</th>
                 <td>{{ orderDetailData.F_ssyy || '-' }}</td>
                 <th>双向转诊单:</th>
@@ -79,10 +93,6 @@
                 <th>人员需求:</th>
                 <td>{{ orderDetailData.F_ryxq || '-' }}</td>
               </tr>
-              <tr v-show="isMen">
-                <th>就诊时间:</th>
-                <td colspan="5">{{ orderDetailData.F_jzsj || '-' }}</td>
-              </tr>
               <!-- 门诊结束 -->
               <!-- 会诊开始 -->
               <tr v-show="isHui">
@@ -374,6 +384,10 @@ export default {
       type: String,
       default: "",
     },
+    listtype: {
+      type: String,
+      default: "",
+    },
   },
   data() {
     return {
@@ -460,6 +474,7 @@ export default {
     clickEye(){
       this.orderDetailData.F_Phon = decrypt(this.orderDetailData.F_PhonShow)
       this.orderDetailData.F_IDNumber = decrypt(this.orderDetailData.F_IDNumberShow)
+      this.orderDetailData.F_CusAddress = decrypt(this.orderDetailData.F_CusAddressShow)
       this.clickbefore = 1
       // const params = {
       //   workordercode:this.orderDetailData.F_WorkOrderCode,
@@ -498,6 +513,7 @@ export default {
       const params = {
         WorkOrderCode: this.rowid,
         type: num,
+        listtype: this.listtype
       };
       GetOrderDetail(params).then((response) => {
         if (num === "1") {

CallCenterWeb.UI/RMYY/src/views/orderManage/mySubmit/index.vue

@@ -565,6 +565,7 @@ export default {
             parent: this,
             data: {
               rowid: row.F_WoCode,
+              listtype: '1'
             }, // props
           },
           area: ["80%", "90%"],

CallCenterWeb.UI/RMYY/src/views/orderManage/orderList/index.vue

@@ -530,6 +530,7 @@
               parent: this,
               data: {
                 rowid: row.F_WoCode,
+                listtype: '0'
               }, // props
             },
             area: ["80%", "90%"],

CallCenterWeb.UI/RMYY/src/views/systemSetup/roleSetting/hospitalCooperate/index.vue

@@ -157,7 +157,7 @@ export default {
           linkman: this.linkman,
           tel: this.tel,
           page: this.pageParams.pageindex, // 第几页
-          pagesise: this.pageParams.pagesize, // 每页几条信息
+          pagesize: this.pageParams.pagesize, // 每页几条信息
         };
         getCooperateList(params)
           .then((response) => {

CallCenterWeb.UI/RMYYAPP/pages/myTask/consultList/consultDetail/consultDetail.vue

@@ -34,23 +34,26 @@
 					class="contentText">{{ detailContentData.F_Sex | sexFilters }}</text>
 			</view>
 			<view class="contentTable">
-				<text class="contentTitle">来<span class="place"></span>源：</text>
-				<text
-					class="contentText">{{ detailContentData.F_Source }}</text>
-			</view>
-			<view class="contentTable">
 				<text class="contentTitle">联系电话：</text>
 				<text class="contentText"  style="margin-top: -5px;">{{ detailContentData.F_Phon  }}<uni-icons v-show="detailContentData.F_Phon&&clickbefore==0" class="frContentText" type="eye" size="30" @click="clickEye"></uni-icons> <uni-icons @click="callHandle" class="frContentText" type="phone" size="30"></uni-icons></text>
 			</view>
-			<view class="contentTable">
+			<view class="contentTable" v-show="identification != 'menzhen' && identification != 'huizhen'">
 				<text class="contentTitle">身份证号：</text>
 				<text
 					class="contentText">{{ detailContentData.F_IDNumber }}</text>
 			</view>
-			<view class="contentTable">
+			<view class="contentTable" v-show="identification != 'menzhen' && identification != 'huizhen'">
 				<text class="contentTitle">家庭住址：</text>
 				<text class="contentText">{{ detailContentData.F_CusAddress }}</text>
 			</view>
+			<view class="contentTable" v-show="identification != 'menzhen' && identification != 'huizhen'">
+				<text class="contentTitle">与患者关系：</text>
+				<text class="contentText">{{ detailContentData.F_Relationship }}</text>
+			</view>
+			<view class="contentTable">
+				<text class="contentTitle">患者姓名：</text>
+				<text class="contentText">{{ detailContentData.F_FullName }}</text>
+			</view>
 			<view class="contentTable">
 				<text class="contentTitle">接单时间：</text>
 				<text class="contentText">{{ detailContentData.F_AcceptTime }}</text>
@@ -66,6 +69,18 @@
 			<!-- 门诊开始 -->
 			<view v-show="identification == 'menzhen'">
 				<view class="contentTable">
+					<text class="contentTitle">患者电话：</text>
+					<text class="contentText">{{ detailContentData.F_hzdh }}</text>
+				</view>
+				<view class="contentTable">
+					<text class="contentTitle">患者年龄：</text>
+					<text class="contentText">{{ detailContentData.F_nl }}</text>
+				</view>
+				<view class="contentTable">
+					<text class="contentTitle">接诊院区：</text>
+					<text class="contentText">{{ detailContentData.jzyqname }}</text>
+				</view>
+				<view class="contentTable">
 					<text class="contentTitle">医联体单位：</text>
 					<text class="contentText">{{ detailContentData.F_ssyy }}</text>
 				</view>
@@ -74,6 +89,10 @@
 					<text class="contentText">{{ detailContentData.F_sxzzd == 0?'无':'有' }}</text>
 				</view>
 				<view class="contentTable">
+					<text class="contentTitle">是否已挂号：</text>
+					<text class="contentText">{{ detailContentData.F_sfgh == 0?'否':'是' }}</text>
+				</view>
+				<view class="contentTable">
 					<text class="contentTitle">来院方式：</text>
 					<text class="contentText">{{ detailContentData.F_lyfs == 0?'自行':'派车' }}</text>
 				</view>
@@ -91,7 +110,7 @@
 				</view>
 				<view class="contentTable">
 					<text class="contentTitle">就诊时间：</text>
-					<text class="contentText">{{ detailContentData.F_jzsj }}</text>
+					<text class="contentText">{{ detailContentData.jzrq }} {{ detailContentData.jzsjd }}</text>
 				</view>
 			</view>		
 			<!-- 门诊结束 -->
@@ -265,6 +284,7 @@
 	import buttonsComponents from "pages/myTask/workOrderDetail/button/button"
 	import pageData from "@/pages/myTask/repairList/addRepair/pageData.js"
 	import uniSteps from "@/pages/components/steps/index.vue"
+	import { encrypt,decrypt } from "@/utils/secretKey"
 	const segmenterData = {
 		0: ["处理结果", "工单流程","就诊记录"]
 	}
@@ -356,14 +376,18 @@
 		},
 		methods: {
 			clickEye(){
-				const params = {
-				  workordercode:this.detailContentData.F_WorkOrderCode,
-				  type:1000
-				}
-				this.$http.get("WorkCommon/GetApplicantPhone",params).then((res)=>{
-					this.detailContentData.F_Phon = res
-					this.clickbefore = 1
-				})
+				this.detailContentData.F_Phon = decrypt(this.detailContentData.F_PhonShow)
+				this.detailContentData.F_IDNumber = decrypt(this.detailContentData.F_IDNumberShow)
+				this.detailContentData.F_CusAddress = decrypt(this.detailContentData.F_CusAddressShow)
+				this.clickbefore = 1
+				// const params = {
+				//   workordercode:this.detailContentData.F_WorkOrderCode,
+				//   type:1000
+				// }
+				// this.$http.get("WorkCommon/GetApplicantPhone",params).then((res)=>{
+				// 	this.detailContentData.F_Phon = res
+				// 	this.clickbefore = 1
+				// })
 			},
 			callHandle(e){
 				if(!this.detailContentData.F_Phon) {
@@ -371,7 +395,7 @@
 					return
 				}
 				uni.makePhoneCall({
-					phoneNumber:this.detailContentData.F_Phon //仅为示例
+					phoneNumber: decrypt(this.detailContentData.F_PhonShow) //仅为示例
 				})
 			},
 			getButtons() {
@@ -425,7 +449,8 @@
 				this.orderProcessDate = []
 				const params = {
 					WorkOrderCode: this.workorderid,
-					type: type
+					type: type,
+					listtype: '1'
 				}
 				this.$http.get("Con_WorkOrder/GetWorkOrder", params).then((response) => {
 					if (response.state.toLowerCase() === "success") {

CallCenterWeb.UI/rmyyechartsNew/src/components/IVRSatisfactionByNow.vue

@@ -7,9 +7,9 @@
 		</div>
 		<div id="IVRSatisfactionByNow" style="width: 100%;height: 440px;padding: 20px 20px 0 30px;">
 			<el-col :span="6" class="bgbox" v-for="item in dataname">			
-			<!-- <div class="bgboxname" v-if="item.F_name.length<=5">{{ item.F_name }}</div>
-			<div class="bgboxname" v-if="item.F_name.length>5">{{ item.F_name.slice(0,4) }}...</div> -->
-			<div class="bgboxname"><div>{{ item.F_name }}</div></div>
+			<div class="bgboxname" v-if="item.F_name.length<=5">{{ item.F_name }}</div>
+			<div class="bgboxname" v-if="item.F_name.length>5">{{ item.F_name.slice(0,4) }}...</div>
+			<!-- <div class="bgboxname"><div>{{ item.F_name }}</div></div> -->
 			<div class="bgboxcon">{{ item.keycount }}</div>
 			</el-col>
 		</div>

CallCenterWeb.UI/rmyyechartsNew/src/utils/request.js

@@ -9,9 +9,9 @@ axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
 const service = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
 //   baseURL: process.env.VUE_APP_BASE_API,
-    baseURL:'http://39.164.159.192:8000/',//测试
+    // baseURL:'http://39.164.159.192:8000/',//测试
 	// baseURL:'https://zyfb.zzrmyy.com/',//本地正式
-	// baseURL:'http://172.16.10.22:8000/',//大屏发布正式
+	baseURL:'http://172.16.10.22:8000/',//大屏发布正式
   // 超时
   timeout: 10000
 })