提成修改

src/HDrpManagement/ProductMag/detail/index.vue

@@ -124,7 +124,6 @@ export default {
   components:{detail_data,saleClass,productPrice,addClass,Edit,productGroup,productInfo},
   methods: {
     async queryMainData(id) {
-      console.log("执行了没有")
       const res = await this.$api.requested({
         "id": 20220923155302,
         "content": {
@@ -134,7 +133,6 @@ export default {
       this.mainData = res.data
       this.changeDataStructure()
       this.$refs.details.$refs.tag.queryTag()
-      console.log(this.mainData)
     },
     // 监听切换数据,上一页,下一页
     pageChange (id,rowindex) {
@@ -243,7 +241,6 @@ export default {
       this.queryTag()
     },
     queryTag(){
-      console.log('执行查询')
       this.$refs.details.$refs.tag.queryTag()
     }
   },

src/HDrpManagement/ProductMag/index.vue

@@ -26,7 +26,7 @@
         <to_examine v-if="tool.checkAuth($route.name,'toExamine')" class="inline-16"  :rowData="rowData" @examineSuccess="onSuccess" :disabled="rowData.length === 0"></to_examine>
         <counter_examine v-if="tool.checkAuth($route.name,'reverseReview')" class="inline-16" :rowData="rowData" @examineSuccess="onSuccess" :disabled="rowData.length === 0"></counter_examine>
         <priceLevelSetting class="inline-16" v-if="tool.checkAuth($route.name,'priceSet')" ></priceLevelSetting>
-        <commissionSchemeSet class="inline-16" v-if="tool.checkAuth($route.name,'commissionSchemeSet')"></commissionSchemeSet>
+        <commissionSchemeSet class="inline-16" v-if="tool.checkAuth($route.name,'commissionSchemeSet') && siteid === 'HY'"></commissionSchemeSet>
         <el-button class="inline-16" size="small" v-if="tool.checkAuth($route.name,'refreshStock')" type="primary" @click="refreshStock">刷新库存</el-button>
         <importFile
           v-if="tool.checkAuth($route.name,'export')"
@@ -236,6 +236,7 @@ export default {
       tradefieldData:[],
       errorUrl:null,
       dateSelect:'',
+      siteid:JSON.parse(sessionStorage.getItem('active_account')).siteid
     }
   },
   components:{

src/HDrpManagement/ProductMag/modules/components/addScheme.vue

@@ -29,7 +29,7 @@
               <tableLayout :layout="tablecols" :data="list" :opwidth="200" :custom="true" :height="'600px'">
                 <template v-slot:customcol="scope">
                   <div v-if="scope.column.columnname === 'rewardstart'">
-                    <el-input v-model="scope.column.data.rewardstart" placeholder="请填写" @input="validateInput(scope.column.data.rewardstart,scope.column.data.rewardend)" :error="errorMessage"></el-input>
+                    <el-input v-model="scope.column.data.rewardstart" placeholder="请填写" type="number" ></el-input>
                   </div>
                   <div v-else-if="scope.column.columnname === 'includerewardstart'">
                     <el-select v-model="scope.column.data.includerewardstart" placeholder="请选择">
@@ -38,7 +38,7 @@
                     </el-select>
                   </div>
                   <div v-else-if="scope.column.columnname === 'rewardend'">
-                    <el-input v-model="scope.column.data.rewardend" placeholder="请填写"></el-input>
+                    <el-input v-model="scope.column.data.rewardend" placeholder="请填写" type="number"></el-input>
                   </div>
                   <div v-else-if="scope.column.columnname === 'includerewardend'">
                     <el-select v-model="scope.column.data.includerewardend" placeholder="请选择">
@@ -47,7 +47,7 @@
                     </el-select>
                   </div>
                   <div v-else-if="scope.column.columnname === 'reward_rate'">
-                    <el-input v-model="scope.column.data.reward_rate" placeholder="请填写"></el-input>
+                    <el-input v-model="scope.column.data.reward_rate" placeholder="请填写" type="number"></el-input>
                   </div>
                   <p v-else>{{scope.column.data[scope.column.columnname]}}</p>
                 </template>

src/HDrpManagement/ProductMag/modules/components/editScheme.vue

@@ -29,7 +29,7 @@
               <tableLayout :layout="tablecols" :data="list" :opwidth="200" :custom="true" :height="'600px'">
                 <template v-slot:customcol="scope">
                   <div v-if="scope.column.columnname === 'rewardstart'">
-                    <el-input v-model="scope.column.data.rewardstart" placeholder="请填写"></el-input>
+                    <el-input v-model="scope.column.data.rewardstart" placeholder="请填写" type="number"></el-input>
                   </div>
                   <div v-else-if="scope.column.columnname === 'includerewardstart'">
                     <el-select v-model="scope.column.data.includerewardstart" placeholder="请选择">
@@ -38,7 +38,7 @@
                     </el-select>
                   </div>
                   <div v-else-if="scope.column.columnname === 'rewardend'">
-                    <el-input v-model="scope.column.data.rewardend" placeholder="请填写"></el-input>
+                    <el-input v-model="scope.column.data.rewardend" placeholder="请填写" type="number"></el-input>
                   </div>
                   <div v-else-if="scope.column.columnname === 'includerewardend'">
                     <el-select v-model="scope.column.data.includerewardend" placeholder="请选择">
@@ -47,7 +47,7 @@
                     </el-select>
                   </div>
                   <div v-else-if="scope.column.columnname === 'reward_rate'">
-                    <el-input v-model="scope.column.data.reward_rate" placeholder="请填写"></el-input>
+                    <el-input v-model="scope.column.data.reward_rate" placeholder="请填写" type="number"></el-input>
                   </div>
                   <p v-else>{{scope.column.data[scope.column.columnname]}}</p>
                 </template>

src/HDrpManagement/projectChange/modules/detail.vue

@@ -280,6 +280,18 @@ export default {
     /*  this.mainData = res.data*/
       this.siteid = JSON.parse(sessionStorage.getItem('active_account')).siteid
       this.mainData = Object.assign({},this.mainData,res.data)
+      if (this.mainData.reward_point){
+        let point = ''
+        for (var i = 0;i< this.mainData.reward_point.length;i++){
+          if (i === this.mainData.reward_point.length -1){
+            point = point + this.mainData.reward_point[i]
+          }else {
+            point = point  + this.mainData.reward_point[i] + '，'
+          }
+        }
+        this.mainData.reward_point = point
+      }
+
     /*  if (this.mainData.discountrate > 1){
         this.mainData.discountrate = Math.round(this.mainData.discountrate)
       }else {
@@ -493,7 +505,7 @@ export default {
 
 
           {label:'负责人',value:this.mainData.name ? this.mainData.name : '--'},
-          {label:'修正比例',value:this.mainData.reward_rate ? Math.round((this.mainData.reward_rate * 100)*100)/100 + '%': '--'},
+          {label:'修正比例',value:this.mainData.reward_rate ? Math.round((this.mainData.reward_rate * 100)*100)/100 + '%': '0%'},
           {label:'提成计算节点',value:this.mainData.reward_point ? this.mainData.reward_point : '--'},
         ],
 

src/SDrpManagement/salerPrivatecustomer/detail/customerDetail.vue

@@ -229,6 +229,17 @@ export default {
       })
      /* this.mainData = res.data*/
       this.mainData = Object.assign({},this.mainData,res.data)
+      if (this.mainData.reward_point){
+        let point = ''
+        for (var i = 0;i< this.mainData.reward_point.length;i++){
+          if (i === this.mainData.reward_point.length -1){
+            point = point + this.mainData.reward_point[i]
+          }else {
+            point = point  + this.mainData.reward_point[i] + '，'
+          }
+        }
+        this.mainData.reward_point = point
+      }
       this.$refs['details'].param.content.type = this.$route.query.tabIndex
       this.$refs['details'].param.content.isExport = false
       this.changeDataStructure()

src/SDrpManagement/salerPrivatecustomer/detail/modules/detailedData.vue

@@ -46,10 +46,10 @@
         </el-descriptions-item>
         <el-descriptions-item label-class-name="my-label" label="负责人">{{ data.leader?data.leader.length !== 0 ?data.leader[0].name:'--':"--" }}</el-descriptions-item>
 
-        <el-descriptions-item label-class-name="my-label" label="修正比例">
-          <span >{{ data.reward_rate?Math.round((data.reward_rate * 100)*100)/100 + '%':"--" }}</span>
+        <el-descriptions-item label-class-name="my-label" label="修正比例" v-if="siteid === 'HY'">
+          <span >{{ data.reward_rate?Math.round((data.reward_rate * 100)*100)/100 + '%':"0%" }}</span>
         </el-descriptions-item>
-        <el-descriptions-item label-class-name="my-label" label="提成计算节点">
+        <el-descriptions-item label-class-name="my-label" label="提成计算节点" v-if="siteid === 'HY'">
           <span >{{ data.reward_point?data.reward_point:"--" }}</span>
         </el-descriptions-item>
 
@@ -83,7 +83,8 @@ export default {
       },
       statusStyle:{
         color:''
-      }
+      },
+      siteid:JSON.parse(sessionStorage.getItem('active_account')).siteid
     }
   },
   mounted() {

src/components/commissionSetNew/index.vue

@@ -59,7 +59,7 @@ export default {
         ],
         reward_rate:[
           { required: false, message: '设置提成比例', trigger: 'change'},
-          { pattern:/^[0-9]+\.{0,1}[0-9]{0,4}$/,message: '请填写增量或减量的百分比%',trigger: 'change'},
+          /*{ pattern:/^[0-9]+\.{0,1}[0-9]{0,4}$/,message: '请填写增量或减量的百分比%',trigger: 'change'},*/
           { validator: NumberSize, trigger: 'change'}
         ]
       }