diff --git a/fuintAdmin/src/api/payConfig/ruleConfig.js b/fuintAdmin/src/api/payConfig/ruleConfig.js
index fccb3057d..372a3e0d6 100644
--- a/fuintAdmin/src/api/payConfig/ruleConfig.js
+++ b/fuintAdmin/src/api/payConfig/ruleConfig.js
@@ -8,6 +8,13 @@ export function listRuleConfig(query) {
     params: query,
   })
 }
+export function listRuleConfigs(query) {
+  return request({
+    url: '/api/ruleConfig/selectList',
+    method: 'get',
+    params: query,
+  })
+}
 
 // 查询支付配置规则列表
 export function getRuleConfig(id) {
diff --git a/fuintAdmin/src/api/sys/message.js b/fuintAdmin/src/api/sys/message.js
index 1f74cd23f..28d1b023a 100644
--- a/fuintAdmin/src/api/sys/message.js
+++ b/fuintAdmin/src/api/sys/message.js
@@ -34,4 +34,42 @@ export function updateApi(data) {
   })
 }
 
+export function getNameListApi(name) {
+  return request({
+    url: 'messageTemplate/getMessageTemplate?name=' + name,
+    method: 'get'
+  })
+}
+
+export function sendMessageSaveApi(data) {
+  return request({
+    url: 'MessageRecord',
+    method: 'post',
+    data: data
+  })
+}
+
+export function messageRecordListApi(query) {
+  return request({
+    url: 'MessageRecord',
+    method: 'get',
+    params: query
+  })
+}
+
+export function selectChildList(query) {
+  return request({
+    url: 'MessageRecord/selectChildList',
+    method: 'get',
+    params: query
+  })
+}
+
+export function getOneApi(id) {
+  return request({
+    url: 'messageTemplate/' + id,
+    method: 'get'
+  })
+}
+
 
diff --git a/fuintAdmin/src/api/sys/messageCost.js b/fuintAdmin/src/api/sys/messageCost.js
index 61a9feb17..ec5b0494e 100644
--- a/fuintAdmin/src/api/sys/messageCost.js
+++ b/fuintAdmin/src/api/sys/messageCost.js
@@ -41,3 +41,11 @@ export function updateCostApi(data) {
     data: data
   })
 }
+
+export function getCostReListApi(query) {
+  return request({
+    url: 'MessageCost/getRechargeList',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/fuintAdmin/src/api/sys/messageRechargeRecord.js b/fuintAdmin/src/api/sys/messageRechargeRecord.js
new file mode 100644
index 000000000..57fe1b11e
--- /dev/null
+++ b/fuintAdmin/src/api/sys/messageRechargeRecord.js
@@ -0,0 +1,43 @@
+import request from '@/utils/request'
+
+
+// 分页查询所有的订单信息
+export function getCostListApi(query) {
+  return request({
+    url: 'MessageCost',
+    method: 'get',
+    params: query
+  })
+}
+
+//
+export function getInfoApi(id) {
+  return request({
+    url: 'MessageCost/' + id,
+    method: 'get'
+  })
+}
+//
+export function deleteCostApi(id) {
+  return request({
+    url: 'MessageCost/' + id,
+    method: 'delete'
+  })
+}
+//
+export function saveMessageRechargeRecordApi(data) {
+  return request({
+    url: 'MessageRechargeRecord',
+    method: 'post',
+    data: data
+  })
+}
+
+// 保存修改信息
+export function updateCostApi(data) {
+  return request({
+    url: 'MessageCost',
+    method: 'put',
+    data: data
+  })
+}
diff --git a/fuintAdmin/src/api/sys/receiptPrint.js b/fuintAdmin/src/api/sys/receiptPrint.js
new file mode 100644
index 000000000..a34ee5589
--- /dev/null
+++ b/fuintAdmin/src/api/sys/receiptPrint.js
@@ -0,0 +1,18 @@
+import request from '@/utils/request'
+
+
+//
+export function addReceiptPrinting(data) {
+  return request({
+    url: 'receiptPrinting/addReceiptPrinting',
+    method: 'post',
+    data: data
+  })
+}
+
+export function getApi() {
+  return request({
+    url: 'receiptPrinting/queryReceiptPrintingList',
+    method: 'get'
+  })
+}
diff --git a/fuintAdmin/src/assets/xiaopiao.jpg b/fuintAdmin/src/assets/xiaopiao.jpg
new file mode 100644
index 000000000..65e2aacdf
Binary files /dev/null and b/fuintAdmin/src/assets/xiaopiao.jpg differ
diff --git a/fuintAdmin/src/views/power/message.vue b/fuintAdmin/src/views/power/message.vue
index 96d161c05..d35d8c448 100644
--- a/fuintAdmin/src/views/power/message.vue
+++ b/fuintAdmin/src/views/power/message.vue
@@ -9,6 +9,7 @@
     </div>
 
     <div class="card-change" style="margin: 20px" v-if="tabindex == 0">
+<!--   短信模板查询   -->
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="180px">
         <el-form-item label="" prop="name">
           <el-input
@@ -20,19 +21,14 @@
           />
         </el-form-item>
 
-        <el-form-item label="" prop="status">
-          <el-select v-model="queryParams.status" style="width: 150px" placeholder="请选择接收角色">
-            <el-option
-              v-for="dict in dict.type.message_status"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            />
+        <el-form-item label="" prop="roeleList">
+          <el-select v-model="queryParams.roeleList" placeholder="请选择接收角色" clearable style="width: 240px;">
+            <el-option v-for="item in dutyList1" :label="item.dutyName" :value="item.dutyId"></el-option>
           </el-select>
         </el-form-item>
 
         <el-form-item label="" prop="status">
-          <el-select v-model="queryParams.status" style="width: 150px" placeholder="短信模版状态">
+          <el-select v-model="queryParams.status" style="width: 150px" placeholder="请选择短信模版状态">
             <el-option
               v-for="dict in dict.type.message_status"
               :key="dict.value"
@@ -54,21 +50,21 @@
           </el-button>
         </el-form-item>
       </el-form>
-
-      <div style="height: 70vh;overflow: auto">
-        <el-table :data="tableData" border style="width: 100%">
+<!-- 短信模板列表 -->
+      <div style="height: 100vh;overflow: auto;width: 100%">
+        <el-table :data="tableData" border width="500%" :header-cell-style="{'text-align':'center'}">
           <el-table-column type="index" label="序号"></el-table-column>
-          <el-table-column prop="messageId" label="短信模板ID">
+          <el-table-column prop="messageId" label="短信模板ID" width="100">
             <template slot-scope="scope">
-              <span>{{scope.row.messageId}}</span>
+              <span class="ju">{{scope.row.messageId}}</span>
             </template>
           </el-table-column>
-          <el-table-column prop="name" label="短信名称">
+          <el-table-column prop="name" label="短信名称" width="100">
             <template slot-scope="scope">
-              <span>{{scope.row.name}}</span>
+              <span class="ju">{{scope.row.name}}</span>
             </template>
           </el-table-column>
-          <el-table-column prop="content" label="短信模板内容">
+          <el-table-column prop="content" label="短信模板内容" width="300">
             <template slot-scope="scope">
               <span>{{scope.row.content}}</span>
             </template>
@@ -85,7 +81,7 @@
             </template>
           </el-table-column>
 
-          <el-table-column prop="status" label="短信状态">
+<!--          <el-table-column prop="status" label="短信状态">
             <template slot-scope="scope">
               <div v-if="scope.row.status==0">
                 停用
@@ -94,53 +90,75 @@
                 启用
               </div>
             </template>
-          </el-table-column>
-          <el-table-column prop="createName" label="创建人">
+          </el-table-column>-->
+          <el-table-column label="短信模板状态" align="center" prop="status" width="100">
             <template slot-scope="scope">
-              <span>{{scope.row.createName}}</span>
+              <el-switch
+                v-model="scope.row.status"
+                active-value="1"
+                inactive-value="0"
+                active-color="#13ce66"
+                inactive-color="#ff4949"
+                @change="changeStatus(scope.row)"
+              >
+              </el-switch>
+            </template>
+          </el-table-column>
+          <el-table-column prop="createName" label="创建人" width="100">
+            <template slot-scope="scope">
+              <span class="ju">{{scope.row.createName}}</span>
             </template>
           </el-table-column>
           <el-table-column prop="createTime" label="创建时间">
             <template slot-scope="scope">
-              <span>{{scope.row.createTime}}</span>
+              <span class="ju">{{scope.row.createTime}}</span>
             </template>
           </el-table-column>
-          <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
+          <el-table-column label="操作" align="center" width="130" class-name="small-padding fixed-width">
             <template slot-scope="scope">
               <el-button
                 size="mini"
                 type="text"
-                icon="el-icon-view"
+                icon="el-icon-edit"
                 @click="edit(scope.row)"
                 v-hasPermi="['setting:message:edit']"
-              >编辑
+              >修改
               </el-button>
               <el-button
                 size="mini"
                 type="text"
-                icon="el-icon-edit"
+                icon="el-icon-delete"
                 @click="del(scope.row)"
                 v-hasPermi="['setting:message:delete']"
               >删除
               </el-button>
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-delete"
+                @click="sendHandleAdd(scope.row)"
+                v-hasPermi="['setting:message:delete']"
+              >发送信息
+              </el-button>
             </template>
           </el-table-column>
         </el-table>
       </div>
       <pagination
-        v-show="total>0"
-        :total="total"
-        :page.sync="queryParams.page"
-        :limit.sync="queryParams.pageSize"
+        v-show="messTemtotal>0"
+        :total="messTemtotal"
+        :page.sync="queryParams.current"
+        :limit.sync="queryParams.size"
         @pagination="getList"
       />
 
     </div>
+<!--  发送短信  -->
     <div class="card-change" style="margin: 20px" v-if="tabindex == 1">
-      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="180px">
+      <el-form :model="sendqueryParams" ref="queryForm" size="small" :inline="true" label-width="180px">
 
-        <el-form-item label="" prop="status">
-          <el-select v-model="queryParams.status" style="width: 150px" placeholder="请选择短信名称">
+<!--        <el-form-item label="" prop="status">
+          <el-select v-model="sendqueryParams.status" style="width: 150px" placeholder="请选择短信名称">
             <el-option
               v-for="dict in dict.type.message_status"
               :key="dict.value"
@@ -148,26 +166,31 @@
               :value="dict.value"
             />
           </el-select>
+        </el-form-item>-->
+
+        <el-form-item label="" prop="name">
+          <el-input
+            v-model="sendqueryParams.name"
+            placeholder="请输入短信名称"
+            clearable
+            style="width: 240px;"
+            @keyup.enter.native="handleQuery"
+          />
         </el-form-item>
 
-        <el-form-item label="" prop="status">
-          <el-select v-model="queryParams.status" style="width: 150px" placeholder="请选择接收角色">
-            <el-option
-              v-for="dict in dict.type.message_status"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            />
+        <el-form-item label="" prop="roeleList">
+          <el-select v-model="sendqueryParams.roeleList" placeholder="请选择接收角色" clearable style="width: 240px;">
+            <el-option v-for="item in dutyList1" :label="item.dutyName" :value="item.dutyId"></el-option>
           </el-select>
         </el-form-item>
 
         <el-form-item style="float: right">
-          <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-          <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="sendhandleQuery">搜索</el-button>
+          <el-button icon="el-icon-refresh" @click="sendresetQuery">重置</el-button>
         </el-form-item>
       </el-form>
-
-      <div style="height: 70vh;overflow: auto">
+<!-- 发送短信列表 -->
+      <div style="height: 70vh;overflow: auto;width: 100%">
         <el-table :data="messageRecordList" border style="width: 100%">
           <el-table-column type="index" label="序号"></el-table-column>
           <el-table-column prop="name" label="短信名称">
@@ -182,12 +205,12 @@
           </el-table-column>
           <el-table-column prop="roleIds" label="接收角色">
             <template slot-scope="scope">
-              <span>{{scope.row.name}}</span>
+              <span>{{scope.row.roleIds}}</span>
             </template>
           </el-table-column>
           <el-table-column prop="successNum" label="短信发送记录">
             <template slot-scope="scope">
-              <span>{{scope.row.successNum || 0}}/{{scope.row.sendNum || 0}}</span>
+              <span @click="showDialog(scope.row)" style="color: #0BADFE">{{scope.row.successNum || 0}}/{{scope.row.sendNum || 0}}</span>
             </template>
           </el-table-column>
 
@@ -208,25 +231,95 @@
           </el-table-column>
           <el-table-column prop="createTime" label="发送时间">
             <template slot-scope="scope">
-              <span>{{scope.row.createTime}}</span>
+              <span>{{convertTimestampToDate(scope.row.sendTime)}}</span>
             </template>
           </el-table-column>
         </el-table>
       </div>
       <pagination
-        v-show="total>0"
-        :total="total"
-        :page.sync="queryParams.page"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getList"
+        v-show="sendquerytotal>0"
+        :total="sendquerytotal"
+        :page.sync="sendqueryParams.page"
+        :limit.sync="sendqueryParams.pageSize"
+        @pagination="messageRecordListss"
       />
+      <!-- 弹出框 -->
+      <el-dialog
+        title="短信接收人"
+        :visible.sync="dialogVisible"
+        width="50%">
+        <el-table
+          :data="msgList"
+          border
+          style="width: 100%">
+          <el-table-column
+            type="index"
+            label="序号"
+            >
+          </el-table-column>
+          <el-table-column
+            prop="deptNames"
+            label="所属机构"
+            >
+          </el-table-column>
+          <el-table-column
+            prop="mobile"
+            label="手机号"
+            width="180">
+          </el-table-column>
+          <el-table-column
+            prop="status"
+            label="短信状态"
+            width="180"
+            :formatter="statusFormatter">
+          </el-table-column>
+          <el-table-column
+            prop="messageNum"
+            label="短信条数"
+            width="180">
+          </el-table-column>
+
+        </el-table>
+        <pagination
+          v-show="msgTotal>0"
+          :total="msgTotal"
+          :page.sync="msgQuery.page"
+          :limit.sync="msgQuery.pageSize"
+          @pagination="msgRecordList"
+        />
+        <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">关闭</el-button>
+      </span>
+      </el-dialog>
 
     </div>
+    <!-- 短信费用 -->
     <div class="card-change" style="margin: 20px" v-if="tabindex == 2">
-      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="180px">
+      <el-form :model="costqueryParams" ref="queryParams2" size="small" :inline="true" label-width="180px">
 
-        <el-form-item label="" prop="status">
-          <el-select v-model="queryParams.status" style="width: 150px" placeholder="请选择机构名称">
+        <el-form-item label="" prop="deptIdList">
+          <el-select v-model="costqueryParams.deptIdList"  placeholder="请选择所属机构" style="width: 150px">
+            <el-option
+              v-for="item in deptListSelect"
+              :key="item.deptId"
+              :label="item.deptName"
+              :value="item.deptId"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="" prop="createName">
+          <el-input
+            v-model="costqueryParams.createName"
+            placeholder="请输入操作人"
+            clearable
+            style="width: 240px;"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+
+<!--        <el-form-item label="" prop="status">
+          <el-select v-model="queryParams2.status" style="width: 150px" placeholder="请选择操作人">
             <el-option
               v-for="dict in dict.type.message_status"
               :key="dict.value"
@@ -234,22 +327,11 @@
               :value="dict.value"
             />
           </el-select>
-        </el-form-item>
-
-        <el-form-item label="" prop="status">
-          <el-select v-model="queryParams.status" style="width: 150px" placeholder="请选择操作人">
-            <el-option
-              v-for="dict in dict.type.message_status"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            />
-          </el-select>
-        </el-form-item>
+        </el-form-item>-->
 
         <el-form-item style="float: right">
-          <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-          <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="costhandleQuery">搜索</el-button>
+          <el-button icon="el-icon-refresh" @click="costresetQuery">重置</el-button>
           <el-button
             type="primary"
             icon="el-icon-plus"
@@ -259,12 +341,12 @@
         </el-form-item>
       </el-form>
 
-      <div style="height: 70vh;overflow: auto">
+      <div style="height: 70vh;overflow: auto;width: 100%">
         <el-table :data="messageCostList" border style="width: 100%">
           <el-table-column type="index" align="center" label="序号"></el-table-column>
           <el-table-column prop="storeId" align="center" label="机构名称">
             <template slot-scope="scope">
-              <span>{{scope.row.storeId}}</span>
+              <span>{{scope.row.deptId}}</span>
             </template>
           </el-table-column>
           <el-table-column prop="contacts" align="center" label="联系人">
@@ -294,12 +376,12 @@
           </el-table-column>
           <el-table-column prop="rechargeRecord" align="center" label="短信充值记录">
             <template slot-scope="scope">
-              <span>{{scope.row.rechargeRecord}}</span>
+              <span @click="rechargeshowDialog(scope.row)" style="color: #0BADFE">{{scope.row.rechargeRecord}}</span>
             </template>
           </el-table-column>
           <el-table-column prop="createName" align="center" label="操作人">
             <template slot-scope="scope">
-              <span>{{scope.row.name}}</span>
+              <span>{{scope.row.createName}}</span>
             </template>
           </el-table-column>
           <el-table-column prop="createTime" align="center" label="操作时间">
@@ -312,7 +394,7 @@
               <el-button
                 size="mini"
                 type="text"
-                @click="del(scope.row)"
+                @click="recharge(scope.row)"
               >充值
               </el-button>
             </template>
@@ -320,23 +402,90 @@
         </el-table>
       </div>
       <pagination
-        v-show="total>0"
-        :total="total"
-        :page.sync="queryParams.page"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getList"
+        v-show="costtotal>0"
+        :total="costtotal"
+        :page.sync="costqueryParams.page"
+        :limit.sync="costqueryParams.pageSize"
+        @pagination="getMessageCostList"
       />
 
-    </div>
+      <el-dialog
+        title="短信充值记录"
+        :visible.sync="rechargedialogVisible"
+        width="50%">
+        <el-table
+          :data="rechargeList"
+          border
+          style="width: 100%">
+          <el-table-column
+            type="index"
+            label="序号"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="deptName"
+            label="所属机构"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="amount"
+            label="充值金额（元）"
+            width="180">
+          </el-table-column>
+          <el-table-column
+            prop="unitPrice"
+            label="短信单价（分/条）"
+            width="180"
+            :formatter="statusFormatter">
+          </el-table-column>
+          <el-table-column
+            prop="messageNum"
+            label="短信条数"
+            width="180">
+          </el-table-column>
+          <el-table-column
+            prop="rechargeUser"
+            label="充值用户"
+            width="180">
+          </el-table-column>
+          <el-table-column
+            prop="createTime"
+            label="充值时间"
+            width="180">
+          </el-table-column>
 
+        </el-table>
+        <pagination
+          v-show="rechargeTotal>0"
+          :total="rechargeTotal"
+          :page.sync="msgQuery.page"
+          :limit.sync="msgQuery.pageSize"
+          @pagination="msgRecordList"
+        />
+        <span slot="footer" class="dialog-footer">
+        <el-button @click="rechargedialogVisible = false">关闭</el-button>
+      </span>
+      </el-dialog>
+
+    </div>
+<!-- 短信模板添加/修改 -->
     <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="35%" append-to-body>
       <el-form ref="form" :rules="rules" :model="form" label-width="120px">
 
         <el-form-item label="短信模板ID" prop="messageId">
-          <el-input v-model="form.messageId" style="width: 300px"></el-input>
+          <el-input v-model="form.messageId" style="width: 300px" placeholder="请输入短信模板ID"></el-input>
         </el-form-item>
         <el-form-item label="短信名称" prop="name">
-          <el-input v-model="form.name" style="width: 300px"></el-input>
+          <el-input v-model="form.name" style="width: 300px" placeholder="请输入短信名称" @blur="handleBlur"></el-input>
+        </el-form-item>
+        <el-form-item label="短信模板" prop="content">
+          <el-input type="textarea"
+            v-model="form.content"
+            :maxlength="200"
+            show-word-limit
+            placeholder="请输入短信模板"
+            style="width: 300px">
+          </el-input>
         </el-form-item>
         <el-form-item label="适用范围" prop="deptIdList">
           <el-select v-model="form.deptIdList" multiple placeholder="请选择所属机构" style="width: 300px">
@@ -348,6 +497,12 @@
             ></el-option>
           </el-select>
         </el-form-item>
+        <!-- 接收角色 -->
+        <el-form-item label="接收角色" :required="true">
+          <el-select v-model="form.roeleList" multiple placeholder="请选择角色" style="width: 300px">
+            <el-option v-for="item in dutyList1" :label="item.dutyName" :value="item.dutyId"></el-option>
+          </el-select>
+        </el-form-item>
 
         <el-form-item label="状态" prop="status">
           <el-switch
@@ -358,6 +513,29 @@
 
         </el-form-item>
 
+        <!-- 发送条件 -->
+        <el-form-item label="发送条件" style="margin-bottom: 10px" :required="true">
+          <div v-for="(condition, index) in form.conditions" :key="index" class="condition-group"
+               style="margin-bottom: 10px">
+            <el-select v-model="condition.field" placeholder="请选择条件" style="width: 150px;margin-right: 10px"
+                       @change="changeField(index)">
+              <el-option label="商品库存量" value="商品库存量"></el-option>
+              <el-option label="剩余可挂账额度" value="剩余可挂账额度"></el-option>
+              <el-option label="车队总余额" value="车队总余额"></el-option>
+              <!-- 添加其他选项 -->
+            </el-select>
+            <el-select v-model="condition.operator" placeholder="请选择" style="width: 100px;margin-right: 10px">
+              <el-option label="大于" value="大于"></el-option>
+              <el-option label="等于" value="等于"></el-option>
+              <el-option label="小于" value="小于"></el-option>
+              <!-- 添加其他选项 -->
+            </el-select>
+            <el-input v-model="condition.value" placeholder="请输入" style="width: 200px;margin-right: 10px">
+              <template slot="append">{{ condition.field != '商品库存量' ? '元' : '件' }}</template>
+            </el-input>
+          </div>
+        </el-form-item>
+
         <!--        <el-form-item label="适用角色" prop="categoryName">-->
         <!--          <el-select v-model="form.roleIds" style="width: 300px" placeholder="全部">-->
         <!--            <el-option-->
@@ -368,9 +546,9 @@
         <!--            />-->
         <!--          </el-select>-->
         <!--        </el-form-item>-->
-        <el-form-item label="短信内容" prop="content">
-          <el-input type="textarea" v-model="form.content" style="width: 300px"></el-input>
-        </el-form-item>
+  <!--        <el-form-item label="短信内容" prop="content">
+            <el-input type="textarea" v-model="form.content" style="width: 300px"></el-input>
+          </el-form-item>-->
         <el-form-item>
           <el-button type="primary" @click="submitForm('form')">提交</el-button>
           <el-button @click="open = false">取 消</el-button>
@@ -378,7 +556,7 @@
       </el-form>
 
     </el-dialog>
-
+<!-- 新增费用设置 -->
     <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open2" width="35%" append-to-body>
       <el-form ref="form2" :rules="rules" :model="form2" label-width="120px">
 
@@ -401,12 +579,13 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm2">确 定</el-button>
-        <el-button @click="open3 = false">取 消</el-button>
+        <el-button @click="open2 = false">取 消</el-button>
       </div>
 
     </el-dialog>
+<!--  充值  -->
     <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open3" width="35%" append-to-body>
-      <el-form ref="form" :rules="rules" :model="form3" label-width="120px">
+      <el-form ref="form3" :rules="rules" :model="form3" label-width="120px">
 
         <el-form-item label="机构名称" prop="deptIdList">
           <el-select v-model="form3.deptIdList" multiple placeholder="请选择所属机构" style="width: 300px">
@@ -418,21 +597,50 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="充值金额" prop="content">
-          <el-input type="textarea" v-model="form3.content" style="width: 300px"></el-input>
+        <el-form-item label="充值金额" prop="amount">
+          <el-input type="textarea" v-model="form3.amount" placeholder="请输入充值金额" style="width: 300px"></el-input>
         </el-form-item>
-        <el-form-item label="短信单价" prop="content">
-          <el-input type="textarea" v-model="form3.content" style="width: 300px"></el-input>
+        <el-form-item label="短信单价" prop="unitPrice">
+          <el-input type="textarea" v-model="form3.unitPrice" placeholder="请输入短信单价" style="width: 300px"></el-input>
         </el-form-item>
-        <el-form-item label="短信条数" prop="content">
-          <el-input type="textarea" v-model="form3.content" style="width: 300px"></el-input>
+        <el-form-item label="短信条数" prop="messageNum">
+          <el-input type="textarea" v-model="form3.messageNum" placeholder="自动获取短信条数" style="width: 300px"></el-input>
+        </el-form-item>
+        <el-form-item>
+            <el-button type="primary" @click="submitForm3">确 定</el-button>
+            <el-button @click="open3 = false">取 消</el-button>
+        </el-form-item>
+      </el-form>
+    </el-dialog>
+<!-- 发送短信框 -->
+    <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="sendOpen" width="35%" append-to-body>
+      <el-form ref="sendForm"  :model="sendForm" label-width="120px">
+        <el-form-item label="短信接收人" prop="messageSendee">
+          <el-input v-model="sendForm.messageSendee" style="width: 300px" placeholder="请输入手机号,多个手机号用英文逗号隔开"></el-input>
+        </el-form-item>
+        <el-form-item label="短信名称" prop="messageId" v-show="false">
+          <el-input v-model="sendForm.messageId" style="width: 300px" placeholder="请选择短信名称" disabled v-show="false"></el-input>
+        </el-form-item>
+        <el-form-item label="短信名称" prop="messageId">
+          <el-input v-model="sendForm.messageName" style="width: 300px" placeholder="请选择短信名称" disabled></el-input>
+        </el-form-item>
+        <el-form-item label="短信模板" prop="messageId">
+          <el-input v-model="sendForm.aa" style="width: 300px" disabled></el-input>
+        </el-form-item>
+        <el-form-item label="发送时间" prop="sendTime">
+          <div class="block">
+            <el-date-picker
+              v-model="sendForm.sendTime"
+              type="date"
+              placeholder="选择日期">
+            </el-date-picker>
+          </div>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="sendSubmitForm">确 定</el-button>
+          <el-button @click="sendOpen = false">取 消</el-button>
         </el-form-item>
-        <div slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="submitForm3">确 定</el-button>
-          <el-button @click="open3 = false">取 消</el-button>
-        </div>
       </el-form>
-
     </el-dialog>
 
   </div>
@@ -440,12 +648,15 @@
 
 <script>
 
-import {deleteApi, getListApi, saveApi, updateApi} from "../../api/sys/message";
+import {deleteApi, getListApi, saveApi, updateApi, getNameListApi, sendMessageSaveApi,
+        messageRecordListApi,selectChildList,getOneApi} from "../../api/sys/message";
 import {getToken} from '../../utils/auth'
 import {selectChildByDeptId} from "../../api/system/Site/site";
 import NotifyMode from "./page/mode.vue";
-import {getCostListApi, saveCostApi, updateCostApi} from "@/api/sys/messageCost";
+import {getCostListApi, saveCostApi, updateCostApi, getCostReListApi} from "@/api/sys/messageCost";
 import {getStaffByDeptId} from "@/api/staff/staff";
+import {saveMessageRechargeRecordApi} from "../../api/sys/messageRechargeRecord.js"
+import {dutyList} from "@/api/duty/duty";
 
 export default {
   name: "printIndex",
@@ -453,6 +664,22 @@ export default {
   dicts: ['dept_ids', 'message_status'],
   data() {
     return {
+      dutyList1: [],
+      conditions: [],
+      tableData: [
+        { status: 0 },
+        { status: 1 },
+      ],
+      dialogVisible: false,
+      rechargedialogVisible: false,
+      currentData: [],
+      sendqueryParams:{
+        page: 1,
+        pageSize: 10,
+        roleIds:'',
+        roeleList:''
+      },
+      sendTime:'',
       tabindex: 0,
       tabs: [
         {
@@ -465,7 +692,7 @@ export default {
           name: '短信费用设置',
         },
       ],
-      tableData: [],
+      // tableData: [],
       form: {},
       deptListSelect: [],
       systemPositionList: [{
@@ -481,8 +708,8 @@ export default {
       total: 0,
       // 查询参数
       queryParams: {
-        page: 1,
-        pageSize: 10,
+        current: 1,
+        size: 10,
         bannerName: '',
         systemPosition: '',
         bannerStatus: '',
@@ -501,13 +728,16 @@ export default {
       queryParams2: {
         page: 1,
         pageSize: 10,
+        deptIdList:''
       },
       messageCostList: [],
       open2: false,
       form2: {},
       open3: false,
       form3: {},
-
+      sendOpen: false,
+      sendForm: {},
+      messageSendee:'',
       // 上传地址
       uploadAction: process.env.VUE_APP_BASE_API + 'backendApi/file/upload',
       uploadHeader: {'Access-Token': getToken()},  // 上传文件列表
@@ -521,6 +751,25 @@ export default {
       imagePath: process.env.VUE_APP_BASE_API,
       // 隐藏上传
       hideUpload: false,
+      msgList:[],
+      msgQuery:{
+        page: 1,
+        pageSize: 10,
+      },
+      costqueryParams:{
+        page: 1,
+        pageSize: 10,
+      },
+      rechargeList:[],
+      rechargeQuery:{
+        page: 1,
+        pageSize: 10,
+      },
+      msgTotal:0,
+      rechargeTotal:0,
+      messTemtotal:0,
+      costtotal:0,
+      sendquerytotal:0,
       // 表单校验
       rules: {
         messageId: [
@@ -533,7 +782,8 @@ export default {
           {required: true, message: "适用范围不能为空", trigger: "blur"}
         ],
         content: [
-          {required: true, message: "短信介绍不能为空", trigger: "blur"}
+          {required: true, message: "短信介绍不能为空", trigger: "blur"},
+          { max: 200, message: '短信模板不能超过200个字符', trigger: 'blur' }
         ],
         deptId: [
           {required: true, message: "机构名称不能为空", trigger: "blur"}
@@ -543,6 +793,15 @@ export default {
         ],
         mobile: [
           {required: true, message: "联系方式不能为空", trigger: "blur"}
+        ],
+        amount: [
+          {required: true, message: "充值金额不能为空", trigger: "blur"}
+        ],
+        unitPrice: [
+          {required: true, message: "单价不能为空", trigger: "blur"}
+        ],
+        messageNum: [
+          {required: true, message: "短信条数不能为空", trigger: "blur"}
         ]
       }
     };
@@ -550,8 +809,196 @@ export default {
   created() {
     this.getList()
     this.selectChildByDeptIdApi()
+    this.messageRecordListss()
+    this.getDutyList()
   },
   methods: {
+    convertTimestampToDate(timestamp) {
+      const date = new Date(timestamp);
+      // 获取本地时间的各部分
+      const year = date.getFullYear();
+      const month = String(date.getMonth() + 1).padStart(2, '0'); // 月份从0开始
+      const day = String(date.getDate()).padStart(2, '0');
+      const hours = String(date.getHours()).padStart(2, '0');
+      const minutes = String(date.getMinutes()).padStart(2, '0');
+      const seconds = String(date.getSeconds()).padStart(2, '0');
+
+      return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+    },
+    changeField(index) {
+      let field = this.form.conditions[index].field
+      let sum = 0
+      this.form.conditions.forEach(res => {
+        if (res.field === field) {
+          sum++
+        }
+      })
+      if (sum > 1) {
+        this.form.conditions.splice(index, 1)
+        this.$message({
+          type: 'info',
+          message: '条件不允许重复!'
+        });
+      }
+    },
+    getDutyList() {
+      // this.loading = true;
+      let queryParams1 = {
+        page: 1,
+        pageSize: 10000
+      }
+      dutyList(queryParams1).then(res => {
+        this.dutyList1 = res.data.records;
+        // this.total1 = res.data.total;
+        // this.loading = false;
+      })
+    },
+    // 充值记录列表
+    rechargeRecordList(){
+      getCostReListApi(this.rechargeQuery).then(res => {
+        console.log(this.rechargeQuery)
+        this.rechargeList = res.data.records
+        this.rechargeTotal = res.data.total
+      })
+    },
+    // 充值记录弹框
+    rechargeshowDialog(row) {
+      this.rechargeQuery.storeId = row.storeId
+      this.rechargeRecordList()
+      this.rechargedialogVisible = true;
+    },
+    // 充值
+    recharge() {
+      this.clean()
+      this.open3 = true;
+      this.title = "充值"
+    },
+    statusFormatter(row, column, cellValue, index) {
+      return cellValue === 0 ? '成功' : '失败';
+    },
+    // 短信接收人
+    showDialog(row) {
+      this.msgQuery.messageRecordId = row.id
+      this.msgRecordList()
+      this.dialogVisible = true;
+    },
+    // 短信接收列表
+    msgRecordList(){
+      selectChildList(this.msgQuery).then(res => {
+        this.msgList = res.data.records
+        this.msgTotal = res.data.total
+      })
+    },
+    // 发送短信重置
+    sendresetQuery() {
+      this.sendqueryParams = {
+        page: 1,
+        pageSize: 10,
+      },
+        this.messageRecordListss()
+    },
+    // 发送短信查询
+    sendhandleQuery() {
+      this.messageRecordListss()
+    },
+    // 发送短信列表
+    messageRecordListss() {
+      this.sendqueryParams.roleIds = this.sendqueryParams.roeleList;
+      messageRecordListApi(this.sendqueryParams).then(res => {
+        this.messageRecordList = res.data.records;
+        this.sendquerytotal = res.data.total
+      })
+    },
+    // 发送信息提交按钮
+    sendSubmitForm: function () {
+      this.$refs["sendForm"].validate(valid => {
+        if (!valid) {
+          return;
+        }
+        sendMessageSaveApi(this.sendForm).then(response => {
+          if (response.code === 200) {
+            this.$modal.msgSuccess("新增成功");
+            this.sendOpen = false;
+            this.getList();
+          }else {
+            this.$message.error(response.message)
+          }
+        });
+      });
+    },
+    sendHandleAdd(e) {
+      this.clean()
+      this.sendForm.messageId = e.id
+      getOneApi(e.id).then(res => {
+        if (res.code === 200) {
+          this.sendForm.messageName = res.data.name;
+          this.sendForm.aa = res.data.content;
+        }
+        this.sendOpen = true;
+        this.title = "发送短信";
+      })
+    },
+    // 校验参数是否为空字符
+    validateMessageId(rule, value, callback) {
+      if (value === null || value === '' || value === undefined) {
+      } else {
+        callback(); // 验证通过
+      }
+    },
+    // 鼠标移出事件
+    handleBlur(){
+      console.log(this.form.name)
+      // if (!this.form.name === undefined || this.form.name === '' || this.form.name === null) {
+        getNameListApi(this.form.name).then(res => {
+          if (res.code === 200) {
+            if (res.data === 1) {
+              this.$message({
+                message: '短信名称重复',
+                type: 'warning'
+              });
+            }
+          }
+        })
+      // }
+    },
+    // 短信模板提交按钮
+    submitForm(form) {
+      this.$refs["form"].validate(valid => {
+        if (!valid) {
+          return;
+        }
+        // 修改的提交
+        if (this.form.id != null) {
+          updateApi(this.form).then(response => {
+            if (response.code === 200) {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            }else {
+              this.$message.error(response.message)
+            }
+          });
+          return;
+        }
+        // 添加的提交
+        saveApi(this.form).then(response => {
+          if (response.code === 200) {
+            this.$modal.msgSuccess("新增成功");
+            this.open = false;
+            this.getList();
+          }else {
+            this.$message.error(response.message)
+          }
+        });
+        // if (valid) {
+        //   // 表单验证通过，可以提交数据
+        //   this.submitDeviceInfo();
+        // } else {
+        //   // 表单验证失败，不执行任何操作
+        //   return false;
+        // }
+      });
+    },
     getStaff(deptId){
       getStaffByDeptId(deptId).then(res => {
         this.form2.contacts = res.data.realName
@@ -589,10 +1036,22 @@ export default {
         }
       });
     },
-    // 提交按钮
+    // 充值提交按钮
     submitForm3: function () {
       this.$refs["form3"].validate(valid => {
-        if (valid) {
+        if (!valid) {
+          return;
+        }
+        saveMessageRechargeRecordApi(this.form3).then(response => {
+          if (response.code === 200) {
+            this.$modal.msgSuccess("新增成功");
+            this.open3 = false;
+            this.getMessageCostList();
+          }else {
+            this.$message.error(response.message)
+          }
+        });
+        /*if (valid) {
           if (!this.form3.id) {
             // saveLinkManageApi(this.form).then(res => {
             //   if (res.data==1){
@@ -616,16 +1075,16 @@ export default {
             //   }
             // })
           }
-        }
+        }*/
       });
     },
     handleAdd2() {
       this.open2 = true
     },
     getMessageCostList() {
-      getCostListApi(this.queryParams2).then(res => {
+      getCostListApi(this.costqueryParams).then(res => {
         this.messageCostList = res.data.records
-        this.total2 = res.data.total
+        this.costtotal = res.data.total
       })
     },
     getindex(index) {
@@ -654,13 +1113,14 @@ export default {
 
       })
     },
+    // 短信模板列表
     getList() {
       getListApi(this.queryParams).then(res => {
         this.tableData = res.data.records;
-        this.total = res.data.total
+        this.messTemtotal = res.data.total
       })
     },
-    submitForm(formName) {
+    /*submitForm(formName) {
       this.$refs[formName].validate(valid => {
         if (valid) {
           // 表单验证通过，可以提交数据
@@ -670,7 +1130,7 @@ export default {
           return false;
         }
       });
-    },
+    },*/
     submitDeviceInfo() {
       // 在这里调用接口提交设备信息数据
       console.log('提交设备信息数据:', this.form);
@@ -690,6 +1150,7 @@ export default {
         })
       }
     },
+    // 修改状态
     changeStatus(data) {
       updateApi(data).then(res => {
         if (res.code === 200) {
@@ -710,10 +1171,22 @@ export default {
     handleQuery() {
       this.getList()
     },
-    resetQuery() {
-      this.queryParams = {
+    costhandleQuery() {
+      this.getMessageCostList()
+    },
+    costresetQuery() {
+      this.queryParams2 = {
         page: 1,
         pageSize: 10,
+        deptIdList: '',
+      },
+        this.getMessageCostList()
+    },
+
+    resetQuery() {
+      this.queryParams = {
+        current: 1,
+        size: 10,
         deviceName: '',
       },
         this.getList()
@@ -763,7 +1236,8 @@ export default {
         bannerStatus: false,       // Banner状态
         note: '',    // 备注
         createByName: '', //
-      }
+      };
+      this.selectedDat = undefined;
     },
   }
 };
@@ -807,6 +1281,7 @@ export default {
   display: flex;
   box-sizing: border-box;
   margin-bottom: 25px;
+  text-align: center; /* 水平居中 */
 
 }
 
@@ -829,5 +1304,10 @@ export default {
   color: #FF770F !important;
 }
 
+.ju {
+  display: block;
+  text-align: center;
+}
+
 </style>
 
diff --git a/fuintAdmin/src/views/power/payment/index.vue b/fuintAdmin/src/views/power/payment/index.vue
index cede55769..c66a9172b 100644
--- a/fuintAdmin/src/views/power/payment/index.vue
+++ b/fuintAdmin/src/views/power/payment/index.vue
@@ -397,9 +397,10 @@
           label="操作">
           <template slot-scope="scope">
             <div style="display: flex;justify-content: center;width: 100%">
-              <div style="color: #409EFF;cursor: pointer;margin: 0 10px" v-hasPermi="['payment:edit']" @click="editRule(scope.row)">修改</div>
-              <div style="color: #409EFF;cursor: pointer;margin: 0 10px" v-hasPermi="['payment:delete']" @click="deleteRule(scope.row)">删除</div>
-              <div style="color: #409EFF;cursor: pointer;margin: 0 10px" @click="EnableRule(scope.row)">启用</div>
+              <div style="color: #409EFF;cursor: pointer;margin: 0 10px" v-hasPermi="['payment:edit']"  v-if="scope.row.status!= 'qy'" @click="editRule(scope.row,1)">修改</div>
+              <div style="color: #409EFF;cursor: pointer;margin: 0 10px" v-hasPermi="['payment:delete']"  v-if="scope.row.status!= 'qy'" @click="deleteRule(scope.row)">删除</div>
+              <div style="color: #409EFF;cursor: pointer;margin: 0 10px" v-if="scope.row.status!= 'qy'" @click="EnableRule(scope.row)">启用</div>
+              <div style="color: #409EFF;cursor: pointer;margin: 0 10px" v-if="scope.row.status!= 'jy'" @click="editRule(scope.row,2)">查看</div>
             </div>
 
           </template>
@@ -456,11 +457,11 @@
     <el-dialog :title="Ruletitle" :visible.sync="addRule">
       <el-form :model="formRule" ref="formRule" :rules="rules">
         <el-form-item label="规则名称" :label-width="formLabelWidth" prop="ruleName">
-          <el-input v-model="formRule.ruleName" placeholder="请输入规则名称" autocomplete="off" style="width: 350px"></el-input>
+          <el-input v-model="formRule.ruleName" placeholder="请输入规则名称" autocomplete="off" style="width: 350px" :disabled="!isEditable"></el-input>
         </el-form-item>
         <el-form-item label="规则描述" :label-width="formLabelWidth">
           <el-input type="textarea" v-model="formRule.description" placeholder="请输入规则描述" autocomplete="off"
-                    style="width: 350px"></el-input>
+                    style="width: 350px" :disabled="!isEditable"></el-input>
         </el-form-item>
         <el-form-item label="规则类型" :label-width="formLabelWidth" prop="ruleType">
           <div style="display: flex">
@@ -494,7 +495,7 @@
             </el-form-item>
             <el-form-item label="交易占比" :label-width="formLabelWidth">
 
-              <el-input v-model="item.proportion" placeholder="请输入交易占比" autocomplete="off" style="width: 300px">
+              <el-input v-model="item.proportion" placeholder="请输入交易占比" autocomplete="off" style="width: 300px" :disabled="!isEditable">
                 <template slot="append">%</template>
               </el-input>
             </el-form-item>
@@ -691,7 +692,8 @@ import {
   deleteRuleConfig,
   editRuleConfig,
   getOilGunList,
-  getRuleConfig
+  getRuleConfig,
+  listRuleConfig, listRuleConfigs
 } from "../../../api/payConfig/ruleConfig";
 import {selectChildByDeptId} from "../../../api/system/role";
 import {getPaymentParameterByDeptId} from "../../../api/payConfig/paymentParameter";
@@ -710,6 +712,7 @@ export default {
       // 规则周期
       ruleCycle: "singleDay",
       form: {
+        isEditable: false,
         name: '',
         region: '',
         date1: '',
@@ -782,6 +785,7 @@ export default {
   },
   created() {
     this.getList();
+    this.tableData1list();
   },
   methods: {
     submitEnable(val){
@@ -923,9 +927,15 @@ export default {
         this.payChannel = res.data
       })
     },
-    editRule(data){
+    editRule(data, index){
       getRuleConfig(data.id).then(res => {
-        this.Ruletitle = '修改商户信息'
+        if (index === 2) {
+          this.Ruletitle = '查看商户信息';
+          this.isEditable = false;
+        }else {
+          this.Ruletitle = '修改商户信息';
+          this.isEditable = true;
+        }
         this.addRule = true
         this.formRule = res.data
         this.formRule.ruleList.forEach(item => {
@@ -951,6 +961,7 @@ export default {
         return deleteRuleConfig(data.id);
       }).then(() => {
         this.getList();
+        this.tableData1list();
         this.$modal.msgSuccess("删除成功");
       }).catch(() => {
       });
@@ -1213,6 +1224,25 @@ export default {
         this.oilConfigList = response.data;
       })
     },
+    // 商户分账列表
+    tableData1list() {
+      listRuleConfigs().then(response => {
+
+        console.log(response.data + "       -==-      -==-")
+
+        this.tableData1 = response.data;
+        /*this.merchantList.forEach(item => {
+          if (item.isOpenRule == "1") {
+            this.value1 = false;
+            this.value = true;
+          }
+        })
+      })
+      listOilConfig().then(response => {
+        this.oilConfigList = response.data;
+      })*/
+      })
+    },
     open() {
       this.$confirm('此操作会发布事件, 是否继续?', '提示', {
         confirmButtonText: '确定',
diff --git a/fuintAdmin/src/views/power/receiptPrint.vue b/fuintAdmin/src/views/power/receiptPrint.vue
index 98c69c07c..ba29644a4 100644
--- a/fuintAdmin/src/views/power/receiptPrint.vue
+++ b/fuintAdmin/src/views/power/receiptPrint.vue
@@ -1,15 +1,340 @@
 <template>
-  <div>
-    小票打印配置
+  <div class="container">
+    <img :src="logo" alt="Logo" style="margin-left: 80px;" class="logo">
+    <div class="form-container">
+      <el-form ref="form" :model="form" label-width="120px">
+        <p style="font-weight: bold;">LOGO设置</p>
+        <div class="radio-and-upload">
+          <el-radio-group v-model="form.logoSet" style="display: inline-block;">
+            <el-radio v-model="logoSet" label="0">自定义小票LOGO</el-radio>
+            <el-radio v-model="logoSet" label="1">不打印小票LOGO</el-radio>
+          </el-radio-group>
+          <!-- logo -->
+          <el-upload
+            :action="uploadAction"
+            list-type="picture-card"
+            :class="{hide:hideUpload}"
+            :file-list="uploadFiles"
+            :auto-upload="true"
+            :show-file-list="false"
+            :headers="uploadHeader"
+            :on-success="handleUploadSuccessCover">
+            <img
+              v-if="this.form.logeImage"
+              :src="imagePath + this.form.logeImage"
+              class="list-img"
+              style="width: 100%; height: auto;"
+            />
+            <i v-if="!this.form.logeImage" class="el-icon-plus"></i>
+          </el-upload>
+        </div>
+        <p style="font-weight: bold;">抬头、脚注设置</p>
+        <el-checkbox-group v-model="form.headfootSets" class="vertical-checkbox-group">
+          <el-checkbox :label="0">店铺名称</el-checkbox>
+          <div class="checkbox-input-container">
+            <el-checkbox :label="1">标题</el-checkbox>
+            <el-input v-model="form.title" style="width: 300px" placeholder="请输入标题"></el-input>
+          </div>
+
+          <div class="checkbox-input-container">
+            <el-checkbox :label="2">小票类型</el-checkbox>
+            <span style="font-size: 10px">注：会员充值、一件加油、收银台消费</span>
+          </div>
+
+          <div class="checkbox-input-container">
+            <el-checkbox :label="3">脚注</el-checkbox>
+            <el-input v-model="form.foot" style="width: 300px" placeholder="请输入脚注"></el-input>
+          </div>
+
+        </el-checkbox-group>
+        <p style="font-weight: bold;">顶部设置</p>
+        <el-checkbox-group v-model="form.topSets">
+          <el-checkbox :label="0" >订单编号</el-checkbox>
+          <el-checkbox :label="1" >会员卡号</el-checkbox>
+          <el-checkbox :label="2" >车牌号</el-checkbox>
+          <el-checkbox :label="3" >会员等级</el-checkbox>
+          <el-checkbox :label="4" >手机号码</el-checkbox>
+          <el-checkbox :label="5" >会员余额</el-checkbox>
+          <el-checkbox :label="6" >会员积分</el-checkbox>
+        </el-checkbox-group>
+        <p style="font-weight: bold;">中部设置</p>
+        <span style="font-size: 15px;font-weight: lighter">该区域为小票模板的固定排版，无法调整！</span>
+        <p style="font-weight: bold;">底部设置</p>
+        <el-checkbox-group v-model="form.bottomSets">
+          <el-checkbox :label="0" >操作时间</el-checkbox>
+          <el-checkbox :label="1" >联系方式</el-checkbox>
+          <el-checkbox :label="2" >操作员</el-checkbox>
+          <el-checkbox :label="3" >地址</el-checkbox>
+          <el-checkbox :label="4" >备注</el-checkbox>
+            <el-input v-model="form.remarks" style="width: 300px" placeholder="请输入备注"></el-input>
+        </el-checkbox-group>
+        <p style="font-weight: bold;">二维码设置</p>
+        <div class="radio-and-upload">
+        <el-radio-group v-model="form.codeSet" >
+          <el-radio v-model="logoSet" label="1">自定义二维码</el-radio>
+          <el-radio v-model="logoSet" label="2">不打印二维码</el-radio>
+        </el-radio-group>
+<!--    二维码      -->
+        <el-upload
+          :action="uploadAction"
+          list-type="picture-card"
+          :class="{hide:hideUpload}"
+          :file-list="uploadFiles"
+          :auto-upload="true"
+          :show-file-list="false"
+          :headers="uploadHeader"
+          :on-success="ermUploadSuccessCover">
+          <img
+            v-if="this.form.codeImage"
+            :src="imagePath + this.form.codeImage"
+            class="list-img"
+            style="width: 100%; height: auto"
+          />
+          <i v-if="!this.form.codeImage" class="el-icon-plus"></i>
+        </el-upload>
+        </div>
+        <el-form-item>
+          <el-button type="primary" @click="submitForm3('form')">保存并同步更新小票样式</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
   </div>
 </template>
 
 <script>
-export default {
 
+import { getToken } from '../../utils/auth'
+import {addReceiptPrinting, getApi} from "@/api/sys/receiptPrint";
+import {getListApi} from "@/api/sys/message";
+export default {
+  data(){
+    return{
+
+      checked: true,
+      form: {
+        id:'',
+        topSets: [],
+        bottomSets: [],
+        headfootSets: [],
+        codeSet:'',
+        logoSet: '',
+        logeImage: '',
+        remarks:'',
+        codeImage:'',
+        title:'',
+        foot:'',
+      },
+      form2: {
+        id:'',
+        topSets: [],
+        bottomSets: [],
+        headfootSets: [],
+        codeSet:'',
+        logoSet: '',
+        logeImage: '',
+        remarks:'',
+        codeImage:'',
+        title:'',
+        foot:'',
+      },
+      logoSet: '', // 单选框的值，
+      ding: '',
+      logo:require('@/assets/xiaopiao.jpg'),
+      imageUrl: '',
+      // 上传地址
+      uploadAction: process.env.VUE_APP_BASE_API + 'backendApi/file/upload',
+      uploadHeader: { 'Access-Token' : getToken() },  // 上传文件列表
+      uploadFiles: [
+        {name:"nihao",
+          url:'http://localhost:8008/static/uploadImages/20231103/ffbbe7d3ee1441fdaf706802fa0f176a.png'}
+      ],
+      // 图片根目录
+      imagePath: process.env.VUE_APP_BASE_API,
+      // 隐藏上传
+      hideUpload: false,
+    };
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    getList() {
+      getApi().then(res => {
+        if (res.code === 200) {
+          if (res.data != null) {
+            this.form = res.data;
+          }
+        }
+      })
+    },
+    // 上传logo
+    handleUploadSuccessCover(file) {
+      this.form.logeImage = file.data.fileName;
+    },
+    // 二维码
+    ermUploadSuccessCover(file) {
+      this.form.codeImage = file.data.fileName;
+    },
+    submitForm3() {
+      addReceiptPrinting(this.cle()) .then(res => {
+        if (res.code === 200) {
+          this.$message({
+            message: '保存成功',
+            type: 'success'
+          })
+        } else {
+          this.$message({
+            message: res.msg,
+            type: 'error'
+          })
+        }
+      })
+    },
+    cle() {
+        this.form2.id=this.form.id
+        this.form2.topSets= this.form.topSets
+        this.form2.bottomSets=  this.form.bottomSets
+        this.form2.headfootSets= this.form.headfootSets
+        this.form2.codeSet= this.form.codeSet
+        this.form2.logoSet= this.form.logoSet
+        this.form2.logeImage= this.form.logeImage
+        this.form2.remarks= this.form.remarks
+        this.form2.codeImage= this.form.codeImage
+        this.form2.title= this.form.title
+        this.form2.foot= this.form.foot
+      return this.form2;
+    }
+  }
 }
 </script>
 
 <style lang="scss" scoped>
 
+.checkbox-input-container {
+  display: flex;
+  align-items: center; /* 垂直居中对齐 */
+  gap: 10px; /* 设置复选框和输入框之间的间距 */
+}
+
+.input-field {
+  width: 300px; /* 设置输入框宽度 */
+}
+
+.vertical-checkbox-group {
+  display: flex;
+  flex-direction: column;
+}
+
+.vertical-checkbox-group .el-checkbox {
+  margin-bottom: 8px; /* 调整间距 */
+}
+
+
+.list-img{
+  width: 98px;
+  height: 98px;
+}
+.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  gap: 5px; /* 减小间距 */
+}
+
+.upload-text {
+  font-size: 8px;
+  color: #606266;
+}
+
+.radio-and-upload {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+::v-deep .el-radio{
+  display: block;
+  margin:10px 0;
+}
+
+.container {
+  display: flex;
+}
+
+.logo {
+  width: 200px;  /* 根据需要调整图片宽度 */
+  height: auto;  /* 保持图片比例 */
+  margin-right: 100px;  /* 图片与内容之间的间距 */
+}
+
+.content {
+  flex: 1;  /* 使内容区域占据剩余空间 */
+}
+
+.radio-and-upload {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.avatar-uploader {
+  width: 80px;
+  height: 80px;
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  cursor: pointer;
+}
+
+.avatar-uploader .avatar {
+  width: 100%;
+  height: auto;
+}
+
+.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+}
+
+avatar-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+.avatar-uploader .el-upload:hover {
+  border-color: #409EFF;
+}
+.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  line-height: 178px;
+  text-align: center;
+}
+.avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
+
+.form-container {
+  display: flex;
+  flex-direction: column;
+  gap: 10px;
+}
+
+/* 使按钮居中对齐 */
+.el-form-item {
+  display: flex;
+  justify-content: center;
+  margin-top: 20px;
+}
+
 </style>