购物店新加修改

src/components/ShoppingStore/ShoppingStore.vue

@@ -2,8 +2,9 @@
   .shoppingStore .hotelResource {
     width: 100%;
     margin-top: 20px;
-}
-.shoppingStore .resourceList {
+  }
+
+  .shoppingStore .resourceList {
     width: 215px;
     height: 230px;
     background-color: #fff;
@@ -13,25 +14,29 @@
     font-size: 12px;
     color: #333333;
     float: left;
-}
-.shoppingStore .resourceList:hover {
+  }
+
+  .shoppingStore .resourceList:hover {
     box-shadow: 0px 0px 20px rgba(191, 191, 191, 1);
     transition: all linear 0.5s;
-}
-.shoppingStore .reTopInfo {
+  }
+
+  .shoppingStore .reTopInfo {
     width: 100%;
     height: 123px;
     position: relative;
-}
-.shoppingStore .reTopInfo img {
+  }
+
+  .shoppingStore .reTopInfo img {
     position: absolute;
     width: 100%;
     height: 100%;
     top: 0;
     border-top-left-radius: 4px;
     border-top-right-radius: 4px;
-}
-.shoppingStore .profitList {
+  }
+
+  .shoppingStore .profitList {
     position: absolute;
     width: 132px;
     height: 54px;
@@ -43,15 +48,18 @@
     left: 50%;
     margin-left: -66px;
     top: 32px;
-}
-.shoppingStore .cumlaProfit {
+  }
+
+  .shoppingStore .cumlaProfit {
     display: inline-block;
     padding: 0 10px;
-}
-.shoppingStore .profOne {
+  }
+
+  .shoppingStore .profOne {
     margin: 8px 0 5px 0;
-}
-.shoppingStore .eventName {
+  }
+
+  .shoppingStore .eventName {
     position: absolute;
     height: 22px;
     width: 100%;
@@ -63,31 +71,36 @@
     text-overflow: ellipsis;
     white-space: nowrap;
     line-height: 22px;
-}
-.shoppingStore .AccumuTrading {
+  }
+
+  .shoppingStore .AccumuTrading {
     color: #666666;
     margin: 20px 0 0 20px;
-}
-.shoppingStore .amountOf {
+  }
+
+  .shoppingStore .amountOf {
     font-size: 14px;
     color: #333;
     margin: 10px 0 0 20px;
     font-family: PingFangSC-Semibold, sans-serif;
-}
-.shoppingStore .PhoneNum {
+  }
+
+  .shoppingStore .PhoneNum {
     width: 175px;
     height: 24px;
     background-color: #ededed;
     text-align: center;
     line-height: 24px;
     margin: 10px auto;
-}
-.shoppingStore .PhoneNum i {
+  }
+
+  .shoppingStore .PhoneNum i {
     font-size: 12px;
     color: #afafaf;
     margin-right: 10px;
-}
-.shoppingStore .Sort {
+  }
+
+  .shoppingStore .Sort {
     position: absolute;
     width: 50px;
     height: 25px;
@@ -98,85 +111,102 @@
     background-image: url(../../assets/img/Sort.png);
     line-height: 25px;
     text-align: center;
-}
-.shoppingStore .resourceList:hover .profitList {
+  }
+
+  .shoppingStore .resourceList:hover .profitList {
     background-color: rgba(4, 213, 124, 0.8);
-}
-.shoppingStore .btnList {
+  }
+
+  .shoppingStore .btnList {
     margin-top: 16px;
     text-align: center;
-}
-.shoppingStore .hotelBtn {
+  }
+
+  .shoppingStore .hotelBtn {
     width: 80px;
     height: 28px;
     background: #f76f6f;
     border-radius: 14px;
     color: #fff;
     cursor: pointer;
-}
-.shoppingStore .hotelBtn:first-child {
+  }
+
+  .shoppingStore .hotelBtn:first-child {
     margin-right: 19px;
-}
-.shoppingStore .w150 .el-input {
+  }
+
+  .shoppingStore .w150 .el-input {
     width: 150px;
-}
-.shoppingStore .btmAddStore::-webkit-scrollbar {
+  }
+
+  .shoppingStore .btmAddStore::-webkit-scrollbar {
     width: 4px;
     height: 8px;
-}
-.shoppingStore .btmAddStore::-webkit-scrollbar-track {
+  }
+
+  .shoppingStore .btmAddStore::-webkit-scrollbar-track {
     -webkit-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2);
     border-radius: 4px;
     background: #ededed;
-}
-.shoppingStore .btmAddStore::-webkit-scrollbar-thumb {
+  }
+
+  .shoppingStore .btmAddStore::-webkit-scrollbar-thumb {
     border-radius: 4px;
     -webkit-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2);
     background: #c9c9c9;
-}
-.shoppingStore .el-pagination {
+  }
+
+  .shoppingStore .el-pagination {
     border: none !important;
-}
-.shoppingStore .btmAddStore {
+  }
+
+  .shoppingStore .btmAddStore {
     border-top: 1px solid #d1d1d1;
     display: none;
     overflow-x: auto;
-  width:86%;
+    width: 86%;
     overflow-y: auto;
     position: fixed;
     background: #f9f9f9;
     bottom: 0;
-}
-.shoppingStore .btmTitle {
+  }
+
+  .shoppingStore .btmTitle {
     padding: 0 10px;
     margin: 20px 0 20px 40px;
     border-left: 3px solid #e95252;
     font-size: 14px;
     color: #000000;
-}
-.shoppingStore .changeMsg li {
+  }
+
+  .shoppingStore .changeMsg li {
     display: inline-block;
     color: #666666;
-}
-.shoppingStore .el-form-item__label {
+  }
+
+  .shoppingStore .el-form-item__label {
     font-size: 12px;
-}
-.shoppingStore .changeMsg {
+  }
+
+  .shoppingStore .changeMsg {
     margin-left: 20px;
-}
-.addressChoice {
+  }
+
+  .addressChoice {
     height: 30px;
     position: relative;
-}
-.shoppingStore .addChoice {
+  }
+
+  .shoppingStore .addChoice {
     width: 210px;
     height: 34px;
     border-radius: 17px;
     outline: none;
     border: 1px solid #d1d1d1;
     padding: 0 50px 0 10px;
-}
-.shoppingStore .addressIcon {
+  }
+
+  .shoppingStore .addressIcon {
     position: absolute;
     right: 4px;
     top: 10px;
@@ -187,29 +217,33 @@
     height: 20px;
     line-height: 20px;
     cursor: pointer;
-}
-.shoppingStore .remarkInfo {
+  }
+
+  .shoppingStore .remarkInfo {
     float: left;
     font-size: 12px;
     color: #666;
     margin-left: 20px;
-}
-.shoppingStore .addImg span,
-.remarkInfo span {
+  }
+
+  .shoppingStore .addImg span,
+  .remarkInfo span {
     display: inline-block;
     width: 100px;
     text-align: right;
     vertical-align: top;
-}
-.shoppingStore .reInfo {
+  }
+
+  .shoppingStore .reInfo {
     width: 225px;
     height: 100px;
     border: 1px solid #dadada;
     border-radius: 10px;
     margin-left: 10px;
     padding: 5px;
-}
-.shoppingStore .addIcon {
+  }
+
+  .shoppingStore .addIcon {
     width: 160px;
     height: 100px;
     background-color: #ececec;
@@ -219,72 +253,86 @@
     cursor: pointer;
     display: inline-block;
     margin-top: -2px;
-}
-.shoppingStore .addImg {
+  }
+
+  .shoppingStore .addImg {
     display: inline-block;
     margin-left: 30px;
     font-size: 12px;
-}
-.shoppingStore .imgDiv {
+  }
+
+  .shoppingStore .imgDiv {
     display: inline-block;
     margin-left: 20px;
-}
-.shoppingStore .addIcon i {
+  }
+
+  .shoppingStore .addIcon i {
     font-size: 50px;
     color: #d1d1d1;
-}
-.shoppingStore .btmBtn {
+  }
+
+  .shoppingStore .btmBtn {
     width: 100%;
     height: 70px;
     border-top: 1px dashed #d1d1d1;
     line-height: 70px;
-}
-.shoppingStore .addIconDiv {
+  }
+
+  .shoppingStore .addIconDiv {
     width: 160px;
     height: 100px;
-}
-.shoppingStore .fillShow,
-.isShow {
+  }
+
+  .shoppingStore .fillShow,
+  .isShow {
     display: block !important;
-}
-.shoppingStore .fillTop,
-.divTop {
+  }
+
+  .shoppingStore .fillTop,
+  .divTop {
     height: 320px;
     overflow-y: scroll;
-}
-.shoppingStore .hotelResource::-webkit-scrollbar {
+  }
+
+  .shoppingStore .hotelResource::-webkit-scrollbar {
     width: 4px;
     height: 8px;
-}
-.shoppingStore .hotelResource::-webkit-scrollbar-track {
+  }
+
+  .shoppingStore .hotelResource::-webkit-scrollbar-track {
     -webkit-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2);
     border-radius: 4px;
     background: #ededed;
-}
-.shoppingStore .hotelResource::-webkit-scrollbar-thumb {
+  }
+
+  .shoppingStore .hotelResource::-webkit-scrollbar-thumb {
     border-radius: 4px;
     -webkit-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2);
     background: #c9c9c9;
-}
-.shoppingStore .el-textarea__inner {
+  }
+
+  .shoppingStore .el-textarea__inner {
     resize: none;
     height: 100px;
     width: 200px;
-}
-.shoppingStore .re-img {
+  }
+
+  .shoppingStore .re-img {
     width: 140px;
     height: 93px;
     border-radius: 10px;
     float: left;
     margin: 0 30px 0 0;
     position: relative;
-}
-.shoppingStore .re-img img {
+  }
+
+  .shoppingStore .re-img img {
     width: 100%;
     height: 100%;
     border-radius: 10px;
-}
-.shoppingStore .imgzhe {
+  }
+
+  .shoppingStore .imgzhe {
     display: none;
     background: rgba(0, 0, 0, 0.4);
     width: 100%;
@@ -292,11 +340,13 @@
     border-radius: 10px;
     position: absolute;
     top: 0;
-}
-.shoppingStore .re-img:hover .imgzhe {
+  }
+
+  .shoppingStore .re-img:hover .imgzhe {
     display: block;
-}
-.shoppingStore .re-delte {
+  }
+
+  .shoppingStore .re-delte {
     width: 32px;
     height: 32px;
     background: gray;
@@ -306,91 +356,116 @@
     color: #fff;
     margin: 30px auto;
     cursor: pointer;
-}
-.shoppingStore .re-delte:hover {
+  }
+
+  .shoppingStore .re-delte:hover {
     color: #e95252;
     background: #fff;
-}
-.shoppingStore .imgList {
+  }
+
+  .shoppingStore .imgList {
     float: left;
-}
-.shoppingStore .upload-demo {
+  }
+
+  .shoppingStore .upload-demo {
     text-align: center;
     padding-bottom: 30px;
-}
-.shoppingStore .impoTable {
+  }
+
+  .shoppingStore .impoTable {
     width: 100%;
     min-width: 1400px;
-}
-.shoppingStore .impoTable td {
+  }
+
+  .shoppingStore .impoTable td {
     text-align: center;
     font-size: 12px;
     color: #333;
     background-color: #e0f4ff;
     height: 34px;
-}
-.shoppingStore .impoTable th {
+  }
+
+  .shoppingStore .impoTable th {
     background-color: #cbe9fa;
     color: #387ea5;
     height: 34px;
     font-size: 12px;
-}
-.shoppingStore .impotBtn {
+  }
+
+  .shoppingStore .impotBtn {
     border-top: none;
-}
-.shoppingStore .typnNoe {
+  }
+
+  .shoppingStore .typnNoe {
     display: none;
-}
-.shoppingStore .disType {
+  }
+
+  .shoppingStore .disType {
     display: block;
-}
-.shoppingStore .delInfo {
+  }
+
+  .shoppingStore .delInfo {
     display: inline-block;
     color: #387ea5;
     width: 30px;
     height: 20px;
     cursor: pointer;
-}
-.shoppingStore .redType .el-input__inner {
+  }
+
+  .shoppingStore .redType .el-input__inner {
     border-color: #e95252;
-}
-.shoppingStore .downBtn {
+  }
+
+  .shoppingStore .downBtn {
     padding: 6px 20px;
     position: relative;
     top: -1px;
-}
-.shoppingStore .litTip {
+  }
+
+  .shoppingStore .litTip {
     font-size: 12px;
     margin-left: 10px;
-}
-.shoppingStore .el-dialog--center .el-dialog__body {
+  }
+
+  .shoppingStore .el-dialog--center .el-dialog__body {
     padding: 15px 25px 0 !important;
-}
-.shoppingStore .mapList {
+  }
+
+  .shoppingStore .mapList {
     width: 850px !important;
     height: 510px !important;
-}
-.delScien {
+  }
+
+  .delScien {
     color: #fff;
-}
-.shoppingStore .delScien {
+  }
+
+  .shoppingStore .delScien {
     position: absolute;
     right: 10px;
     top: 10px;
     display: none;
-}
-.shoppingStore .delScien:hover {
+  }
+
+  .shoppingStore .delScien:hover {
     color: #f76f6f;
     cursor: pointer;
-}
-.shoppingStore .resourceList:hover .delScien {
+  }
+
+  .shoppingStore .resourceList:hover .delScien {
     display: block;
-}
-.shoppingStore .combottomDiv{height:400px;}
-.IsConflict td{
-  background-color:pink!important;
-}
-/* 购物店 */
+  }
+
+  .shoppingStore .combottomDiv {
+    height: 400px;
+  }
+
+  .IsConflict td {
+    background-color: pink !important;
+  }
+
+  /* 购物店 */
+
 </style>
 <template>
   <div class="flexOne shoppingStore">
@@ -399,13 +474,13 @@
         <li>
           <span>
             <em>{{$t('system.quety_area')}}</em>
-            <el-select v-model="msg.QCountry" clearable class="w150" filterable @change="getProvinceList(msg.QCountry,1)"
-              :placeholder="$t('hotel.hotel_country')">
+            <el-select v-model="msg.QCountry" clearable class="w150" filterable
+              @change="getProvinceList(msg.QCountry,1)" :placeholder="$t('hotel.hotel_country')">
               <el-option v-for='item in countryList' :key="item.ID" :label="item.Name" :value="item.ID">
               </el-option>
             </el-select>
-            <el-select v-model="msg.QProvince" clearable class="w150" filterable @change="getProvinceList(msg.QProvince,2)"
-              :placeholder="$t('hotel.hotel_province')">
+            <el-select v-model="msg.QProvince" clearable class="w150" filterable
+              @change="getProvinceList(msg.QProvince,2)" :placeholder="$t('hotel.hotel_province')">
               <el-option v-for='item in provinceList' :key="item.ID" :label="item.Name" :value="item.ID">
               </el-option>
             </el-select>
@@ -427,7 +502,8 @@
           </span>
         </li>
         <li>
-          <button class="hollowFixedBtn" type="button" @click="resetPageIndex(),getList()">{{$t('pub.searchBtn')}}</button>
+          <button class="hollowFixedBtn" type="button"
+            @click="resetPageIndex(),getList()">{{$t('pub.searchBtn')}}</button>
           <button class="normalBtn" type="button" @click="showDiv">{{$t('pub.addBtn')}}</button>
           <button class="normalBtn importBtn" type="button" @click="outerVisible=true">导入营销数据</button>
           <a class="hollowFixedBtn downBtn" :href="downList">下载模板</a>
@@ -466,8 +542,8 @@
         </div>
       </div>
     </div>
-    <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage" layout="total,prev, pager, next, jumper"
-      :page-size='msg.pageSize' :total='total'>
+    <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
+      layout="total,prev, pager, next, jumper" :page-size='msg.pageSize' :total='total'>
     </el-pagination>
     <div class="combottomDiv" v-if="isShow">
       <el-row>
@@ -496,18 +572,22 @@
           </li>
           <li>
             <el-form-item label="国家">
-              <el-select placeholder="请选择国家" filterable v-model="addMsg.Country" class='multiple_input w150' @change="GetSubAreaList(addMsg.Country,1)">
+              <el-select placeholder="请选择国家" filterable v-model="addMsg.Country" class='multiple_input w150'
+                @change="GetSubAreaList(addMsg.Country,1)">
                 <el-option :label="$t('pub.unlimitedSel')" :value='SelectDefaultValue'></el-option>
-                <el-option v-for="childItem in AddMsgCountryList" :key="childItem.ID" :label="childItem.Name" :value="childItem.ID">
+                <el-option v-for="childItem in AddMsgCountryList" :key="childItem.ID" :label="childItem.Name"
+                  :value="childItem.ID">
                 </el-option>
               </el-select>
             </el-form-item>
           </li>
           <li>
             <el-form-item label="省">
-              <el-select placeholder="请选择省" filterable class='multiple_input w150' v-model="addMsg.Province" @change="GetSubAreaList(addMsg.Province,2)">
+              <el-select placeholder="请选择省" filterable class='multiple_input w150' v-model="addMsg.Province"
+                @change="GetSubAreaList(addMsg.Province,2)">
                 <el-option :label="$t('pub.unlimitedSel')" :value='SelectDefaultValue'></el-option>
-                <el-option v-for="childItem in AddMsgProvinceList" :key="childItem.ID" :label="childItem.Name" :value="childItem.ID">
+                <el-option v-for="childItem in AddMsgProvinceList" :key="childItem.ID" :label="childItem.Name"
+                  :value="childItem.ID">
                 </el-option>
               </el-select>
             </el-form-item>
@@ -516,7 +596,8 @@
             <el-form-item label="市">
               <el-select placeholder="请选择市" filterable class='multiple_input w150' v-model="addMsg.City">
                 <el-option :label="$t('pub.unlimitedSel')" :value='SelectDefaultValue'></el-option>
-                <el-option v-for="childItem in AddMsgCityList" :key="childItem.ID" :label="childItem.Name" :value="childItem.ID">
+                <el-option v-for="childItem in AddMsgCityList" :key="childItem.ID" :label="childItem.Name"
+                  :value="childItem.ID">
                 </el-option>
               </el-select>
             </el-form-item>
@@ -531,9 +612,10 @@
           </li>
           <li>
             <el-form-item label="营业时间">
-              <el-time-select v-model="startTime" :picker-options="{start: '00:00',step: '00:05',end: '24:00'}" class="w150"
-                placeholder="选择时间"></el-time-select>
-              至 <el-time-select placeholder="结束时间" v-model="endTime" class="w150" :picker-options="{ start: '00:00', step: '00:05', end: '24:00',minTime: startTime}"></el-time-select>
+              <el-time-select v-model="startTime" :picker-options="{start: '00:00',step: '00:05',end: '24:00'}"
+                class="w100" placeholder="选择时间"></el-time-select>
+              至 <el-time-select placeholder="结束时间" v-model="endTime" class="w100"
+                :picker-options="{ start: '00:00', step: '00:05', end: '24:00',minTime: startTime}"></el-time-select>
             </el-form-item>
           </li>
           <li>
@@ -546,6 +628,15 @@
               <el-input v-model="addMsg.Contact" class="w150" maxlength="20"></el-input>
             </el-form-item>
           </li>
+          <li>
+            <el-form-item label="资金池账户">
+              <el-select placeholder="请选择资金池" class='multiple_input w150' v-model="addMsg.CapitalPoolId">
+                <el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
+                <el-option v-for='item in accountList' :label='item.Alias' :value='item.ID' :key='item.ID'>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </li>
         </ul>
         <div class="clearfix">
           <div class="remarkInfo">
@@ -565,8 +656,8 @@
                 </div>
               </div>
               <div class="addIcon">
-                <el-upload :http-request="UploadImage" :multiple="true" accept="image/jpeg,image/gif,image/png,image/bmp"
-                  :show-file-list="false" action="">
+                <el-upload :http-request="UploadImage" :multiple="true"
+                  accept="image/jpeg,image/gif,image/png,image/bmp" :show-file-list="false" action="">
                   <div class="addIconDiv">
                     <i class="iconfont icon-img_haha"></i>
                   </div>
@@ -641,7 +732,8 @@
     </el-dialog>
 
     <el-dialog custom-class='w700' title="导入营销数据" :visible.sync="outerVisible" center>
-      <el-upload drag class="upload-demo" :action="importFileUrl2" :on-success="handleAvatarSuccess" :before-upload="beforeAvatarUpload">
+      <el-upload drag class="upload-demo" :action="importFileUrl2" :on-success="handleAvatarSuccess"
+        :before-upload="beforeAvatarUpload">
         <i class="el-icon-upload"></i>
         <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
         <div slot="tip" class="el-upload__tip">只能上传Excel文件</div>
@@ -694,7 +786,7 @@
         //城市列表
         AddMsgCityList: [],
         //表格Loading
-        tabLoading:false,
+        tabLoading: false,
         msg: {
           pageIndex: 1,
           pageSize: 14,
@@ -720,8 +812,12 @@
           PicPath: "",
           Country: 0,
           Province: 0,
-          City: 0
+          City: 0,
+          //资金池编号
+          CapitalPoolId: 0
         },
+        //资金池账户列表
+        accountList: [],
         rules: {
           Name: [{
             required: true,
@@ -991,6 +1087,22 @@
         this.isShow = true;
         this.addMsg.ID = 0;
         this.titleInfo = "新增购物店";
+        this.addMsg.Name = "";
+        this.addMsg.Type = "";
+        this.addMsg.Contact = "";
+        this.addMsg.Tel = "";
+        this.addMsg.Remark = "";
+        this.addMsg.BusinessHours = "";
+        this.addMsg.Address = "";
+        this.addMsg.QCountry = "";
+        this.addMsg.QProvince = "";
+        this.addMsg.QCity = "";
+        this.addMsg.QDistrict = 0;
+        this.addMsg.PicPath = "";
+        this.addMsg.Country = 0;
+        this.addMsg.Province = 0;
+        this.addMsg.City = 0;
+        this.addMsg.CapitalPoolId = 0;
       },
       hideFill() {
         this.fillShow = false;
@@ -1129,9 +1241,23 @@
             null
           );
         });
+      },
+      GetCashPoolList() { // 获取资金池账
+        this.apipost('BankAccount_post_GetCashPoolListExt', {
+          Alias: ''
+        }, res => {
+          if (res.data.resultCode === 1) {
+            let data = res.data.data;
+            data.forEach(x => {
+              x.allName = x.Alias;
+            });
+            this.accountList = data;
+          }
+        }, err => {})
       }
     },
     mounted() {
+      this.GetCashPoolList();
       var jsArray = document.getElementsByTagName("script");
       var flag = false;
       var jsUrl = this.domainManager().GoogleMapUrl;