Merge remote-tracking branch 'origin/master'

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

@@ -8,10 +8,14 @@
           <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
           <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.createOrgName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="采购系统">
+                <el-input v-model="listQuery.params.purchaseSystemName" placeholder="" clearable/>
+              </el-form-item>
               <el-form-item label="品牌">
-                <el-select v-model="listQuery.params.brandSid" placeholder="请选择" filterable clearable>
-                  <el-option v-for="item in brand_list" :key="item.sid" :label="item.brandName" :value="item.sid"/>
-                </el-select>
+                <el-input v-model="listQuery.params.brandName" placeholder="" clearable/>
               </el-form-item>
               <el-form-item label="创建日期">
                 <el-date-picker v-model="listQuery.params.createStartTime" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
@@ -57,7 +61,7 @@
                 <span>{{ scope.row.state == '0' ? '未计提' : scope.row.state == '1' ? '计提中' : scope.row.state == '2' ? '待核对' : scope.row.state == '3' ? '核对中' : scope.row.state == '5' ? '分配中' : scope.row.state == '6' ? '' : scope.row.state == '已分配' ? '' : '' }}</span>
               </template>
             </el-table-column>
-            <el-table-column prop="useOrgName" label="分公司" align="center" width="150" />
+            <el-table-column prop="createOrgName" label="分公司" align="center" width="150" />
             <el-table-column prop="purchaseSystemName" label="采购系统" align="center" width="140" />
             <el-table-column prop="brandName" label="品牌" align="center" width="120" />
             <el-table-column prop="createTime" label="创建日期" align="center" width="120" />
@@ -96,7 +100,7 @@ import req from '@/api/specialrebate/specialrebatemanagement'
 import Pagination from '@/components/pagination'
 import pageye from '@/components/pagination/pageye'
 import ButtonBar from '@/components/ButtonBar'
-import { getOrgSidByPath, typeValues, brandDown } from '@/api/cheliang/dictcommons'
+import { getOrgSidByPath, typeValues } from '@/api/cheliang/dictcommons'
 import specialrebatemanagementAdd from './specialrebatemanagementAdd'
 import specialrebatemanagementInfo from './specialrebatemanagementInfo'
 
@@ -144,20 +148,35 @@ export default {
       sids: [],
       FormLoading: false,
       listLoading: false,
-      brand_list: [],
       rebateType_list: [],
       state_list: [
         {
-          dictKey: 0,
+          dictKey: '0',
           dictValue: '未计提'
         },
         {
-          dictKey: 1,
-          dictValue: '已计提'
+          dictKey: '1',
+          dictValue: '计提中'
         },
         {
-          dictKey: 2,
+          dictKey: '2',
+          dictValue: '待核对'
+        },
+        {
+          dictKey: '3',
+          dictValue: '核对中'
+        },
+        {
+          dictKey: '4',
           dictValue: '已核对'
+        },
+        {
+          dictKey: '5',
+          dictValue: '分配中'
+        },
+        {
+          dictKey: '6',
+          dictValue: '已分配'
         }
       ],
       listQuery: {
@@ -168,7 +187,9 @@ export default {
           rebateName: '',
           rebateTypeKey: '',
           state: '',
-          brandSid: '',
+          createOrgName: '',
+          purchaseSystemName: '',
+          brandName: '',
           orgPath: '',
           userSid: '',
           menuUrl: ''
@@ -197,11 +218,6 @@ export default {
       getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((resp) => {
         if (resp.success) {
           this.listQuery.params.createOrgSid = resp.data
-          brandDown({ useOrg: this.listQuery.params.createOrgSid }).then((res) => {
-            if (res.success) {
-              this.brand_list = res.data
-            }
-          })
           this.getList()
         }
       })
@@ -280,7 +296,9 @@ export default {
           rebateName: '',
           rebateTypeKey: '',
           state: '',
-          brandSid: '',
+          createOrgName: '',
+          purchaseSystemName: '',
+          brandName: '',
           orgPath: '',
           userSid: '',
           menuUrl: ''

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

@@ -70,7 +70,7 @@
           <el-row>
             <el-col :span="8">
               <div class="span-sty">其中支出费用</div>
-              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.expectDisburseCost" @keyup.native="formobj.expectDisburseCost = getNumber(formobj.expectDisburseCost, 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>
@@ -133,7 +133,7 @@ export default {
         purchaseSystemSid: '',
         purchaseSystemName: '',
         palceGenDate: '',
-        expectDisburseCost: '',
+        expectItureCost: '',
         expectTreatCost: '',
         expectSuppCost: '',
         expectSuppRemark: '',
@@ -277,7 +277,7 @@ export default {
         purchaseSystemSid: '',
         purchaseSystemName: '',
         palceGenDate: '',
-        expectDisburseCost: '',
+        expectItureCost: '',
         expectTreatCost: '',
         expectSuppCost: '',
         expectSuppRemark: '',

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

@@ -60,7 +60,7 @@
           <el-row>
             <el-col :span="8">
               <div class="span-sty">其中支出费用</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.expectDisburseCost }}</span></el-form-item>
+              <el-form-item><span class="addinputInfo">{{ formobj.expectItureCost }}</span></el-form-item>
             </el-col>
             <el-col :span="8">
               <div class="span-sty">其中待支付费用</div>
@@ -101,7 +101,7 @@
           <el-row>
             <el-col :span="8">
               <div class="span-sty">其中支出费用</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.onceDisburseCost }}</span></el-form-item>
+              <el-form-item><span class="addinputInfo">{{ formobj.onceItureCost }}</span></el-form-item>
             </el-col>
             <el-col :span="8">
               <div class="span-sty">其中待支付费用</div>
@@ -134,7 +134,7 @@
           <el-row>
             <el-col :span="8">
               <div class="span-sty">其中支出费用</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.secondDisburseCost }}</span></el-form-item>
+              <el-form-item><span class="addinputInfo">{{ formobj.secondItureCost }}</span></el-form-item>
             </el-col>
             <el-col :span="8">
               <div class="span-sty">其中待支付费用</div>