Merge branch 'mergeBranch' into orangeUrgent

src/Form/commissionDistribution/add.vue

@@ -13,12 +13,32 @@
           <el-form :model="form" :rules="rules" ref="formRef" label-width="120px" label-position="left" size="mini">
             <el-col :span="24">
               <el-form-item label="请选择收入凭证:" >
+                  <div style="float: left;margin-left: 20px">审核时间：</div>
+                  <el-date-picker
+                      v-model="auditDate"
+                      @change="selectChange"
+                      type="daterange"
+                      style="width:200px;float: left"
+                      format="yyyy-MM-dd"
+                      value-format="yyyy-MM-dd"
+                      range-separator="至"
+                      start-placeholder="开始日期"
+                      end-placeholder="结束日期">
+                  </el-date-picker>
+                  <div style="margin-left: 20px;float: left">回款比例(%)：</div>
+                  <div>
+                    <el-input v-model="begrate" style="width: 200px" placeholder="请输入回款比例" @change="rateChange"></el-input> ——
+                    <el-input v-model="endrate" style="width: 200px" placeholder="请输入回款比例" @change="rateChange"></el-input>
+                  </div>
               </el-form-item>
              </el-col>
             <el-col :span="24">
                 <tableNewLayout style="margin-bottom: 20px" ref="tableRef" :checkbox="true" :layout="tablecols" :data="list" :opwidth="200" height="calc(100vh - 410px)" :width="true" :custom="true" @selectionChange="selectionChange">
                   <template v-slot:customcol="scope">
-                    <div>
+                    <div v-if="scope.column.columnname === 'rate'">
+                      <div>{{Math.round((scope.column.data.rate * 100)*100)/100}}</div>
+                    </div>
+                    <div v-else>
                       {{scope.column.data[[scope.column.columnname]] || scope.column.columnname === 'operation'?scope.column.data[[scope.column.columnname]]:'--'}}
                     </div>
                   </template>
@@ -49,6 +69,9 @@ export default {
     return {
       dialogVisible:false,
       tablecols:[],
+      auditDate:'',
+      begrate:'',
+      endrate:'',
       list:[],
       form:{
         "sa_hrpayapplyid":0,
@@ -63,12 +86,14 @@ export default {
         "content": {
           "sa_hrpayapplyid":0,
           "pageNumber": 1,
-          "pageSize": 999,
+          "pageSize": 99999,
           "where":{
             "condition":"",
             "begdate":"",
             "enddate":"",
-            "status":""
+            "status":"",
+            "begrate":'',//开始回款比例
+            "endrate":'' //截止回款比例
           }
         }
       }
@@ -110,7 +135,32 @@ export default {
         "hrpayapplydetail": []
       }
       this.list = []
+      this.auditDate = ''
+      this.begrate = ''
+      this.endrate = ''
       this.$refs.tableRef.$refs.table.clearSelection()
+    },
+    selectChange(){
+      if (this.auditDate){
+        this.param.content.where.begdate = this.auditDate[0]
+        this.param.content.where.enddate = this.auditDate[1]
+      }else {
+        this.param.content.where.begdate = ''
+        this.param.content.where.enddate = this.auditDate[1]
+      }
+      this.listData()
+    },
+    rateChange(){
+      if (this.begrate && this.endrate){
+        const begrate = this.begrate /100
+        const endrate = this.endrate /100
+        this.param.content.where.begrate = begrate.toFixed(4)
+        this.param.content.where.endrate = endrate.toFixed(4)
+      }else {
+        this.param.content.where.begrate = ''
+        this.param.content.where.endrate = ''
+      }
+      this.listData()
     }
   },
   created() {

src/Form/marketing2/agent/add.vue

@@ -158,6 +158,33 @@
               <el-input v-model.number="form.freefreightamount" placeholder="请输入免运费额度"></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="24">
+            <p class="normal-title normal-margin">银行卡信息</p>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item v-if="isBank" label="银行名称:" prop="bank">
+              <el-input v-model="form.bank" placeholder="请输入银行名称"></el-input>
+            </el-form-item>
+            <el-form-item v-else label="银行名称:">
+              <el-input v-model="form.bank" placeholder="请输入银行名称"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item v-if="isBank" label="卡号:" prop="bankcardno">
+              <el-input v-model="form.bankcardno" placeholder="请输入银行卡号"></el-input>
+            </el-form-item>
+            <el-form-item v-else label="卡号:" >
+              <el-input v-model="form.bankcardno" placeholder="请输入银行卡号"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item v-if="isBank" label="开户人:" prop="bankname">
+              <el-input v-model="form.bankname" placeholder="请输入开户人"></el-input>
+            </el-form-item>
+            <el-form-item v-else label="开户人:" >
+              <el-input v-model="form.bankname" placeholder="请输入开户人"></el-input>
+            </el-form-item>
+          </el-col>
         </el-form>
       </el-row>
       </div>
@@ -178,6 +205,7 @@ export default {
   data () {
     return {
       radio:-1,
+      isBank:false,
       title:'选择上级合作伙伴',
       rules: {
         enterprisename: [
@@ -195,6 +223,15 @@ export default {
         // erpagentnum: [
         //   { required: true, message: '请输入erp经销商编号', trigger: 'change' },
         // ],
+        bank: [
+          { required: true, message: '请输入银行名称', trigger: 'blur' },
+        ],
+        bankcardno: [
+          { required: true, message: '请输入银行卡号', trigger: 'blur' },
+        ],
+        bankname: [
+          { required: true, message: '请输入开户人', trigger: 'blur' },
+        ],
       },
       fill:true,
       cooperationstatus:[
@@ -213,7 +250,6 @@ export default {
         "parentid": "",
         "agentnum": "",
         "signdate": "",
-        "grade": "",
         "sys_enterpriseid": '',
         "sa_saleareaids": [
 
@@ -230,6 +266,9 @@ export default {
         "saleclassauth": 1, //是否需要经营授权,默认1
         "grade":'',
         "standardsauth":0,
+        "bank": "", //银行名称
+        "bankcardno": "", //银行卡号
+        "bankname": "" //开户人
       },
       ENlist:[],
       agent_level:[],
@@ -303,7 +342,32 @@ export default {
     },
     onSubmit () {
       this.$refs['form'].validate(async (valid) => {
-          if (!valid) return false
+        if (!valid) return false
+        if (this.form.bankcardno || this.form.bank || this.form.bankname){
+          if (this.form.bankcardno && this.form.bank && this.form.bankname){
+            this.isBank = false
+            const res = await this.$api.requested({
+              "classname": "webmanage.sale.agents.agents",
+              "method": "insertormodify_agent",
+              "content": this.form
+            })
+            this.tool.showMessage(res,()=>{
+              this.$emit('onSuccess')
+              // this.$refs['form'].resetFields();
+              this.dialogVisible = false
+              this.onClose()
+            })
+          }else {
+            this.isBank = true
+            this.$alert('请完善银行卡', '提示', {
+              showClose:false,
+              confirmButtonText: '确定',
+              callback: action => {
+              }
+            });
+          }
+        }else {
+          this.isBank = false
           const res = await this.$api.requested({
             "classname": "webmanage.sale.agents.agents",
             "method": "insertormodify_agent",
@@ -315,6 +379,7 @@ export default {
             this.dialogVisible = false
             this.onClose()
           })
+        }
       })
     },
     radioChange (val) {

src/Form/marketing2/agent/edit.vue

@@ -208,6 +208,15 @@ export default {
         // erpagentnum: [
         //   { required: true, message: '请输入erp经销商编号', trigger: 'change' },
         // ],
+        bank: [
+          { required: true, message: '请输入银行名称', trigger: 'blur' },
+        ],
+        bankcardno: [
+          { required: true, message: '请输入银行卡号', trigger: 'blur' },
+        ],
+        bankname: [
+          { required: true, message: '请输入开户人', trigger: 'blur' },
+        ],
       },
       fill:true,
       cooperationstatus:[
@@ -226,7 +235,6 @@ export default {
         "parentid": "",
         "agentnum": "",
         "signdate": "",
-        "grade": "",
         "sys_enterpriseid": '',
         "sa_saleareaids": [
 
@@ -363,17 +371,17 @@ export default {
     },
     onSubmit () {
       this.$refs['form'].validate(async (valid) => {
-          if (!valid) return false
-          const res = await this.$api.requested({
-            "classname": "webmanage.sale.agents.agents",
-            "method": "insertormodify_agent",
-            "content": this.form
-          })
-          this.tool.showMessage(res,()=>{
-            this.$emit('onSuccess')
-            // this.$refs['form'].resetFields();
-            this.dialogVisible = false
-          })
+        if (!valid) return false
+        const res = await this.$api.requested({
+          "classname": "webmanage.sale.agents.agents",
+          "method": "insertormodify_agent",
+          "content": this.form
+        })
+        this.tool.showMessage(res,()=>{
+          this.$emit('onSuccess')
+          // this.$refs['form'].resetFields();
+          this.dialogVisible = false
+        })
       })
     },
     onChange () {

src/SDrpManagement/commissionDistribution/detail/modules/addDetail.vue

@@ -13,12 +13,32 @@
           <el-form :model="form" :rules="rules" ref="formRef" label-width="120px" label-position="left" size="mini">
             <el-col :span="24">
               <el-form-item label="请选择收入凭证:" >
+                <div style="float: left;margin-left: 20px">审核时间：</div>
+                <el-date-picker
+                    v-model="auditDate"
+                    @change="selectChange"
+                    type="daterange"
+                    style="width:200px;float: left"
+                    format="yyyy-MM-dd"
+                    value-format="yyyy-MM-dd"
+                    range-separator="至"
+                    start-placeholder="开始日期"
+                    end-placeholder="结束日期">
+                </el-date-picker>
+                <div style="margin-left: 20px;float: left">回款比例(%)：</div>
+                <div>
+                  <el-input v-model="begrate" style="width: 200px" placeholder="请输入回款比例" @change="rateChange"></el-input> ——
+                  <el-input v-model="endrate" style="width: 200px" placeholder="请输入回款比例" @change="rateChange"></el-input>
+                </div>
               </el-form-item>
              </el-col>
             <el-col :span="24">
                 <tableNewLayout style="margin-bottom: 20px" ref="tableRef" :checkbox="true" :layout="tablecols" :data="list" :opwidth="200" height="calc(100vh - 250px)" :width="true" :custom="true" @selectionChange="selectionChange">
                   <template v-slot:customcol="scope">
-                    <div>
+                    <div v-if="scope.column.columnname === 'rate'">
+                      <div>{{Math.round((scope.column.data.rate * 100)*100)/100}}</div>
+                    </div>
+                    <div v-else>
                       {{scope.column.data[[scope.column.columnname]] || scope.column.columnname === 'operation'?scope.column.data[[scope.column.columnname]]:'--'}}
                     </div>
                   </template>
@@ -43,6 +63,9 @@ export default {
     return {
       dialogVisible:false,
       tablecols:[],
+      auditDate:'',
+      begrate:'',
+      endrate:'',
       list:[],
       form:{
         "sa_hrpayapplyid": '',
@@ -54,7 +77,7 @@ export default {
         "content": {
           "sa_hrpayapplyid":0,
           "pageNumber": 1,
-          "pageSize": 999,
+          "pageSize": 99999,
           "where":{
             "condition":"",
             "begdate":"",
@@ -101,7 +124,32 @@ export default {
         "hrpayapplydetail": []
       }
       this.list = []
+      this.auditDate = ''
+      this.begrate = ''
+      this.endrate = ''
       this.$refs.tableRef.$refs.table.clearSelection()
+    },
+    selectChange(){
+      if (this.auditDate){
+        this.param.content.where.begdate = this.auditDate[0]
+        this.param.content.where.enddate = this.auditDate[1]
+      }else {
+        this.param.content.where.begdate = ''
+        this.param.content.where.enddate = this.auditDate[1]
+      }
+      this.listData()
+    },
+    rateChange(){
+      if (this.begrate && this.endrate){
+        const begrate = this.begrate /100
+        const endrate = this.endrate /100
+        this.param.content.where.begrate = begrate.toFixed(4)
+        this.param.content.where.endrate = endrate.toFixed(4)
+      }else {
+        this.param.content.where.begrate = ''
+        this.param.content.where.endrate = ''
+      }
+      this.listData()
     }
   },
   created() {

src/SDrpManagement/salerAccount/modules/detail.vue

@@ -151,7 +151,7 @@ export default {
     },
     detailGo(row){
       console.log(row)
-      if (row.type === '1'){
+      if (row.type == '1'){
         let route = this.$route
         if (route.path !== '/salerIncomeDetail') {
           this.oldRoute = {path:route.path,query:route.query}

src/components/commissionSetNew/index.vue

@@ -9,11 +9,12 @@
         <el-form :model="form" :rules="rules" ref="form" label-width="130px" label-position="right" size="mini">
           <el-col :span="24">
             <el-form-item label="提成计算节点：" prop="reward_point">
-              <el-checkbox-group v-model="form.reward_point">
-                <el-checkbox :label="'订单审核'">订单审核</el-checkbox>
-                <el-checkbox :label="'物流单审核'">物流单审核</el-checkbox>
-                <el-checkbox :label="'开票审核'">开票审核</el-checkbox>
-                <el-checkbox :label="'订单核销审核'">订单核销审核</el-checkbox>
+              <el-checkbox-group v-model="form.reward_point" @change="rewardChange">
+                <el-checkbox :label="'订单审核'" :disabled="isPoint">订单审核</el-checkbox>
+                <el-checkbox :label="'物流单审核'" :disabled="isPoint">物流单审核</el-checkbox>
+                <el-checkbox :label="'开票审核'" :disabled="isPoint">开票审核</el-checkbox>
+                <el-checkbox :label="'订单核销审核'" :disabled="isPoint">订单核销审核</el-checkbox>
+                <el-checkbox :label="'不计算提成'" :disabled="isReward">不计算提成</el-checkbox>
               </el-checkbox-group>
             </el-form-item>
           </el-col>
@@ -47,6 +48,8 @@ export default {
     }
     return {
       dialogFormVisible:false,
+      isReward:false,
+      isPoint:false,
       form:{
         ownertable: "",
         ownerid: '',
@@ -68,8 +71,51 @@ export default {
   methods:{
     onShow(){
       this.dialogFormVisible = true
-      this.form.reward_point = this.form.reward_point?this.data.reward_point.length > 0?this.data.reward_point:[]:[]
-      this.form.reward_rate = this.form.reward_rate || this.form.reward_rate == 0?Math.round((this.data.reward_rate * 100)*100)/100:0
+      this.form.reward_point = this.data.reward_point?this.data.reward_point:[]
+      if (this.form.reward_point){
+        if (this.form.reward_point.length === 0){
+          this.isReward = false
+          this.isPoint = true
+          this.form.reward_point = ['不计算提成']
+        }else if (this.form.reward_point.length === 1){
+          if (this.form.reward_point[0] === '不计算提成'){
+            this.isReward = false
+            this.isPoint = true
+          }else {
+            this.isReward = true
+            this.isPoint = false
+          }
+        }else {
+          this.isReward = true
+          this.isPoint = false
+        }
+      }
+      this.form.reward_rate = this.data.reward_rate || this.data.reward_rate == 0?Math.round((this.data.reward_rate * 100)*100)/100:0
+    },
+    rewardChange(val){
+      if (this.isPoint){
+        this.isReward = false
+        this.isPoint = false
+        this.form.reward_point = []
+      }else {
+        if (val.length === 0){
+          this.isReward = false
+          this.isPoint = false
+        }else if (val.length === 1){
+          if (val[0] === '不计算提成'){
+            this.isReward = false
+            this.isPoint = true
+          }else {
+            this.isReward = true
+            this.isPoint = false
+            this.form.reward_point.forEach((item,index)=>{
+              if (item === '不计算提成'){
+                this.form.reward_point.splice(index,1)
+              }
+            })
+          }
+        }
+      }
     },
     onSubmit(){
       this.$refs.form.validate(async (valid)=>{