From 74c37d903d4d6a0e0ab8def8da28987532030ae0 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Thu, 23 Nov 2023 11:23:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=80=A7=E8=83=BD=E6=A3=80=E9=AA=8Ctabs?=
 =?UTF-8?q?=E6=94=B9=E5=8A=A8=E5=8F=8A=E8=AE=B0=E5=BD=95=E6=9F=A5=E7=9C=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/qm/behavior.vue      | 135 ++++++++++++++++++---------------
 src/views/qm/behavior_form.vue |   2 +-
 2 files changed, 73 insertions(+), 64 deletions(-)

diff --git a/src/views/qm/behavior.vue b/src/views/qm/behavior.vue
index 5becff78..84e3bf20 100644
--- a/src/views/qm/behavior.vue
+++ b/src/views/qm/behavior.vue
@@ -19,10 +19,6 @@
             </div>
         </el-header>
         <el-main class="nopadding">
-            <el-tabs v-model="activeId" class="demo-tabs" @tab-click="handleClick" type="card">
-                <el-tab-pane v-for="item in behaviors" v-bind:key="item.id" :label="item.name" :name="item.id">
-                </el-tab-pane>
-            </el-tabs>
             <!-- <el-radio-group v-model="radio1" class="ml-4">
                 <el-radio
                     v-for="item in behaviors"
@@ -33,64 +29,74 @@
                     {{ item.name }}
                 </el-radio>
             </el-radio-group> -->
-            <scTable
-                ref="table"
-                :data="tableData"
-                :apiObj="apiObj"
-                row-key="id"
-                stripe
-                :height="600"
-                :params="query"
-            >
-                <el-table-column type="index" width="50"/>
-                <el-table-column label="实验日期" prop="test_date" show-overflow-tooltip>
-                </el-table-column>
-                <el-table-column label="样品编号" prop="sample_number">
-                </el-table-column>
-                <el-table-column label="样品厚度/mm" prop="val_hd" v-if="activeName=='透过率'">
-                </el-table-column>
-                <el-table-column label="型号规格" prop="specification" v-if="activeName=='中温粘度'||activeName=='膨胀'">
-                </el-table-column>
-                <el-table-column label="样品数量" prop="sample_count" v-if="activeName=='析晶'">
-                </el-table-column>
-                <el-table-column label="样品密度" prop="sample_density" v-if="activeName=='高温粘度'">
-                </el-table-column>
-                <el-table-column label="检验员" prop="test_user" show-overflow-tooltip>
-                </el-table-column>
-                <el-table-column label="实验温度及保温时间" prop="sample_number" v-if="activeName=='析晶'">
-                </el-table-column>
-                <el-table-column label="升至最高温度/℃" prop="val_zgwd" v-if="activeName=='高温粘度'">
-                </el-table-column>
-                <el-table-column label="仪器状态" prop="factory" show-overflow-tooltip>
-                    <template #default="scope">
-                        <el-tag>{{ state_[scope.row.equip_state] }}</el-tag>
-                    </template>
-                </el-table-column>
-                <el-table-column label="折射率(589nm)" prop="val_zsl" v-if="activeName=='折射率'">
-                </el-table-column>
-                <el-table-column label="透过率(550nm)" prop="val_tgl" v-if="activeName=='透过率'">
-                </el-table-column>
-                <el-table-column label="Ts/℃" prop="val_ts" v-if="activeName=='中温粘度'">
-                </el-table-column>
-                <el-table-column label="30-300℃膨胀系数" prop="val_pzxs" v-if="activeName=='膨胀'">
-                </el-table-column>
-                <el-table-column label="Tg/℃" prop="val_tg" v-if="activeName=='膨胀'">
-                </el-table-column>
-                <el-table-column label="Tf/℃" prop="val_tf" v-if="activeName=='膨胀'">
-                </el-table-column>
-                <el-table-column label="析晶" prop="val_xj" v-if="activeName=='析晶'">
-                    <template #default="scope">
-                        <el-tag>{{ state_xj[scope.row.val_xj] }}</el-tag>
-                    </template>
-                </el-table-column>
-                <el-table-column label="操作" fixed="right" width="150">
-                    <template #default="scope">
-                        <el-link type="primary" @click="table_show(scope.row)">查看</el-link>
-                        <el-divider direction="vertical"></el-divider>
-                        <el-link type="danger" @click="table_del(scope.row)">删除</el-link>
-                    </template>
-                </el-table-column>
-            </scTable>
+            <el-container>
+                <el-header style="padding:13px 15px 7px;">
+                    <el-tabs v-model="activeId" class="demo-tabs" @tab-click="handleClick" type="card">
+                        <el-tab-pane v-for="item in behaviors" v-bind:key="item.id" :label="item.name" :name="item.id">
+                        </el-tab-pane>
+                    </el-tabs>
+                </el-header>
+                <el-main class="nopadding">
+                    <scTable
+                        ref="table"
+                        :data="tableData"
+                        :apiObj="apiObj"
+                        row-key="id"
+                        stripe
+                        :params="query"
+                    >
+                        <el-table-column type="index" width="50"/>
+                        <el-table-column label="实验日期" prop="test_date" show-overflow-tooltip>
+                        </el-table-column>
+                        <el-table-column label="样品编号" prop="sample_number">
+                        </el-table-column>
+                        <el-table-column label="样品厚度/mm" prop="val_hd" v-if="activeName=='透过率'">
+                        </el-table-column>
+                        <el-table-column label="型号规格" prop="specification" v-if="activeName=='中温粘度'||activeName=='膨胀'">
+                        </el-table-column>
+                        <el-table-column label="样品数量" prop="sample_count" v-if="activeName=='析晶'">
+                        </el-table-column>
+                        <el-table-column label="样品密度" prop="sample_density" v-if="activeName=='高温粘度'">
+                        </el-table-column>
+                        <el-table-column label="检验员" prop="test_user" show-overflow-tooltip>
+                        </el-table-column>
+                        <el-table-column label="实验温度及保温时间" prop="sample_number" v-if="activeName=='析晶'">
+                        </el-table-column>
+                        <el-table-column label="升至最高温度/℃" prop="val_zgwd" v-if="activeName=='高温粘度'">
+                        </el-table-column>
+                        <el-table-column label="仪器状态" prop="factory" show-overflow-tooltip>
+                            <template #default="scope">
+                                <el-tag>{{ state_[scope.row.equip_state] }}</el-tag>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="折射率(589nm)" prop="val_zsl" v-if="activeName=='折射率'">
+                        </el-table-column>
+                        <el-table-column label="透过率(550nm)" prop="val_tgl" v-if="activeName=='透过率'">
+                        </el-table-column>
+                        <el-table-column label="Ts/℃" prop="val_ts" v-if="activeName=='中温粘度'">
+                        </el-table-column>
+                        <el-table-column label="30-300℃膨胀系数" prop="val_pzxs" v-if="activeName=='膨胀'">
+                        </el-table-column>
+                        <el-table-column label="Tg/℃" prop="val_tg" v-if="activeName=='膨胀'">
+                        </el-table-column>
+                        <el-table-column label="Tf/℃" prop="val_tf" v-if="activeName=='膨胀'">
+                        </el-table-column>
+                        <el-table-column label="析晶" prop="val_xj" v-if="activeName=='析晶'">
+                            <template #default="scope">
+                                <el-tag>{{ state_xj[scope.row.val_xj] }}</el-tag>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="操作" fixed="right" width="150">
+                            <template #default="scope">
+                                <el-link type="primary" @click="table_show(scope.row)">查看</el-link>
+                                <el-divider direction="vertical"></el-divider>
+                                <el-link type="danger" @click="table_del(scope.row)">删除</el-link>
+                            </template>
+                        </el-table-column>
+                    </scTable>
+                </el-main>
+            </el-container>
+            
         </el-main>
         <save-dialog v-if="visible" ref="saveDialog" :activeName="activeName" :activeId="activeId"
             @success="handleSuccess" @closed="visible = false">
@@ -203,7 +209,10 @@ import saveDialog from './behavior_form.vue';
             },
             //查看
             table_show(row) {
-                
+                this.visible = true;
+                this.$nextTick(() => {
+                    this.$refs.saveDialog.open("show").setData(row);
+                });
             },
             handleQuery() {
                 this.$refs.table.queryData(this.query)
diff --git a/src/views/qm/behavior_form.vue b/src/views/qm/behavior_form.vue
index cad5bd65..7a21ce91 100644
--- a/src/views/qm/behavior_form.vue
+++ b/src/views/qm/behavior_form.vue
@@ -174,7 +174,7 @@
           </el-row>
         </el-form>
       </el-main>
-      <el-footer>
+      <el-footer v-if="this.mode!=='show'">
         <el-button type="primary" :loading="isSaveing" @click="submit">保存</el-button>
         <el-button @click="visible = false">取消</el-button>
       </el-footer>