Merge branch 'mergeBranch' into orangeUrgent

src/Form/commissionDistribution/add.vue

@@ -26,17 +26,21 @@
                       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 style="margin-left: 20px;float: left">
+                    <el-input v-model="begrate" style="width: 200px" placeholder="请输入回款比例" @change="rateChange" :clearable="true"></el-input> —
+                    <el-input v-model="endrate" style="width: 200px" placeholder="请输入回款比例" @change="rateChange" :clearable="true"></el-input>
                   </div>
+                <div style="margin-left: 20px;float: left">搜索：</div>
+                <div>
+                  <el-input v-model="param.content.where.condition" style="width: 200px" placeholder="单号、业务员、部门、备注" @change="listData" :clearable="true"></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 v-if="scope.column.columnname === 'rate'">
-                      <div>{{Math.round((scope.column.data.rate * 100)*100)/100}}</div>
+                      <div>{{scope.column.data.rate?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]]:'--'}}

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

@@ -2,7 +2,7 @@
   <div>
     <el-button size="small" :type="status == '发放'?'':'primary'"  @click="dialogVisible = true;listData()" :disabled="status == '发放'">添 加</el-button>
     <el-drawer
-        title="新建提成发放清单明细"
+        title="添加收入凭证"
         :visible.sync="dialogVisible"
         size="80%"
         direction="rtl"
@@ -26,9 +26,13 @@
                     end-placeholder="结束日期">
                 </el-date-picker>
                 <div style="margin-left: 20px;float: left">回款比例(%)：</div>
+                <div style="margin-left: 20px;float: left">
+                  <el-input v-model="begrate" style="width: 200px" placeholder="请输入回款比例" @change="rateChange" :clearable="true"></el-input> —
+                  <el-input v-model="endrate" style="width: 200px" placeholder="请输入回款比例" @change="rateChange" :clearable="true"></el-input>
+                </div>
+                <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>
+                  <el-input v-model="param.content.where.condition" style="width: 200px" placeholder="单号、业务员、部门、备注" @change="listData" :clearable="true"></el-input>
                 </div>
               </el-form-item>
              </el-col>
@@ -36,7 +40,7 @@
                 <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 v-if="scope.column.columnname === 'rate'">
-                      <div>{{Math.round((scope.column.data.rate * 100)*100)/100}}</div>
+                      <div>{{scope.column.data.rate?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]]:'--'}}