yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

master
fanzongzhe 11 months ago
parent
11c24229c7 f613a5f102
commit
1e5d29f7c9
3 changed files with 75 additions and 58 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 125
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
  2. 6
      anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehugenjinjilu/genjinjiluguanli.vue
  3. 2
      anrui-buscenter/anrui-buscenter-ui/src/views/workflow/publicPage/financialscheme.vue

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

@ -485,73 +485,85 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
BusSalesOrderTrailerDetailsVo busSalesOrderTrailerDetailsVo = busSalesOrderTrailerDetailsVos.get(0); BusSalesOrderTrailerDetailsVo busSalesOrderTrailerDetailsVo = busSalesOrderTrailerDetailsVos.get(0);
BusSalesOrderTrailer busSalesOrderTrailer = busSalesOrderTrailerService.fetchBySid(busSalesOrderTrailerDetailsVo.getSid()); BusSalesOrderTrailer busSalesOrderTrailer = busSalesOrderTrailerService.fetchBySid(busSalesOrderTrailerDetailsVo.getSid());
String certFile = busSalesOrderTrailer.getCertFile(); String certFile = busSalesOrderTrailer.getCertFile();
String[] certFiles = certFile.split(","); if (StringUtils.isNotBlank(certFile)){
List<BusSalesOrderTrailerFile> certFiless = new ArrayList<>(); String[] certFiles = certFile.split(",");
for (String path : certFiles) { List<BusSalesOrderTrailerFile> certFiless = new ArrayList<>();
String url = fileUploadComponent.getUrlPrefix() + path; for (String path : certFiles) {
BusSalesOrderTrailerFile busSalesOrderTrailerFile = new BusSalesOrderTrailerFile(); String url = fileUploadComponent.getUrlPrefix() + path;
busSalesOrderTrailerFile.setUrl(url); BusSalesOrderTrailerFile busSalesOrderTrailerFile = new BusSalesOrderTrailerFile();
certFiless.add(busSalesOrderTrailerFile); busSalesOrderTrailerFile.setUrl(url);
} certFiless.add(busSalesOrderTrailerFile);
busSalesOrderTrailerDetailsVo.setCertFile(certFiless); }
busSalesOrderTrailerDetailsVo.setCertFile(certFiless);
}
String contractFile = busSalesOrderTrailer.getContractFile(); String contractFile = busSalesOrderTrailer.getContractFile();
String[] contractFiles = contractFile.split(","); if (StringUtils.isNotBlank(contractFile)){
List<BusSalesOrderTrailerFile> contractFiless = new ArrayList<>(); String[] contractFiles = contractFile.split(",");
for (String path : contractFiles) { List<BusSalesOrderTrailerFile> contractFiless = new ArrayList<>();
String url = fileUploadComponent.getUrlPrefix() + path; for (String path : contractFiles) {
BusSalesOrderTrailerFile busSalesOrderTrailerFile = new BusSalesOrderTrailerFile(); String url = fileUploadComponent.getUrlPrefix() + path;
busSalesOrderTrailerFile.setUrl(url); BusSalesOrderTrailerFile busSalesOrderTrailerFile = new BusSalesOrderTrailerFile();
contractFiless.add(busSalesOrderTrailerFile); busSalesOrderTrailerFile.setUrl(url);
} contractFiless.add(busSalesOrderTrailerFile);
busSalesOrderTrailerDetailsVo.setContractFile(contractFiless); }
busSalesOrderTrailerDetailsVo.setContractFile(contractFiless);
}
vo.setGc1(busSalesOrderTrailerDetailsVo); vo.setGc1(busSalesOrderTrailerDetailsVo);
}else if (busSalesOrderTrailerDetailsVos.size() == 2){ }else if (busSalesOrderTrailerDetailsVos.size() == 2){
//挂车1 //挂车1
BusSalesOrderTrailerDetailsVo gc1 = busSalesOrderTrailerDetailsVos.get(0); BusSalesOrderTrailerDetailsVo gc1 = busSalesOrderTrailerDetailsVos.get(0);
BusSalesOrderTrailer gcst1 = busSalesOrderTrailerService.fetchBySid(gc1.getSid()); BusSalesOrderTrailer gcst1 = busSalesOrderTrailerService.fetchBySid(gc1.getSid());
String certFile1 = gcst1.getCertFile(); String certFile1 = gcst1.getCertFile();
String[] certFiles1 = certFile1.split(","); if (StringUtils.isNotBlank(certFile1)){
List<BusSalesOrderTrailerFile> certFiless1 = new ArrayList<>(); String[] certFiles1 = certFile1.split(",");
for (String path : certFiles1) { List<BusSalesOrderTrailerFile> certFiless1 = new ArrayList<>();
String url = fileUploadComponent.getUrlPrefix() + path; for (String path : certFiles1) {
BusSalesOrderTrailerFile busSalesOrderTrailerFile = new BusSalesOrderTrailerFile(); String url = fileUploadComponent.getUrlPrefix() + path;
busSalesOrderTrailerFile.setUrl(url); BusSalesOrderTrailerFile busSalesOrderTrailerFile = new BusSalesOrderTrailerFile();
certFiless1.add(busSalesOrderTrailerFile); busSalesOrderTrailerFile.setUrl(url);
} certFiless1.add(busSalesOrderTrailerFile);
gc1.setCertFile(certFiless1); }
gc1.setCertFile(certFiless1);
}
String contractFile1 = gcst1.getContractFile(); String contractFile1 = gcst1.getContractFile();
String[] contractFiles1 = contractFile1.split(","); if (StringUtils.isNotBlank(contractFile1)){
List<BusSalesOrderTrailerFile> contractFiless1 = new ArrayList<>(); String[] contractFiles1 = contractFile1.split(",");
for (String path : contractFiles1) { List<BusSalesOrderTrailerFile> contractFiless1 = new ArrayList<>();
String url = fileUploadComponent.getUrlPrefix() + path; for (String path : contractFiles1) {
BusSalesOrderTrailerFile busSalesOrderTrailerFile = new BusSalesOrderTrailerFile(); String url = fileUploadComponent.getUrlPrefix() + path;
busSalesOrderTrailerFile.setUrl(url); BusSalesOrderTrailerFile busSalesOrderTrailerFile = new BusSalesOrderTrailerFile();
contractFiless1.add(busSalesOrderTrailerFile); busSalesOrderTrailerFile.setUrl(url);
} contractFiless1.add(busSalesOrderTrailerFile);
gc1.setContractFile(contractFiless1); }
gc1.setContractFile(contractFiless1);
}
//挂车2 //挂车2
BusSalesOrderTrailerDetailsVo gc2 = busSalesOrderTrailerDetailsVos.get(1); BusSalesOrderTrailerDetailsVo gc2 = busSalesOrderTrailerDetailsVos.get(1);
BusSalesOrderTrailer gcst2 = busSalesOrderTrailerService.fetchBySid(gc2.getSid()); BusSalesOrderTrailer gcst2 = busSalesOrderTrailerService.fetchBySid(gc2.getSid());
String certFile2 = gcst2.getCertFile(); String certFile2 = gcst2.getCertFile();
String[] certFiles2 = certFile2.split(","); if (StringUtils.isNotBlank(certFile2)){
List<BusSalesOrderTrailerFile> certFiless2 = new ArrayList<>(); String[] certFiles2 = certFile2.split(",");
for (String path : certFiles2) { List<BusSalesOrderTrailerFile> certFiless2 = new ArrayList<>();
String url = fileUploadComponent.getUrlPrefix() + path; for (String path : certFiles2) {
BusSalesOrderTrailerFile busSalesOrderTrailerFile = new BusSalesOrderTrailerFile(); String url = fileUploadComponent.getUrlPrefix() + path;
busSalesOrderTrailerFile.setUrl(url); BusSalesOrderTrailerFile busSalesOrderTrailerFile = new BusSalesOrderTrailerFile();
certFiless2.add(busSalesOrderTrailerFile); busSalesOrderTrailerFile.setUrl(url);
} certFiless2.add(busSalesOrderTrailerFile);
gc2.setCertFile(certFiless2); }
gc2.setCertFile(certFiless2);
}
String contractFile2 = gcst1.getContractFile(); String contractFile2 = gcst1.getContractFile();
String[] contractFiles2 = contractFile2.split(","); if (StringUtils.isNotBlank(contractFile2)){
List<BusSalesOrderTrailerFile> contractFiless2 = new ArrayList<>(); String[] contractFiles2 = contractFile2.split(",");
for (String path : contractFiles2) { List<BusSalesOrderTrailerFile> contractFiless2 = new ArrayList<>();
String url = fileUploadComponent.getUrlPrefix() + path; for (String path : contractFiles2) {
BusSalesOrderTrailerFile busSalesOrderTrailerFile = new BusSalesOrderTrailerFile(); String url = fileUploadComponent.getUrlPrefix() + path;
busSalesOrderTrailerFile.setUrl(url); BusSalesOrderTrailerFile busSalesOrderTrailerFile = new BusSalesOrderTrailerFile();
contractFiless2.add(busSalesOrderTrailerFile); busSalesOrderTrailerFile.setUrl(url);
} contractFiless2.add(busSalesOrderTrailerFile);
gc2.setContractFile(contractFiless2); }
gc2.setContractFile(contractFiless2);
}
vo.setGc1(gc1); vo.setGc1(gc1);
vo.setGc2(gc2); vo.setGc2(gc2);
} }
@ -867,6 +879,11 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
if (solutionsDetailsVoResultBean.getData() != null) { if (solutionsDetailsVoResultBean.getData() != null) {
SolutionsDetailsssVo solutionsDetailsssVo = new SolutionsDetailsssVo(); SolutionsDetailsssVo solutionsDetailsssVo = new SolutionsDetailsssVo();
BeanUtil.copyProperties(solutionsDetailsVoResultBean.getData(), 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); vo.setSolutionsDetailsssVo(solutionsDetailsssVo);
} }
if ("2".equals(entity.getPayTypeKey())) { if ("2".equals(entity.getPayTypeKey())) {

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

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

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

@ -35,7 +35,7 @@
<div class="addinputInfo"> <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><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.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.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> <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> </div>

Write Preview
Loading…
Cancel
Save