完善单车返利管理

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

@@ -8,6 +8,12 @@
           <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"/>
@@ -52,9 +58,9 @@
         </div>
         <div class="">
           <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;" @selection-change="handleSelectionChange">
-            <el-table-column fixed type="selection" align="center" width="50px"/>
-            <el-table-column fixed label="序号" type="index" :index="indexMethod" align="center" width="80px"/>
-            <el-table-column fixed label="操作" align="center" width="180px" >
+            <el-table-column fixed type="selection" align="center" width="50" />
+            <el-table-column fixed label="序号" type="index" :index="indexMethod" align="center" width="80" />
+            <el-table-column fixed label="操作" align="center" width="180">
               <template slot-scope="scope">
                 <el-button type="primary" :disabled="scope.row.state !== '0'" size="mini" @click="toEdit(scope.row)">编辑</el-button>
                 <el-button type="primary" size="mini" @click="toInfo(scope.row)">查看</el-button>
@@ -70,126 +76,32 @@
                 <span>{{ scope.row.onceCheckState == '1' ? '是' : scope.row.onceCheckState == '0' ? '否' : scope.row.onceCheckState == '2' ? '一次核对中' : '' }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="品牌" align="center" width="200">
-              <template slot-scope="scope">
-                <span>{{ scope.row.brandName }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="车型" align="center" width="200">
-              <template slot-scope="scope">
-                <span>{{ scope.row.vehModelName }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="车架号" align="center" width="150">
-              <template slot-scope="scope">
-                <span>{{ scope.row.vinNo }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="厂家结算价" align="center" width="140">
-              <template slot-scope="scope">
-                <span>{{ scope.row.manufactorSettlementPrice }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="其中运费" align="center" width="120">
-              <template slot-scope="scope">
-                <span>{{ scope.row.freight }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="创建日期" align="center" width="120">
-              <template slot-scope="scope">
-                <span>{{ scope.row.createTime }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="返利类型" align="center" width="150">
-              <template slot-scope="scope">
-                <span>{{ scope.row.rebateTypeValue }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="返利名称" align="center" width="150">
-              <template slot-scope="scope">
-                <span>{{ scope.row.rebateName }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="计算标准" align="center" width="100">
-              <template slot-scope="scope">
-                <span>{{ scope.row.calculationStandard }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="预计返利" align="center" width="120">
-              <template slot-scope="scope">
-                <span>{{ scope.row.estimateRebate }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="其中预计费用" align="center" width="160">
-              <template slot-scope="scope">
-                <span>{{ scope.row.expectCost }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="所属年月" align="center" width="120">
-              <template slot-scope="scope">
-                <span>{{ scope.row.palceGenDate }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="预提日期" align="center" width="120">
-              <template slot-scope="scope">
-                <span>{{ scope.row.withholdingDate }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="上传日期" align="center" width="120">
-              <template slot-scope="scope">
-                <span>{{ scope.row.uploadDate }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="上传金额" align="center" width="120">
-              <template slot-scope="scope">
-                <span>{{ scope.row.uploadMoney }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="二次上传日期" align="center" width="120">
-              <template slot-scope="scope">
-                <span>{{ scope.row.secondaryUploadDate }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="二次上传金额" align="center" width="120">
-              <template slot-scope="scope">
-                <span>{{ scope.row.secondaryUploadMoney }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="待确定金额" align="center" width="120">
-              <template slot-scope="scope">
-                <span>{{ scope.row.stayDetermineMoney }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="费用" align="center" width="120">
-              <template slot-scope="scope">
-                <span>{{ scope.row.money }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="是否调整" align="center" width="100">
-              <template slot-scope="scope">
-                <span>{{ scope.row.isAdjustment }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="差异金额" align="center" width="120">
-              <template slot-scope="scope">
-                <span>{{ scope.row.diffAmount }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="调整金额" align="center" width="120">
-              <template slot-scope="scope">
-                <span>{{ scope.row.adjustmentMoney }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="调整说明" align="center" min-width="200">
-              <template slot-scope="scope">
-                <span>{{ scope.row.adjustmentRemarks }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="备注" align="center" min-width="200">
-              <template slot-scope="scope">
-                <span>{{ scope.row.remarks }}</span>
-              </template>
-            </el-table-column>
+            <el-table-column prop="createOrgName" label="分公司" align="center" width="150" />
+            <el-table-column prop="brandName" label="品牌" align="center" width="200" />
+            <el-table-column prop="purchaseSystemName" label="采购系统" align="center" width="140" />
+            <el-table-column prop="vehModelName" label="车型" align="center" width="200" />
+            <el-table-column prop="vinNo" label="车架号" align="center" width="150" />
+            <el-table-column prop="manufactorSettlementPrice" label="厂家结算价" align="center" width="140" />
+            <el-table-column prop="freight" label="其中运费" align="center" width="120" />
+            <el-table-column prop="createTime" label="创建日期" align="center" width="120" />
+            <el-table-column prop="rebateTypeValue" label="返利类型" align="center" width="150" />
+            <el-table-column prop="rebateName" label="返利名称" align="center" width="150" />
+            <el-table-column prop="calculationStandard" label="计算标准" align="center" width="100" />
+            <el-table-column prop="estimateRebate" label="预计返利" align="center" width="120" />
+            <el-table-column prop="expectCost" label="其中预计费用" align="center" width="160" />
+            <el-table-column prop="palceGenDate" label="所属年月" align="center" width="120" />
+            <el-table-column prop="withholdingDate" label="预提日期" align="center" width="120" />
+            <el-table-column prop="uploadDate" label="上传日期" align="center" width="120" />
+            <el-table-column prop="uploadMoney" label="上传金额" align="center" width="120" />
+            <el-table-column prop="secondaryUploadDate" label="二次上传日期" align="center" width="120" />
+            <el-table-column prop="secondaryUploadMoney" label="二次上传金额" align="center" width="120" />
+            <el-table-column prop="stayDetermineMoney" label="待确定金额" align="center" width="120" />
+            <el-table-column prop="money" label="费用" align="center" width="120" />
+            <el-table-column prop="isAdjustment" label="是否调整" align="center" width="100" />
+            <el-table-column prop="diffAmount" label="差异金额" align="center" width="120" />
+            <el-table-column prop="adjustmentMoney" label="调整金额" align="center" width="120" />
+            <el-table-column prop="adjustmentRemarks" label="调整说明" align="center" min-width="200" />
+            <el-table-column prop="remarks" label="备注" align="center" min-width="200" />
           </el-table>
         </div>
         <div class="pages">
@@ -337,6 +249,8 @@ export default {
           rebateName: '',
           rebateTypeKey: '',
           state: '',
+          createOrgName: '',
+          purchaseSystemName: '',
           vinNo: '',
           vehModelName: '',
           brandSid: '',
@@ -461,6 +375,8 @@ export default {
           rebateName: '',
           rebateTypeKey: '',
           state: '',
+          createOrgName: '',
+          purchaseSystemName: '',
           vinNo: '',
           vehModelName: '',
           brandSid: '',

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

@@ -67,6 +67,8 @@
                 </el-button>
               </template>
             </el-table-column>
+            <el-table-column prop="brandName" label="品牌" align="center" width="120" />
+            <el-table-column prop="purchaseSystemName" label="采购系统" align="center" width="140" />
             <el-table-column prop="vinNo" label="车架号" align="center" width="150" />
             <el-table-column prop="manufactorSettlementPrice" label="厂家结算价" align="center" width="140"/>
             <el-table-column prop="freight" label="其中运费" align="center" width="130" />
@@ -103,7 +105,7 @@
 
 <script>
 import req from '@/api/bikerebate/bicyclerebatemanagement'
-import { typeValues } from '@/api/cheliang/dictcommons'
+import { getTypeValueList, typeValues } from '@/api/cheliang/dictcommons'
 import bicyclerebatemanagementByVehicle from './bicyclerebatemanagementByVehicle'
 
 export default {
@@ -145,7 +147,7 @@ export default {
   },
   methods: {
     init() {
-      typeValues({ type: 'rebateType' }).then((res) => {
+      getTypeValueList({ type: 'rebateType', groupNum: 'DC' }).then((res) => {
         if (res.success) {
           this.rebateType_list = res.data
         }
@@ -224,6 +226,8 @@ export default {
             expectSuppRemark: '',
             brandName: e.brandName,
             brandSid: e.brandSid,
+            purchaseSystemName: e.purchaseSystemName,
+            purchaseSystemSid: e.purchaseSystemSid,
             vehModelName: e.vehModelName,
             vehModelSid: e.vehModelSid,
             remarks: ''

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

@@ -52,7 +52,7 @@
               <el-form-item prop="calculationStandard"><el-input class="addinputInfo addinputw" v-model="formobj.calculationStandard" @keyup.native="formobj.calculationStandard = getNumber(formobj.calculationStandard, 2)" clearable placeholder="" /></el-form-item>
             </el-col>
           </el-row>
-          <div class="title">车辆信息({{ formobj.vinNo }})</div>
+          <div class="title">车辆信息({{ formobj.vinNo }} —— {{ formobj.brandName }} —— {{ formobj.purchaseSystemName }})</div>
           <el-row>
             <el-col :span="8">
               <div class="span-sty">厂家结算价</div>
@@ -102,7 +102,7 @@
 
 <script>
 import req from '@/api/bikerebate/bicyclerebatemanagement'
-import { typeValues } from '@/api/cheliang/dictcommons'
+import { getTypeValueList, typeValues } from '@/api/cheliang/dictcommons'
 
 export default {
   name: 'BicycleRebateManagementEdit',
@@ -152,7 +152,7 @@ export default {
   },
   methods: {
     init() {
-      typeValues({ type: 'rebateType' }).then((res) => {
+      getTypeValueList({ type: 'rebateType', groupNum: 'DC' }).then((res) => {
         if (res.success) {
           this.rebateType_list = res.data
         }

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

@@ -16,11 +16,21 @@
         <div class="titwu"><span>单车返利</span></div>
         <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
           <el-row style="border-top: 1px solid #e0e3eb">
+            <el-col :span="8">
+              <div class="span-sty">分公司</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createOrgName }}</span></el-form-item>
+            </el-col>
             <el-col :span="8">
               <div class="span-sty">品牌</div>
               <el-form-item><span class="addinputInfo">{{ formobj.brandName }}</span></el-form-item>
             </el-col>
             <el-col :span="8">
+              <div class="span-sty">采购系统</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.purchaseSystemName }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="16">
               <div class="span-sty">车型</div>
               <el-form-item><span class="addinputInfo">{{ formobj.vehModelName }}</span></el-form-item>
             </el-col>