9.12

fuintAdmin/src/layout/components/Sidebar/SidebarItem.vue

@@ -35,7 +35,7 @@
             <img src="@/assets/menu_icon/caiwu.png" v-if="!activeMenu.includes('/financialStatement')" style="width: 25px;height: 25px;"/>
             <img src="@/assets/menu_icon/caiwu_b.png" v-else style="width: 25px;height: 25px;"/>
           </span>
-          <span style="margin-right: 10px;" v-if="item.meta.title=='门店管理'">
+          <span style="margin-right: 10px;" v-if="item.meta.title=='油站设置'">
             <img src="@/assets/menu_icon/shouye.png" v-if="!activeMenu.includes(item.path) && !activeMenu.includes('/staff') && !activeMenu.includes('/feedBack') && !activeMenu.includes('/duty')" style="width: 21px;height: 21px;"/>
             <img src="@/assets/menu_icon/shouye_b.png" v-else style="width: 21px;height: 21px;"/>
           </span>
@@ -84,7 +84,7 @@
             <img src="@/assets/menu_icon/caiwu1.png" v-if="!activeMenu.includes('/financialStatement')" style="width: 25px;height: 25px;"/>
             <img src="@/assets/menu_icon/caiwu1_b.png" v-else style="width: 25px;height: 25px;"/>
           </span>
-          <span style="margin-right: 10px;" v-if="item.meta.title=='门店管理'">
+          <span style="margin-right: 10px;" v-if="item.meta.title=='油站设置'">
             <img src="@/assets/menu_icon/shouye.png" v-if="!activeMenu.includes(item.path) && !activeMenu.includes('/staff') && !activeMenu.includes('/feedBack') && !activeMenu.includes('/duty')" style="width: 25px;height: 25px;"/>
             <img src="@/assets/menu_icon/shouye_b.png" v-else style="width: 25px;height: 25px;"/>
           </span>

fuintAdmin/src/views/EventMarketing/center/index.vue

@@ -723,7 +723,7 @@ export default {
   background: #fff;
   border-radius: 10px;
   box-sizing: border-box;
-  padding: 15px;
+  padding: 20px;
 }
 
 .gang {
@@ -745,7 +745,7 @@ export default {
   border: 1px solid #EEEEEE;
   margin-top: 15px;
   margin-right: 15px;
-  width: 310px;
+  width: 315px;
 }
 
 .nr-top {

fuintAdmin/src/views/feedBack/index.vue

@@ -15,15 +15,6 @@
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-        <el-form-item label="" prop="status" style="width: 180px">
-          <el-select
-            v-model="queryParams.storeId"
-            clearable
-            placeholder="请选择机构名称"
-          >
-            <el-option v-for="(item,index) in storeList" :key="index" :label="item.name" :value="item.id"/>
-          </el-select>
-        </el-form-item>
         <el-form-item label="">
           <el-date-picker
             v-model="beginTime"
@@ -49,7 +40,7 @@
       <div style="height: 70vh;overflow: auto">
         <el-table v-loading="loading" :data="list">
           <el-table-column type="index" width="80" align="center" label="序号"/>
-          <!--        <el-table-column align="center"  prop="userId" label="用户昵称"/>-->
+          <el-table-column align="center" prop="storeName" label="所属机构"/>
           <el-table-column align="center" prop="userName" label="用户昵称"/>
           <el-table-column align="center" prop="userMobile" label="用户手机号"/>
           <el-table-column align="center" prop="content" label="反馈内容"/>
@@ -111,7 +102,7 @@
           <el-input v-model="form.content" disabled placeholder="请输入反馈内容" type="textarea"/>
         </el-form-item>
 
-        <el-form-item label="截图" >
+        <el-form-item label="截图">
           <span v-if="screenshotUrl.length>0"
                 v-for="(item,index) in screenshotUrl" :key="index">
                 <img style="width: 150px;margin-right: 15px" :src="baseUrl + item">
@@ -149,13 +140,13 @@ export default {
         page: 1,
         pageSize: 10,
       },
-      beginTime:"",
+      beginTime: "",
-      endTime:'',
+      endTime: '',
-      storeList:[],
+      storeList: [],
       title: '',
       open: false,
       form: {},
-      screenshotUrl:[],
+      screenshotUrl: [],
       // 表单校验
       rules: {
         content: [
@@ -172,7 +163,7 @@ export default {
     this.getStoreList()
   },
   methods: {
-    getStoreList(){
+    getStoreList() {
       storesList().then(response => {
         this.storeList = response.data
       });

fuintAdmin/src/views/power/message.vue

@@ -157,17 +157,6 @@
     <div class="card-change" style="margin: 20px" v-if="tabindex == 1">
       <el-form :model="sendqueryParams" ref="queryForm" size="small" :inline="true" label-width="180px">
 
-<!--        <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"
-              :label="dict.label"
-              :value="dict.value"
-            />
-          </el-select>
-        </el-form-item>-->
-
         <el-form-item label="" prop="name">
           <el-input
             v-model="sendqueryParams.name"

fuintAdmin/src/views/staff/list.vue

@@ -159,150 +159,8 @@
 
     <!-- 添加或修改对话框 -->
     <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="30%" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-<!--        <el-row>-->
-<!--          <el-col :span="8">-->
-<!--            <el-form-item label="姓名" prop="realName">-->
-<!--              <el-input v-model="form.realName" placeholder="请输入姓名" maxlength="30"/>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-<!--          <el-col :span="8">-->
-<!--            <el-form-item label="手机号" prop="mobile">-->
-<!--              <el-input v-model="form.mobile" placeholder="请输入联系人电话" maxlength="30"/>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-<!--        </el-row>-->
-<!--        <el-row>-->
-<!--          <el-col :span="8">-->
-<!--            <el-form-item label="角色组" prop="roleId">-->
-<!--              <el-select v-model="form.roleId" placeholder="请选择角色">-->
-<!--                <el-option-->
-<!--                  v-for="item in roleList"-->
-<!--                  :key="item.dutyId+''"-->
-<!--                  :label="item.dutyName"-->
-<!--                  :value="item.dutyId+''"-->
-<!--                ></el-option>-->
 
-<!--              </el-select>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-<!--          <el-col :span="8">-->
-<!--            <el-form-item label="登录密码" prop="password">-->
-<!--              <el-input v-model="form.password" type="password" @input="changePassword" placeholder="不填写默认：123456"-->
-<!--                        maxlength="30"/>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-
-<!--        </el-row>-->
-<!--        <el-row>-->
-
-<!--        </el-row>-->
-
-<!--        <el-row>-->
-<!--          <el-col :span="8">-->
-<!--            <el-form-item label="一键加油" prop="isRefuel">-->
-<!--              <el-select v-model="form.isRefuel">-->
-<!--                <el-option-->
-<!--                  v-for="dict in dict.type.display"-->
-<!--                  :key="dict.value"-->
-<!--                  :label="dict.label"-->
-<!--                  :value="dict.value"-->
-<!--                />-->
-<!--              </el-select>-->
-<!--              <br/>-->
-<!--              <el-tooltip-->
-<!--                class="item"-->
-<!--                effect="dark"-->
-<!--                placement="bottom">-->
-<!--                <div slot="content">加油时选择加油员场景使用,选择不显示加油员将无法被指定<br/>(需系统开启加油选择加油员功能)终端支持:(PC、POS、小程序)-->
-<!--                </div>-->
-<!--                <span>加油时选择加油员场...</span>-->
-<!--              </el-tooltip>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-
-<!--          <el-col :span="8">-->
-<!--            <el-form-item label="收款通知" prop="notice">-->
-<!--              <el-select v-model="form.notice">-->
-<!--                <el-option-->
-<!--                  v-for="dict in dict.type.notice"-->
-<!--                  v-if="dict.value!='zdyx'"-->
-<!--                  :key="dict.value"-->
-<!--                  :label="dict.label"-->
-<!--                  :value="dict.value"-->
-<!--                />-->
-<!--              </el-select>-->
-<!--              <br/>-->
-<!--              <el-tooltip-->
-<!--                class="item"-->
-<!--                effect="dark"-->
-<!--                placement="bottom">-->
-<!--                <div slot="content"> 收款成功接收的公众号模板消息通知,需<br/>关注公众号,且本站小程序中会员手机号<br/>信息与当前员工手机号一致-->
-<!--                </div>-->
-<!--                <span>收款成功接收的...</span>-->
-<!--              </el-tooltip>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-
-<!--        </el-row>-->
-
-<!--        <el-row>-->
-<!--          <el-col :span="8">-->
-<!--            <el-form-item label="账号状态" prop="status">-->
-<!--              <el-select v-model="form.status">-->
-<!--                <el-option-->
-<!--                  v-for="dict in dict.type.zhzt"-->
-<!--                  :key="dict.value"-->
-<!--                  :label="dict.label"-->
-<!--                  :value="dict.value"-->
-<!--                />-->
-<!--              </el-select>-->
-<!--              <br/>-->
-<!--              <el-tooltip-->
-<!--                class="item"-->
-<!--                effect="dark"-->
-<!--                placement="bottom">-->
-<!--                <div slot="content"> 状态禁用后,当前账号则无法进行<br/>登录和操作</div>-->
-<!--                <span>状态禁用后,当前账号...</span>-->
-<!--              </el-tooltip>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-<!--          <el-col :span="8">-->
-<!--            <el-form-item label="审核权限">-->
-<!--              <el-select-->
-<!--                v-model="auditPrem"-->
-<!--                multiple-->
-<!--                collapse-tags-->
-<!--                @change="getCheckbox"-->
-<!--                placeholder="请选择">-->
-<!--                <el-checkbox style="margin-left: 100px" :checked="checked" v-model="checked" @change='selectAll'>全选-->
-<!--                </el-checkbox>-->
-<!--                <el-option-->
-<!--                  v-for="dict in shqxList"-->
-<!--                  :key="dict.dictValue"-->
-<!--                  :label="dict.dictLabel"-->
-<!--                  :value="dict.dictLabel"-->
-<!--                >-->
-<!--                </el-option>-->
-<!--              </el-select>-->
-<!--              <br/>-->
-<!--              <el-tooltip-->
-<!--                class="item"-->
-<!--                effect="dark"-->
-<!--                placement="bottom">-->
-<!--                <div slot="content">可设置当前员工是否有油品/商品入库、盘点、审核废止等权限</div>-->
-<!--                <span>可设置当前员工是否有...</span>-->
-<!--              </el-tooltip>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-<!--        </el-row>-->
-<!--        <el-row>-->
-<!--          <el-col :span="24">-->
-<!--            <el-form-item label="备注信息">-->
-<!--              <el-input v-model="form.description" type="textarea" placeholder="请输入内容"></el-input>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-<!--        </el-row>-->
         <el-form-item label="所属机构" prop="storeId">
           <el-select v-model="form.storeId" placeholder="请选择所属机构" style="width: 100%">
             <el-option

fuintAdmin/src/views/staff/storeInfo/index.vue

@@ -1,39 +1,36 @@
 <template>
   <div class="app-container">
-    <el-row>
+    <div class="box">
-      <el-col :span="18">
+      <el-row>
-        <el-card class="card">
+        <el-col :span="18">
-          <div slot="header" class="clearfix">
+          <el-card class="card">
-            <span>{{ store.name }}{{ store.description ? "(" + store.description + ")" : "" }}</span>
+            <div slot="header" class="clearfix">
-          </div>
+              <span>{{ store.name }}{{ store.description ? "(" + store.description + ")" : "" }}</span>
-
+            </div>
-          <el-row>
-<!--            <el-col :span="12">-->
 
+            <el-row>
 
               <!--      上传图片-->
-            <div style="display: flex">
               <div style="display: flex">
-                <span style="margin-right: 10px">店铺logo：</span>
+                <div style="display: flex">
-                <imgUpload1 v-if="flag" :imgUrl="store.logo" :limit="1" @input="getImgUrl"></imgUpload1>
+                  <span style="margin-right: 10px">店铺logo：</span>
+                  <imgUpload1 v-if="flag" :imgUrl="store.logo" :limit="1" @input="getImgUrl"></imgUpload1>
+                </div>
+                <div style="display: flex">
+                  <span style="margin-right: 10px">营业执照：</span>
+                  <imgUpload1 v-if="flag" :imgUrl="store.license" :limit="1" @input="getLicenseUrl"></imgUpload1>
+                </div>
               </div>
-              <div style="display: flex">
-                <span style="margin-right: 10px">营业执照：</span>
-                <imgUpload1 v-if="flag" :imgUrl="store.license" :limit="1" @input="getLicenseUrl"></imgUpload1>
-              </div>
-            </div>
               <!--      上传图片-->
               <div style="display: flex; margin-top: 20px ">
                 <span style="margin-right: 20px">门头照：</span>
                 <imgUpload1 v-if="flag" :doorUrl="store.doorstepPhoto" @input="getDoorImgUrl"></imgUpload1>
               </div>
-              <div style="display: flex;margin-bottom: 20px">
+              <div style="display: flex;">
                 <p>退款密码：
                   <el-input v-model="store.refPass" style="width: 50%" show-password></el-input>
                 </p>
               </div>
-<!--            </el-col>-->
-<!--            <el-col :span="12">-->
 
               <map-componment :pform="form" ref="mapRef" @pform="getForm"></map-componment>
               <div style="display: flex;margin-bottom: 20px">
@@ -48,45 +45,36 @@
                 </el-checkbox-group>
               </div>
 
-<!--            </el-col>-->
+            </el-row>
-          </el-row>
+            <el-button type="primary" @click="submitStore" v-hasPermi="['staff:storeInfo:index:save']">保存信息
-          <el-button type="primary" @click="submitStore" v-hasPermi="['staff:storeInfo:index:save']">保存信息</el-button>
+            </el-button>
-        </el-card>
+          </el-card>
-      </el-col>
+        </el-col>
-      <el-col :span="6">
+        <el-col :span="6">
-        <el-card class="card" style="margin-left: 20px;">
+          <el-card class="card" style="margin-left: 20px;">
-          <div slot="header" class="clearfix">
+            <div slot="header" class="clearfix">
-            <span>油站二维码</span>
+              <span>油站二维码</span>
-          </div>
-          <div style="position: relative;">
-            <img id="collection" class="qrcode" :src="baseUrl + collectionImg"/><br/>
-            <div style="display: flex;justify-content: center;position: absolute;bottom: 25px;left: 90px" >
-              <el-button  type="warning" size="small"
-                         @click="handleDownloadqrCode('collection')">
-                下载图片
-              </el-button>
-              <el-button style="margin-left: 10px;color: #fe8c4a" size="small" v-if="type==0" @click="getQRCodeInfoByStoreId(1)">切换样式
-              </el-button>
-              <br/>
-              <el-button style="margin-left: 10px;color: #fe8c4a" size="small" v-if="type==1" @click="getQRCodeInfoByStoreId(0)">切换样式
-              </el-button>
             </div>
-          </div>
+            <div style="position: relative;">
-        </el-card>
+              <img id="collection" class="qrcode" :src="baseUrl + collectionImg"/><br/>
-      </el-col>
+              <div style="display: flex;justify-content: center;position: absolute;bottom: 25px;left: 90px">
-    </el-row>
+                <el-button type="warning" size="small"
-
+                           @click="handleDownloadqrCode('collection')">
-    <!--    <el-card class="card">-->
+                  下载图片
-    <!--      <div slot="header" class="clearfix">-->
+                </el-button>
-    <!--        <span>收款二维码</span>-->
+                <el-button style="margin-left: 10px;color: #fe8c4a" size="small" v-if="type==0"
-    <!--      </div>-->
+                           @click="getQRCodeInfoByStoreId(1)">切换样式
-    <!--      <img id="payment" class="qrcode" :src="paymentImg" /><br/>-->
+                </el-button>
-    <!--      <el-button class="but" type="primary"-->
+                <br/>
-    <!--                 icon="el-icon-download"-->
+                <el-button style="margin-left: 10px;color: #fe8c4a" size="small" v-if="type==1"
-    <!--                 @click="handleDownloadqrCode('payment')">-->
+                           @click="getQRCodeInfoByStoreId(0)">切换样式
-    <!--        下载收款二维码-->
+                </el-button>
-    <!--      </el-button>-->
+              </div>
-    <!--    </el-card>-->
+            </div>
+          </el-card>
+        </el-col>
+      </el-row>
+    </div>
   </div>
 </template>
 <script>
@@ -293,6 +281,13 @@ export default {
   width: 100%;
   height: 100%;
   background: #f6f8f9;
+  margin: 0;
+  padding: 0;
+}
+
+.box{
+  width: 98%;
+  margin: 0 auto;
 }
 
 .card {

fuintAdmin_zt/src/layout/components/Sidebar/SidebarItem.vue

@@ -48,7 +48,7 @@
             <img src="@/assets/menu_icon/setting.png" v-if="!activeMenu.includes('/indexBanner') && !activeMenu.includes('/setting') && !activeMenu.includes('/system')" style="width: 21px;height: 21px;"/>
             <img src="@/assets/menu_icon/setting_b.png" v-else style="width: 21px;height: 21px;"/>
           </span>
-          <span style="margin-right: 10px;" v-if="item.meta.title=='门店管理'">
+          <span style="margin-right: 10px;" v-if="item.meta.title=='油站设置'">
             <img src="@/assets/menu_icon/shouye.png" v-if="!activeMenu.includes(item.path) && !activeMenu.includes('/staff') && !activeMenu.includes('/feedBack') && !activeMenu.includes('/duty')" style="width: 21px;height: 21px;"/>
             <img src="@/assets/menu_icon/shouye_b.png" v-else style="width: 21px;height: 21px;"/>
           </span>
@@ -113,7 +113,7 @@
             <img src="@/assets/menu_icon/setting.png" v-if="!activeMenu.includes('/indexBanner')" style="width: 21px;height: 21px;"/>
             <img src="@/assets/menu_icon/setting_b.png" v-else style="width: 21px;height: 21px;"/>
           </span>
-          <span style="margin-right: 10px;" v-if="item.meta.title=='门店管理'">
+          <span style="margin-right: 10px;" v-if="item.meta.title=='油站设置'">
             <img src="@/assets/menu_icon/shouye.png" v-if="!activeMenu.includes(item.path) && !activeMenu.includes('/staff') && !activeMenu.includes('/feedBack') && !activeMenu.includes('/duty')" style="width: 25px;height: 25px;"/>
             <img src="@/assets/menu_icon/shouye_b.png" v-else style="width: 25px;height: 25px;"/>
           </span>

fuintBackend/fuint-application/src/main/java/com/fuint/business/member/mapper/xml/LJStaffMapper.xml

@@ -27,6 +27,7 @@
                 and ms.id = #{staff.id}
             </if>
         </where>
+        ORDER BY ms.create_time DESC
     </select>
 
     <update id="updateStatus">

fuintBackend/fuint-application/src/main/java/com/fuint/business/member/utils/QrCodeUtils.java

@@ -92,11 +92,13 @@ public class QrCodeUtils {
                 // 店铺名称位置文字绘制到指定位置
                 g.drawString(store.getName(), returnX(g,bufImg.getWidth(),store.getName()), 550);
                 // 加油员姓名位置文字绘制到指定位置
+                String staffName = "站长名称："+staff1.getRealName();
                 if (ObjectUtil.isNotEmpty(staff)) {
-                    g.drawString("加油员："+staff.getRealName(), 50, 670);
+//                    g.drawString("加油员："+staff.getRealName(), 50, 670);
+                    staffName += "；加油员："+staff.getRealName();
                 }
                 // 站长名称位置文字绘制到指定位置
-                g.drawString("站长名称："+staff1.getRealName(), 50, 580);
+                g.drawString(staffName, 50, 580);
                 // 服务监督电话位置文字绘制到指定位置
                 g.drawString("服务监督电话："+staff1.getMobile(), 50, 610);
                 // 店铺地址位置文字绘制到指定位置

fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/xml/FeedbackMapper.xml

@@ -2,7 +2,10 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fuint.business.userManager.mapper.FeedbackMapper">
     <sql id="selectFeedback">
-        select fb.*,mu.name userName,mu.mobile userMobile from feedback fb left join mt_user mu on fb.user_id = mu.id
+        select fb.*,mu.name userName,mu.mobile userMobile,ms.`name` storeName
+        from feedback fb
+            left join mt_user mu on fb.user_id = mu.id
+            LEFT JOIN mt_store ms ON fb.store_id = ms.id
     </sql>
 
     <select id="selectFeedbackList" resultType="com.fuint.business.userManager.vo.FeedbackVo">

fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/vo/FeedbackVo.java

@@ -13,4 +13,8 @@ public class FeedbackVo extends Feedback {
      * 用户电话
      */
     private String userMobile;
+    /**
+     * 所属机构
+     */
+    private String storeName;
 }