From 1b5a143ee7e62a0a28765bffae0bb39026d6f1dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BD=97=E6=96=8C=E6=9D=B0?= <>
Date: Tue, 10 Oct 2023 15:40:36 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/fee-settings/Item.vue | 199 ++++++++++++++++++--------------
 1 file changed, 114 insertions(+), 85 deletions(-)

diff --git a/src/views/fee-settings/Item.vue b/src/views/fee-settings/Item.vue
index 08da6d2..ce8bc6c 100644
--- a/src/views/fee-settings/Item.vue
+++ b/src/views/fee-settings/Item.vue
@@ -126,17 +126,12 @@
     >
       <el-form ref="form" :model="form" label-width="110px" :rules="rules">
         <el-row>
-          <el-col :span="8">
-            <el-form-item label="名称" prop="displayName">
-              <el-input v-model="form.displayName" ref="refinput"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="英文缩写" prop="englishShortName">
-              <el-input v-model="form.englishShortName"></el-input>
+          <el-col :span="10">
+            <el-form-item label="项目编号" prop="displayName">
+              <el-input v-model="form.id" :disabled="true"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+         <el-col :span="6">
             <el-form-item label="项目类别" prop="itemTypeId">
               <!-- <el-cascader
                 v-model="form.itemTypeId"
@@ -171,13 +166,23 @@
               </el-select> -->
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="名称" prop="displayName">
+              <el-input v-model="form.displayName" ref="refinput"></el-input>
+            </el-form-item>
+          </el-col>
           <el-col :span="8">
             <el-form-item label="价格" prop="price">
               <el-input v-model="form.price"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="价表项目编码" prop="priceItemId">
+            <el-form-item label="英文缩写" prop="englishShortName">
+              <el-input v-model="form.englishShortName"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="价表项目编码" prop="">
               <el-select
                 v-model="form.priceItemId"
                 placeholder="请选择"
@@ -211,79 +216,96 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="默认结果" prop="defaultResult">
-              <!-- <el-input v-model="form.defaultResult"></el-input> -->
-              <el-select
-                v-model="form.defaultResult"
-                placeholder="请选择"
-                style="width: 100%"
+            <el-form-item label="生成小结" prop="isProduceSummary">
+              <el-input v-model="form.isProduceSummary"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="名称进入小结" prop="isNameIntoSummary">
+              <el-radio-group v-model="form.isNameIntoSummary">
+                <el-radio
+                  v-for="item in isNameIntoSummary"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-row>
+              <el-form-item label="默认结果" prop="defaultResult">
+                <el-input v-model="form.defaultResult">
+                  <template slot="append">
+                    <el-select
+                    v-model="form.defaultResult"
+                    placeholder="请选择"
+                    style="width: 38px;"
               >
                 <el-option
                   v-for="item in defaultResult"
                   :key="item.value"
                   :label="item.label"
-                  :value="item.value"
+                  :value="item.label"
                 >
                 </el-option>
               </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="参考范围类型" prop="referenceRangeTypeFlag">
-              <el-select
-                v-model="form.referenceRangeTypeFlag"
-                placeholder="请选择"
-                style="width: 100%"
+                  </template>
+                </el-input>
+
+
+                 <!-- <el-col span="22">
+                  <el-input v-model="form.defaultResult" type="textarea"></el-input>
+                 </el-col>
+                 <el-col span="2">
+                  <el-select
+                    v-model="form.defaultResult"
+                    placeholder="请选择"
+                    style="width: 38px;"
               >
                 <el-option
-                  v-for="item in referenceRangeTypeFlag"
+                  v-for="item in defaultResult"
                   :key="item.value"
                   :label="item.label"
-                  :value="item.value"
+                  :value="item.label"
                 >
                 </el-option>
               </el-select>
-              <!-- <el-input v-model="form.referenceRangeTypeFlag"></el-input> -->
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="生成小结" prop="isProduceSummary">
-              <el-input v-model="form.isProduceSummary"></el-input>
+                 </el-col> -->
             </el-form-item>
+            </el-row>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="名称进入小结" prop="isNameIntoSummary">
+            <el-form-item label="参考范围类型" prop="referenceRangeTypeFlag">
               <el-select
-                v-model="form.isNameIntoSummary"
+                v-model="form.referenceRangeTypeFlag"
                 placeholder="请选择"
                 style="width: 100%"
               >
                 <el-option
-                  v-for="item in isNameIntoSummary"
+                  v-for="item in referenceRangeTypeFlag"
                   :key="item.value"
                   :label="item.label"
                   :value="item.value"
                 >
                 </el-option>
               </el-select>
+              <!-- <el-input v-model="form.referenceRangeTypeFlag"></el-input> -->
             </el-form-item>
-          </el-col>
+          </el-col> 
           <el-col :span="8">
             <el-form-item label="启用诊断函数" prop="isDiagnosisFunction">
-              <el-select
-                @change="enablediagnostics"
-                v-model="form.isDiagnosisFunction"
-                placeholder="请选择"
-                style="width: 100%"
-              >
-                <el-option
+               <el-radio-group v-model="form.isDiagnosisFunction" @change="enablediagnostics">
+                <el-radio
                   v-for="item in isDiagnosisFunction"
                   :key="item.value"
-                  :label="item.label"
+                  :label="item.value"
                   :value="item.value"
                 >
-                </el-option>
-              </el-select>
+                {{item.label}}
+                </el-radio>
+              </el-radio-group>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -296,19 +318,16 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="是计算项目" prop="isCalculationItem">
-              <el-select
-                v-model="form.isCalculationItem"
-                placeholder="请选择"
-                style="width: 100%"
-              >
-                <el-option
+              <el-radio-group v-model="form.isCalculationItem">
+                <el-radio
                   v-for="item in isCalculationItem"
                   :key="item.value"
-                  :label="item.label"
+                  :label="item.value"
                   :value="item.value"
                 >
-                </el-option>
-              </el-select>
+                {{item.label}}
+                </el-radio>
+              </el-radio-group>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -316,29 +335,30 @@
               <el-input v-model="form.calculationFunction"></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="输入结果校验" prop="">
+              <el-input v-model="form.inputCheck"></el-input>
+            </el-form-item>
+          </el-col>
           <el-col :span="8">
             <el-form-item label="继续处理" prop="isContinueProcess">
-              <el-select
-                v-model="form.isContinueProcess"
-                placeholder="请选择"
-                style="width: 100%"
-              >
-                <el-option
+              <el-radio-group v-model="form.isContinueProcess">
+                <el-radio
                   v-for="item in isContinueProcess"
                   :key="item.value"
-                  :label="item.label"
+                  :label="item.value"
                   :value="item.value"
                 >
-                </el-option>
-              </el-select>
+                {{item.label}}
+                </el-radio>
+              </el-radio-group>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <!-- <el-col :span="8">
             <el-form-item label="项目结果模板" prop="resultTemplateTypeFlag">
               <el-input v-model="form.resultTemplateTypeFlag"
                 >resulttemp</el-input
               >
-              <!-- 
               <el-select
                 v-model="form.resultTemplateTypeFlag"
                 placeholder="请选择"
@@ -352,29 +372,20 @@
                 >
                 </el-option>
               </el-select>
-               -->
             </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="输入结果校验" prop="">
-              <el-input v-model="form.inputCheck"></el-input>
-            </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="8">
             <el-form-item label="启用" prop="isActive">
-              <el-select
-                v-model="form.isActive"
-                placeholder="请选择"
-                style="width: 100%"
-              >
-                <el-option
+              <el-radio-group v-model="form.isActive">
+                <el-radio
                   v-for="item in isActive"
                   :key="item.value"
-                  :label="item.label"
+                  :label="item.value"
                   :value="item.value"
                 >
-                </el-option>
-              </el-select>
+                {{item.label}}
+                </el-radio>
+              </el-radio-group>
             </el-form-item>
           </el-col>
         </el-row>
@@ -1767,8 +1778,8 @@ export default {
         this.title = 2;
         this.dialogVisible = true;
         posjrctid(this.form.id).then((res) => {
-          console.log(res);
           this.form = res.data;
+           console.log(this.form);
         });
       }
     },
@@ -1780,7 +1791,7 @@ export default {
             this.form.price = Number(this.form.price);
             addproject(this.form).then((res) => {
               if (res.code == 1) {
-                this.$message.success("新增成功222");
+                this.$message.success("新增成功");
                 this.getlist();
                 this.dialogVisible = false;
               }
@@ -1864,4 +1875,22 @@ export default {
 
   width: 100%;
 }
+:deep(.el-textarea__inner){ 
+  resize: none; 
+} 
+:deep .el-dialog__header {
+    padding: 14px 20px 14px;
+}
+:deep .el-dialog__body {
+    padding: 0px 20px 0px;
+}
+:deep .el-form-item {
+    margin-bottom: 14px;
+}
+:deep .el-divider--horizontal {
+    margin: 0px 0 14px;
+}
+:deep .el-dialog__footer {
+    padding: 0px 20px 14px;
+}
 </style>

From da7f97439af6860dc14f053cdd6a4e7ed81de08f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BD=97=E6=96=8C=E6=9D=B0?= <>
Date: Tue, 10 Oct 2023 16:42:58 +0800
Subject: [PATCH 2/2] 00

---
 src/views/fee-settings/Item.vue | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/src/views/fee-settings/Item.vue b/src/views/fee-settings/Item.vue
index ce8bc6c..6a354f9 100644
--- a/src/views/fee-settings/Item.vue
+++ b/src/views/fee-settings/Item.vue
@@ -253,26 +253,6 @@
               </el-select>
                   </template>
                 </el-input>
-
-
-                 <!-- <el-col span="22">
-                  <el-input v-model="form.defaultResult" type="textarea"></el-input>
-                 </el-col>
-                 <el-col span="2">
-                  <el-select
-                    v-model="form.defaultResult"
-                    placeholder="请选择"
-                    style="width: 38px;"
-              >
-                <el-option
-                  v-for="item in defaultResult"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.label"
-                >
-                </el-option>
-              </el-select>
-                 </el-col> -->
             </el-form-item>
             </el-row>
           </el-col>