Merge remote-tracking branch 'origin/dev-20210702' into dev-20210702

src/views/IM/diagnosis-admin/diagnosis-editor.vue

@@ -75,13 +75,13 @@
                 </el-form-item>
                 
                 <!-- 新增 -->
-                <el-form-item label="分诊人员" v-if="formData.triageOperatorName">
+                <el-form-item label="分诊人员">
                     <el-input v-model="formData.triageOperatorName" placeholder="" disabled class="set-width"></el-input>
                 </el-form-item>
-                <el-form-item label="接诊人员" v-if="formData.receptionOperatorName">
+                <el-form-item label="接诊人员">
                     <el-input v-model="formData.receptionOperatorName" placeholder="" disabled class="set-width"></el-input>
                 </el-form-item>
-                <el-form-item label="助诊意向时间" v-if="formData.assistantBeginTime || formData.assistantEndTime" prop="appointBeginTime" >
+                <el-form-item label="助诊意向时间" prop="appointBeginTime" >
                     <el-date-picker
                         :disabled="true"
                         type="datetime"
@@ -104,19 +104,19 @@
                     >
                     </el-date-picker>
                 </el-form-item>
-                <el-form-item label="备注（助诊）" v-if="formData.assistantRemark" >
+                <el-form-item label="备注（助诊）" >
                     <span>{{formData.assistantRemark}}</span>
                 </el-form-item>
-                <el-form-item label="分诊科室" v-if="formData.triageDepartment">
+                <el-form-item label="分诊科室">
                     <!-- 由于不可编辑，只展示，故前端option获取接口省略，由前端写死 -->
                     <el-select v-model="formData.triageDepartmentId" placeholder="请选择状态" disabled class="set-width">
                         <el-option v-for="item of [{ value: formData.triageDepartmentId, label: formData.triageDepartment }]" :key="item.value" :label="item.label" :value="item.value"></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="备注（分诊）" v-if="formData.triageRemark" >
+                <el-form-item label="备注（分诊）" >
                     <span>{{ formData.triageRemark }}</span>
                 </el-form-item>
-                <el-form-item label="接诊意向时间" v-if="formData.receptionBeginTime || formData.receptionEndTime" prop="appointBeginTime" >
+                <el-form-item label="接诊意向时间" prop="appointBeginTime" >
                     <el-date-picker
                         :disabled="true"
                         type="datetime"
@@ -292,22 +292,22 @@
                 
                 <br/>
                 <h1 v-if="showSettlement">结算信息</h1>
-                <el-form-item label="接诊服务费" v-if="formData.receptionServiceFeeStr" prop="receptionServiceFeeStr">
-                    ￥{{formData.receptionServiceFeeStr}}
+                <el-form-item label="接诊服务费"  prop="receptionServiceFeeStr">
+                   {{formData.receptionServiceFeeStr ? `￥ ${formData.receptionServiceFeeStr}` : ''}}
                 </el-form-item>
-                <el-form-item label="接诊付款方式" v-if="formData.receptionPayType" prop="receptionPayType">
+                <el-form-item label="接诊付款方式"  prop="receptionPayType">
                     {{getReceptionPayType}}
                 </el-form-item>
-                <el-form-item label="接诊付款时间" v-if="formData.receptionSettleTime" prop="receptionSettleTime">
+                <el-form-item label="接诊付款时间"  prop="receptionSettleTime">
                     {{formData.receptionSettleTime}}
                 </el-form-item>
-                <el-form-item label="助诊服务费" v-if="formData.assistantServiceFeeStr" prop="assistantServiceFeeStr">
-                    ￥{{ formData.assistantServiceFeeStr }}
+                <el-form-item label="助诊服务费"  prop="assistantServiceFeeStr">
+                    {{formData.assistantServiceFeeStr ? `￥ ${formData.assistantServiceFeeStr}` : ''}}
                 </el-form-item>
-                <el-form-item label="助诊付款方式" v-if="formData.assistantPayType" prop="assistantPayType">
+                <el-form-item label="助诊付款方式"  prop="assistantPayType">
                     {{getAssistantPayType}}
                 </el-form-item>
-                <el-form-item label="助诊付款时间" v-if="formData.assistantSettleTime" prop="assistantSettleTime">
+                <el-form-item label="助诊付款时间" prop="assistantSettleTime">
                     {{formData.assistantSettleTime}}
                 </el-form-item>
                 
@@ -473,6 +473,7 @@ export default {
     },
     data(){
         return {
+            asd: 123,
             diagnoseLogId: '',
             birthDisable: false,
             noable: false,

src/views/IM/diagnosis-admin/diagnosis-list-new.vue

@@ -144,7 +144,6 @@
                 start-placeholder="开始日期"
                 end-placeholder="结束日期"
                 style="width: 220px"
-                :picker-options="pickerOptions1"
               >
               </el-date-picker>
             </el-form-item>
@@ -331,6 +330,11 @@ export default {
           return time.getTime() > new Date().getTime(); //减去一天的时间代表可以选择同一天;
         },
       },
+      pickerOptions2: {
+        disabledDate: (time) => {
+          return time.getTime() < new Date().getTime(); //减去一天的时间代表可以选择同一天;
+        },
+      },
       fromType: 0, //1或不传为为预约单列表  2为运营预约单列表  3为分诊台 4为接诊台
     };
   },