xiaochan 2 лет назад
Родитель
Сommit
60c6c574c5

+ 10 - 12
src/components/zhu-yuan-yi-sheng/hui-zhen-shen-qing/TianJiaHuiZhenShenQing.vue

@@ -105,7 +105,10 @@
                   placeholder="请输入内容"
                   type="textarea"/>
       </el-form-item>
-      <el-button style="margin-left: 20px" type="success" @click="huiZhenShenQingClick">申请</el-button>
+      <el-button style="margin-left: 20px" type="success"
+                 v-el-btn="huiZhenShenQingClick">
+        申请
+      </el-button>
       <el-tag style="margin-left: 20px">申请人:{{ huiZhenShenQing.name }}</el-tag>
       <el-tag style="margin-left: 20px">申请时间:{{ huiZhenShenQing.inputDate }}</el-tag>
     </el-form>
@@ -233,21 +236,16 @@ const huiZhenShenQingClick = async () => {
   if (!form) return
   try {
     await form.validate()
-    ElMessageBox.confirm('请认真审核申请信息', '提示', {
+    await ElMessageBox.confirm('请认真审核申请信息', '提示', {
       confirmButtonText: '确认',
       cancelButtonText: '取消',
       type: 'info',
     })
-        .then(() => {
-          huiZhenShenQing.value.inpatientNo = huanZheXinXi.value.inpatientNo
-          huiZhenShenQing.value.admissTimes = huanZheXinXi.value.admissTimes
-          huiZhenShenQing.value.deptCode = huiZhenShenQing.value.wardCode = huanZheXinXi.value.zkWard
-          submitHuiZhenShenQing(huiZhenShenQing.value).then((res) => {
-            emit('successfulApplication')
-          })
-        })
-        .catch(() => {
-        })
+    huiZhenShenQing.value.inpatientNo = huanZheXinXi.value.inpatientNo
+    huiZhenShenQing.value.admissTimes = huanZheXinXi.value.admissTimes
+    huiZhenShenQing.value.deptCode = huiZhenShenQing.value.wardCode = huanZheXinXi.value.zkWard
+    await submitHuiZhenShenQing(huiZhenShenQing.value)
+    emit('successfulApplication')
   } catch (error) {
   }
 }

+ 0 - 3
src/components/zhu-yuan-yi-sheng/yi-zhu-lu-ru/yz-edit/YzEditor.vue

@@ -634,9 +634,6 @@ const toAddAnOrder = async () => {
     setTheTemporaryVariableMedicalOrder()
     return true
   }
-  if (yiZhuData.value.frequCode === 'ONCE' && queryParam.value.frequCode === frequCodeEnum.longTerm) {
-    BizException(ExceptionEnum.LOGICAL_ERROR, '长期医嘱页面无法选择临时医嘱频率。')
-  }
   let param = {
     inpatientNo: props.patientInfo.inpatientNo,
     admissTimes: props.patientInfo.admissTimes,