Merge remote-tracking branch 'origin/master'

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

@@ -61,7 +61,7 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="诊断日期" prop="visitDate">
-            <el-input  v-model="formattedDiagnosisTime"  placeholder="-" :disabled="true" maxlength="20" />
+            <el-input v-model="formattedDiagnosisTime" placeholder="-" :disabled="true" maxlength="20" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
@@ -144,7 +144,10 @@
           <el-form-item label="药物处理" prop="medication">
             <div v-for="(singleItem, index) in prescribingForm.medication" :key="index" class="single-medication">
               <div class="single-file">
-                <el-form-item prop="drug">
+                <el-form-item
+                  :rules="{validator: validatePharmDrug(singleItem, 'drugId', '请选择药品'), trigger: 'blur'}"
+                  prop="drug"
+                >
                   <el-select
                     v-model="singleItem.drugId"
                     clearable
@@ -162,18 +165,31 @@
                 </el-form-item>
               </div>
               <div class="single-file">
-                <el-form-item label="数量" prop="recipelNum">
-                  <el-input-number
-                    v-model.trim="singleItem.recipelNum"
-                    :max="100"
-                    :min="0"
-                    controls-position="right"
-                  />&nbsp;{{ singleItem.smallSallNormsUnit || '盒' }}
+                <el-form-item
+                  :rules="{validator: validatePharmDrugOther(singleItem, 'recipelNum', '请输入剂量'), trigger: 'blur'}"
+                  label="剂量"
+                  prop="recipelNum"
+                >
+                  <div style="display: flex;align-items: center;">
+                    <el-input-number
+                      :disabled="!singleItem.drugId"
+                      v-model.trim="singleItem.recipelNum"
+                      :max="9999"
+                      :min="0"
+                      controls-position="right"
+                    />
+                    <span class="unit-text">{{ singleItem.normsUnit || '' }}</span>
+                  </div>
                 </el-form-item>
               </div>
               <div>
-                <el-form-item label="sig" prop="remark">
+                <el-form-item
+                  :rules="{validator: validatePharmDrugOther(singleItem, 'remark', '请输入具体用法'), trigger: 'blur'}"
+                  label="sig"
+                  prop="remark"
+                >
                   <el-input
+                    :disabled="!singleItem.drugId"
                     v-model.trim="singleItem.remark"
                     placeholder="请输入具体用法"
                     maxlength="30"
@@ -292,7 +308,7 @@
                 clearable
                 placeholder="请选择病房类型"
                 style="width: 100%"
-                disabled="true"
+                :disabled="true"
               >
                 <el-option
                   v-for="(item, index) in dict.type.ward_type"
@@ -471,6 +487,7 @@ export default {
         this.prescribingForm.treatment = [...val.treatManageBo]
       }
       if (val && val.stockDispenseOutboundList.length > 0) {
+        console.log('val.stockDispenseOutboundList', val.stockDispenseOutboundList)
         this.prescribingForm.medication = [...val.stockDispenseOutboundList]
       }
       if (val && val.inHospitalBo) {
@@ -549,7 +566,8 @@ export default {
             sallUnit: item.smallSallNormsUnit,
             sallNum: item.smallSallNormsNum,
             standardAmount: item.sellingPrice,
-            paymentStatus: '0'
+            paymentStatus: '0',
+            normsUnit: item.normsUnit
           }
         })
         console.log('drugOptions!!!!!!!!!!!!!', this.drugOptions)
@@ -572,6 +590,39 @@ export default {
         }
       }
     },
+    // 校验触发--药物相关
+    validatePharmDrug(singleItem) {
+      return (rule, value, callback) => {
+        if (singleItem.drugId) {
+          callback()
+          return true
+        } else if (singleItem.recipelNum || singleItem.remark) {
+          callback('请选择药品')
+          return false
+        } else {
+          callback()
+          return true
+        }
+      }
+    },
+    // 校验触发--药物相关
+    validatePharmDrugOther(singleItem, key, message) {
+      return (rule, value, callback) => {
+        if (!singleItem.drugId) {
+          callback()
+          return true
+        } else if (!singleItem[key]) {
+          callback(message)
+          return false
+        } else if (key === 'recipelNum' && !/^[1-9]\d*$/.test(singleItem[key])) {
+          callback('仅支持数字')
+          return false
+        } else {
+          callback()
+          return true
+        }
+      }
+    },
     // 设置当前行治疗名称
     setTreatItemsName(rowData, options) {
       console.log('setTreatItemsName', rowData, options)
@@ -606,6 +657,7 @@ export default {
           rowData['sallNum'] = item.sallNum
           rowData['standardAmount'] = item.standardAmount
           rowData['paymentStatus'] = item.paymentStatus
+          rowData['normsUnit'] = item.normsUnit
         }
       })
       console.log('finishSetDrugOthers', rowData)
@@ -864,7 +916,9 @@ export default {
   .el-input--small {
     width: 188px !important;
   }
-
+.unit-text{
+  margin-left: unset;
+}
   .el-input-number--small {
     width: 188px !important;
   }