最近提交

config/index.js

@@ -26,7 +26,8 @@ module.exports = {
     assetsPublicPath: "/",
     proxyTable: {
       "/api": {
-         target: "http://192.168.31.214:8084/", //设置你调用的接口域名和端口号 别忘了加http 本地
+        //  target: "http://192.168.31.214:8084/", //设置你调用的接口域名和端口号 别忘了加http 本地
+         target: "http://192.168.31.177:8084/", //设置你调用的接口域名和端口号 别忘了加http 本地
         //target: "http://192.168.31.209:8084/", //设置你调用的接口域名和端口号 别忘了加http 本地
         // target: "http://192.168.31.201:8084/", //设置你调用的接口域名和端口号 别忘了加http 本地
         // target: "http://139.9.185.131:8098/", //设置你调用的接口域名和端口号 别忘了加http 天懿达正式

src/api/storeManage.js

@@ -5,6 +5,8 @@ import {
   localPath
 } from "./api.js";
 
+
+
 // 获取某门店参数
 export function allStores(data){
   return service({
@@ -14,6 +16,24 @@ export function allStores(data){
   })
 }
 
+// 获取超级密码验证码
+export function getStoreId(data){
+  return service({
+    url: "/api" + '/demay/ssm/staffLogin/getDynamicPsw',
+    method: "post",
+    data
+  })
+}
+
+// 动态密码登录
+export function DynamicLoginNews(data){
+  return service({
+    url: "/api" + '/demay/ssm/staffLogin/DynamicLoginNews',
+    method: "post",
+    data
+  })
+}
+
 // 同步总店数据
 export function totalData(params){
   return service({

src/components/staffList/staff/index.vue

@@ -16,7 +16,7 @@
         <template slot-scope="scope">
           <div class="form-input-width" v-if="editIndex != scope.$index"
             @click="openStaffRatio(scope.$index, scope.row)">
-            {{ scope.row.ratio }}
+            {{ scope.row.ratio?scope.row.ratio.toFixed(2)*1:0 }}
             <i class="el-icon-edit text-cyan" v-if="scope.$index != 0"></i>
           </div>
           <el-input v-focus class="form-input-width-xs" size="samll" type="number" v-else v-model="scope.row.ratio" @blur="endStaffRatio(scope.row, scope.$index)"></el-input>

src/login/components/superPassword.vue

@@ -0,0 +1,178 @@
+<template>
+<el-dialog
+  :title="title"
+  :visible.sync="dialogVisible"
+  width="30%"
+  :before-close="handleClose">
+  <div class="maxbox">
+    <div class="center">
+        <el-form ref="form" label-width="40px" label-position='left'>
+            <el-form-item label="超级密码">
+                <el-input v-model="captCha" placeholder="请输入超级密码" style="width:150px"></el-input>
+            </el-form-item>
+        </el-form>
+        <el-button style="height:0.2rem;margin-left:10px" @click="getCode" :class="{'disabled-style':getCodeBtnDisable}" :disabled="getCodeBtnDisable" type="mini" :loading='codeload'>{{codeBtnWord}}</el-button>
+    </div>
+    <div class="bot">
+        <span slot="footer" class="dialog-footer">
+            <el-button size="mini" type="primary" plain @click="handleCloseCancel">取 消</el-button>
+            <el-button size="mini" type="primary" @click="confirms" :loading='confirmLoad'>确 认</el-button>
+        </span>
+    </div>
+  </div>
+</el-dialog>
+</template>
+
+<script>
+import { getStoreId,DynamicLoginNews } from "@/api/storeManage.js";
+export default {
+    props:{
+        storeId:{
+            type:String,
+            default:""
+        },
+        mobilePhone:{
+            type:String,
+            default:''
+        },
+        password:{
+            type:String,
+            default:""
+        }
+    },
+    data () {
+        return {
+            captCha:'',
+            codeload:false,
+            confirmLoad:false,
+            dialogVisible:false,
+            timer:null,
+            codeBtnWord:"获取验证码",
+            waitTime:61 //验证码失效时间
+        }
+    },
+    computed:{
+        title(){
+            return '超级密码'
+        },
+        // 控制获取验证码按钮是否可点击
+        getCodeBtnDisable:{
+            get(){
+                if(this.waitTime == 61){
+                    return false
+                }
+                return true
+            },
+            // 注意：因为计算属性本身没有set方法，不支持在方法中进行修改，而下面我要进行这个操作，所以需要手动添加
+            set(){} 
+        }
+    },
+    methods:{
+        handleCloseCancel(){
+            // Object.assign(this.$data, this.$options.data()) 
+            this.codeBtnWord = '获取验证码'
+            this.getCodeBtnDisable = false
+            this.waitTime = 61
+            clearInterval(this.timer)
+            this.dialogVisible = false
+        },
+        handleClose(done){
+            done()
+            // 清除定时器
+            clearInterval(this.timer)
+            this.codeBtnWord = '获取验证码'
+            this.getCodeBtnDisable = false
+            this.waitTime = 61
+            Object.assign(this.$data, this.$options.data())
+        },
+        confirms(){
+            this.confirmLoad = true
+            let params = {
+                mobilePhone:this.mobilePhone,
+                dynamicPsw:this.captCha,
+                storeId:this.storeId,
+                password:this.password
+            }
+            DynamicLoginNews(params).then(res=>{
+                this.confirmLoad = false
+                if(res.code=='000000'){
+                    this.$message.success({
+                      message: "验证成功",
+                    });
+                    this.$emit('confirm')
+                }else{
+                    this.$alert(res.message, "提示", {
+                      confirmButtonText: "确定",
+                      confirmButtonClass: "confirmbtnFalses",
+                      type: "warning",
+                      center: true,
+                      callback: (action) => {},
+                    });
+                }
+            })
+        },
+        getCode(){
+           this.codeload = true
+           getStoreId({id:this.storeId}).then(res=>{
+            this.codeload = false
+            if(res.code === '000000'){
+              this.$message.success({
+                message: "已发送验证码",
+              });
+              let that = this
+              that.waitTime--
+              that.getCodeBtnDisable = true
+              this.codeBtnWord = `${this.waitTime}s 后重新获取`
+              this.timer = setInterval(function(){
+                  if(that.waitTime>1){
+                      that.waitTime--
+                      that.codeBtnWord = `${that.waitTime}s 后重新获取`
+                  }else{
+                      that.codeBtnWord = '获取验证码'
+                      that.getCodeBtnDisable = false
+                      that.waitTime = 61
+                      clearInterval(that.timer)
+                  }
+              },1000)
+            }
+           })
+        },
+    }
+}
+</script>
+ 
+<style  scoped>
+    .bot{
+        widows: 100%;
+        text-align: right;
+    }
+    .radio{
+        width: 100%;
+        margin-bottom: 15px;
+    }
+    .box{
+        height: 130px;
+        width: 100%;
+        text-align: center;
+    }
+    .center1{
+        display: flex;
+    }
+    .box1{
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        text-align: center;
+    }
+    .center{
+        width: 100%;
+        display: flex;
+    }
+    .el-input{
+        flex: 1;
+    }
+    .el-button.disabled-style {
+        background-color: #EEEEEE;
+        color: #CCCCCC;
+    }
+</style>

src/login/login.vue

@@ -60,17 +60,15 @@
     </el-card>
     <choice ref="choice" @radioData="radioData"></choice>
     <hiddens ref="hiddens" @hiddensData="hiddensData"></hiddens>
+    <super-password ref="superPassword" @confirm='confirm' :storeId="storeId" :mobilePhone='form.mobilePhone' :password='form.password'/>
   </div>
 </template>
 
 <script>
 import {
-  phoneLogin,
   phonePassLogin,
   getSmsCode,
-  staffls,
   storeLists,
-  getSmsCodesPassword,
   phonePassLoginzd,
   phonePassLoginNew,
   phonePassLoginNews,
@@ -85,8 +83,9 @@ import { setCookie, getCookie, delCookie } from "../utils/utils";
 import { partten } from "../../partten/index";
 import choice from "./components/radio.vue";
 import hiddens from "./components/hiddens.vue";
+import superPassword from "./components/superPassword.vue";
 export default {
-  components: { choice, hiddens },
+  components: { choice, hiddens,superPassword },
   data() {
     return {
       loading: false,
@@ -110,9 +109,13 @@ export default {
       passText: "",
       rowForm: {},
       loginText: "",
+      res:null,
     };
   },
   methods: {
+    confirm(){
+      this.toHome(this.res)
+    },
     openPass() {
       this.$refs.password.focus();
       this.$refs.password.select();
@@ -167,6 +170,7 @@ export default {
       if (partten.phoneNum.test(this.form.mobilePhone)) {
         phonePassLoginNew(this.form).then((res) => {
           if (res.code == "000000") {
+            // this.$refs.superPassword.dialogVisible = true
             if (res.data.storeType == 2) {
               localStorage.setItem("token", res.data.token);
               sessionStorage.setItem("token", res.data.token);
@@ -211,10 +215,16 @@ export default {
               localStorage.setItem("token", res.data.token);
               sessionStorage.setItem("token", res.data.token);
               setCookie("token", res.data.token, 120); //设置
-              this.toHome(res);
+              // this.toHome(res);
-            } else {
+              if(v.dynamicCheckPsw==1){
-              this.$refs.choice.show(res.data.baseStores);
+                this.$refs.superPassword.dialogVisible = true
-            }
+                this.res = res
+              }else{
+                this.toHome(res);
+              }
+              } else {
+                this.$refs.choice.show(res.data.baseStores);
+              }
           } else {
             this.$alert(res.message, "提示", {
               confirmButtonText: "确定",
@@ -234,7 +244,13 @@ export default {
               localStorage.setItem("token", res.data.token);
               sessionStorage.setItem("token", res.data.token);
               setCookie("token", res.data.token, 120); //设置
-              this.toHome(res);
+              // this.toHome(res);
+              if(v.dynamicCheckPsw==1){
+                this.$refs.superPassword.dialogVisible = true
+                this.res = res
+              }else{
+                this.toHome(res);
+              }
             } else {
               this.$refs.choice.show(res.data.baseStores);
             }
@@ -255,6 +271,7 @@ export default {
     radioData(v) {
       let form = { ...this.form };
       form.storeId = v.id;
+      this.storeId = v.id
       form.storeName = v.storeName;
       form.storeNum = v.storeNum;
       if (this.showLogin == 0) {
@@ -263,7 +280,13 @@ export default {
             localStorage.setItem("token", res.data.token);
             sessionStorage.setItem("token", res.data.token);
             setCookie("token", res.data.token, 120); //设置
-            this.toHome(res);
+            if(v.dynamicCheckPsw==1){
+              this.$refs.superPassword.dialogVisible = true
+              this.res = res
+              // this.toHome(res);
+            }else{
+              this.toHome(res);
+            }
           } else {
             this.$alert(res.message, "提示", {
               confirmButtonText: "确定",
@@ -282,7 +305,13 @@ export default {
             localStorage.setItem("token", res.data.token);
             sessionStorage.setItem("token", res.data.token);
             setCookie("token", res.data.token, 120); //设置
-            this.toHome(res);
+            // this.toHome(res);
+            if(v.dynamicCheckPsw==1){
+              this.$refs.superPassword.dialogVisible = true
+              this.res = res
+            }else{
+              this.toHome(res);
+            }
           } else {
             this.$alert(res.message, "提示", {
               confirmButtonText: "确定",
@@ -331,7 +360,6 @@ export default {
       }).then((res) => {
         sessionStorage.setItem("storeInfo", JSON.stringify(res.data));
         if (res.code == "000000") {
-          console.log('存储进去了呀？？？',res.data)
           if (res.data.parentId == null) {
             sessionStorage.setItem("parentId", res.data.id);
             sessionStorage.setItem("parentName", res.data.storeName);

src/pages/branch/map/components/room/room.vue

@@ -78,14 +78,12 @@
             <template slot-scope="scope">
               <el-button type="success" size="mini" @click="addRenew(scope.row,scope.$index)">加钟</el-button>
               <el-button type="success" size="mini" @click="openPro(addIndex=scope.$index)">加其他</el-button>
-              </el-switch>
             </template>
           </el-table-column>
           <el-table-column align="center" prop="renew" label="操作" min-width="80">
             <template slot-scope="scope">
               <el-button type="danger" size="mini" @click="del(scope.row,scope.$index)">删除</el-button>
-              </el-switch>
+              </template>
-            </template>
           </el-table-column>
         </el-table>
       </div>

src/pages/eashier/cardToStore/components/edit.vue

@@ -13,7 +13,7 @@
         </div>
       </el-form-item>
       <el-form-item label="手机号码">
-        <el-input class="form-width-ms" style="padding-left:0px;" ref="" oninput="this.value=this.value.replace(/\D/g,'')" pattern="[0-9]*" :maxlength="11" v-model="form.mobilePhone" @blur="query" @change="query">
+        <el-input class="form-width-ms" style="padding-left:0px;" ref="" oninput="this.value=this.value.replace(/\D/g,'')" pattern="[0-9]*" :maxlength="11" v-model="form.mobilePhone" @change="query">
           <el-button size="mini" slot="append" icon="el-icon-search" @click="openMember"></el-button>
         </el-input>
       </el-form-item>

src/pages/eashier/service/passcode.vue

@@ -17,7 +17,7 @@
     </el-form>
     <span slot="footer" class="dialog-footer">
       <el-button size="mini" type="primary" plain @click="handleClose">取 消</el-button>
-      <el-button size="mini" type="primary" @click="confirm()">确 定</el-button>
+      <el-button size="mini" type="primary" @click="confirm">确 定</el-button>
     </span>
   </el-dialog>
 </template>

src/pages/eashier/service/service.vue

@@ -865,14 +865,9 @@ export default {
           return time.getTime() > Date.now();
         }
       },
-      useRecharge:
+      useRecharge:JSON.parse(sessionStorage.getItem("sessionStorageData")).useRecharge *1,
-        JSON.parse(sessionStorage.getItem("sessionStorageData")).useRecharge *
+      balance:JSON.parse(sessionStorage.getItem("sessionStorageData")).balance * 1 +0.01,
-        1,
+      memberIntegral: JSON.parse(sessionStorage.getItem("sessionStorageData")).memberIntegral,
-      balance:
-        JSON.parse(sessionStorage.getItem("sessionStorageData")).balance * 1 +
-        0.01,
-      memberIntegral: JSON.parse(sessionStorage.getItem("sessionStorageData"))
-        .memberIntegral,
       debtMoneys: 0,
       list: [], //主数组
       listCopy: [],

src/pages/promotion/components/suit.vue

@@ -43,7 +43,6 @@ export default {
   methods: {
     //组件传值
     show(form) {
-      console.log("🚀 ~ file: suit.vue ~ line 46 ~ show ~ form", form)
       this.dataList = [];
       this.form = { ...form };
       if (form.promotionStores) {
@@ -52,6 +51,12 @@ export default {
           arr.push(item.storeId);
         });
         this.dataList = arr;
+      }else if (form.rechargeTypeStoreList) {
+        let arr = [];
+        form.rechargeTypeStoreList.forEach((item) => {
+          arr.push(item.storeId);
+        });
+        this.dataList = arr;
       }
       this.dialogVisible = true;
       this.getData();

src/pages/promotion/recpromotion/components/edit.vue

@@ -28,6 +28,19 @@
         <el-input class="form-width" type="number" :disabled="title == '明细'" v-model.trim="form.firstAmount" autocomplete="off" placeholder="请输入首充金额">
         </el-input>
       </el-form-item>
+      <el-form-item label="适用门店:" required prop="storeType">
+        <el-radio-group v-model.trim="form.storeType" style="font-size: 14px">
+          <el-radio :label="0">所有门店</el-radio>
+          <el-radio :label="1">指定门店</el-radio>
+          <el-button
+            :disabled="!(form.storeType === 1)"
+            size="mini"
+            type="text"
+            @click="openSuitStore(form)"
+            ><span>门店列表</span></el-button
+          >
+        </el-radio-group>
+      </el-form-item>
       <el-divider content-position="left">充值</el-divider>
       <el-form-item required label="续充金额" prop="rechargeMoney">
         <el-input class="form-width" type="number" :disabled="title == '明细'" v-model.trim="form.rechargeMoney" autocomplete="off" placeholder="请输入续充金额" maxlength="50"></el-input>
@@ -60,12 +73,15 @@
       <el-button size="mini" @click="close">取 消</el-button>
       <el-button size="mini" type="primary" @click="save">确 定</el-button>
     </div>
+    <suit ref="suit" @suitData="suitData"></suit>
   </el-dialog>
 </template>
 
 <script>
 import { addrecType, editrecType } from "@/api/storeManage.js";
+import suit from "../../components/suit";
 export default {
+  components: { suit },
   data() {
     return {
       form: {}, //主对象
@@ -168,6 +184,19 @@ export default {
   },
   created() {},
   methods: {
+    openSuitStore(row) {
+      this.$refs.suit.show(row);
+    },
+    suitData(v) {
+      let list = [];
+      v.forEach((item) => {
+        if (item.id) {
+          item.storeId = item.id;
+          list.push(item);
+        }
+      });
+      this.form.rechargeTypeStoreList = list;
+    },
     //组件传值
     show(form) {
       if (form == "添加") {

src/pages/statistics/staffBrokerage/detail/index.vue

@@ -29,6 +29,7 @@
           {{scope.row.cashComm?scope.row.cashComm:'--'}}
         </template>
       </el-table-column>
+      <el-table-column align="center" min-width="120" prop="cooperationAchi" label="合作方业绩"></el-table-column>
       <el-table-column align="center" min-width="80" prop="totalPerformance" label="总业绩"></el-table-column>
       <el-table-column align="center" min-width="80" prop="totalCommission" label="总提成"></el-table-column>
     </el-table>

src/pages/statistics/staffBrokerage/examine/index.vue

@@ -104,6 +104,7 @@
           {{scope.row.xftlcczhjyj?scope.row.xftlcczhjyj:'--'}}
         </template>
       </el-table-column>
+      <el-table-column align="center" min-width="120" prop="cooperationAchi" label="合作方业绩"></el-table-column>
       <el-table-column align="center" min-width="120" prop="zyj" label="总业绩"></el-table-column>
       <el-table-column align="center" min-width="120" prop="totaltc" label="总提成"></el-table-column>
       <el-table-column align="center" min-width="120" prop="ntmoney" label="内调金额"></el-table-column>

src/pages/statistics/staffBrokerage/staffBrokerage.vue

@@ -112,6 +112,7 @@
       </el-table-column>
 
       <el-table-column align="center" min-width="120" prop="ntmoney" label="内调金额"></el-table-column>
+      <el-table-column align="center" min-width="120" prop="cooperationAchi" label="合作方业绩"></el-table-column>
       <el-table-column align="center" min-width="120" prop="zyj" label="总业绩"></el-table-column>
       <el-table-column align="center" min-width="120" prop="totaltc" label="总提成"></el-table-column>
       <el-table-column align="center" min-width="120" prop="totalWages" label="结算"></el-table-column>