From 0e576626a4234be72a52970809db1be7a505149b Mon Sep 17 00:00:00 2001
From: zzk <2428569932@qq.com>
Date: Sat, 11 Mar 2023 15:27:52 +0800
Subject: [PATCH] ---

---
 config/index.js                               |   2 +-
 src/api/promotion.js                          |   2 +-
 .../promotion/sellpacking/sellpacking.vue     | 217 +++++++++---------
 3 files changed, 115 insertions(+), 106 deletions(-)

diff --git a/config/index.js b/config/index.js
index 302f3e4..5050b29 100644
--- a/config/index.js
+++ b/config/index.js
@@ -47,7 +47,7 @@ module.exports = {
       }
     },
     // Various Dev Server settingsss
-    host: "192.168.31.191", // can be overwritten by process.env.HOST
+    host: "192.168.31.214", // can be overwritten by process.env.HOST
     port: 3000, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: false,
     errorOverlay: true,
diff --git a/src/api/promotion.js b/src/api/promotion.js
index a452d51..23ce369 100644
--- a/src/api/promotion.js
+++ b/src/api/promotion.js
@@ -52,7 +52,7 @@ export function promotionRevokeAudit(params) {
 // 促销活动关闭 (门店端-促销活动-促销活动关闭)
 export function promotionShutDown(params) {
   return service({
-    url: "/api" + "demay/ssm/promotion/shutDown",
+    url: "/api" + "/demay/ssm/promotion/shutDown",
     method: "post",
     data: params
   });
diff --git a/src/pages/promotion/sellpacking/sellpacking.vue b/src/pages/promotion/sellpacking/sellpacking.vue
index c18c552..626fe43 100644
--- a/src/pages/promotion/sellpacking/sellpacking.vue
+++ b/src/pages/promotion/sellpacking/sellpacking.vue
@@ -1,92 +1,119 @@
 <template>
   <div class="sellpacking">
-    <el-form :model="form" inline label-width="80px">
-      <el-form-item label="手机号码">
-        <div class="form-width-ms flex">
-          <el-input style="padding-left:0px;" ref="" oninput="this.value=this.value.replace(/\D/g,'')" pattern="[0-9]*" maxlength="11" v-model="form.mobilePhone" @change="memberOne" @blur="memberOne">
-            <el-button size="mini" slot="append" icon="el-icon-search" @click="openMember"></el-button>
-          </el-input>
-          <el-button icon="el-icon-circle-plus-outline" type="text" @click="openAddMember"></el-button>
+    <el-form :model="form" inline label-width="70px">
+      <div class="flex">
+        <div >
+          <el-form-item label="手机号码:">
+            <div class="form-width-ms flex">
+              <el-input style="padding-left:0px;" ref="" oninput="this.value=this.value.replace(/\D/g,'')" pattern="[0-9]*" maxlength="11" v-model="form.mobilePhone" @change="memberOne" @blur="memberOne">
+                <el-button size="mini" slot="append" icon="el-icon-search" @click="openMember"></el-button>
+              </el-input>
+              <el-button icon="el-icon-circle-plus-outline" type="text" @click="openAddMember"></el-button>
 
+            </div>
+          </el-form-item>
+          <el-form-item label="会员名字:">
+            <div class="form-width-sm text-cyan text-bold">
+              {{form.memberName}}
+            </div>
+          </el-form-item>
+          <el-form-item label="促销名称:">
+            <div class="form-width-sm text-red text-bold">
+              {{form.promotionName}}
+              <!-- <div v-if="form.promotionName!=''" @click="openPromotion( openPromotionDialog=true)"> {{form.promotionName}} </div>
+              <el-button size="mini" type="text" @click="openPromotion( openPromotionDialog=true)" v-else>选择</el-button> -->
+            </div>
+          </el-form-item>
+          <br>
+          <el-form-item label="促销总价:">
+            <div class="form-width-ms text-red text-price">
+              {{form.totalMoney}}
+            </div>
+          </el-form-item>
+          <el-form-item label="促销单价:">
+            <div class="form-width-sm ">
+              <span class="text-red" v-if="form.moneyType==1&&checkTableList.length==0">选择下列项目</span>
+              <span v-else class="text-red text-price">{{form.saleMoney}}</span>
+            </div>
+          </el-form-item>
+          <el-form-item label="购买套数:">
+            <div class="form-width-sm text-cyan text-bold">
+              <div style="width:100%;cursor: pointer;" v-if="!countShow" @click="editCount">{{form.count}}
+              </div>
+              <el-input class="form-width-x" ref="countInput" v-else v-model="form.count" @blur="endEditCount()"></el-input>
+            </div>
+          </el-form-item>
+          <br>
+          <el-form-item label="销售金额:">
+            <div class="form-width-ms text-red text-price">
+              {{form.amount}}
+            </div>
+          </el-form-item>
+          
+          <el-form-item label="待付金额:">
+            <div class="form-width-sm text-green text-price">
+              {{form.debtMoney}}
+            </div>
+          </el-form-item>
+          
+          <el-form-item label="适用对象:">
+            <div class="form-width-sm">
+              <span v-show="form.suitableObject==0">全部会员</span>
+              <span v-show="form.suitableObject==1">生日会员</span>
+              <span v-show="form.suitableObject==2">指定会员</span>
+            </div>
+          </el-form-item>
+          <br>
+          <el-form-item label="限购套数:">
+            <div class="form-width-ms">
+              <span v-show="form.limitBuy==0">不限购</span>
+              <span v-show="form.limitBuy==1"> 限购{{form.limitCount}}套</span>
+            </div>
+          </el-form-item>
+          <el-form-item label="卡付折扣:">
+            <div class="form-width-sm">
+              <span v-show="form.cardBuy==0">不允许卡付</span>
+              <span v-show="form.cardBuy==1">允许卡付
+                <!-- <span v-show="form.cardLimit==1">可打折</span> <span v-show="form.cardLimit==0">不可打折</span> -->
+              </span>
+            </div>
+          </el-form-item>
+          <el-form-item label="开始时间:">
+            <div>
+              {{form.beginDate }}
+            </div>
+          </el-form-item>
+          <br>
+          <el-form-item label="结束时间:">
+            <div class="form-width-ms">
+              {{form.endDate }}
+            </div>
+          </el-form-item>
+          <el-form-item label="购买备注:">
+            <el-input size="small" type="textarea" :autosize="{ minRows: 1.5, maxRows: 2 }" v-model="form.description" style="max-width:300px;width:300px"></el-input>
+          </el-form-item>
         </div>
-      </el-form-item>
-      <el-form-item label="会员名字">
-        <div class="form-width-ms text-cyan text-bold">
-          {{form.memberName}}
-        </div>
-      </el-form-item>
-      <el-form-item label="促销名称:">
-        <div class="form-width-ms text-red text-bold">
-          {{form.promotionName}}
-          <!-- <div v-if="form.promotionName!=''" @click="openPromotion( openPromotionDialog=true)"> {{form.promotionName}} </div>
-          <el-button size="mini" type="text" @click="openPromotion( openPromotionDialog=true)" v-else>选择</el-button> -->
-        </div>
-      </el-form-item>
-      <el-form-item label="促销总价:">
-        <div class="form-width-ms text-red text-price">
-          {{form.totalMoney}}
-        </div>
-      </el-form-item>
-      <br>
-      <el-form-item label="促销单价:">
-        <div class="form-width-ms ">
-          <span class="text-red" v-if="form.moneyType==1&&checkTableList.length==0">选择下列项目</span>
-          <span v-else class="text-red text-price">{{form.saleMoney}}</span>
-        </div>
-      </el-form-item>
-      <el-form-item label="购买套数:">
-        <div class="form-width-ms text-cyan text-bold">
-          <div style="width:100%;cursor: pointer;" v-if="!countShow" @click="editCount">{{form.count}}
-          </div>
-          <el-input class="form-width-xs" ref="countInput" v-else v-model="form.count" @blur="endEditCount()"></el-input>
-        </div>
-      </el-form-item>
-      <el-form-item label="销售金额:">
-        <div class="form-width-ms text-red text-price">
-          {{form.amount}}
-        </div>
-      </el-form-item>
-      <el-form-item label="待付金额">
-        <div class="form-width-ms text-green text-price">
-          {{form.debtMoney}}
-        </div>
-      </el-form-item>
-      <br>
-      <el-form-item label="适用对象:">
-        <div class="form-width-ms">
-          <span v-show="form.suitableObject==0">全部会员</span>
-          <span v-show="form.suitableObject==1">生日会员</span>
-          <span v-show="form.suitableObject==2">指定会员</span>
-        </div>
-      </el-form-item>
-      <el-form-item label="限购套数:">
-        <div class="form-width-ms">
-          <span v-show="form.limitBuy==0">不限购</span>
-          <span v-show="form.limitBuy==1"> 限购{{form.limitCount}}套</span>
-        </div>
-      </el-form-item>
-      <el-form-item label="卡付折扣:">
-        <div class="form-width-ms">
-          <span v-show="form.cardBuy==0">不允许卡付</span>
-          <span v-show="form.cardBuy==1">允许卡付
-            <!-- <span v-show="form.cardLimit==1">可打折</span> <span v-show="form.cardLimit==0">不可打折</span> -->
-          </span>
-        </div>
-      </el-form-item>
-      <el-form-item label="开始时间:">
-        <div>
-          {{form.beginDate }}
-        </div>
-      </el-form-item>
-      <br>
-      <el-form-item label="结束时间:">
-        <div class="form-width-ms">
-          {{form.endDate }}
+        <div style="width:250px" class="border-radius-10 border margin-right-xs  bg-white padding-xs">
+          <el-table :data="payLists" :summary-method="getSummaries" show-summary>
+            <el-table-column align="center" prop="payName" label="支付方式" min-width="100"></el-table-column>
+            <el-table-column align="center" prop="payMoney" fixed="right" label="本次支付 ( ¥ )" width="120">
+              <template slot-scope="scope">
+                <div style="padding:0 10px" v-if="!scope.row.isShow" @click="openpay(scope.row,scope.$index)">
+                  <span>{{scope.row.payMoney}}</span>
+                  <i class="el-icon-edit text-cyan"></i>
+                </div>
+                <el-input v-else v-focus type="number" @blur="endEdit(scope.row)" v-model="scope.row.payMoney">
+                </el-input>
+              </template>
+            </el-table-column>
+          </el-table>
+          <!-- <div class="close">
+            <span>合计</span>
+            <span>¥{{payMoneys}}</span>
+          </div> -->
         </div>
-      </el-form-item>
-      <el-form-item label="购买备注:">
-        <el-input size="small" type="textarea" :autosize="{ minRows: 1.5, maxRows: 2 }" v-model="form.description" style="max-width:600px;width:600px"></el-input>
-      </el-form-item>
+      </div>
+      
       <div class="border-radius-10 border   bg-white padding-xs" v-if="form.projectCount" style="width:920px;margin-left:20px">
         <el-table ref="regTable" @selection-change="handleSelectionChange" @row-click="rowClicks" :data="projectList" :header-cell-style="{background: 'linear-gradient(#6cb3ff, #1873d4)',color:'#eeeeee',}">
           <el-table-column type="selection" width="55"></el-table-column>
@@ -103,7 +130,7 @@
       </div>
       <br>
       <div class="flex justify-center align-start flex-wrap padding-top-xs padding-left margin-left" style="width:940px">
-        <div style="width:610px" class="border-radius-10 border margin-right-xs  bg-white padding-xs" v-if="form.cardBuy==1">
+        <div style="width:940px" class="border-radius-10 border margin-right-xs  bg-white padding-xs" v-if="form.cardBuy==1">
           <el-table :data="rechargeAccountList" :summary-method="getSummaries" show-summary>
             <el-table-column align="center" :show-overflow-tooltip="true" prop="rechargeTypeName" label="名称" min-width="120"></el-table-column>
             <el-table-column show-overflow-tooltip min-width="70" align="center" prop="cardRestMoney" label="剩余金额"></el-table-column>
@@ -128,25 +155,7 @@
             <span v-else style="margin-right:300px;">¥{{spendMoneys}}</span>
           </div> -->
         </div>
-        <div style="width:300px" class="border-radius-10 border margin-right-xs  bg-white padding-xs">
-          <el-table :data="payLists" :summary-method="getSummaries" show-summary>
-            <el-table-column align="center" prop="payName" label="支付方式" min-width="100"></el-table-column>
-            <el-table-column align="center" prop="payMoney" fixed="right" label="本次支付 ( ¥ )" width="120">
-              <template slot-scope="scope">
-                <div style="padding:0 10px" v-if="!scope.row.isShow" @click="openpay(scope.row,scope.$index)">
-                  <span>{{scope.row.payMoney}}</span>
-                  <i class="el-icon-edit text-cyan"></i>
-                </div>
-                <el-input v-else v-focus type="number" @blur="endEdit(scope.row)" v-model="scope.row.payMoney">
-                </el-input>
-              </template>
-            </el-table-column>
-          </el-table>
-          <!-- <div class="close">
-            <span>合计</span>
-            <span>¥{{payMoneys}}</span>
-          </div> -->
-        </div>
+        
       </div>
       <div class="flex justify-start align-start flex-wrap padding-top-xs padding-left margin-left">
         <staffsles ref="staffsles" @staffslesData="staffslesData"></staffsles>