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

src/utils/constants.js

@@ -263,7 +263,7 @@ export const ALL_TAB_LIST = [
   },
   {
     label: '待问诊',
-    active: '16'
+    active: '26'
   },
   {
     label: '问诊中',
@@ -303,7 +303,7 @@ export const RUN_TAB_LIST = [
   },
   {
     label: '待问诊',
-    active: '16'
+    active: '26'
   },
   {
     label: '问诊中',

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

@@ -291,7 +291,7 @@
                 <!-- -->
                 
                 <br/>
-                <h1 v-if="showSettlement">结算信息</h1>
+                <h1>结算信息</h1>
                 <el-form-item label="接诊服务费"  prop="receptionServiceFeeStr">
                    {{formData.receptionServiceFeeStr ? `￥ ${formData.receptionServiceFeeStr}` : ''}}
                 </el-form-item>
@@ -357,13 +357,13 @@
                         <el-radio :label="2">否</el-radio>
                     </el-radio-group>
                 </el-form-item>
-                <el-form-item label="是否有价值" prop="valueFlag" >
+                <el-form-item label="是否有价值" prop="valueFlag" v-show="formData.patInFlag == 1">
                     <el-radio-group v-model="formData.valueFlag" :disabled="editorType== 2">
                         <el-radio :label="1">是</el-radio>
                         <el-radio :label="2">否</el-radio>
                     </el-radio-group>
                 </el-form-item>
-                <el-form-item label="" prop="worthlessReason" v-show="formData.valueFlag == 2">
+                <el-form-item label="" prop="worthlessReason" v-show="formData.valueFlag == 1 && formData.patInFlag == 1">
                     <el-input type="textarea" v-model="formData.worthlessReason" placeholder="请输入低价值说明" maxlength="1000" :disabled="editorType== 2" show-word-limit></el-input>
                 </el-form-item>
                 <el-form-item label="其他备注" prop="otherRemark" >
@@ -677,10 +677,6 @@ export default {
     mounted() {
     },
     computed: {
-      showSettlement () {
-        let { formData } = this;
-        return formData.receptionServiceFeeStr || formData.receptionPayType || formData.receptionSettleTime || formData.assistantServiceFeeStr || formData.assistantPayType || formData.assistantSettleTime
-      },
       getReceptionPayType () {
         return PAY_TYPE[this.formData.receptionPayType]
       },

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

@@ -542,7 +542,8 @@ export default {
       // });
       let target = this.$refs.target
       const { origin, pathname } = window.location
-      let u = `${origin}${pathname}#/diagnosis-editor?id=${row.diagnoseLogId}&editorType=${flag}`
+      let editorType = flag ? 1 : 2
+      let u = `${origin}${pathname}#/diagnosis-editor?id=${row.diagnoseLogId}&editorType=${editorType}`
       target.setAttribute('href', u)
       target.click()
     },