Merge remote-tracking branch 'origin/master'

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

@@ -92,6 +92,11 @@
                 <span>{{ scope.row.costTitleValue }}</span>
               </template>
             </el-table-column>
+            <el-table-column label="付款方式" align="center" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.payWayValue }}</span>
+              </template>
+            </el-table-column>
             <el-table-column label="收款单位名称" align="center" width="150">
               <template slot-scope="scope">
                 <span>{{ scope.row.receiveCompany }}</span>
@@ -642,6 +647,8 @@ export default {
       this.formobj.receiveBankAccount = row.receiveBankAccount
       this.formobj.receiveBank = row.receiveBank
       this.formobj.payCode = row.payCode
+      this.formobj.payWayValue = row.payWayValue
+      this.formobj.payWayKey = row.payWayKey
       const aa = []
       aa.push(row.sid)
       this.sids = aa

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

@@ -318,7 +318,9 @@ export default {
           freight: element.freight,
           vehModelName: element.vehicleAlias,
           vehModelSid: element.modelSid,
-          topAmount: element.topAmount
+          topAmount: element.topAmount,
+          purchaseSystemName: element.purchaseSystemName,
+          purchaseSystemSid: element.purchaseSystemSid
         })
       })
       this.sids = aa