Merge remote-tracking branch 'origin/master'

src/views/article-management/article-insert.vue

@@ -89,7 +89,7 @@ export default {
   data() {
     const contentNotNull = (rule, value, callback) => {
       const contentValue = html2Text(value)
-      if (contentValue.length === 0) {
+      if ((contentValue.length === 0 || contentValue.trim().length === 0) && !value.includes('img')) {
         callback(new Error('请输入内容详情'))
       } else {
         callback()

src/views/service-management/registration-queue/components/prescribing-modle.vue

@@ -286,6 +286,7 @@
                 clearable
                 placeholder="请选择病房类型"
                 style="width: 100%"
+                disabled="true"
               >
                 <el-option
                   v-for="(item, index) in dict.type.ward_type"
@@ -410,7 +411,8 @@ export default {
             checkType: '',
             checkItemsName: '',
             checkItemsId: '',
-            payAmount: ''
+            payAmount: '',
+            devicePrice: ''
           }
         ],
         treatment: [
@@ -492,6 +494,8 @@ export default {
     changeWardType(prescribingForm) {
       if (prescribingForm.diseaseLevel === '1') {
         prescribingForm.wardType = '2'
+      } else if (prescribingForm.diseaseLevel === null || prescribingForm.diseaseLevel === '') {
+        prescribingForm.wardType = null
       } else {
         prescribingForm.wardType = '1'
       }
@@ -514,7 +518,8 @@ export default {
             return {
               label: item.name,
               value: item.id,
-              payAmount: item.price
+              payAmount: item.price,
+              devicePrice: item.hospitalPlatformPrice
             }
           })
           this.checkKeys = Object.keys(this.checkItemOptions).length
@@ -574,6 +579,7 @@ export default {
         if (item.value === rowData.checkItemsId) {
           rowData.checkItemsName = item.label
           rowData.payAmount = item.payAmount
+          rowData.devicePrice = item.devicePrice
         }
       })
     },
@@ -707,7 +713,8 @@ export default {
             checkType: '',
             checkItemsName: '',
             checkItemsId: '',
-            payAmount: ''
+            payAmount: '',
+            devicePrice: ''
           }
           break
         case 'treatment':