Merge remote-tracking branch 'origin/master'

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java

@@ -5680,6 +5680,10 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                         if (StringUtils.isNotBlank(mainSchedule.getBankContractNo())) {
                             importSleepData.setBankContractNo(mainSchedule.getBankContractNo());
                         }
+                        importSleepData.setSalesOrderSid(mainSchedule.getSalesOrderSid());
+                        if (StringUtils.isNotBlank(mainSchedule.getBankName())) {
+                            importSleepData.setBankName(mainSchedule.getBankName());
+                        }
                     } else {
                         LoanRepaymentSchedule otherSchedule = baseMapper.selByOtherBankContractNoForSleepData(bankContractNo, vinNo);
                         if (null != otherSchedule) {
@@ -5721,6 +5725,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                             if (StringUtils.isNotBlank(otherSchedule.getOtherBankNo())) {
                                 importSleepData.setBankContractNo(otherSchedule.getOtherBankNo());
                             }
+                            importSleepData.setSalesOrderSid(otherSchedule.getSalesOrderSid());
                         } else {
                             setMsg.add("资方合同号" + bankContractNo + ",车架号" + vinNo + "不存在，请先导入还款计划主表");
                         }
@@ -5883,6 +5888,8 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
             }
             BigDecimal Q1 = Q; //Q的剩余金额 初始值Q1 = Q
             BigDecimal T1 = T; //T的剩余金额 初始值T1 = T
+            BigDecimal TempL = L;//临时垫资方逾期利息
+            BigDecimal TempB = B;//临时资金占用费
             boolean isOther = false; //资方是否相同 0否 1是
             int md = 0; //主产品估算期数
             int od = 0; //其他融估算期数

yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemAdd.vue

@@ -57,7 +57,7 @@
           <el-row>
             <el-col :span="8">
               <div class="span-sty"><span class="icon">*</span>工时单价</div>
-              <el-form-item prop="hourPrice"><el-input class="addinputInfo addinputw" @keyup.native="formobj.hourPrice = getNumber(formobj.hourPrice, 2)" v-model="formobj.hourPrice" clearable placeholder="" /></el-form-item>
+              <el-form-item prop="hourPrice"><el-input @input="priceInput(formobj)" class="addinputInfo addinputw" @keyup.native="formobj.hourPrice = getNumber(formobj.hourPrice, 2)" v-model="formobj.hourPrice" clearable placeholder="" /></el-form-item>
             </el-col>
             <el-col :span="8">
               <div class="span-sty"><span class="icon">*</span>工时数</div>

yxt-as-ui/src/views/purchase/procurement/procurement.vue

@@ -421,7 +421,7 @@ export default {
           userSid: ''
         }
       }
-      this.init()
+      this.getList()
     },
     toAdd() {
       this.viewState = 2

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillMapper.xml

@@ -4,7 +4,23 @@
 <!--    <where> ${ew.sqlSegment} </where>-->
 <!--    ${ew.customSqlSegment} -->
 	<select id="selectPageVo" resultType="com.yxt.anrui.as.api.asbusreservebill.AsBusreserveBillVo">
-		SELECT a.* FROM as_busreserve_bill as a
+		SELECT a.sid,
+		       a.billNo,
+		       a.state,
+		       a.useOrgName,
+		       a.deptName as createDept,
+		       a.createByName,
+		       a.createTime,
+		       a.customerName,
+		       a.vehMark,
+		       a.vinNo,
+		       a.mobile,
+		       a.reserveStart,
+		       a.reserveEnd,
+		       a.waitorName,
+		       a.reserveEquip,
+		       a.remarks
+		FROM as_busreserve_bill as a
 		left join anrui_portal.sys_organization as s on a.deptSid = s.sid
 		 <where>
 		    ${ew.sqlSegment}

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillService.java

@@ -164,7 +164,7 @@ public class AsBusreserveBillService extends MybatisBaseService<AsBusreserveBill
             qw.like("a.waitorName", query.getWaitorName());
         }
         if (StringUtils.isNotBlank(query.getCreateDept())) {
-            qw.like("a.createDept", query.getCreateDept());
+            qw.like("a.deptName", query.getCreateDept());
         }
         if (StringUtils.isNotBlank(query.getCreateByName())) {
             qw.like("a.createByName", query.getCreateByName());