Merge branch 'master' of http://192.168.31.40:10101/r/Demay_New

src/components/staffList/staff/index.vue

@@ -108,7 +108,6 @@ export default {
     },
     //组件传值
     show(list, storeId) {
-      console.log(list);
       this.staffLists = [...list];
       this.staffLists.forEach((item) => {
         if (item.id || item.staffId) {

src/layout/components/asider.vue

@@ -156,14 +156,14 @@ export default {
               icon: "el-icon-s-check",
               route: "/alliance",
               index: "alliance",
-              number: "400810",
+              number: "4008100",
             },
             {
               name: "物资",
               icon: "el-icon-s-ticket",
               route: "/materials",
               index: "materials",
-              number: "400810",
+              number: "4008100",
             },
 
             {
@@ -576,119 +576,119 @@ export default {
               icon: "el-icon-info",
               route: "/recommend",
               index: "recommend",
-              number: "600200",
+              number: "6001100",
             },
             {
               name: "人均单价",
               icon: "el-icon-s-finance",
               route: "/perCapita",
               index: "perCapita",
-              number: "600200",
+              number: "6001100",
             },
             {
               name: "活动排行榜",
               icon: "el-icon-s-cooperation",
               route: "/activity",
               index: "activity",
-              number: "600200",
+              number: "6001100",
             },
             {
               name: "计划达成",
               icon: "el-icon-s-flag",
               route: "/achieve",
               index: "achieve",
-              number: "600200",
+              number: "6001100",
             },
             {
               name: "商城营收",
               icon: "el-icon-s-marketing",
               route: "/turnover",
               index: "turnover",
-              number: "600200",
+              number: "6001100",
             },
             {
               name: "商品营收",
               icon: "el-icon-s-flag",
               route: "/commodity",
               index: "commodity",
-              number: "600200",
+              number: "6001100",
             },
             {
               name: "新增会员",
               icon: "el-icon-s-custom",
               route: "/addMember",
               index: "addMember",
-              number: "600200",
+              number: "6001100",
             },
             {
               name: "离职率",
               icon: "el-icon-finished",
               route: "/separation",
               index: "separation",
-              number: "600200",
+              number: "6001100",
             },
             {
               name: "费用清单",
               icon: "el-icon-tickets",
               route: "/expenses",
               index: "expenses",
-              number: "600200",
+              number: "6001100",
             },
             {
               name: "结算",
               icon: "el-icon-document",
               route: "/account",
               index: "account",
-              number: "600200",
+              number: "6001100",
             },
             {
               name: "活动效率比",
               icon: "el-icon-takeaway-box",
               route: "/efficiency",
               index: "efficiency",
-              number: "600200",
+              number: "6001100",
             },
             {
               name: "活动新会员",
               icon: "el-icon-user",
               route: "/activityNew",
               index: "activityNew",
-              number: "600200",
+              number: "6001100",
             },
             {
               name: "服务年限",
               icon: "el-icon-more-outline",
               route: "/seniority",
               index: "seniority",
-              number: "600200",
+              number: "6001100",
             },
             {
               name: "会员时长",
               icon: "el-icon-s-platform",
               route: "/memberTime",
               index: "memberTime",
-              number: "600200",
+              number: "6001100",
             },
             {
               name: "创收",
               icon: "el-icon-s-platform",
               route: "/income",
               index: "income",
-              number: "600200",
+              number: "6001100",
             },
             {
               name: "合作费用",
               icon: "el-icon-s-finance",
               route: "/collaboration",
               index: "collaboration",
-              number: "600200",
+              number: "6001100",
             },
             {
               name: "合作费用支付",
               icon: "el-icon-s-claim",
               route: "/verification",
               index: "verification",
-              number: "600200",
+              number: "6001100",
             },
 
             {
@@ -755,28 +755,28 @@ export default {
           name: "优惠券",
           index: "100",
           icon: "el-icon-s-ticket",
-          number: "400",
+          number: "1000",
           menuLists: [
             {
               name: "发布",
               icon: "el-icon-s-promotion",
               route: "/couponIssue",
               index: "couponIssue",
-              number: "400100",
+              number: "1000100",
             },
             {
               name: "管理",
               icon: "el-icon-s-operation",
               route: "/couponMane",
               index: "couponMane",
-              number: "400100",
+              number: "1000200",
             },
             {
               name: "领取消费",
               icon: "el-icon-time",
               route: "/couponRecord",
               index: "couponRecord",
-              number: "400100",
+              number: "1000300",
             },
           ],
         },

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

@@ -1206,6 +1206,9 @@ export default {
       this.recListCopy.forEach((item) => {
         list.forEach((items) => {
           if (item.id == items.id) {
+            console.log(item);
+            console.log(item.giftConsumeMoney);
+            console.log(item.giftSpendMoney);
             item.cardOver = (item.cardOver + items.spendMoney).toFixed(2) * 1;
             item.cardOvers = (item.cardOvers + items.spendMoney).toFixed(2) * 1;
             item.cardGiftOvers =
@@ -1658,11 +1661,6 @@ export default {
       this.list.forEach((item) => {
         let debtMoney = 0;
         if (item.amount && item.courseAccountId == null) {
-          console.log(item.amount);
-          console.log(item.collectionCashAmount);
-          console.log(item.collRecAmonnt);
-          console.log(item.collectionIntegralAmount);
-
           debtMoney =
             (
               item.amount -
@@ -1673,7 +1671,6 @@ export default {
           money += debtMoney;
         }
       });
-      console.log(money);
       this.form.cashAmount = money.toFixed(2) * 1;
       this.list.forEach((item) => {
         if (
@@ -1762,6 +1759,7 @@ export default {
       });
       return sums;
     },
+
     notData() {
       Object.assign(this.$data, this.$options.data.call(this));
       var that = this;

src/pages/eashier/reatment/reatment.vue

@@ -237,10 +237,20 @@
                 <el-button @click.stop="openPostpone(scope.row, (postponeDialog = true))" :disabled="scope.row.isCancel === 1" size="mini" type="success">账户延期</el-button>
               </template>
             </el-table-column> -->
-            <el-table-column align="center" fixed="right" label="操作" width="220">
-              <template slot-scope="scope" fixed="right">
+            <el-table-column align="center" fixed="right" label="明细" width="76">
+              <template slot-scope="scope">
                 <el-button size="mini" type="primary" @click="detail(scope.row)" plain>明细</el-button>
+                </el-button>
+              </template>
+            </el-table-column>
+            <el-table-column align="center" fixed="right" label="作废" width="76">
+              <template slot-scope="scope">
                 <el-button @click.stop="abolish(scope.row)" size="mini" :disabled="scope.row.isCancel === 1" type="primary" v-role="5004003">作废</el-button>
+                </el-button>
+              </template>
+            </el-table-column>
+            <el-table-column align="center" fixed="right" label="打印" width="76">
+              <template slot-scope="scope">
                 <el-button @click.stop="print(scope.row, (printDialogVisible = true))" :disabled="scope.row.isCancel === 1" size="mini" type="success" v-role="5004004">打印
                 </el-button>
               </template>

src/pages/eashier/refundCourse/refundCourse.vue

@@ -1110,7 +1110,6 @@ export default {
         refundOrderId: this.radiorefValueList.id,
       }).then((res) => {
         if (res.code == "000000") {
-          this.reset();
           if (res.rows.length == 0) {
             this.$alert("未找到相关明细", "提示", {
               confirmButtonText: "确定",
@@ -1153,7 +1152,7 @@ export default {
             selectOne({
               type: 5,
               orderNum: this.refund.refundNum,
-              storeId: this.radioListsValueList.storeId,
+              storeId: this.radiorefValueList.storeId,
             }).then((res) => {
               if (res.code == "000000") {
                 let managerList = [];

src/pages/eashier/refundRecharge/refundRecharge.vue

@@ -2,7 +2,6 @@
 
   <div class="rech">
     <el-form :model="refund" inline :label-width="formWidth">
-
       <el-form-item prop="rechPhone" label="手机号码:">
         <div class="form-width-ms">
           <el-input style="padding-left:0px;" oninput="this.value=this.value.replace(/\D/g,'')" pattern="[0-9]*" maxlength="11" v-model="refund.mobilePhone" @change="memberOne" @blur="memberOne">
@@ -150,7 +149,7 @@
             <!-- 状态 0:添加/1:送审/2:回收/3:审核/4:反审核 -->
             <el-button type="danger" size="mini" @click="delOrder()" v-if="radiorefValueList.state==0">删除</el-button>
             <el-button @click="detail()" :disabled="radiorefValueList.state==undefined " size="mini" type="primary" plain>明细</el-button>
-            <el-button @click="editOrder(formDialog=true,title='修改')" :disabled="radiorefValueList.state==undefined||radiorefValueList.state==5 ||radiorefValueList.state==1 || radiorefValueList.state==3" size="mini" type="primary" plain v-role='5005003'>修改</el-button>
+            <el-button @click="editOrder(title='修改')" :disabled="radiorefValueList.state==undefined||radiorefValueList.state==5 ||radiorefValueList.state==1 || radiorefValueList.state==3" size="mini" type="primary" plain v-role='5005003'>修改</el-button>
             <el-button @click="SendAudit" size="mini" type="primary" :disabled="radiorefValueList.state==3||radiorefValueList.state==5 ||radiorefValueList.state==1 ||radiorefValueList.state==undefined" v-role='5005004'>送审</el-button>
             <el-button @click="recycle" size="mini" type="primary" :disabled="radiorefValueList.state==0||radiorefValueList.state==5||radiorefValueList.state==2||radiorefValueList.state==3||radiorefValueList.state==4||radiorefValueList.state==undefined" plain v-role='5005005'>回收</el-button>
             <el-button v-if="headOffice==1" @click="audit" size="mini" type="primary" :disabled="radiorefValueList.state==2||radiorefValueList.state==5||radiorefValueList.state==3 || radiorefValueList.state==0|| radiorefValueList.state==4||radiorefValueList.state==undefined" v-role='5005006'>审核</el-button>
@@ -1262,7 +1261,7 @@ export default {
         refundOrderId: this.radiorefValueList.id,
       }).then((res) => {
         if (res.code == "000000") {
-          this.reset();
+          this.formDialog = true;
           if (res.pageInfo.total == 0) {
             this.$alert("未找到相关明细", "提示", {
               confirmButtonText: "确定",
@@ -1299,7 +1298,7 @@ export default {
             selectOne({
               type: 4,
               orderNum: this.refund.refundNum,
-              storeId: this.radioListsValueList.storeId,
+              storeId: this.radiorefValueList.storeId,
             }).then((res) => {
               if (res.code == "000000") {
                 let managerList = [];

src/pages/promotion/sellpacking/sellpackingTable.vue

@@ -45,7 +45,6 @@
       <el-table-column prop="amount" label="销售价格" align="center" min-width="80"></el-table-column>
       <el-table-column prop="debtMoney" label="欠款金额" align="center" min-width="80"></el-table-column>
       <el-table-column prop="storeName" label="门店名称" align="center" min-width="80"></el-table-column>
-
       <el-table-column label="明细" align="center" width="76" fixed="right">
         <template slot-scope="scope">
           <el-button size="mini" type="primary" plain @click="detail(scope.row)">明细</el-button>