From 3e0319131d877f026fef011b0c20164f1a718cfd Mon Sep 17 00:00:00 2001
From: pengjun <158915633@qq.com>
Date: Mon, 21 Aug 2023 18:18:38 +0800
Subject: [PATCH] group

---
 .../patientRegister/PatientRegisterList.vue         |  7 +++++--
 src/views/basic-dictionary/SampleContainer.vue      | 13 ++++++++++++-
 src/views/common-settings/SampleGroup.vue           |  2 +-
 src/views/fee-settings/Item.vue                     |  4 +++-
 4 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/src/components/patientRegister/PatientRegisterList.vue b/src/components/patientRegister/PatientRegisterList.vue
index aee5d42..bd37e31 100644
--- a/src/components/patientRegister/PatientRegisterList.vue
+++ b/src/components/patientRegister/PatientRegisterList.vue
@@ -173,10 +173,13 @@
         <el-button type="primary" class="btnClass" @click="guidePrint('0001', true)">指引单预览</el-button>
       </div>
       <div class="listBtn">
-        <el-button type="primary" class="btnClass" @click="guidePrint('0001', false)">指引单打印</el-button>
+        <el-button type="primary" class="btnClass" @click="lisPrint('0003', false)">检验申请</el-button>
       </div>
       <div class="listBtn">
-        <el-button type="primary" class="btnClass" @click="guidePrint('0001', true)">指引单预览</el-button>
+        <el-button type="primary" class="btnClass" @click="lisPrint('0002', true)">检验条码</el-button>
+      </div>
+      <div class="listBtn">
+        <el-button type="primary" class="btnClass" @click="">补打条码</el-button>
       </div>
     </div>
 
diff --git a/src/views/basic-dictionary/SampleContainer.vue b/src/views/basic-dictionary/SampleContainer.vue
index 6462c68..9515f8a 100644
--- a/src/views/basic-dictionary/SampleContainer.vue
+++ b/src/views/basic-dictionary/SampleContainer.vue
@@ -28,6 +28,7 @@
           </el-table-column>
           <el-table-column prop="displayName" label="名称" width="">
           </el-table-column>
+          <el-table-column prop="containerRemark" label="备注" width="" />          
           <el-table-column prop="creatorName" label="创建者" width="">
           </el-table-column>
           <el-table-column prop="creationTime" label="创建时间" width="200">
@@ -107,7 +108,14 @@
                   <el-input v-model="form.containerColorName"></el-input>
                 </el-form-item>
               </el-col>
-              <div style="margin-top: 70px"><el-divider></el-divider></div>
+              <el-col :span="24">
+                <el-form-item label="备注" prop="containerRemark">
+                  <el-input v-model="form.containerRemark"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-divider/>
+              </el-col>              
               <el-col :span="4" style="margin-left: 15px">
                 <el-form-item label="创建者">
                   <el-input
@@ -226,6 +234,7 @@ export default {
         displayName: "",
         containerColorName: "",
         containerColor: "",
+        containerRemark:'',
       },
       curRow: {},
     };
@@ -383,6 +392,7 @@ export default {
               displayName: this.form.displayName,
               containerColorName: this.form.containerColorName,
               containerColor: this.form.containerColor,
+              containerRemark: this.form.containerRemark,
             }).then((res) => {
               this.$message.success("新增成功");
               this.getlist();
@@ -393,6 +403,7 @@ export default {
               displayName: this.form.displayName,
               containerColorName: this.form.containerColorName,
               containerColor: this.form.containerColor,
+              containerRemark: this.form.containerRemark,
             }).then((res) => {
               this.$message.success("修改成功");
               this.getlist();
diff --git a/src/views/common-settings/SampleGroup.vue b/src/views/common-settings/SampleGroup.vue
index de92528..613db82 100644
--- a/src/views/common-settings/SampleGroup.vue
+++ b/src/views/common-settings/SampleGroup.vue
@@ -4,7 +4,7 @@
       <el-card style="height: 800px">
         <el-table
           :data="tableData"
-          style="width: 100%; height: 200px"
+          width="100%" height="350px"
           v-loading="loading"
           row-key="id"
           class="el-table__body-wrapper tbody"
diff --git a/src/views/fee-settings/Item.vue b/src/views/fee-settings/Item.vue
index a8bc5d8..871c07e 100644
--- a/src/views/fee-settings/Item.vue
+++ b/src/views/fee-settings/Item.vue
@@ -311,7 +311,8 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="项目结果模板" prop="resultTemplateTypeFlag">
-              <!-- <el-input v-model="form.resultTemplateTypeFlag">resulttemp</el-input> -->
+              <el-input v-model="form.resultTemplateTypeFlag">resulttemp</el-input>
+              <!-- 
               <el-select
                 v-model="form.resultTemplateTypeFlag"
                 placeholder="请选择"
@@ -325,6 +326,7 @@
                 >
                 </el-option>
               </el-select>
+               -->
             </el-form-item>
           </el-col>
           <el-col :span="8">