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

@@ -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>
@@ -518,7 +527,8 @@
             VisaOrderStatus: '0',
             CreateBy: 0,
             RB_Branch_Id: -1,
-            OrderId: 0
+            OrderId: 0,
+            IsFinish: '0',
           },
           addMsg: {
             Id: 0,
@@ -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;
@@ -908,4 +925,3 @@
     }
 
   </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>