10.24

fuintAdmin/src/api/system/account.js

@@ -45,9 +45,9 @@ export function delAccount(userId) {
 }
 
 // 用户密码重置
-export function resetAccountPwd(userId, password) {
+export function resetAccountPwd(acctId, password) {
   const data = {
-    userId,
+    acctId,
     password
   }
   return request({

fuintAdmin/src/layout/components/Navbar.vue

@@ -45,7 +45,7 @@
           <div class="avatar-wrapper">
             <img :src="avatar" class="user-avatar">
             <span class="j-kuang">
-                  系统管理员
+                  {{ roleName }}
                 </span>
             <span class="user-name">{{ name }}</span>
             <i class="el-icon-caret-bottom"/>
@@ -190,7 +190,8 @@ export default {
       'sidebar',
       'avatar',
       'name',
-      'device'
+      'device',
+      'roleName'
     ]),
     setting: {
       get() {

fuintAdmin/src/store/getters.js

@@ -7,6 +7,7 @@ const getters = {
   token: state => state.user.token,
   avatar: state => state.user.avatar,
   name: state => state.user.name,
+  roleName: state => state.user.roleName,
   introduction: state => state.user.introduction,
   roles: state => state.user.roles,
   permissions: state => state.user.permissions,

fuintAdmin/src/store/modules/user.js

@@ -22,6 +22,9 @@ const user = {
     SET_NAME: (state, name) => {
       state.name = name
     },
+    SET_ROLE_NAME: (state, roleName) => {
+      state.roleName = roleName
+    },
     SET_AVATAR: (state, avatar) => {
       state.avatar = avatar
     },
@@ -105,7 +108,7 @@ const user = {
     GetInfo({ commit, state }) {
       return new Promise((resolve, reject) => {
         getInfo().then(res => {
-          console.log("22222223")
+          console.log("22222223",res.data.accountInfo)
 
           const user = res.data.accountInfo
           const avatar = (user.avatar == "" || user.avatar == null) ? require("@/assets/images/avatar.png") : process.env.VUE_APP_BASE_API + user.avatar;
@@ -116,6 +119,7 @@ const user = {
               commit('SET_ROLES', ['ROLE_DEFAULT'])
           }
           commit('SET_NAME', user.accountName)
+          commit('SET_ROLE_NAME', user.roleName)
           commit('SET_AVATAR', avatar)
           commit('SET_MERCHANT_ID',  user.merchantId)
           commit('SET_MERCHANT_NAME',  user.merchantName)

fuintAdmin/src/views/order/order_Added.vue

@@ -139,15 +139,13 @@
         </el-table>
       </div>
       <div class="pagination-box">
-        <el-pagination
+        <pagination
-          background
           v-show="total>0"
-          layout="prev, pager, next"
           :total="total"
           :page.sync="queryParams.page"
           :limit.sync="queryParams.pageSize"
-          @current-change="getList">
+          @pagination="getList"
-        </el-pagination>
+        />
       </div>
 
 
@@ -376,19 +374,7 @@ export default {
     handleClose(done) {
       done();
     },
-    getList(val) {
+    getList() {
-      if (val != undefined) {
-        this.queryParams.page = val
-      }
-
-      let dateRange1 = this.dateRange
-      // let dateRange = []
-      // if (this.isSysDate){
-      //   dateRange.push(dateRange1[0].toLocaleDateString())
-      //   dateRange.push(dateRange1[1].toLocaleDateString())
-      // }else {
-      //   dateRange = this.dateRange
-      // }
       let dateRange = []
       if (this.beginTime && this.endTime) {
         dateRange.push(this.beginTime.toLocaleDateString())

fuintAdmin/src/views/order/order_Goods.vue

@@ -168,15 +168,13 @@
         </el-table>
       </div>
       <div class="pagination-box">
-        <el-pagination
+        <pagination
-          background
-          layout="prev, pager, next"
           v-show="total>0"
           :total="total"
           :page.sync="queryParams.page"
           :limit.sync="queryParams.pageSize"
-          @current-change="getList">
+          @pagination="getList"
-        </el-pagination>
+        />
       </div>
 
       <!--    订单退款-->
@@ -469,12 +467,7 @@ export default {
       })
     },
     // 查询订单
-    getList(val) {
+    getList() {
-      if (val != undefined) {
-        this.queryParams.page = val
-      }
-
-      let dateRange1 = this.dateRange
       // let dateRange = []
       // if (this.isSysDate){
       //   dateRange.push(dateRange1[0].toLocaleDateString())

fuintAdmin/src/views/order/order_Oil.vue

@@ -166,7 +166,7 @@
               <span>{{scope.row.remark || "--"}}</span>
             </template>
           </el-table-column>
-          <el-table-column prop="staffName" label="关联员工" align="center" > </el-table-column>
+          <el-table-column prop="realName" label="关联员工" align="center" > </el-table-column>
 
 
           <el-table-column label="订单创建时间" align="center" width="160" prop="payTime">
@@ -194,15 +194,13 @@
         </el-table>
       </div>
       <div class="pagination-box">
-        <el-pagination
+        <pagination
-          background
           v-show="total>0"
-          layout="prev, pager, next"
           :total="total"
           :page.sync="queryParams.page"
           :limit.sync="queryParams.pageSize"
-          @current-change="getList">
+          @pagination="getList"
-        </el-pagination>
+        />
       </div>
     </div>
 
@@ -606,12 +604,7 @@
         return name;
       },
       // 获取订单列表信息
-      getList(val){
+      getList(){
-        if (val!=undefined){
-          this.queryParams.page = val
-        }
-
-        let dateRange1 = this.dateRange
         // let dateRange = []
         // if (this.isSysDate){
         //   dateRange.push(dateRange1[0].toLocaleDateString())

fuintAdmin/src/views/order/order_Vip.vue

@@ -114,15 +114,13 @@
         </el-table>
       </div>
       <div class="pagination-box">
-        <el-pagination
+        <pagination
-          background
           v-show="total>0"
-          layout="prev, pager, next"
           :total="total"
           :page.sync="queryParams.pageNo"
           :limit.sync="queryParams.pageSize"
-          @current-change="getList">
+          @pagination="getList"
-        </el-pagination>
+        />
       </div>
 
 
@@ -371,12 +369,8 @@ export default {
       this.handleQuery();
     },
     // 获取列表信息
-    getList(val) {
+    getList() {
-      if (val != undefined) {
-        this.queryParams.pageNo = val
-      }
 
-      let dateRange1 = this.dateRange
       // let dateRange = []
       // if (this.isSysDate){
       //   dateRange.push(dateRange1[0].toLocaleDateString())

fuintAdmin/src/views/staff/list.vue

@@ -313,6 +313,7 @@ import html2canvas from "html2canvas";
 import {getDicts} from "@/api/order/data";
 import {dutyList} from "@/api/duty/duty";
 import {selectStoreListByDeptId} from "../../api/staff/store";
+import {resetAccountPwd} from "@/api/system/account";
 
 export default {
   name: "StaffList",
@@ -844,12 +845,14 @@ export default {
       this.$prompt('请输入重置后的密码', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
-
+        closeOnClickModal: false,
+        inputPattern: /^.{5,20}$/,
+        inputErrorMessage: "用户密码长度必须介于 5 和 20 之间"
       }).then(({ value }) => {
-        this.$message({
+        resetAccountPwd(row.acctId,value).then(res => {
-          type: 'success',
+          this.$modal.msgSuccess("修改成功，新密码是：" + value);
-          message: '你的密码是: ' + value
+          console.log(res,854)
-        });
+        })
       }).catch(() => {
         this.$message({
           type: 'info',

fuintBackend/fuint-application/src/main/java/com/fuint/business/member/entity/LJStaff.java

@@ -131,6 +131,9 @@ public class LJStaff extends BaseEntity implements Serializable {
     //码牌绑定状态 0：未绑定 1：已绑定
     @TableField(exist = false)
     private String tagStatus;
+//    登录账号id
+    @TableField(exist = false)
+    private Integer acctId;
 //    登录账号
     @TableField(exist = false)
     private String accountName;

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

@@ -6,7 +6,7 @@
     </sql>
 <!--根据条件分页查询用户信息-->
     <select id="selectLJStaffList" resultType="com.fuint.business.member.entity.LJStaff">
-        SELECT ms.*,td.duty_name,ta.account_name,ta.real_name accountRealName FROM mt_staff ms
+        SELECT ms.*,td.duty_name,ta.account_name,ta.real_name accountRealName,ta.acct_id acctId FROM mt_staff ms
             left join t_duty td on ms.role_id = td.duty_id
             LEFT JOIN t_account ta on ms.id = ta.staff_id
         <where>

fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/OilOrder.java

@@ -176,6 +176,8 @@ public class OilOrder extends BaseEntity implements Serializable {
     @TableField(exist = false)
     private String StoreName;
     @TableField(exist = false)
+    private String realName;
+    @TableField(exist = false)
     private Long deptId;
     @TableField(exist = false)
     private List<Long> storeIds;

fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml

@@ -6,41 +6,41 @@
     </sql>
 
     <select id="selectOilOrderList" resultType="com.fuint.business.order.entity.OilOrder">
-        <include refid="selectOrders"></include>
+        select oo.*,ms.real_name from oil_order oo LEFT JOIN mt_staff ms ON oo.staff_id = ms.id
         <where>
-            store_id = #{order.storeId}
+            oo.store_id = #{order.storeId}
             <if test="order.userId != null and order.userId != ''">
-                and user_id = #{order.userId}
+                and oo.user_id = #{order.userId}
             </if>
             <if test="order.staffId != null and order.staffId != ''">
-                and staff_id = #{order.staffId}
+                and oo.staff_id = #{order.staffId}
             </if>
             <if test="order.terminal != null and order.terminal != ''">
-                and terminal = #{order.terminal}
+                and oo.terminal = #{order.terminal}
             </if>
             <if test="order.oils != null and order.oils != ''">
-                and oils = #{order.oils}
+                and oo.oils = #{order.oils}
             </if>
             <if test="order.oilGunNum != null and order.oilGunNum != ''">
-                and oil_gun_num = #{order.oilGunNum}
+                and oo.oil_gun_num = #{order.oilGunNum}
             </if>
             <if test="order.payType != null and order.payType != ''">
-                and pay_type = #{order.payType}
+                and oo.pay_type = #{order.payType}
             </if>
             <if test="order.orderStatus != null and order.orderStatus != ''">
-                and order_status = #{order.orderStatus}
+                and oo.order_status = #{order.orderStatus}
             </if>
             <if test="order.orderNo != null and order.orderNo != ''">
-                and order_no like concat('%', #{order.orderNo}, '%')
+                and oo.order_no like concat('%', #{order.orderNo}, '%')
             </if>
             <if test="order.payUser != null and order.payUser != ''">
-                and pay_user like concat('%', #{order.payUser}, '%')
+                and oo.pay_user like concat('%', #{order.payUser}, '%')
             </if>
             <if test="order.params.beginTime != null and order.params.beginTime != ''"><!-- 开始时间检索 -->
-                and date_format(create_time,'%y%m%d') &gt;= date_format(#{order.params.beginTime},'%y%m%d')
+                and date_format(oo.create_time,'%y%m%d') &gt;= date_format(#{order.params.beginTime},'%y%m%d')
             </if>
             <if test="order.params.endTime != null and order.params.endTime != ''"><!-- 结束时间检索 -->
-                and date_format(create_time,'%y%m%d') &lt;= date_format(#{order.params.endTime},'%y%m%d')
+                and date_format(oo.create_time,'%y%m%d') &lt;= date_format(#{order.params.endTime},'%y%m%d')
             </if>
             order by create_time desc
         </where>

fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/mapper/xml/PrintDeviceInfoMapper.xml

@@ -69,6 +69,7 @@
                 and store_id = #{printDeviceInfo.storeId}
             </if>
         </where>
+        order by create_time desc
     </select>
 
     <!--统计总行数-->