Merge remote-tracking branch 'origin/master'

anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatewithholding/specialrebatewithholding.vue

@@ -9,7 +9,7 @@
           <div v-show="isSearchShow" class="search">
             <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
               <el-form-item label="分公司">
-                <el-input v-model="listQuery.params.useOrgName" placeholder="" clearable/>
+                <el-input v-model="listQuery.params.createOrgName" placeholder="" clearable/>
               </el-form-item>
               <el-form-item label="申请部门">
                 <el-input v-model="listQuery.params.deptName" placeholder="" clearable/>
@@ -61,7 +61,7 @@
               </template>
             </el-table-column>
             <el-table-column prop="billNo" label="申请编号" align="center" width="180" />
-            <el-table-column prop="useOrgName" label="分公司" align="center" width="120" />
+            <el-table-column prop="createOrgName" label="分公司" align="center" width="120" />
             <el-table-column prop="deptName" label="申请部门" align="center" width="120" />
             <el-table-column prop="createByName" label="申请人" align="center" width="120" />
             <el-table-column prop="createTime" label="申请日期" align="center" width="120" />
@@ -148,7 +148,7 @@ export default {
       listLoading: false,
       listQuery: {
         params: {
-          useOrgName: '',
+          createOrgName: '',
           deptName: '',
           createByName: '',
           billNo: '',
@@ -280,7 +280,7 @@ export default {
     handleReset() {
       this.listQuery = {
         params: {
-          useOrgName: '',
+          createOrgName: '',
           deptName: '',
           createByName: '',
           billNo: '',