Merge remote-tracking branch 'origin/master'

anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementAdd.vue

@@ -76,12 +76,12 @@
             <el-table-column prop="estimateRebate" label="预计返利" align="center" width="130" />
             <el-table-column label="其中待支付费用" align="center" min-width="200">
               <template slot-scope="scope">
-                <el-input v-model="scope.row.expectTreatCost" @keyup.native="scope.row.expectTreatCost = getNumber(scope.row.expectTreatCost, 2)" clearable placeholder=""></el-input>
+                <el-input v-model="scope.row.expectTreatCost" @keyup.native="scope.row.expectTreatCost = getNumber(scope.row.expectTreatCost, 2)" clearable placeholder="待支付的相关人员返利等"></el-input>
               </template>
             </el-table-column>
             <el-table-column label="其中抵顶费用" align="center" min-width="200">
               <template slot-scope="scope">
-                <el-input v-model="scope.row.expectSuppCost" @keyup.native="scope.row.expectSuppCost = getNumber(scope.row.expectSuppCost, 2)" clearable placeholder=""></el-input>
+                <el-input v-model="scope.row.expectSuppCost" @keyup.native="scope.row.expectSuppCost = getNumber(scope.row.expectSuppCost, 2)" clearable placeholder="抵顶各种垫付款,例如垫付厂家人员房租"></el-input>
               </template>
             </el-table-column>
             <el-table-column label="抵顶费用说明" align="center" min-width="200">

anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementEdit.vue

@@ -74,11 +74,11 @@
             </el-col>
             <el-col :span="8">
               <div class="span-sty">其中待支付费用</div>
-              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.expectTreatCost" @keyup.native="formobj.expectTreatCost = getNumber(formobj.expectTreatCost, 2)" clearable placeholder="" /></el-form-item>
+              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.expectTreatCost" @keyup.native="formobj.expectTreatCost = getNumber(formobj.expectTreatCost, 2)" clearable placeholder="待支付的相关人员返利等" /></el-form-item>
             </el-col>
             <el-col :span="8">
               <div class="span-sty">其中抵顶费用</div>
-              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.expectSuppCost" @keyup.native="formobj.expectSuppCost = getNumber(formobj.expectSuppCost, 2)" clearable placeholder="" /></el-form-item>
+              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.expectSuppCost" @keyup.native="formobj.expectSuppCost = getNumber(formobj.expectSuppCost, 2)" clearable placeholder="抵顶各种垫付款,例如垫付厂家人员房租" /></el-form-item>
             </el-col>
           </el-row>
           <el-row>

anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatemanagement/specialrebatemanagementAdd.vue

@@ -70,15 +70,15 @@
           <el-row>
             <el-col :span="8">
               <div class="span-sty">其中支出费用</div>
-              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.expectItureCost" @keyup.native="formobj.expectItureCost = getNumber(formobj.expectItureCost, 2)" placeholder="" clearable /></el-form-item>
+              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.expectItureCost" @keyup.native="formobj.expectItureCost = getNumber(formobj.expectItureCost, 2)" placeholder="因组织行销活动而发生的实际支出费用" clearable /></el-form-item>
             </el-col>
             <el-col :span="8">
               <div class="span-sty">其中待支付费用</div>
-              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.expectTreatCost" @keyup.native="formobj.expectTreatCost = getNumber(formobj.expectTreatCost, 2)" clearable placeholder="" /></el-form-item>
+              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.expectTreatCost" @keyup.native="formobj.expectTreatCost = getNumber(formobj.expectTreatCost, 2)" clearable placeholder="待支付的相关人员返利等" /></el-form-item>
             </el-col>
             <el-col :span="8">
               <div class="span-sty">其中抵顶费用</div>
-              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.expectSuppCost" @keyup.native="formobj.expectSuppCost = getNumber(formobj.expectSuppCost, 2)" clearable placeholder="" /></el-form-item>
+              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.expectSuppCost" @keyup.native="formobj.expectSuppCost = getNumber(formobj.expectSuppCost, 2)" clearable placeholder="抵顶各种垫付款,例如垫付厂家人员房租" /></el-form-item>
             </el-col>
           </el-row>
           <el-row>