From c92e63dbc70e710a9aae3d59f854ccb7244b0add Mon Sep 17 00:00:00 2001
From: "DESKTOP-369JRHT\\12997" <9>
Date: Fri, 18 Oct 2024 11:14:43 +0800
Subject: [PATCH] 10.18

---
 fuintAdmin/src/views/setting/print/index.vue | 36 +++++++++++++++-----
 1 file changed, 27 insertions(+), 9 deletions(-)

diff --git a/fuintAdmin/src/views/setting/print/index.vue b/fuintAdmin/src/views/setting/print/index.vue
index 00cf7b461..ddc4dde9c 100644
--- a/fuintAdmin/src/views/setting/print/index.vue
+++ b/fuintAdmin/src/views/setting/print/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="aainer">
     <div class="wit-b">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
         <el-form-item label="" prop="name">
@@ -61,8 +61,20 @@
             {{ jsonChange(scope.row.staffIds) }}
           </template>
         </el-table-column>
-        <el-table-column align="center" prop="machineCode" label="设备终端号"></el-table-column>
-        <el-table-column align="center" prop="msign" label="设备密钥"></el-table-column>
+        <el-table-column align="center" prop="machineCode" label="设备编号"></el-table-column>
+        <el-table-column align="center" prop="msign" label="密钥"></el-table-column>
+        <el-table-column align="center" prop="acquiesce" label="设备状态">
+          <template slot-scope="scope">
+            <el-switch
+              v-model="scope.row.acquiesce"
+              active-color="#13ce66"
+              inactive-color="#ff4949">
+            </el-switch>
+          </template>
+        </el-table-column>
+
+        <el-table-column align="center" prop="machineCode" label="备注"></el-table-column>
+        <el-table-column align="center" prop="machineCode" label="创建时间"></el-table-column>
         <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
           <template slot-scope="scope">
             <el-button
@@ -91,10 +103,10 @@
       />
 
     </div>
-    <el-dialog :title="title" :close-on-click-modal="false" :before-close="handleCancel" :visible.sync="open" width="30%"
+    <el-dialog :title="title" :close-on-click-modal="false" :before-close="handleCancel" :visible.sync="open" width="24%"
                append-to-body >
-      <el-form ref="deviceForm" :model="deviceInfo" label-width="80px">
-        <el-form :model="deviceInfo" :rules="rules" ref="deviceForm" label-width="120px">
+
+        <el-form :model="deviceInfo" :rules="rules" ref="deviceForm" label-width="95px">
           <el-form-item label="设备名称" prop="deviceName">
             <el-input v-model="deviceInfo.deviceName" style="width: 300px"></el-input>
           </el-form-item>
@@ -104,7 +116,7 @@
           <el-form-item label="设备功能" prop="deviceAb">
             <el-checkbox-group v-model="deviceInfo.deviceAb">
               <el-checkbox name="deviceAb" label="打印小票"></el-checkbox>
-              <el-checkbox name="deviceAb" label="语音播报"></el-checkbox>
+              <el-checkbox name="deviceA1b" label="语音播报"></el-checkbox>
             </el-checkbox-group>
           </el-form-item>
           <el-form-item label="设备终端号" prop="machineCode">
@@ -144,7 +156,7 @@
             <el-button type="primary" @click="submitForm('deviceForm')">提交</el-button>
           </el-form-item>
         </el-form>
-      </el-form>
+
     </el-dialog>
 
   </div>
@@ -188,7 +200,7 @@ export default {
         deviceSi: [
           {required: true, message: '设备品牌不能为空', trigger: 'blur'}
         ],
-        deviceAb: [{type: 'array', required: true, message: '设备功能不能为空', trigger: 'change'}],
+        deviceAb: [ {required: true, message: '设备功能不能为空', trigger: 'blur'}],
         machineCode: [
           {required: true, message: '设备终端号不能为空', trigger: 'blur'}
         ],
@@ -372,6 +384,12 @@ export default {
   height: 50px;
   line-height: 60px;
 }
+.aainer{
+  background: #f5f7f8;
+  box-sizing: border-box;
+  padding: 10px;
+}
+
 .wit-b{
   background: #fff;
   border-radius: 8px;