Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-finmanage-ui/src/api/jichuxinxi/dictcommons.js

@@ -231,3 +231,14 @@ export function fetchBySidByTops(sid) {
     method: 'get'
   })
 }
+
+// 根据分公司全路径Sid获取分公司下开票信息(采购系统不能为空)
+//  开票单位
+export function getInvoicingList(data) {
+  return request({
+    url: '/fin/v1/fincompanyinvoicing/getInvoicingList',
+    method: 'GET',
+    params: data
+  })
+}
+

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/chunafukuan/chunafukuanguanli/cashier.vue

@@ -77,17 +77,17 @@
                 <span>{{ scope.row.createTime }}</span>
               </template>
             </el-table-column>
-<!--            <el-table-column label="业务编号" align="center">-->
-<!--              <template slot-scope="scope">-->
-<!--                <span>{{ scope.row.billNo }}</span>-->
-<!--              </template>-->
-<!--            </el-table-column>-->
-            <el-table-column label="款项类别" align="center" width="120">
+            <el-table-column label="付款编号" align="center" width="120">
               <template slot-scope="scope">
-                <span>{{ scope.row.costTypeValue }}</span>
+                <span>{{ scope.row.id }}</span>
               </template>
             </el-table-column>
             <el-table-column label="款项名称" align="center" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.costTypeValue }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="款项详情" align="center" width="120">
               <template slot-scope="scope">
                 <span>{{ scope.row.costTitleValue }}</span>
               </template>

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentAdd.vue

@@ -66,7 +66,7 @@
               <div class="span-sty">付款单位</div>
               <el-form-item>
                 <el-select class="addinputInfo" v-model="formobj.payCompany" filterable placeholder="请选择" @change="changePayCompany" clearable>
-                  <el-option v-for="item in payCompany_list" :key="item.sid" :label="item.name" :value="item.name"/>
+                  <el-option v-for="item in payCompany_list" :key="item.companyInvoicingSid" :label="item.companyInvoicingName" :value="item.companyInvoicingName"/>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -253,7 +253,7 @@
 
 <script>
 import req from '@/api/anruifinmanagement/payment'
-import { typeValues, getOrgSidByPath, fetchBySid, getListOrg, brandDown, selectNameByOrg } from '@/api/jichuxinxi/dictcommons'
+import { typeValues, getOrgSidByPath, getInvoicingList, brandDown, selectNameByOrg } from '@/api/jichuxinxi/dictcommons'
 import vehcile from './relation/vehcile'
 import paymentInformationAdd from './relation/paymentInformationAdd'
 import paymentInformationInfo from './relation/paymentInformationInfo'
@@ -358,7 +358,7 @@ export default {
           this.costTitle_list = res.data
         }
       })
-      getListOrg().then((res) => {
+      getInvoicingList({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
         if (res.success) {
           this.payCompany_list = res.data
         }
@@ -372,12 +372,6 @@ export default {
         if (response.success) {
           this.formobj.createOrgSid = response.data
           this.formobj.useOrgSid = response.data
-          this.formobj.payCompanySid = response.data
-          fetchBySid(response.data).then((res) => {
-            if (res.success) {
-              this.formobj.payCompany = res.data.name
-            }
-          })
           brandDown({ useOrg: response.data }).then((res) => {
             if (res.success) {
               this.carBrand_list = res.data
@@ -456,9 +450,9 @@ export default {
       }
     },
     changePayCompany(value) {
-      const choose = this.payCompany_list.filter((item) => item.name === value)
+      const choose = this.payCompany_list.filter((item) => item.companyInvoicingName === value)
       if (choose.length > 0 && choose !== null) {
-        this.formobj.payCompanySid = choose[0].sid
+        this.formobj.payCompanySid = choose[0].companyInvoicingSid
       } else {
         this.formobj.payCompanySid = ''
       }
@@ -548,12 +542,11 @@ export default {
       if (this.formobj.detailsList.length > 0) {
         this.formobj.detailsList[this.paymentInformation.index].finPaymentapplyDetailsBelowList = this.paymentInformation.list
         this.formobj.detailsList.forEach((e) => {
+          e.payAccountTotal = ''
           if (e.finPaymentapplyDetailsBelowList.length > 0) {
             e.finPaymentapplyDetailsBelowList.forEach((k) => {
               e.payAccountTotal = Math.round((parseFloat(e.payAccountTotal !== '' ? e.payAccountTotal : 0) + parseFloat(k.payAccount !== '' ? k.payAccount : 0)) * 100) / 100
             })
-          } else {
-            e.payAccountTotal = ''
           }
         })
       }

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentInfo.vue

@@ -228,7 +228,7 @@ export default {
           this.formobj = resp.data
           if (this.formobj.vehicleList.length > 0) {
             for (var i = 0; i < this.formobj.vehicleList.length; i++) {
-              if (this.formobj.vehicleList[i].isSettle === '是') {
+              if (this.formobj.vehicleList[i].isSettle === '1') {
                 this.viewTitle = '付款买断申请'
                 return
               }

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanDaiBanInfo.vue

@@ -305,7 +305,7 @@ export default {
           this.formobj = resp.data
           if (this.formobj.vehicleList.length > 0) {
             for (var i = 0; i < this.formobj.vehicleList.length; i++) {
-              if (this.formobj.vehicleList[i].isSettle === '是') {
+              if (this.formobj.vehicleList[i].isSettle === '1') {
                 this.viewTitle = '付款买断申请'
                 return
               }

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanEdit.vue

@@ -65,7 +65,7 @@
               <div class="span-sty">付款单位</div>
               <el-form-item>
                 <el-select class="addinputInfo" v-model="formobj.payCompany" filterable placeholder="请选择" @change="changePayCompany" clearable>
-                  <el-option v-for="item in payCompany_list" :key="item.sid" :label="item.name" :value="item.name"/>
+                  <el-option v-for="item in payCompany_list" :key="item.companyInvoicingSid" :label="item.companyInvoicingName" :value="item.companyInvoicingName"/>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -252,7 +252,7 @@
 
 <script>
 import req from '@/api/anruifinmanagement/payment'
-import { typeValues, getListOrg, brandDown, selectNameByOrg } from '@/api/jichuxinxi/dictcommons'
+import { typeValues, brandDown, selectNameByOrg, getInvoicingList } from '@/api/jichuxinxi/dictcommons'
 import vehcile from './relation/vehcile'
 import paymentInformationAdd from './relation/paymentInformationAdd'
 import paymentInformationInfo from './relation/paymentInformationInfo'
@@ -374,11 +374,6 @@ export default {
           this.costTitle_list = res.data
         }
       })
-      getListOrg().then((res) => {
-        if (res.success) {
-          this.payCompany_list = res.data
-        }
-      })
       typeValues({ type: 'paymentType' }).then((res) => {
         if (res.success) {
           this.payment_list = res.data
@@ -400,6 +395,11 @@ export default {
               this.actualPay_list = res.data
             }
           })
+          getInvoicingList({ orgPath: this.formobj.orgSidPath }).then((res) => {
+            if (res.success) {
+              this.payCompany_list = res.data
+            }
+          })
           brandDown({ useOrg: this.formobj.useOrgSid }).then((res) => {
             if (res.success) {
               this.carBrand_list = res.data
@@ -441,9 +441,9 @@ export default {
       }
     },
     changePayCompany(value) {
-      const choose = this.payCompany_list.filter((item) => item.name === value)
+      const choose = this.payCompany_list.filter((item) => item.companyInvoicingName === value)
       if (choose.length > 0 && choose !== null) {
-        this.formobj.payCompanySid = choose[0].sid
+        this.formobj.payCompanySid = choose[0].companyInvoicingSid
       } else {
         this.formobj.payCompanySid = ''
       }
@@ -533,12 +533,11 @@ export default {
       if (this.formobj.detailsList.length > 0) {
         this.formobj.detailsList[this.paymentInformation.index].finPaymentapplyDetailsBelowList = this.paymentInformation.list
         this.formobj.detailsList.forEach((e) => {
+          e.payAccountTotal = ''
           if (e.finPaymentapplyDetailsBelowList.length > 0) {
             e.finPaymentapplyDetailsBelowList.forEach((k) => {
               e.payAccountTotal = Math.round((parseFloat(e.payAccountTotal !== '' ? e.payAccountTotal : 0) + parseFloat(k.payAccount !== '' ? k.payAccount : 0)) * 100) / 100
             })
-          } else {
-            e.payAccountTotal = ''
           }
         })
       }

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanYiBanInfo.vue

@@ -263,7 +263,7 @@ export default {
           this.formobj = resp.data
           if (this.formobj.vehicleList.length > 0) {
             for (var i = 0; i < this.formobj.vehicleList.length; i++) {
-              if (this.formobj.vehicleList[i].isSettle === '是') {
+              if (this.formobj.vehicleList[i].isSettle === '1') {
                 this.viewTitle = '付款买断申请'
                 return
               }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@@ -3456,7 +3456,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         }
         dataMap.put("wlList", finCollectionConfirmationMaterials);
         dataMap.put("zcollMoney", finCollectionConfirmationDetailsVo.getCollectionMoney().toString());
-        String tPriceDX = TransformMoney.transform(finCollectionConfirmationDetailsVo.getCollectionMoney().toString());
+//        String tPriceDX = TransformMoney.transform(finCollectionConfirmationDetailsVo.getCollectionMoney().toString());
+        String tPriceDX = bigDecimalToLocalStr(finCollectionConfirmationDetailsVo.getCollectionMoney());
         dataMap.put("tPriceDX", tPriceDX);
         dataMap.put("makeName", finCollectionConfirmationDetailsVo.getCreateByName() + DateUtil.formatDate(new Date()));
         dataMap.put("confirmName", finCollectionConfirmationDetailsVo.getConfirmName() + finCollectionConfirmationDetailsVo.getConfirmDate());
@@ -3534,7 +3535,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         }
         dataMap.put("wlList", finCollectionConfirmationMaterials);
         dataMap.put("zcollMoney", finCollectionConfirmationDetailsVo.getCollectionMoney().toString());
-        String tPriceDX = TransformMoney.transform(finCollectionConfirmationDetailsVo.getCollectionMoney().toString());
+//        String tPriceDX = TransformMoney.transform(finCollectionConfirmationDetailsVo.getCollectionMoney().toString());
+        String tPriceDX = bigDecimalToLocalStr(finCollectionConfirmationDetailsVo.getCollectionMoney());
         dataMap.put("tPriceDX", tPriceDX);
         dataMap.put("makeName", finCollectionConfirmationDetailsVo.getCreateByName() + DateUtil.formatDate(new Date()));
         dataMap.put("confirmName", finCollectionConfirmationDetailsVo.getConfirmName() + finCollectionConfirmationDetailsVo.getConfirmDate());
@@ -3623,7 +3625,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         }
         dataMap.put("wlList", finCollectionConfirmationMaterials);
         dataMap.put("zcollMoney", finCollectionConfirmationDetailsVo.getCollectionMoney().toString());
-        String tPriceDX = TransformMoney.transform(finCollectionConfirmationDetailsVo.getCollectionMoney().toString());
+        String tPriceDX = bigDecimalToLocalStr(finCollectionConfirmationDetailsVo.getCollectionMoney());
+//        String tPriceDX = TransformMoney.transform(finCollectionConfirmationDetailsVo.getCollectionMoney().toString());
         dataMap.put("tPriceDX", tPriceDX);
         dataMap.put("makeName", finCollectionConfirmationDetailsVo.getCreateByName() + DateUtil.formatDate(new Date()));
         dataMap.put("confirmName", finCollectionConfirmationDetailsVo.getConfirmName() + finCollectionConfirmationDetailsVo.getConfirmDate());
@@ -3670,6 +3673,37 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         return rb.success();
     }
 
+
+    /**
+     * 转换大写数字
+     * @param bigDecimal
+     * @return
+     */
+    public static String bigDecimalToLocalStr(BigDecimal bigDecimal) {
+        String[] chinese = new String[]{"", "拾", "佰", "仟", "万", "拾", "佰", "仟", "亿", "拾", "佰", "仟", "万"};
+        String[] numChinese = new String[]{"零", "壹", "贰", "叁", "肆", "伍", "陆", "柒", "捌", "玖"};
+        String[] afterChinese = new String[]{"角", "分"};
+        String str = String.valueOf(bigDecimal);
+        String[] arr = str.split("\\.");
+        char[] chars = arr[0].toCharArray();
+        StringBuffer sb = new StringBuffer();
+        for (int i = 0; i < chars.length; ++i) {
+            sb.append(numChinese[Integer.valueOf(String.valueOf(chars[i])).intValue()]).append(chinese[chars.length - i - 1]);
+        }
+        if (arr.length == 1) {
+            return sb.toString() + "元整";
+        } else if (arr[1].length() > 2) {
+            throw new IllegalArgumentException("人民币大写转换BigDecimal只能保留2位小数");
+        } else {
+            sb.append("元");
+            char[] chars1 = arr[1].toCharArray();
+            for (int i = 0; i < chars1.length; ++i) {
+                sb.append(numChinese[Integer.valueOf(String.valueOf(chars1[i])).intValue()]).append(afterChinese[i]);
+            }
+            return sb.toString();
+        }
+    }
+
     /**
      * 重推收款单
      *

anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckAdd.vue

@@ -132,8 +132,12 @@ export default {
     // 获取制单日期
     newDate() {
       let date = new Date()
-      let year = date.getFullYear() // 年
-      let month = date.getMonth() // 月
+      let year = date.getFullYear() // 本年
+      let month = date.getMonth() // 上一月
+      let day = date.getDate() // 本日
+      if (day > 6) {
+        month = date.getMonth() + 1 // 本月
+      }
       this.formobj.checkApply = year + '年' + month + '月'
     },
     init() {

anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckInfo.vue

@@ -7,6 +7,8 @@
         <div>{{ viewTitle }}</div>
         <!--start 添加修改按钮-->
         <div>
+          <el-button type="primary" size="small">导出</el-button>
+          <el-button type="primary" size="small">下载</el-button>
           <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
         </div>
       </div>

anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/bicyclerebatewithholdingAdd.vue

@@ -121,8 +121,12 @@ export default {
     // 获取日期
     newDate() {
       let date = new Date()
-      let year = date.getFullYear() // 年
-      let month = date.getMonth() // 月
+      let year = date.getFullYear() // 本年
+      let month = date.getMonth() // 上一月
+      let day = date.getDate() // 本日
+      if (day > 6) {
+        month = date.getMonth() + 1 // 本月
+      }
       this.formobj.withApply = year + '年' + month + '月'
     },
     showAdd(createOrgSid) {

anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/bicyclerebatewithholdingInfo.vue

@@ -7,6 +7,8 @@
         <div>{{ viewTitle }}</div>
         <!--start 添加修改按钮-->
         <div>
+          <el-button type="primary" size="small">导出</el-button>
+          <el-button type="primary" size="small">下载</el-button>
           <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
         </div>
       </div>

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>

anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanguanli/collectionrebatemanagementAdd.vue

@@ -135,7 +135,7 @@
 
 <script>
 import req from '@/api/manufacturerrebates/collectionrebatemanagement'
-import { fetchBySid, typeValues } from '@/api/cheliang/dictcommons'
+import { fetchBySid, getTypeValueList } from '@/api/cheliang/dictcommons'
 
 export default {
   name: 'HuiKuanFanLiGuanLiAdd',
@@ -205,7 +205,7 @@ export default {
   },
   methods: {
     init() {
-      typeValues({ type: 'rebateType' }).then((res) => {
+      getTypeValueList({ type: 'rebateType', groupNum: 'HK' }).then((res) => {
         if (res.success) {
           this.rebateType_list = res.data
         }

anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatecheckedAdd.vue

@@ -113,8 +113,12 @@ export default {
     // 获取制单日期
     newDate() {
       let date = new Date()
-      let year = date.getFullYear() // 年
-      let month = date.getMonth() // 月
+      let year = date.getFullYear() // 本年
+      let month = date.getMonth() // 上一月
+      let day = date.getDate() // 本日
+      if (day > 6) {
+        month = date.getMonth() + 1 // 本月
+      }
       this.formobj.checkApply = year + '年' + month + '月'
     },
     init() {

anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatecheckedInfo.vue

@@ -7,6 +7,8 @@
         <div>{{ viewTitle }}</div>
         <!--start 添加修改按钮-->
         <div>
+          <el-button type="primary" size="small">导出</el-button>
+          <el-button type="primary" size="small">下载</el-button>
           <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
         </div>
       </div>

anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/collectionrebatewithholdingAdd.vue

@@ -119,8 +119,12 @@ export default {
     // 获取日期
     newDate() {
       let date = new Date()
-      let year = date.getFullYear() // 年
-      let month = date.getMonth() // 月
+      let year = date.getFullYear() // 本年
+      let month = date.getMonth() // 上一月
+      let day = date.getDate() // 本日
+      if (day > 6) {
+        month = date.getMonth() + 1 // 本月
+      }
       this.formobj.collectionApply = year + '年' + month + '月'
     },
     showAdd(createOrgSid) {

anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/collectionrebatewithholdingInfo.vue

@@ -7,6 +7,8 @@
         <div>{{ viewTitle }}</div>
         <!--start 添加修改按钮-->
         <div>
+          <el-button type="primary" size="small">导出</el-button>
+          <el-button type="primary" size="small">下载</el-button>
           <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
         </div>
       </div>

anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheckAdd.vue

@@ -120,8 +120,12 @@ export default {
     // 获取制单日期
     newDate() {
       let date = new Date()
-      let year = date.getFullYear() // 年
-      let month = date.getMonth() // 月
+      let year = date.getFullYear() // 本年
+      let month = date.getMonth() // 上一月
+      let day = date.getDate() // 本日
+      if (day > 6) {
+        month = date.getMonth() + 1 // 本月
+      }
       this.formobj.checkApply = year + '年' + month + '月'
     },
     init() {

anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheckInfo.vue

@@ -7,6 +7,8 @@
         <div>{{ viewTitle }}</div>
         <!--start 添加修改按钮-->
         <div>
+          <el-button type="primary" size="small">导出</el-button>
+          <el-button type="primary" size="small">下载</el-button>
           <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
         </div>
       </div>

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

@@ -102,7 +102,7 @@
 
 <script>
 import req from '@/api/specialrebate/specialrebatemanagement'
-import { typeValues, fetchBySid, brandDown, fetchDetailsByUseOrgSid } from '@/api/cheliang/dictcommons'
+import { fetchBySid, brandDown, fetchDetailsByUseOrgSid, getTypeValueList } from '@/api/cheliang/dictcommons'
 
 export default {
   name: 'ZhuanXiangFanLiGuanLiAdd',
@@ -170,7 +170,7 @@ export default {
       return val
     },
     init(createOrgSid) {
-      typeValues({ type: 'rebateType' }).then((res) => {
+      getTypeValueList({ type: 'rebateType', groupNum: 'ZX' }).then((res) => {
         if (res.success) {
           this.rebateType_list = res.data
         }

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

@@ -115,8 +115,12 @@ export default {
     // 获取日期
     newDate() {
       let date = new Date()
-      let year = date.getFullYear() // 年
-      let month = date.getMonth() // 月
+      let year = date.getFullYear() // 本年
+      let month = date.getMonth() // 上一月
+      let day = date.getDate() // 本日
+      if (day > 6) {
+        month = date.getMonth() + 1 // 本月
+      }
       this.formobj.withApply = year + '年' + month + '月'
     },
     showAdd(createOrgSid) {

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

@@ -7,6 +7,8 @@
         <div>{{ viewTitle }}</div>
         <!--start 添加修改按钮-->
         <div>
+          <el-button type="primary" size="small">导出</el-button>
+          <el-button type="primary" size="small">下载</el-button>
           <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
         </div>
       </div>