Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/assets/common/lang/zh.js

@@ -768,6 +768,9 @@ export const active = {
   cjjiangxiang: '抽奖奖项',
   cl_man: '满',
   cl_keyong: '可用',
+  cl_cjleixing: '抽奖类型',
+  cl_huodong: '活动',
+  cl_renwu: '任务',
 }
 
 export const fnc = {
@@ -1736,4 +1739,6 @@ export const visaT = {
   qxzzzdqzlx:'请选择正确的签证类型！',
   qxzxybddry:"请选择需要绑定的人员",
   v_Othervisas:'其他'
-}
+}
\ No newline at end of file
+import invoicesManager from './H/h-invoicesManager'
+export const invoices = invoicesManager
\ No newline at end of file

src/components/Complaints/ComplaintsDetail.vue

@@ -236,7 +236,7 @@
             </li>
             <li
               v-if="ComplainInfo.DisposeStatus===4&&(getLocalStorage().EmployeeId===ComplainDetial[ComplainDetial.length-1].CreateBy||authority.indexOf('S_Complain_Finance')!=-1)">
-              <span>赔偿列表：</span>
+              <span>立即制单：</span>
               <span v-for="compensation in ComplainCompensation" class="CD_dealResult" href="javascript:void(0)"
                     @click="setFinance(compensation)">{{compensation.CompensateMoney}}</span>
             </li>
@@ -593,6 +593,7 @@
       },
       //设置财务单据
       setFinance (compensation) {
+        let id = [11];
         //TODO跳转到财务单据
         if (compensation.FinanceID === 0) {
           var TCArr = [this.PriceInfo.TCID]
@@ -607,6 +608,7 @@
             name: 'ChoiceAddFinancialDocuments',
             query: {
               Type: 2,
+              templateID: JSON.stringify(id),
               companyID: this.PriceInfo.OutBranchId,
               'blank': 'y',
               'orderObj': JSON.stringify(orderObj)

src/components/FinancialModule/ChoiceAddFinancialDocuments2.vue

@@ -85,6 +85,7 @@
         lastID:-1,
         orderObj:null,
         showTab:0,
+        templateID: null,
       }
     },methods:{
       goUrl(path,id,Name,Type,IsUploadPic) {
@@ -121,6 +122,18 @@
         }else{
           this.noData = false;
         }
+        let newList = [];
+        if (this.templateID) {
+          this.templateID.forEach(x=>{
+            this.GetList.forEach(y=>{
+              if(x === y.Id) {
+                newList.push(y)
+              }
+            })
+          })
+          this.GetList = newList
+        }
+        
       },
       Financial_post_GetList(){ //获取
         this.apipost('Financial_post_GetList',{},res=>{
@@ -131,13 +144,13 @@
                 if(x.Type==1){
                   this.collectList.push(x);
                 }else if (x.Type==2){
-                  if(this.active===2){
-                     if(x.Id!=11){
-                       this.payList.push(x);
-                     }
-                  }else{
+                  // if(this.active===2){
+                  //    if(x.Id!=11){
+                  //      this.payList.push(x);
+                  //    }
+                  // }else{
                     this.payList.push(x);
-                  }
+                  // }
                 }else if (x.Type==7){
                   this.GZList.push(x);
                 }
@@ -156,6 +169,7 @@
         },err=>{})
       },
     },mounted(){
+      this.templateID = this.$route.query.templateID ? JSON.parse(this.$route.query.templateID) : null
       this.Financial_post_GetList();
       this.showTab = this.$route.query.Type?this.$route.query.Type:0;
       if(this.showTab==1){

src/components/FinancialModule/RecPayQuery.vue

@@ -918,7 +918,7 @@ export default {
             if(!this.msg.CurrencyId)this.msg.CurrencyId=0;
             if(!this.msg.CostTypeID)this.msg.CostTypeID=0;
             if(!this.msg.TemplateId)this.msg.TemplateId=0;
-            if(!this.msg.RB_Branch_Id)this.msg.RB_Branch_Id=-1;
+            if(this.msg.RB_Branch_Id === '')this.msg.RB_Branch_Id=-1;
             if(!this.msg.RB_Depart_Id)this.msg.RB_Depart_Id=0;
             if(!this.msg.UpdateBy)this.msg.UpdateBy=0;
             if(!this.msg.TCID)this.msg.TCID=0;
@@ -958,7 +958,7 @@ export default {
         if(!this.msg.CurrencyId)this.msg.CurrencyId=0;
         if(!this.msg.CostTypeID)this.msg.CostTypeID=0;
         if(!this.msg.TemplateId)this.msg.TemplateId=0;
-        if(!this.msg.RB_Branch_Id)this.msg.RB_Branch_Id=-1;
+        if(this.msg.RB_Branch_Id === '')this.msg.RB_Branch_Id=-1;
         if(!this.msg.RB_Depart_Id)this.msg.RB_Depart_Id=0;
         if(!this.msg.UpdateBy)this.msg.UpdateBy=0;
         if(!this.msg.TCID)this.msg.TCID=0;

src/components/SalesModule/MyCustomer.vue

@@ -65,7 +65,9 @@
   .page_MyCustomerSearch li>span {display: inline-block; }
   .page_MyCustomerSearch li span>em{display: inline-block; min-width: 60px; text-align: right; font-style: normal; margin:0 12px 0 0;}
   .page_MyCustomerSearch li:last-child{float: right;}
-
+.page_MyCustomerSearch ._class_b{
+	color: #257BF1 !important
+}
 </style>
 <template>
     <div class="page_MyCustomer">
@@ -106,7 +108,7 @@
 				       <img v-if='item.icon' :onerror="defaultImg" :src='item.icon'/>
                        <p>{{item.contact}}</p>
                        <p><i class="iconfont icon-img_dianhua"></i>{{item.contactNumber}}</p>
-                       <p class="_addr">{{item.customerName}}</p>
+                       <p class="_addr">{{item.customerName}} <i class="iconfont icon-shimingrenzheng" :class="{'_class_b': item.RealNameAuthentication===1}"></i></p>
                    </div>
                    <div class="_record" v-if="item.customerAccountId!=0">
                         <p class="_fist_n" v-if="item.customerVisitList.length>0">近期约访：{{item.customerVisitList[0].visitDateTime}}</p>

src/components/SalesModule/customerApproval.vue

@@ -27,7 +27,9 @@
 	.customerApprovalLayercontentBtn>span.cked{border:2px solid #E95252;box-sizing: border-box;}
 	.customerApprovalLayercontentBtn>span>img{float: left; margin:10px 23px; width: 63px; height: 63px;}
 	.customerApproval .lastVisitContent{background: #f5f5f5; font-size: 12px; padding: 5px 12px; margin-top: 8px;}
-	
+	.customerApproval ._class_b{
+	color: #257BF1 !important
+}
 </style>
 
 <template>
@@ -197,7 +199,7 @@
 				<th width="15%">操作</th>
 			</tr>
 			<tr v-for="item in list">
-				<td class="fz16">{{item.customerName}}</td>
+				<td class="fz16">{{item.customerName}}<i class="iconfont icon-shimingrenzheng" :class="{'_class_b': item.RealNameAuthentication===1}"></i></td>
 				<td>
 					{{item.contact}}
 				</td>

src/components/SalesModule/customerTransfer.vue

@@ -115,7 +115,7 @@
                 @change="ckeckedOne"
                 style="vertical-align: middle;"
               >
-              {{item.CustomerName}}
+              {{item.CustomerName}}<i class="iconfont icon-shimingrenzheng" :class="{'_class_b': item.RealNameAuthentication===1}"></i>
             </label>
           </td>
           <td>{{item.Contact}}</td>
@@ -1045,6 +1045,9 @@ export default {
   box-sizing: border-box;
   border-bottom: none;
   border-right: none;
+}
+	.customerTransferTable ._class_b{
+	color: #257BF1 !important
 }
 .customerTransferTable tr th {
   background: #dcdcdc;

src/components/SalesModule/publicCustomer.vue

@@ -54,13 +54,13 @@
 					<th width="20%">
 						<label><input type="checkbox"  v-model="isCkedAll"  @click='checkedAll()'  style="vertical-align: middle;"/>门店名称</label>
 					</th>
-					<th width="10%">联系电话</th>
+					<th width="17%">联系电话</th>
 					<th width="20%">地址</th>
 					<th width="10%">来源</th>
-					<th width="10%">拜访次数</th>
+					<th width="8%">拜访次数</th>
 					<th width="10%">交易金额</th>
 					<th width="10%">创建人</th>
-					<th width="10%">操作</th>
+					<th width="5%">操作</th>
 				</tr>
 				<tr>
 					<td colspan="8" align="center" v-show='list.length==0'>
@@ -69,7 +69,7 @@
 				</tr>
 				<tr  v-for='(item,index) in list'>
 					<td>
-						<label><input type="checkbox" :value="item.CustomerId" v-model="customerList" @change="ckeckedOne" style="vertical-align: middle;"/>{{item.CustomerName}}</label>
+						<label><input type="checkbox" :value="item.CustomerId" v-model="customerList" @change="ckeckedOne" style="vertical-align: middle;"/>{{item.CustomerName}}<i class="iconfont icon-shimingrenzheng" :class="{'_class_b': item.RealNameAuthentication===1}"></i></label>
 					</td>
 					<td><i class="iconfont icon-img_dianhua fz14" style="color:#09D49D;margin-right: 5px;"></i>{{item.ContactNumber}}</td>
 						<td>{{item.Address}}</td>
@@ -249,4 +249,7 @@
 	.pd20{padding: 12px 20px !important; }
 	.el-popper[x-placement^=bottom]{margin-top: 0px !important;}
 	.el-popper[x-placement^=top]{margin-bottom: 0px !important;}
+	.publicCustomerTable ._class_b{
+	color: #257BF1 !important
+}
 </style>
\ No newline at end of file

src/components/activity/CouponList.vue

@@ -98,6 +98,7 @@
         <th>{{$t('active.cl_couponNum')}}</th>
         <th>{{$t('active.cl_ffzongliang')}}</th>
         <th>{{$t('active.ad_endNum')}}</th>
+        <th>{{$t('fnc.sygongsi')}}</th>
         <th>{{$t('system.query_lineName')}}</th>
         <th>{{$t('active.ad_xlmc')}}</th>
         <th>{{$t('system.query_type')}}</th>
@@ -119,6 +120,7 @@
           <span class="_couponReceiveCount"  @click="item.couponReceiveCount === 0 ? '' : goDetail('CouponDetail', item)">{{item.couponReceiveCount}}</span>
         </td>
         <td>{{(item.couponCount - item.couponReceiveCount) > 0 ? (item.couponCount - item.couponReceiveCount) : 0 }}</td>
+        <td>{{item.branchName}}</td>
         <td>{{item.lineId <= 0 ? $t('pub.unlimitedSel') : item.lineName}}</td>
         <td>{{item.lineteamId <= 0 ? $t('pub.unlimitedSel') : item.lineTeamName}}</td>
         <td>{{item.couponsType ===1 ? $t('active.cl_dyquan') : $t('active.cl_zkquan')}}</td>
@@ -191,6 +193,7 @@
                   v-model="addMsg.branchId"
                   :placeholder="$t('system.ph_choice')"
                 >
+                  <el-option :label="$t('system.ph_buxian')" :value="-1" :key="-1"></el-option>
                   <el-option
                     v-for="item in layerCompanyList"
                     :label="item.BName"

src/components/activity/LuckyDraw.vue

@@ -133,6 +133,7 @@
       <tr>
         <th>{{$t('active.ld_name')}}</th>
         <th>{{$t('admin.admin_company')}}</th>
+        <th>{{$t('active.cl_cjleixing')}}</th>
         <th>{{$t('active.ld_cjcs')}}</th>
         <th>{{$t('hotel.hotel_StartDate')}}</th>
         <th>{{$t('hotel.hotel_EndDate')}}</th>
@@ -143,6 +144,7 @@
       <tr v-for="item in dataList">
           <td>{{item.lotteryName}}</td>
           <td>{{item.branchName}}</td>
+          <td>{{item.lotteryType === 1 ? $t('active.cl_huodong') : $t('active.cl_renwu')}}</td>
           <td>{{item.lotteryCount}}</td>
           <td>{{item.startDate}}</td>
           <td>{{item.endDate}}</td>
@@ -206,7 +208,17 @@
               </el-form-item>
             </td>
             <td>
-              <el-form-item :label="$t('system.table_company')" prop="branchId">
+              <el-form-item label="抽奖类型" prop="lotteryType">
+                <el-select filterable class="w217" v-model="addMsg.lotteryType" :placeholder="$t('system.ph_choice')" @change="addMsg.branchId = ''">
+                  <el-option :label="$t('active.cl_huodong')" :value="1" :key="1"></el-option>
+                  <el-option :label="$t('active.cl_renwu')" :value="2" :key="2"></el-option>
+                </el-select>
+              </el-form-item>
+            </td>
+          </tr>
+          <tr>
+            <td>
+              <el-form-item :label="$t('system.table_company')" prop="branchId" v-if="addMsg.lotteryType === 1">
                 <el-select filterable class="w217" v-model="addMsg.branchId" :placeholder="$t('system.ph_choice')">
                   <el-option
                     v-for="item in companyList"
@@ -216,21 +228,17 @@
                   ></el-option>
                 </el-select>
               </el-form-item>
+              <el-form-item :label="$t('system.table_company')" prop="branchId" v-else>
+                <el-select filterable class="w217" v-model="addMsg.branchId" :placeholder="$t('system.ph_choice')">
+                  <el-option label="不限" :value="-1" :key="-1"></el-option>
+                </el-select>
+              </el-form-item>
             </td>
-          </tr>
             <td>
               <el-form-item :label="$t('active.ld_cjNum')" prop="lotteryCount">
                 <el-input v-model="addMsg.lotteryCount" class="w217" @keyup.native="checkInteger(addMsg,'lotteryCount')" :placeholder="$t('active.ld_cjNum')"/>
               </el-form-item>
             </td>
-            <td>
-              <el-form-item :label="$t('active.ld_status')" prop="lotteryStatus">
-                <el-select filterable v-model="addMsg.lotteryStatus" class="w217">
-                  <el-option :label="$t('pub.normalSel')" :value="1"></el-option>
-                  <el-option :label="$t('active.ld_jinyong')" :value="2"></el-option>
-                </el-select>
-              </el-form-item>
-            </td>
           </tr>
           <tr>
             <td>
@@ -247,6 +255,16 @@
               </el-form-item>
             </td>
           </tr>
+          <tr>
+            <td>
+              <el-form-item :label="$t('active.ld_status')" prop="lotteryStatus">
+                <el-select filterable v-model="addMsg.lotteryStatus" class="w217">
+                  <el-option :label="$t('pub.normalSel')" :value="1"></el-option>
+                  <el-option :label="$t('active.ld_jinyong')" :value="2"></el-option>
+                </el-select>
+              </el-form-item>
+            </td>
+          </tr>
           <tr>
             <td colspan="2">
               <el-form-item :label="$t('active.ld_cjRule')" prop="lotteryRules">
@@ -331,6 +349,7 @@ export default {
           lotteryPlatform:1,
           lotteryRules:'',
           image:'',
+          lotteryType: 1,
       },
       toolbar: {
         clean: true, //加粗
@@ -357,6 +376,7 @@ export default {
         lotteryCount: [{ required: true, message: "请输入抽奖次数", trigger: "blur" }],
         startDate: [{ required: true, message: "请选择开始日期", trigger: "blur" }],
         endDate: [{ required: true, message: "请选择结束日期", trigger: "blur" }],
+        lotteryType: [{ required: true, message: "请选择抽奖类型", trigger: "blur" }],
       },
       loading:false,
       currentPage: 1,
@@ -406,6 +426,7 @@ export default {
           lotteryPlatform:1,
           lotteryRules:'',
           image:'',
+          lotteryType: '',
         }
         this.addMsg= newMsg;
     },
@@ -484,8 +505,9 @@ export default {
       this.addMsg.groupId = item.groupId;
       this.addMsg.branchId = item.branchId;
       this.addMsg.lotteryStatus = item.lotteryStatus;
-      this.addMsg.lotteryRules = item.lotteryRules,
+      this.addMsg.lotteryRules = item.lotteryRules
       this.addMsg.image = item.image
+      this.addMsg.lotteryType = item.lotteryType
     },
     // 删除抽奖
     deleteItem: function (item) {
@@ -515,6 +537,7 @@ export default {
         name: 'awardList',
         query: { 
             lotteryId: item.id,
+            branchId: item.branchId,
             blank: "y", 
             tab: this.$t('active.cjjiangxiang') 
         }

src/components/activity/awardList.vue

@@ -193,7 +193,6 @@ export default {
     },
     //修改信息
     updateData(item){
-      console.log(item);
       this.addMsg.id=item.id;
       this.addMsg.lotteryId = item.lotteryId;
       this.addMsg.awardName = item.awardName;
@@ -206,8 +205,7 @@ export default {
     },
     //根据奖项类型请求关联Id
     getAwardRelationId(id){
-      let userInfo = localStorage.userInfo ? JSON.parse(localStorage.userInfo) : '';
-      let branchId = userInfo.RB_Branch_id ? userInfo.RB_Branch_id : 0
+      let branchId = this.$route.query.branchId;
       if(id==3){
           let msg = {
             couponId:this.addMsg.awardRelationId,