From 6bb8da1d317da366769d64120ee645c03f305023 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期四, 16 五月 2024 14:55:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/components/do/b1-ins-order/add.vue |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index 75adee2..6cd0389 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -197,7 +197,9 @@
         <el-col class="search_thing" :span="6">
           <div class="search_label"><span class="required-span">* </span>鏉ユ牱鏂瑰紡锛�</div>
           <div class="search_input">
-            <el-input size="small" clearable v-model="addObj.formType" :readonly="active>1"></el-input>
+            <el-select v-model="addObj.formType" size="small" :disabled="active>1" style="width: 100%;">
+              <el-option v-for="(a,ai) in formType" :key="ai" :label="a.label" :value="a.value"></el-option>
+            </el-select>
           </div>
         </el-col>
         <el-col class="search_thing" :span="6">
@@ -634,7 +636,8 @@
         tell: '',
         noLoading: false,
         orderType: [],
-        filters: []
+        filters: [],
+        formType: []
       }
     },
     watch: {
@@ -653,6 +656,7 @@
       this.selectStandardMethods()
       this.selectEnumByCategoryForOrderType()
       this.selectEnumByCategoryForSonLaboratory()
+      this.selectEnumByCategoryForSampleForm()
       if (this.active != 1) {
         // 鏌ョ湅/瀹℃牳娴佺▼
         // 璇锋眰鎺ュ彛锛屽洖鏄炬暟鎹�
@@ -1126,6 +1130,16 @@
           }
         })
       },
+      selectEnumByCategoryForSampleForm() {
+        this.$axios.post(this.$api.enums.selectEnumByCategory, {
+          category: "鏉ユ牱鏂瑰紡"
+        }).then(res => {
+          this.formType = res.data
+          if(this.formType.length > 0){
+            this.addObj.formType = this.formType[0].value
+          }
+        })
+      },
       methodChange(val, row) {
         if(val===null||val==='')return
         this.getProductLoad = true

--
Gitblit v1.9.3