Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -485,6 +485,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             BusSalesOrderTrailerDetailsVo busSalesOrderTrailerDetailsVo = busSalesOrderTrailerDetailsVos.get(0);
             BusSalesOrderTrailer busSalesOrderTrailer = busSalesOrderTrailerService.fetchBySid(busSalesOrderTrailerDetailsVo.getSid());
             String certFile = busSalesOrderTrailer.getCertFile();
+            if (StringUtils.isNotBlank(certFile)){
                 String[] certFiles = certFile.split(",");
                 List<BusSalesOrderTrailerFile> certFiless = new ArrayList<>();
                 for (String path : certFiles) {
@@ -494,7 +495,9 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                     certFiless.add(busSalesOrderTrailerFile);
                 }
                 busSalesOrderTrailerDetailsVo.setCertFile(certFiless);
+            }
             String contractFile = busSalesOrderTrailer.getContractFile();
+            if (StringUtils.isNotBlank(contractFile)){
                 String[] contractFiles = contractFile.split(",");
                 List<BusSalesOrderTrailerFile> contractFiless = new ArrayList<>();
                 for (String path : contractFiles) {
@@ -504,12 +507,14 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                     contractFiless.add(busSalesOrderTrailerFile);
                 }
                 busSalesOrderTrailerDetailsVo.setContractFile(contractFiless);
+            }
             vo.setGc1(busSalesOrderTrailerDetailsVo);
         }else if (busSalesOrderTrailerDetailsVos.size() == 2){
             //挂车1
             BusSalesOrderTrailerDetailsVo gc1 = busSalesOrderTrailerDetailsVos.get(0);
             BusSalesOrderTrailer gcst1 = busSalesOrderTrailerService.fetchBySid(gc1.getSid());
             String certFile1 = gcst1.getCertFile();
+            if (StringUtils.isNotBlank(certFile1)){
                 String[] certFiles1 = certFile1.split(",");
                 List<BusSalesOrderTrailerFile> certFiless1 = new ArrayList<>();
                 for (String path : certFiles1) {
@@ -519,7 +524,9 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                     certFiless1.add(busSalesOrderTrailerFile);
                 }
                 gc1.setCertFile(certFiless1);
+            }
             String contractFile1 = gcst1.getContractFile();
+            if (StringUtils.isNotBlank(contractFile1)){
                 String[] contractFiles1 = contractFile1.split(",");
                 List<BusSalesOrderTrailerFile> contractFiless1 = new ArrayList<>();
                 for (String path : contractFiles1) {
@@ -529,10 +536,12 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                     contractFiless1.add(busSalesOrderTrailerFile);
                 }
                 gc1.setContractFile(contractFiless1);
+            }
             //挂车2
             BusSalesOrderTrailerDetailsVo gc2 = busSalesOrderTrailerDetailsVos.get(1);
             BusSalesOrderTrailer gcst2 = busSalesOrderTrailerService.fetchBySid(gc2.getSid());
             String certFile2 = gcst2.getCertFile();
+            if (StringUtils.isNotBlank(certFile2)){
                 String[] certFiles2 = certFile2.split(",");
                 List<BusSalesOrderTrailerFile> certFiless2 = new ArrayList<>();
                 for (String path : certFiles2) {
@@ -542,7 +551,9 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                     certFiless2.add(busSalesOrderTrailerFile);
                 }
                 gc2.setCertFile(certFiless2);
+            }
             String contractFile2 = gcst1.getContractFile();
+            if (StringUtils.isNotBlank(contractFile2)){
                 String[] contractFiles2 = contractFile2.split(",");
                 List<BusSalesOrderTrailerFile> contractFiless2 = new ArrayList<>();
                 for (String path : contractFiles2) {
@@ -552,6 +563,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                     contractFiless2.add(busSalesOrderTrailerFile);
                 }
                 gc2.setContractFile(contractFiless2);
+            }
             vo.setGc1(gc1);
             vo.setGc2(gc2);
         }
@@ -867,6 +879,11 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         if (solutionsDetailsVoResultBean.getData() != null) {
             SolutionsDetailsssVo solutionsDetailsssVo = new SolutionsDetailsssVo();
             BeanUtil.copyProperties(solutionsDetailsVoResultBean.getData(), solutionsDetailsssVo);
+            BigDecimal total = new BigDecimal("0");
+            for (BusSalesOrderTrailerDetailsVo datum : busSalesOrderTrailerDetailsVos) {
+                total = total.add(datum.getSingleFinalPrice().multiply(new BigDecimal(datum.getTrailerCount())));
+            }
+            solutionsDetailsssVo.setTrailerAmount(total.toString());
             vo.setSolutionsDetailsssVo(solutionsDetailsssVo);
         }
         if ("2".equals(entity.getPayTypeKey())) {

anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehugenjinjilu/genjinjiluguanli.vue

@@ -114,7 +114,7 @@
       </div>
     </div>
     <genjinjilu-add ref="addAndUpdate" v-show="viewState == 2 ||viewState == 3" @handleReturn="resetState" @created="dataCreated" @updated="dataUpdated"/>
-    <genjinjilu-info ref="openInfo" v-show="viewState == 4" @handleReturn="resetState"/>
+<!--    <genjinjilu-info ref="openInfo" v-show="viewState == 4" @handleReturn="resetState"/>-->
     <!--车辆需求-->
     <cheliangxuqiu ref="openCheXu" v-show="viewState ==5" @handleReturn="cheliangxuqiu"/>
   </div>
@@ -127,7 +127,7 @@ import pageye from '@/components/pagination/pageye'
 import ButtonBar from '@/components/ButtonBar'
 import genjinjiluAdd from './genjinjiliAdd.vue'
 import {typeValues} from '@/api/dictcommons/shujuzidian'
-import genjinjiluInfo from './genjinjiluinfo.vue'
+// import genjinjiluInfo from './genjinjiluinfo.vue'
 import {loginDetails} from '@/api/dictcommons/basemanufacturer'
 import {getStorage} from '@/utils/auth'
 import {getPcAppendix} from '@/api/jichuxinxi/commonappendix'
@@ -140,7 +140,7 @@ export default {
     pageye,
     ButtonBar,
     genjinjiluAdd,
-    genjinjiluInfo,
+    // genjinjiluInfo,
     cheliangxuqiu
   },
   data() {

anrui-buscenter/anrui-buscenter-ui/src/views/workflow/publicPage/financialscheme.vue

@@ -35,7 +35,7 @@
               <div class="addinputInfo">
                 <span><span class="icon">*</span>主车发票价<el-input v-model="finance.mainVehicleAmount" @input="financingProject" clearable style="width: 100px" placeholder="" @keyup.native="finance.mainVehicleAmount = oninput(finance.mainVehicleAmount, 0)"/>元</span>
                 <span style="padding-left: 5px"><el-checkbox @change="financingProject" v-model="finance.accessoriesAmountCb" style="padding-right: 5px"/>配件<el-input v-model="finance.accessoriesAmount" @input="financingProject" clearable style="width: 100px" placeholder="" @keyup.native="finance.accessoriesAmount = oninput(finance.accessoriesAmount, 0)"/>元</span>
-                <span style="padding-left: 5px"><el-checkbox @change="financingProject" v-model="finance.trailerAmountCb" style="padding-right: 5px"/>挂车<el-input v-model="finance.trailerAmount" @input="financingProject" clearable style="width: 100px" placeholder="" @keyup.native="finance.trailerAmount = oninput(finance.trailerAmount, 0)"/>元</span>
+                <span style="padding-left: 5px"><el-checkbox disabled @change="financingProject" v-model="finance.trailerAmountCb" style="padding-right: 5px"/>挂车<el-input disabled v-model="finance.trailerAmount" @input="financingProject" clearable style="width: 100px" placeholder="" @keyup.native="finance.trailerAmount = oninput(finance.trailerAmount, 0)"/>元</span>
                 <span style="padding-left: 5px"><el-checkbox @change="financingProject" v-model="finance.premiumCb" :disabled="finance.isPack == '0'" style="padding-right: 5px"/>保险<el-input v-model="finance.premium" @input="financingProject" clearable style="width: 100px" placeholder="" @keyup.native="finance.premium = oninput(finance.premium, 0)"/>元</span>
                 <span style="padding-left: 5px"><el-checkbox @change="financingProject" v-model="finance.purchaseTaxCb" :disabled="finance.isPack == '0'" style="padding-right: 5px"/>购置税<el-input v-model="finance.purchaseTax" @input="financingProject" clearable style="width: 100px" placeholder="" @keyup.native="finance.purchaseTax = oninput(finance.purchaseTax, 0)"/>元</span>
               </div>