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

src/components/SalesModule/Common/addTeamman.vue

@@ -65,15 +65,15 @@
                           </el-select>
                       </el-form-item>
                   </div>
-                  <!-- <div class="MyEditForm-item" >
+                  <div class="MyEditForm-item" >
                       <el-form-item label="权限" class="label-pad-left form-check">
                           <div class="pad-left-10">
                               <el-radio v-model="form.IsRead" :label="1">只读</el-radio>
                               <el-radio v-model="form.IsRead" :label="0">读写</el-radio>
                           </div>
                       </el-form-item>
-                  </div> -->
-                  <div class="MyEditForm-item">
+                  </div>
+                  <!-- <div class="MyEditForm-item">
                       <el-form-item label="同时添加至" class="label-pad-left form-check">
                           <div class="pad-left-10">
                               <el-checkbox-group v-model="TransferOther">
@@ -83,7 +83,7 @@
                               </el-checkbox-group>
                           </div>
                       </el-form-item>
-                  </div>
+                  </div> -->
               </el-form>
           </div>
           <div slot="footer" class="dialog-footer">
@@ -134,13 +134,13 @@
           });
           this.form.EmpIds = str.substring(0, str.length - 1);
         }
-        if (this.TransferOther.length < 1) {
-          let str2 = "";
-          this.TransferOther.map((x, i) => {
-            str2 = str2 + x + ",";
-          });
-          this.form.TransferOther = str2.substring(0, str2.length - 1);
-        }
+        // if (this.TransferOther.length < 1) {
+        //   let str2 = "";
+        //   this.TransferOther.map((x, i) => {
+        //     str2 = str2 + x + ",";
+        //   });
+        //   this.form.TransferOther = str2.substring(0, str2.length - 1);
+        // }
         this.loading = true
         this.crmapipost("/api/Customer/AddTeamMembers", this.form, (res) => {
           if (res.data.resultCode == 1) {
@@ -194,7 +194,7 @@
           CustomerId: 0,
           EmpIds: [],
           IsRead: 0,
-          TransferOther: [],
+          TransferOther: '',
         };
         this.$refs[formName].resetFields();
       },

src/components/SalesVisa/components/VisaProductOrder.vue

@@ -4,7 +4,7 @@
       width: 100%;
       margin-top: 20px;
     }
-  
+
     .page_MyCustomer ._mc_addbox>li {
       float: left;
       width: 116px;
@@ -16,19 +16,19 @@
       background: #E9E9E9;
       cursor: pointer;
     }
-  
+
     .page_MyCustomer ._mc_addbox>li.active {
       background: #fff;
       color: #333;
     }
-  
+
     .page_MyCustomer ._mc_addbox .divActive {
       margin: -3px auto;
       width: 26px;
       height: 3px;
       background: #E95252;
     }
-  
+
     .page_MyCustomer ._mc_edit {
       overflow: auto;
       display: none;
@@ -42,36 +42,36 @@
       width: 100%;
       min-width: 1146px;
     }
-  
+
     .page_MyCustomer .edHeight {
       display: block;
       height: 291px;
     }
-  
+
     .page_MyCustomer ._mc_list {
       overflow-x: auto;
       background: #fff;
       padding-top: 20px;
       padding-left: 15px;
     }
-  
+
     .page_MyCustomer ._scrollbar::-webkit-scrollbar {
       width: 4px;
       height: 8px;
     }
-  
+
     .page_MyCustomer ._scrollbar::-webkit-scrollbar-thumb {
       border-radius: 4px;
       -webkit-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2);
       background: #c9c9c9;
     }
-  
+
     .page_MyCustomer ._scrollbar::-webkit-scrollbar-track {
       -webkit-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2);
       border-radius: 4px;
       background: #EDEDED;
     }
-  
+
     .page_MyCustomer ._mc_edit ._tit {
       padding-left: 10px;
       border-left: 3px solid #E95252;
@@ -79,55 +79,55 @@
       font-family: 'PingFangSc-Fine';
       color: #000000
     }
-  
+
     .page_MyCustomer ._mc_edit ._info_box ul._form li {
       float: left;
     }
-  
+
     .page_MyCustomer ._check_list {
       padding-left: 120px;
       margin-bottom: 20px;
     }
-  
+
     .page_MyCustomer ._check_box .el-form-item {
       margin-bottom: 0
     }
-  
+
     .page_MyCustomer ._info_box .el-form-item__label {
       font-size: 12px;
       color: #666;
     }
-  
+
     ._remark textarea {
       resize: none;
       width: 646px;
       height: 100px
     }
-  
+
     .page_MyCustomer .avatar {
       width: 148px;
       height: 148px;
       display: block;
     }
-  
+
     .page_MyCustomerSearch {
       width: 100%;
       min-height: auto;
       overflow: hidden;
       padding: 0 0 20px 0;
     }
-  
+
     .page_MyCustomerSearch li {
       float: left;
       font-size: 12px;
       color: #666;
       margin: 20px 0 0px 0;
     }
-  
+
     .page_MyCustomerSearch li>span {
       display: inline-block;
     }
-  
+
     .page_MyCustomerSearch li span>em {
       display: inline-block;
       min-width: 60px;
@@ -135,18 +135,18 @@
       font-style: normal;
       margin: 0 12px 0 0;
     }
-  
+
     .page_MyCustomerSearch li:last-child {
       float: right;
     }
-  
+
     .VisaProductTable {
       width: 100%;
       font-size: 14px;
       color: #333;
       border-collapse: collapse;
     }
-  
+
     .VisaProductTable tr th {
       background: #E6E6E6;
       height: 30px;
@@ -154,12 +154,12 @@
       text-align: left;
       text-indent: 25px;
     }
-  
+
     .VisaProductTable tr {
       background: #fff;
       text-align: left;
     }
-  
+
     .VisaProductTable tr td {
       height: 60px;
       padding-left: 25px;
@@ -167,7 +167,7 @@
       font-size: 14px;
       color: #333;
     }
-  
+
     .VisaProductTable tr td>img {
       width: 24px;
       height: 24px;
@@ -175,7 +175,7 @@
       float: left;
       margin-right: 5px;
     }
-  
+
     .VisaProductTable tr td .tuanqian {
       vertical-align: middle;
       font-weight: 400;
@@ -187,7 +187,7 @@
       color: #FFFFFF;
       background: #2AAEF2;
     }
-  
+
     .VisaProductTable tr td .geqian {
       vertical-align: middle;
       font-weight: 400;
@@ -199,29 +199,29 @@
       color: #FFFFFF;
       background: #FF9000;
     }
-  
+
     .VisaProductTable tr td .totalPrice {
       color: #FF9000;
       font-weight: 400;
       font-size: 16px;
     }
-  
+
     .VisaProductTable tr td .sendVisaDate {
       font-weight: bold;
     }
-  
+
     .page_MyCustomer ._edHeight {
       height: 340px;
     }
-  
+
     .dateClass {
       width: 171px !important;
     }
-  
+
     .surplusNum {
       color: #E95252 !important;
     }
-  
+
     .peopleNum {
       height: 15px;
       font-size: 16px;
@@ -229,7 +229,7 @@
       color: rgba(51, 51, 51, 1);
       line-height: 24px;
     }
-  
+
     .Visa_income {
       width: 18px;
       height: 16px;
@@ -238,7 +238,7 @@
       line-height: 24px;
       color: RGBA(71, 191, 140, 1);
     }
-  
+
     .VisaProductTable tr td .createName {
       vertical-align: middle;
       display: table-cell;
@@ -246,39 +246,39 @@
       width: 50px;
       height: 21px;
     }
-  
+
     .groupTourOrderIcon button {
       width: 28px;
       height: 28px;
       border-radius: 4px;
     }
-  
+
     .groupTourOrderIcon .el-button--primary {
       padding: 5px;
       margin: 0;
       font-size: 14px !important;
     }
-  
+
     .groupTourOrder_tickets_red {
       color: #ff0000;
       text-decoration: underline;
     }
-  
+
     .groupTourOrder_tickets_blue {
       color: #0000ff;
       text-decoration: underline;
     }
-  
+
     .groupTourOrder_tickets_green {
       color: #008000;
       text-decoration: underline;
     }
-  
+
     .groupTourOrder_tickets_black {
       color: #000000;
       text-decoration: underline;
     }
-  
+
     .VD-remarkTitle {
       display: inline-block;
       float: left;
@@ -286,18 +286,18 @@
       white-space: nowrap;
       font-size: 14px;
     }
-  
+
     .VD-remarkCon {
       float: left;
       display: inline-block;
       width: 94%;
       font-size: 14px;
     }
-  
+
     .VD-redType {
       color: red;
     }
-  
+
   </style>
   <template>
     <div class="page_MyCustomer">
@@ -336,6 +336,15 @@
                 <el-option label="待付款" value="3" key='3'></el-option>
               </el-select>
             </span></li>
+            <li>
+              <span>
+                <em>完结状态</em>
+                <el-select v-model='msg.IsFinish'>
+                  <el-option label="不限" value="0" key='0'></el-option>
+                  <el-option label="已完结" value="1" key='1'></el-option>
+                  <el-option label="未完结" value="2" key='2'></el-option>
+                </el-select>
+              </span></li>
           <li v-if="pagesTitle!='销售'">
             <span>
               <em>业务员</em>
@@ -382,7 +391,7 @@
         <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
           layout="total,prev, pager, next, jumper" :page-size="this.msg.pageSize" :total="total">
         </el-pagination>
-  
+
       <div class="_mc_edit _scrollbar" :class="addShow==true?'edHeight':''">
         <p class="_tit">{{$t('salesModule.UpOrder')}}
           <span class="fr">
@@ -505,7 +514,7 @@
           userInfo: {},
           qjGroupId: -1,
           F_InvoiceManagement: false,
-          F_Finance_Create: false,        	
+          F_Finance_Create: false,
           msg: {
             pageIndex: 1,
             pageSize: 12,
@@ -518,7 +527,8 @@
             VisaOrderStatus: '0',
             CreateBy: 0,
             RB_Branch_Id: -1,
-            OrderId: 0
+            OrderId: 0,
+            IsFinish: '0',
           },
           addMsg: {
             Id: 0,
@@ -621,7 +631,7 @@
               this.F_Finance_Create = true;
             }
           });
-  
+
         },
         goUrlFinance(name, path, id, tcmun) {
           this.$router.push({
@@ -759,7 +769,7 @@
             }
           });
         },
-  
+
         cancelOrder(obj) {
           this.$confirm('是否取消?', '提示', {
             confirmButtonText: '确定',
@@ -791,8 +801,15 @@
           this.apipost(url, this.msg, res => {
             if (res.data.resultCode == 0) {
               this.loading = false;
+
               this.dataList = []
             } else {
+              let arrList = function(list){
+                list.forEach(x => {
+                  x.loading = false
+                });
+              }
+              arrList(res.data.data.pageData)
               this.dataList = res.data.data.pageData;
               this.total = res.data.data.count;
               this.loading = false;
@@ -826,15 +843,15 @@
               this.addMsg.EnterCountryFlight = x[0].EnterCountryFlight
               this.addMsg.LeaveCountryFlight = x[0].LeaveCountryFlight
               this.addMsg.VisaPlanId = x[0].VisaPlanId
-              //this.addMsg.DepartDate=x[0].DepartDate	
+              //this.addMsg.DepartDate=x[0].DepartDate
               this.addMsg.ClientType = x[0].ClientType.toString()
-  
+
             }
-  
+
           }, err => {})
-  
-  
-  
+
+
+
         },
         saveVisa() { // 保存
           this.$refs['addMsg'].validate((valid) => {
@@ -906,6 +923,5 @@
         this.GetSupperOrderEditAuth();
       }
     }
-  
+
   </script>
-  
\ No newline at end of file

src/components/temp/operation.vue

@@ -527,6 +527,7 @@
                   1.以上制度公司会因市场变动与业务实际情况及公司规模採取适当因应或调整,敬请注意!!</br>
                   2.购物佣金不计入OP毛利奖金</br>
                   3.如果小包团、落地散团出现利润亏损，需其他团分摊亏损的利润</br>
+                  4.签证订单 需OP点完结后方可参与提成。</br>
                 </div>
                 <div style="display: none; padding: 10px 0 0 0;color: #E95252;line-height: 30px;width: 50%;white-space: wrap;">
                   <p style="font-weight: bold;">关于提成发放流程的补充通知：</p>
@@ -538,8 +539,7 @@
                   2.未在规定时间内改价平账订单，违反提成规则，该订单报名当事人提成金额为0。</br>
                   3.未平账订单继续追溯至下个月，直到全部帐平为止，再放发上月其他订单提成</br>
                   4.未结团团期或成本遗漏补录等原因，造成团队利润变动，销售提成会在次月再次验证此团利润，多退少补；</br>
-                  5.签证订单 需OP点完结后方可参与提成。</br>
-                  6.提成工作环环相扣，请所有人员务必有公德心，同时遵守工作流程，尊重他人。</br>
+                  5.提成工作环环相扣，请所有人员务必有公德心，同时遵守工作流程，尊重他人。</br>
                 </div>
               </div>