1

src/components/administrative/LianMengManagement.vue

@@ -34,10 +34,10 @@
       </tr>
       <tr v-for="item in dataList">
          <td>{{item.AllianceName}}</td>
-         <td>{{item.CustomerCount}}</td>
+         <td><span class="cursorpointer text-decoration" @click="goCustomerList(item.ID)">{{item.CustomerCount}}</span></td>
          <td>{{item.StartYear}}-{{item.EndYear}}</td>
          <td>{{moneyFormat(item.TradeMoney)}}</td>
-         <td><span class="cursorpointer text-decoration" @click="goCustomerList(item.ID)">{{item.TotalGuestNum}}</span></td>
+         <td><span class="cursorpointer text-decoration" @click="jiesuan(item.ID, 'happyMoneyDetails', 1)" >{{item.TotalGuestNum}}</span></td>
          <td class="_icon_btn">
             <el-tooltip class="item" effect="dark" content="新增客户" placement="top">
               <i class="edit el-icon-edit"@click="addCustorm(item)"></i>
@@ -186,13 +186,14 @@ export default {
     this.employeeMsg.GroupId = userInfo.RB_Group_id;    //集团ID
     this.getEmployee()
   },methods: {
-    jiesuan: function (ID, path){
+    jiesuan: function (ID, path, t){
       this.$router.push({
         name: path,
         query: {
           id: ID,
           blank: "y",
-          tab: '大红包结算'
+          tab: '大红包结算',
+          type: t
         }
       });
     },

src/components/administrative/happyMoneyDetails.vue

@@ -120,9 +120,22 @@
   background-color: #a0a0a0;
   border-color: #a0a0a0;
 }
+.happyMoney ._icon_btn i {
+    width: 30px;
+    height: 30px;
+    display: inline-block;
+    color: white !important;
+    border-radius: 50%;
+    text-align: center;
+    line-height: 28px;
+    margin-right: 10px;
+    cursor: pointer;
+    outline: none;
+}
+.happyMoney ._icon_btn i.icon-guanli2{background-color: #E95252;}
 </style>
 <template>
-  <div class="happyMoney" v-if="show">
+  <div class="happyMoney" v-loading="!show">
     <div class="tit">
       <div class="name">{{dataList.AllianceName + dataList.EndYear}}年度大红包结算</div>
     </div>
@@ -143,15 +156,21 @@
               <th>名称</th>
               <th>交易金额</th>
               <th>交易人头</th>
-              <th>预计返现</th>
-              <th width="200">确认返现</th>
+              <th v-if="!hideBtn">预计返现</th>
+              <th width="200" v-if="!hideBtn">确认返现</th>
+              <th v-if="hideBtn">操作</th>
             </tr>
             <tr v-for="(item, index) in dataList.CustomerList">
-              <td>{{item.CustomerName}}</td>
+              <td>{{item.CustomerName}} <span v-if="item.IsMain == 1"  style="color: #E95252">(主)</span> </td>
               <td>¥{{moneyFormat(item.TradeMoney)}}</td>
               <td>{{item.TotalGuestNum}}人</td>
-              <td>¥{{moneyFormat(item.PredictPrice)}}</td>
-              <td>¥{{moneyFormat(item.PredictPrice)}}</td>
+              <td v-if="!hideBtn">¥{{moneyFormat(item.PredictPrice)}}</td>
+              <td v-if="!hideBtn">¥{{moneyFormat(item.PredictPrice)}}</td>
+              <td class="_icon_btn" v-if="hideBtn">
+                <el-tooltip class="item" effect="dark" content="设置主门店" placement="top">
+                  <i class="iconfont icon-guanli2"@click="setAdmin(item)"></i>
+                </el-tooltip>
+              </td>
             </tr>
           </table>
           <div class="_addUpload_box clearfix">
@@ -203,18 +222,47 @@ export default {
       picIsShow: false,
       show: false,
       dataList: {}, 
+      hideBtn: false,
     };
   },
   mounted() {
     let id = this.$route.query.id
+    if (this.$route.query.type){
+      this.hideBtn = true
+    }
     this.getList(id);
   },
   methods: {
+    setAdmin: function(obj) {
+      let ParentId = this.$route.query.id
+      this.$confirm('确认设置“'+ obj.CustomerName + '”为主门店？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.apipost(
+          "app_customer_UpdateIsMain",
+          {ParentId: ParentId, Id: obj.ID},
+          res => {
+            if (res.data.resultCode === 1) {
+              this.$message.success(res.data.message)
+              this.getList(ParentId);
+            }
+          },
+          null
+        );
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消'
+        });          
+      });
+    },
     getList: function(id) {
       this.show = false
       this.apipost(
         "app_customer_GetClearingAllianceDetails",
-        { Id: id},
+        {Id: id},
         res => {
           if (res.data.resultCode === 1) {
             this.show = true

src/components/leaderPay2.vue

@@ -1338,7 +1338,7 @@
         let obj = this.lingjiandiObj
         let inputPrice = obj.price ? parseFloat(obj.price) : 0
         let userinfo = this.getLocalStorage()
-        if (inputPrice <= 0) {
+        if (inputPrice == 0) {
           this.$message.error('请输入制单金额')
           return
         }