最近提交

src/api/statistics.js

@@ -17,6 +17,24 @@ export function delMonthTask(params) {
     data: params
   });
 }
+
+export function exportStoreDailys(params) {
+  return service({
+    url: "/api" + "/demay/ssm/storeExport/storeDailys",
+    method: "post",
+    data: params
+  });
+}
+
+export function exportStore(params) {
+  return service({
+    url: "/api" + "/demay/ssm/storeExport/export",
+    method: "post",
+    data: params,
+    responseType:"blob"
+  });
+}
+
 // 分页查询门店月度任务 门店端-门店月度任务-分页查询门店月度任务
 export function monthTaskPage(params) {
   return service({

src/components/perform/detail/index.vue

@@ -26,8 +26,8 @@
           {{scope.row.cashComm?scope.row.cashComm:'--'}}
         </template>
       </el-table-column>
-      <el-table-column align="center" min-width="80" prop="saleAchievementAmount" 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="saleCommissionAmount" label="总提成"></el-table-column>
+      <el-table-column align="center" min-width="80" prop="totalCommission" label="总提成"></el-table-column>
     </el-table>
     <span slot="footer" class="dialog-footer">
       <el-button size="mini" type="primary" @click="dialogVisible = false">关闭</el-button>

src/components/recharge/type/index.vue

@@ -135,6 +135,12 @@
 <script>
 import { recTypeList } from "@/api/eashier.js";
 export default {
+  props:{
+    rechargeTypeId:{
+      type:String,
+      default:""
+    }
+  },
   data() {
     return {
       radio: null, //单选值
@@ -175,7 +181,7 @@ export default {
     async getData() {
       this.listLoading = true;
       let form = {
-        id: "",
+        rechargeTypeId:this.rechargeTypeId?this.rechargeTypeId:null,
         storeId: sessionStorage.getItem("parentId")
       };
       if (this.selectNumber != null) {

src/pages/branch/branch.vue

@@ -30,7 +30,7 @@
           {{btntxt}}</el-button>
       </el-form-item>
       <el-form-item label="选择行业" prop="industry">
-        <el-select filterable default-first-option v-model="form.industry" filterable default-first-option placeholder="请选择">
+        <el-select filterable default-first-option v-model="form.industry"  placeholder="请选择">
           <el-option v-for="item in options" :key="item.num" :label="item.name" :value="item.num">
           </el-option>
         </el-select>

src/pages/branch/openBranch/index.vue

@@ -292,6 +292,7 @@ export default {
       } else {
         getphonecode({
           phone: this.storeForm.registrantMobilePhone,
+          getType:1
         })
           .then((res) => {
             if (res.code == "000000") {

src/pages/eashier/collectionList/collectionList.vue

@@ -1153,7 +1153,7 @@ export default {
         this.saveloading = false;
       }, 3000);
       if (this.liftType == 0) {
-        // this.form.giveType = this.giveType
+        this.form.giveType = this.giveType
         addrec(this.form).then((res) => {
           this.saveloading = false;
           if (res.code == "000000") {

src/pages/eashier/refundRecharge/service/detail/detail.vue

@@ -46,8 +46,8 @@
       </el-table-column>
       <el-table-column align="center" prop="" label="人数" min-width="100">
         <template slot-scope="scope">
-          <span class="text-blue">{{scope.row.man?(' 男 '+scope.row.man):''}}</span>
+          <span class="text-blue">{{scope.row.manNumber?(' 男 '+scope.row.manNumber):''}}</span>
-          <span class="text-red">{{scope.row.woman?(' 女 '+scope.row.woman):''}}</span>
+          <span class="text-red">{{scope.row.womanNumber?(' 女 '+scope.row.womanNumber):''}}</span>
         </template>
       </el-table-column>
       <el-table-column align="center" prop="inputBy" label="录单人" show-overflow-tooltip min-width="80"></el-table-column>

src/pages/eashier/refundRecharge/service/service.vue

@@ -304,7 +304,6 @@ import {
   selectListType,
   storeMemberOne,
   ctlist,
-  cashdoCash,
   couAccountList,
   proOne,
   addCash,

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

@@ -65,7 +65,7 @@
     </div>
     <member ref="member" @memberData="memberData"></member>
     <rec ref="rec" @recTypeData="recData"></rec>
-    <rectype ref="rectype" @recTypeData="rectypeData"></rectype>
+    <rectype ref="rectype" @recTypeData="rectypeData" :rechargeTypeId='form.outRechargeTypeId'></rectype>
     <div 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>
@@ -225,7 +225,6 @@ export default {
       if (number == 0) {
         this.$refs.rec.show(this.memberForm);
       } else {
-        console.log(this.form.outType);
         this.$refs.rectype.show(this.form.outType);
       }
     },

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

@@ -42,12 +42,12 @@
           <el-radio :label="1">比例赠送</el-radio>
         </el-radio-group>
       </el-form-item>
-      <!-- <el-form-item label="仅本店使用：" prop="giveType">
+      <el-form-item label="仅本店使用：" prop="giveType">
-        <el-radio-group v-model="form.giveType">
+        <el-radio-group v-model="form.giveType" :disabled='title==="修改"'>
           <el-radio :label="1">是</el-radio>
           <el-radio :label="0">否</el-radio>
         </el-radio-group>
-      </el-form-item> -->
+      </el-form-item>
       <el-form-item label="赠送金额：" prop="giftMoney">
         <el-input type="number" :placeholder="form.donateType==0?'固定金额':form.donateType==1?'比例赠送(%)':''" class="form-width" v-model="form.giftMoney" autocomplete="on" :disabled="form.type === 1">
         </el-input>

src/pages/statistics/storeSummary/index.vue

@@ -13,6 +13,7 @@
           end-placeholder="结束日期"
         >
         </el-date-picker>
+        <el-button type="primary" size="mini" @click="handleExport">导出<i class="el-icon-download"></i></el-button>
       </div>
     </div>
     <el-table
@@ -29,15 +30,17 @@
     >
       <el-table-column
         align="center"
-        min-width="50"
+        min-width="80"
         prop="storeNum"
         label="门店编码"
+        fixed='left'
       ></el-table-column>
       <el-table-column
         align="center"
-        min-width="50"
+        min-width="80"
         prop="storeName"
         label="门店名称"
+        fixed='left'
       ></el-table-column>
       <el-table-column
         align="center"
@@ -45,13 +48,13 @@
         :key="index"
         :label="item.label"
         :prop="item.prop"
-        width="60"
+        width="80"
       ></el-table-column>
     </el-table>
   </div>
 </template>
-
 <script>
+import { exportStoreDailys,exportStore } from "@/api/statistics.js";
 export default {
   data() {
     return {
@@ -96,105 +99,47 @@ export default {
     this.init()
   },
   methods: {
+    handleExport(){
+      let params = {
+        startDate:this.days[0],
+        endDate:this.days[1]
+      }
+      exportStore(params).then(res=>{
+          console.log(res)
+          let blob = new Blob([res]);
+          var a = document.createElement("a");
+          var url = window.URL.createObjectURL(blob);
+          a.href = url;
+          a.download = "收款总汇表.xlsx";
+          a.click();
+          window.URL.revokeObjectURL(url);
+      })
+    },
     init() {
       this.loading = true
-      let res = {
+      let params = {
-        list: [
+        startDate:this.days[0],
-          {
+        endDate:this.days[1]
-            cashPeopleNum: 0,
+      }
-            cashMoney: 0,
+      exportStoreDailys(params).then(res=>{
-            courseMoney: 0,
+        this.loading = false
-            courseOrderNum: 0,
+        if(res.code == '000000'){
-            rechargeMoney: 2000.0,
+         this.$nextTick(()=>{
-            rechargeOrderNum: 2,
+          this.list = res.data.exportList.map((item,index)=>{
-            repayMoney: 0,
+            return{
-            refundMoney: 0,
+              label:item,
-            cashRefundMoney: 0,
+              prop:`sum${index}`
-            newMemberNum: 0,
+            }
-            memberNum: 6,
-            recNegativeMoney: 2000.0,
-            startMemberNum: 6,
-            woman: 0,
-            man: 0,
-            date: "2023-01-12",
-            cashierCashMoney: 0,
-            cashierCardMoney: 0,
-            cashlMoney: 0,
-            coursexMoney: 0,
-            coursekMoney: 0,
-            recRepay: null,
-            recRepayMoney: 0,
-            courseRepay: null,
-            courseRepayMoney: 0,
-            promotionCourseRepay: null,
-            promotionCourseRepayMoney: 0,
-            changeInPayMoney: 0,
-            rechargeMoneys: 2000.0,
-            coursexMoneys: 0,
-            cashierCashMoneys: 0,
-            grouponCounts: 0.0,
-            grouponMoney: 0.0,
-            sumList:[10,100,0]
-          },
-          {
-            cashPeopleNum: 0,
-            cashMoney: 0,
-            courseMoney: 0,
-            courseOrderNum: 0,
-            rechargeMoney: 2000.0,
-            rechargeOrderNum: 2,
-            repayMoney: 0,
-            refundMoney: 0,
-            cashRefundMoney: 0,
-            newMemberNum: 0,
-            memberNum: 6,
-            recNegativeMoney: 2000.0,
-            startMemberNum: 6,
-            woman: 0,
-            man: 0,
-            date: "2023-01-12",
-            cashierCashMoney: 0,
-            cashierCardMoney: 0,
-            cashlMoney: 0,
-            coursexMoney: 0,
-            coursekMoney: 0,
-            recRepay: null,
-            recRepayMoney: 0,
-            courseRepay: null,
-            courseRepayMoney: 0,
-            promotionCourseRepay: null,
-            promotionCourseRepayMoney: 0,
-            changeInPayMoney: 0,
-            rechargeMoneys: 2000.0,
-            coursexMoneys: 0,
-            cashierCashMoneys: 0,
-            grouponCounts: 0.0,
-            grouponMoney: 0.0,
-            sumList:[100,10000]
-          },
-        ],
-        exportList: [
-          {
-            label: "1-1",
-          },
-          {
-            label: "1-2",
-          },
-        ],
-      };
-      this.list = res.exportList
-      this.tableDate = res.list
-      this.$nextTick(()=>{
-        res.list.forEach((item,index)=>{
-          res.list.forEach((item,index)=>{
-            this.list[index].prop = 'sum'+index
           })
-          item.sumList.forEach((item2,index2)=>{
+          this.tableDate = res.data.list
-              this.$set(this.tableDate[index],`sum${index2}`,item2)
+            res.data.list.forEach((item,index)=>{
+              item.sumList.forEach((item2,index2)=>{
+                  this.$set(this.tableDate[index],`sum${index2}`,item2.sum)
+              })
+            })
           })
-        })
+         }
       })
-      this.loading = false
     },
     // 获取当月第一天至今的时间
     defaultDate(){
@@ -214,64 +159,9 @@ export default {
     changeMonth(date) {
       if (!date) {
       } else {
+        this.init()
       }
     },
-    currentMonthDays() {
-      // 获取标准时间
-      const date = new Date();
-      // 获取当天日期
-      const currentDay = date.getDate();
-      // 获取当前月份（实际月份需要加1）
-      const currentMonth =
-        date.getMonth() + 1 < 10 ? date.getMonth() + 1 : date.getMonth() + 1;
-      // 获取当前年份
-      const currentYear = date.getFullYear();
-      // 获取当前月有多少天
-      const currentMonthDays = new Date(currentYear, currentMonth, 0).getDate();
-      // 当前月份所有日期集合
-      const currentMonthArr = [];
-      for (let day = 1; day <= currentMonthDays; day++) {
-        // 截至当前日期为止
-        if (day <= currentDay) {
-          // 年月日(yyyy-MM-dd)
-          // let dateItem = currentYear + "-" + currentMonth + "-" + (day < 10 ? '0' + day : day)
-          let dateItem = currentMonth + "-" + (day < 10 ? "0" + day : day);
-          currentMonthArr.push(dateItem);
-        }
-      }
-      return currentMonthArr;
-    },
-    // 获取所有日期
-    getDayAll(starDay, endDay) {
-      let arr = [];
-      let dates = [];
-      // 设置两个日期UTC时间
-      let db = new Date(starDay);
-      let de = new Date(endDay);
-      // 获取两个日期GTM时间
-      let s = db.getTime() - 24 * 60 * 60 * 1000;
-      let d = de.getTime() - 24 * 60 * 60 * 1000;
-
-      // 获取到两个日期之间的每一天的毫秒数
-      for (let i = s; i <= d; ) {
-        i = i + 24 * 60 * 60 * 1000;
-        arr.push(parseInt(i));
-      }
-      // 获取每一天的时间  YY-MM-DD
-      for (let j in arr) {
-        let time = new Date(arr[j]);
-        let year = time.getFullYear(time);
-        let mouth =
-          time.getMonth() + 1 >= 10
-            ? time.getMonth() + 1
-            : "0" + (time.getMonth() + 1);
-        let day = time.getDate() >= 10 ? time.getDate() : "0" + time.getDate();
-        let YYMMDD = mouth + "-" + day;
-        // let YYMMDD = year + '-' + mouth + '-' + day;
-        dates.push(YYMMDD);
-      }
-      return dates;
-    },
   },
 };
 </script>

src/pages/storeManage/storeParameters/storeParameters.vue

@@ -439,6 +439,7 @@ export default {
       var dataList = {}; //dataList.employeesSMS
       console.log( 'row--->',row )
       row.forEach((item) => {
+        // employeesSMS
         if (item.paramentName == "minimum") {
           dataList.minimum = item.paramentValue;
         }
@@ -524,6 +525,11 @@ export default {
         }
         if (item.paramentName == "employeesSMS") {
           dataList.employeesSMS = item.paramentValue;
+          if (dataList.employeesSMS == '0') {
+            dataList.employeesSMS = true;
+          } else {
+            dataList.employeesSMS = false;
+          }
         }
 
         if (item.paramentName == "course") {
@@ -689,11 +695,6 @@ export default {
         } else {
           dataList.refunSpan = false;
         }
-        if (dataList.employeesSMS == '0') {
-          dataList.employeesSMS = true;
-        } else {
-          dataList.employeesSMS = false;
-        }
         if (dataList.recDebt == 1 && dataList.recDebt != undefined) {
           dataList.recDebt = true;
         } else {
@@ -897,6 +898,7 @@ export default {
         dataList.refunSpan = 0;
       }
       if (dataList.employeesSMS == true) {
+        //1否 0选中
         dataList.employeesSMS = 0;
       } else {
         dataList.employeesSMS = 1;