Browse Source

Merge remote-tracking branch 'origin/master'

master
God 3 years ago
parent
commit
d99eb05fdc
  1. 4
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
  2. 3
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExamineDetailsVo.java
  3. 3
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExamineInfoVo.java
  4. 14
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java
  5. 21
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java
  6. 74
      anrui-scm/anrui-scm-ui/src/views/cheliang/chexingbaojia/daibaojiaguanli/diabaojiaAdd.vue
  7. 56
      anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangAdd.vue
  8. 22
      anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangDaiBanInfo.vue
  9. 80
      anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue
  10. 22
      anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangYiBanInfo.vue
  11. 5
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehicleexamine/AppExamineDetailsVo.java

4
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml

@ -742,8 +742,8 @@
bv.locationName location,
<!--存放地点sid-->
bv.location locationSid,
<!--销售指导价-->
bv.salePrice as guidedPrice,
<!--销售指导价 取值厂家结算价 -->
bv.costPrice as guidedPrice,
bmc.configName,
bmc.sid as configSid,
DATE_FORMAT(bv.priceDate, '%Y-%m-%d') as priceDate,

3
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExamineDetailsVo.java

@ -55,4 +55,7 @@ public class AppScmVehicleExamineDetailsVo implements Vo {
@ApiModelProperty("保修卡卡号")
private String guaranteeCardNo; // 保修卡卡号
@ApiModelProperty("检验项集合")
private List<AppScmInspectionItemVo> inspectList;
}

3
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExamineInfoVo.java

@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
@Data
@ -53,6 +54,6 @@ public class AppScmVehicleExamineInfoVo implements Vo {
private String guaranteeCardNo; // 保修卡卡号
@ApiModelProperty("检验项集合")
private List<AppScmInspectionItemVo> inspectList;
private List<AppScmInspectionItemVo> inspectList = new ArrayList<>();
}

14
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java

@ -295,11 +295,9 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle
//车辆台账推送数据
BaseVehicleDto baseVehicleDto = new BaseVehicleDto();
baseVehicleDto.setVinNo(dto.getVin());
String userSid = dto.getUserSid();
ResultBean<String> pathSidByUserSid = sysStaffOrgFeign.getPathSidByUserSid(userSid);
String data2 = pathSidByUserSid.getData();
baseVehicleDto.setCreateOrgSid(data2);
baseVehicleDto.setUseOrgSid(data2);
baseVehicleDto.setCreateOrgSid(scmVehicleEnterlibrary.getUseOrgSid());
baseVehicleDto.setUseOrgSid(scmVehicleEnterlibrary.getUseOrgSid());
baseVehicleDto.setUseOrgName(scmVehicleEnterlibrary.getUseOrgName());
baseVehicleDto.setSettlementStatus("0");
baseVehicleDto.setLockedState("0");
baseVehicleDto.setLockedStateValue("未锁定");
@ -308,10 +306,8 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle
baseVehicleDto.setContractPrice(0);//Integer.parseInt(dto.getContractPrice().toString())
baseVehicleDto.setFreight(0);//Integer.parseInt(dto.getOnceFreight().subtract(dto.getSecondaryFreight()).toString())
baseVehicleDto.setCostPrice(0);//Integer.parseInt(dto.getCostPrice().toString())
// if ("01".equals(scmVehicleEnterlibrary.getPurchaseTypeKey())) {
// baseVehicleDto.setCertificateState("0003");
// baseVehicleDto.setCertificateStateValue("待转");
// }
baseVehicleDto.setWitPinState("100");
baseVehicleDto.setWitPinStateValue("未调车");
baseVehicleDto.setPriceDate(DateUtil.today());//dto.getPriceDate()
baseVehicleDto.setDepartureDate(DateUtil.today());//dto.getDepartureDate()
baseVehicleDto.setLocation(dto.getWarehouseKey()); //库存地点sid

21
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java

@ -248,9 +248,7 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
String type2 = "02"; // 验车相关照片 02
List<String> factoryImages = new ArrayList<>();
List<String> carInspectedImages = new ArrayList<>();
String useOrgSid = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData().getSid();
String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
AppScmVehicleExamineInfoVo vo = baseMapper.getCarInspectedInfo(inspectedSid, useOrgSid);
List<ScmVehinspectItemVo> scmVehinspectItemVos = scmVehinspectItemService.selInfoByVehInspectSid(inspectedSid);
@ -295,6 +293,19 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
List<String> carInspectedImages = new ArrayList<>();
AppScmVehicleExamineDetailsVo vo = baseMapper.getCarInspected(inspectedSid);
List<ScmVehinspectItemVo> scmVehinspectItemVos = scmVehinspectItemService.selInfoByVehInspectSid(inspectedSid);
List<AppScmInspectionItemVo> inspectionItemVos = new ArrayList<>();
for (ScmVehinspectItemVo scmVehinspectItemVo : scmVehinspectItemVos) {
AppScmInspectionItemVo appScmInspectionItemVo = new AppScmInspectionItemVo();
appScmInspectionItemVo.setItem(scmVehinspectItemVo.getItem());
appScmInspectionItemVo.setSid(scmVehinspectItemVo.getSid());
appScmInspectionItemVo.setResult(scmVehinspectItemVo.getResult());
appScmInspectionItemVo.setIconUrl(fileUploadComponent.getUrlPrefix() + scmVehinspectItemVo.getIconUrl());
inspectionItemVos.add(appScmInspectionItemVo);
}
vo.setInspectList(inspectionItemVos);
if (vo.getPrice() == null || vo.getPrice().equals("")) {
BigDecimal bigDecimal = new BigDecimal("0.00");
vo.setPrice(bigDecimal);
@ -495,8 +506,8 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
baseVehicleDto.setContractPrice(0);//Integer.parseInt(dto.getContractPrice().toString())
baseVehicleDto.setFreight(0);//Integer.parseInt(dto.getOnceFreight().subtract(dto.getSecondaryFreight()).toString())
baseVehicleDto.setCostPrice(0);//Integer.parseInt(dto.getCostPrice().toString())
// baseVehicleDto.setCertificateState("0003");
// baseVehicleDto.setCertificateStateValue("待转");
baseVehicleDto.setWitPinState("100");
baseVehicleDto.setWitPinStateValue("未调车");
baseVehicleDto.setPriceDate(DateUtil.today());//dto.getPriceDate()
baseVehicleDto.setDepartureDate(DateUtil.today());//dto.getDepartureDate()
baseVehicleDto.setModelSid(scmVehicleExamine.getModelSid()); //车型sid

74
anrui-scm/anrui-scm-ui/src/views/cheliang/chexingbaojia/daibaojiaguanli/diabaojiaAdd.vue

@ -9,7 +9,7 @@
</div>
<div class="listconadd">
<el-form ref="dataForm" :model="formobj" class="formaddcopy02">
<div class="headline">品牌车型询价单</div>
<div class="title">品牌车型询价单</div>
<el-row>
<el-col :span="8">
<div class="span-sty spanOneWidth"><span>销售专员</span></div>
@ -48,7 +48,7 @@
<el-form-item><span class="addinputInfo addinputwOne">{{ formobj.otherConfig }}</span></el-form-item>
</el-col>
</el-row>
<div class="headline">品牌车型报价单</div>
<div class="title">品牌车型报价单</div>
<div class="headtitle">{{ formobj.vehicleAlias }}</div>
<!-- <div class="headtitle"><span>系列{{ formobj.productLineValue }}<span style="margin-left: 20px">驱动{{ formobj.driveFormValue }}<span style="margin-left: 20px">功能{{ formobj.vehicleTypeValue }}<span style="margin-left: 20px">马力{{ formobj.powerValue }}</span></span></span></span></div>-->
<el-row>
@ -85,7 +85,7 @@
<el-form-item><span class="addinputInfo">{{ formobj.gearboxTypeValue }}</span></el-form-item>
</el-col>
</el-row>
<div class="headline">车型信息</div>
<div class="title">车型信息</div>
<el-row>
<el-col :span="5">
<div class="span-sty spanTwoWidth"><span>排放标准</span></div>
@ -108,7 +108,7 @@
<el-form-item><span class="addinputInfo addinputwTwo">{{ formobj.departmentValue }}</span></el-form-item>
</el-col>
</el-row>
<div class="headline">常用配置</div>
<div class="title">常用配置</div>
<el-row>
<el-col :span="5" class="colStyle">
<div class="span-sty"><span>颜色</span></div>
@ -169,14 +169,11 @@
<el-col :span="5" class="colStyle">
<div class="span-sty"><span>空调</span></div>
<el-form-item>
<el-select v-model="formobj.airConditioner" placeholder="请选择" filterable clearable class="addinputwWidth"
@change="changeAirConditioner">
<el-option v-for="item in airConditioner_list" :key="item.dictKey" :label="item.dictValue"
:value="item.dictKey"/>
<el-select v-model="formobj.airConditioner" placeholder="请选择" filterable clearable class="addinputwWidth" @change="changeAirConditioner">
<el-option v-for="item in airConditioner_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<button style="border: 0px;background: #FFFFFF;font-size: 20px;margin-left: 2px"
@click="add('airConditioner', '空调')">+
<button style="border: 0px;background: #FFFFFF;font-size: 20px;margin-left: 2px" @click="add('airConditioner', '空调')">+
</button>
</el-col>
<el-col :span="5" class="colStyle">
@ -191,14 +188,11 @@
<el-col :span="5" class="colStyle">
<div class="span-sty"><span>导流罩</span></div>
<el-form-item>
<el-select v-model="formobj.baffleModel" placeholder="请选择" filterable clearable class="addinputwWidth"
@change="changeBaffleModel">
<el-option v-for="item in baffleModel_list" :key="item.dictKey" :label="item.dictValue"
:value="item.dictKey"/>
<el-select v-model="formobj.baffleModel" placeholder="请选择" filterable clearable class="addinputwWidth" @change="changeBaffleModel">
<el-option v-for="item in baffleModel_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<button style="border: 0px;background: #FFFFFF;font-size: 20px;margin-left: 2px"
@click="add('baffleModel', '导流罩')">+
<button style="border: 0px;background: #FFFFFF;font-size: 20px;margin-left: 2px" @click="add('baffleModel', '导流罩')">+
</button>
</el-col>
<el-col :span="4" class="colStyle">
@ -224,14 +218,11 @@
<el-col :span="5" class="colStyle">
<div class="span-sty"><span>护轮罩</span></div>
<el-form-item>
<el-select v-model="formobj.tireCover" placeholder="请选择" filterable clearable class="addinputwWidth"
@change="changeTireCover">
<el-option v-for="item in tireCover_list" :key="item.dictKey" :label="item.dictValue"
:value="item.dictKey"/>
<el-select v-model="formobj.tireCover" placeholder="请选择" filterable clearable class="addinputwWidth" @change="changeTireCover">
<el-option v-for="item in tireCover_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<button style="border: 0px;background: #FFFFFF;font-size: 20px;margin-left: 2px"
@click="add('tireCover', '护轮罩')">+
<button style="border: 0px;background: #FFFFFF;font-size: 20px;margin-left: 2px" @click="add('tireCover', '护轮罩')">+
</button>
</el-col>
<el-col :span="5" class="colStyle">
@ -275,14 +266,11 @@
<el-col :span="5" class="colStyle">
<div class="span-sty"><span>独立热源</span></div>
<el-form-item>
<el-select v-model="formobj.independentSources" placeholder="请选择" filterable clearable
class="addinputwWidth" @change="changeIndependentSources">
<el-option v-for="item in independentSources_list" :key="item.dictKey" :label="item.dictValue"
:value="item.dictKey"/>
<el-select v-model="formobj.independentSources" placeholder="请选择" filterable clearable class="addinputwWidth" @change="changeIndependentSources">
<el-option v-for="item in independentSources_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<button style="border: 0px;background: #FFFFFF;font-size: 20px;margin-left: 2px"
@click="add('independentSources', '独立热源')">+
<button style="border: 0px;background: #FFFFFF;font-size: 20px;margin-left: 2px" @click="add('independentSources', '独立热源')">+
</button>
</el-col>
<el-col :span="5" class="colStyle">
@ -297,14 +285,11 @@
<el-col :span="5" class="colStyle">
<div class="span-sty"><span>多媒体</span></div>
<el-form-item>
<el-select v-model="formobj.multimedia" placeholder="请选择" filterable clearable class="addinputwWidth"
@change="changeMultimedia">
<el-option v-for="item in multimedia_list" :key="item.dictKey" :label="item.dictValue"
:value="item.dictKey"/>
<el-select v-model="formobj.multimedia" placeholder="请选择" filterable clearable class="addinputwWidth" @change="changeMultimedia">
<el-option v-for="item in multimedia_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<button style="border: 0px;background: #FFFFFF;font-size: 20px;margin-left: 2px"
@click="add('multimedia', '多媒体')">+
<button style="border: 0px;background: #FFFFFF;font-size: 20px;margin-left: 2px" @click="add('multimedia', '多媒体')">+
</button>
</el-col>
<el-col :span="4" class="colStyle">
@ -317,7 +302,7 @@
<button style="border: 0px;background: #FFFFFF;font-size: 18px;" @click="add('specification', '货箱')">+</button>
</el-col>
</el-row>
<div class="headline">更多配置</div>
<div class="title">更多配置</div>
<el-row>
<el-col :span="24">
<el-form-item>
@ -325,7 +310,7 @@
</el-form-item>
</el-col>
</el-row>
<div class="headline">特殊或差异说明</div>
<div class="title">特殊或差异说明</div>
<el-row>
<el-col :span="24">
<el-form-item>
@ -609,7 +594,7 @@ export default {
} else if (this.typeName === '货箱') {
this.packingCase_list = resp.data
}
this.$nextTick(() =>{
this.$nextTick(() => {
this.handleColse()
})
}
@ -925,15 +910,6 @@ export default {
}
</script>
<style scoped>
.headline{
height: 40px;
padding: 10px;
font-weight: bold;
font-size: 20px;
background-color: #0294d7;
text-align: left;
color: #ffffff;
}
.headtitle{
height: 40px;
padding: 10px;
@ -950,10 +926,10 @@ export default {
width: 100px !important;
}
.addinputwOne {
margin-left: 150px !important;
margin-left: 140px !important;
}
.addinputwTwo {
margin-left: 110px !important;
margin-left: 100px !important;
}
.addinputwThree {
width: 100% !important;
@ -961,7 +937,7 @@ export default {
}
.addinputwWidth {
padding: 5px 0;
margin-left: 80px;
margin-left: 70px;
}
.colStyle {
display: flex;

56
anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangAdd.vue

@ -61,7 +61,7 @@
</el-col>
<el-col :span="3" class="tleftb"><span>其中上装价格</span></el-col>
<el-col :span="5">
<el-form-item><el-input v-model="formobj.amongSzPrice" @keyup.native="UpNumber" @keydown.native="UpNumber" placeholder="" clearable class="addinputw"/></el-form-item>
<el-form-item><el-input v-model="formobj.amongSzPrice" @keyup.native="formobj.amongSzPrice = oninput(formobj.amongSzPrice,2)" placeholder="" clearable class="addinputw"/></el-form-item>
</el-col>
<el-col :span="3" class="tleftb"><span>上装价格计算依据</span></el-col>
<el-col :span="5">
@ -72,11 +72,11 @@
<el-col :span="8" class="tcenterb"><span>其中含运费</span></el-col>
<el-col :span="3" class="tleftb"><span>一次运费</span></el-col>
<el-col :span="5">
<el-form-item><el-input @input="inputOnceFreight" v-model="formobj.onceFreight" placeholder="" clearable @keyup.native="UpNumber" @keydown.native="UpNumber" class="addinputw"/></el-form-item>
<el-form-item><el-input @input="inputOnceFreight" v-model="formobj.onceFreight" placeholder="" clearable @keyup.native="formobj.onceFreight = oninput(formobj.onceFreight,2)" class="addinputw"/></el-form-item>
</el-col>
<el-col :span="3" class="tleftb"><span>二次运费</span></el-col>
<el-col :span="5">
<el-form-item><el-input @input="inputSecondaryFreight" v-model="formobj.secondaryFreight" placeholder="" clearable @keyup.native="UpNumber" @keydown.native="UpNumber" class="addinputw"/></el-form-item>
<el-form-item><el-input @input="inputSecondaryFreight" v-model="formobj.secondaryFreight" placeholder="" clearable @keyup.native="formobj.secondaryFreight = oninput(formobj.secondaryFreight,2)" class="addinputw"/></el-form-item>
</el-col>
</el-row>
<div class="title">
@ -90,7 +90,7 @@
</el-col>
<el-col :span="3" class="tleftb"><span>可享受金额</span></el-col>
<el-col :span="5">
<el-form-item><el-input @input="inputEligibleAmountOne" @keyup.native="UpNumber" @keydown.native="UpNumber" v-model="formobj.eligibleAmountOne" placeholder="" clearable class="addinputw"/></el-form-item>
<el-form-item><el-input @input="inputEligibleAmountOne" @keyup.native="formobj.eligibleAmountOne = oninput(formobj.eligibleAmountOne,2)" v-model="formobj.eligibleAmountOne" placeholder="" clearable class="addinputw"/></el-form-item>
</el-col>
<el-col :span="8" class="tcenterb"><span>计算政策2时:<el-checkbox @change="changePolicyOne" style="padding-left: 5px" v-model="policyOneChecked">扣减政策1</el-checkbox></span><span style="padding-left: 15px">计算政策3时:<el-checkbox @change="changePolicyTwo" style="padding-left: 5px" v-model="policyTwoChecked">扣减政策1</el-checkbox><el-checkbox @change="changePolicyThree" v-model="policyThreeChecked">扣减政策2</el-checkbox></span></el-col>
</el-row>
@ -101,7 +101,7 @@
</el-col>
<el-col :span="3" class="tleftb"><span>可享受比例%</span></el-col>
<el-col :span="5">
<el-form-item><el-input @input="inputEligibleProportionTwo" v-model="formobj.eligibleProportionTwo" @keyup.native="UpNumberRatio" @keydown.native="UpNumberRatio" placeholder="" clearable class="addinputw"/></el-form-item>
<el-form-item><el-input @input="inputEligibleProportionTwo" v-model="formobj.eligibleProportionTwo" @keyup.native="formobj.eligibleProportionTwo = UpNumberRatio(formobj.eligibleProportionTwo,2)" placeholder="" clearable class="addinputw"/></el-form-item>
</el-col>
<el-col :span="3" class="tleftb"><span>对应金额</span></el-col>
<el-col :span="5">
@ -115,7 +115,7 @@
</el-col>
<el-col :span="3" class="tleftb"><span>可享受比例%</span></el-col>
<el-col :span="5">
<el-form-item><el-input @input="inputEligibleProportionThree" v-model="formobj.eligibleProportionThree" @keyup.native="UpNumberRatio" @keydown.native="UpNumberRatio" placeholder="" clearable class="addinputw"/></el-form-item>
<el-form-item><el-input @input="inputEligibleProportionThree" v-model="formobj.eligibleProportionThree" @keyup.native="formobj.eligibleProportionThree = UpNumberRatio(formobj.eligibleProportionThree,2)" placeholder="" clearable class="addinputw"/></el-form-item>
</el-col>
<el-col :span="3" class="tleftb"><span>对应金额</span></el-col>
<el-col :span="5">
@ -125,7 +125,7 @@
<el-row>
<el-col :span="3" class="tleftb"><span>金额合计</span></el-col>
<el-col :span="5">
<el-form-item><el-input v-model="formobj.moneyCount" placeholder="" clearable class="addinputw"/></el-form-item>
<el-form-item><el-input v-model="formobj.moneyCount" @keyup.native="formobj.moneyCount = UpNumberRatio(formobj.moneyCount,2)" placeholder="" clearable class="addinputw"/></el-form-item>
</el-col>
<el-col :span="3" class="tleftb"><span>政策备注</span></el-col>
<el-col :span="13">
@ -261,19 +261,39 @@ export default {
}
})
},
UpNumber(e) {
e.target.value = e.target.value.replace(/[^\d]/g, '') // ."-"
//
oninput(val, limit = 0) {
val = val.replace(/[^\d]/g, '') //
val = val.replace(/^00/, '0'); // 0
/^0\d+/.test(val) ? val = val.slice(1) : '' // 0
const str = '^(\\d+)\\.(\\d{' + limit + '}).*$'
const reg = new RegExp(str)
if (limit === 0) {
//
val = val.replace(reg, '$1')
} else {
//
val = val.replace(reg, '$1.$2')
}
return val
},
UpNumberRatio(e) {
e.target.value = e.target.value.replace(/[^\d.]/g, '') // ."-"
e.target.value = e.target.value.replace(/^00/, '0.') // 0
e.target.value = e.target.value.replace(/\.{2,}/g, '.') // .
e.target.value = e.target.value.replace('.', '$#$').replace(/\./g, '').replace('$#$', '.')
e.target.value = e.target.value.replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3') //
if (e.target.value.indexOf('.') < 0 && e.target.value !== '') {
// 0102
e.target.value = parseFloat(e.target.value)
UpNumberRatio(val, limit = 2) {
val = val.replace(/[^\d.]/g, '') //
val = val.replace(/^00/, '0.') // 0
val = val.replace(/^\./g, '0.') // 0.
val = val.replace(/\.{2,}/g, '.') //
val = val.replace('.', '$#$').replace(/\./g, '').replace('$#$', '.'); //
/^0\d+/.test(val) ? val = val.slice(1) : '' // 0
const str = '^(\\d+)\\.(\\d{' + limit + '}).*$'
const reg = new RegExp(str)
if (limit === 0) {
//
val = val.replace(reg, '$1')
} else {
//
val = val.replace(reg, '$1.$2')
}
return val
},
inputOnceFreight() {
this.inputEligibleProportionTwo()

22
anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangDaiBanInfo.vue

@ -85,50 +85,50 @@
</div>
<el-row>
<el-col :span="3" class="tleftb"><span>政策1</span></el-col>
<el-col :span="4">
<el-col :span="3">
<el-form-item>{{ formobj.policyOne }}</el-form-item>
</el-col>
<el-col :span="3" class="tleftb"><span>可享受金额</span></el-col>
<el-col :span="4">
<el-col :span="3">
<el-form-item>{{ formobj.eligibleAmountOne }}</el-form-item>
</el-col>
<el-col :span="10" class="tcenterb"><span>计算政策2时:<el-checkbox style="padding-left: 5px" v-model="policyOneChecked">扣减政策1</el-checkbox></span><span style="padding-left: 15px">计算政策3时:<el-checkbox style="padding-left: 5px" v-model="policyTwoChecked">扣减政策1</el-checkbox><el-checkbox v-model="policyThreeChecked">扣减政策2</el-checkbox></span></el-col>
<el-col :span="12" class="tcenterb"><span>计算政策2时:<el-checkbox style="padding-left: 5px" v-model="policyOneChecked">扣减政策1</el-checkbox></span><span style="padding-left: 15px">计算政策3时:<el-checkbox style="padding-left: 5px" v-model="policyTwoChecked">扣减政策1</el-checkbox><el-checkbox v-model="policyThreeChecked">扣减政策2</el-checkbox></span></el-col>
</el-row>
<el-row>
<el-col :span="3" class="tleftb"><span>政策2</span></el-col>
<el-col :span="4">
<el-col :span="3">
<el-form-item>{{ formobj.policyTwo }}</el-form-item>
</el-col>
<el-col :span="3" class="tleftb"><span>可享受比例%</span></el-col>
<el-col :span="4">
<el-col :span="3">
<el-form-item>{{ formobj.eligibleProportionTwo }}</el-form-item>
</el-col>
<el-col :span="3" class="tleftb"><span>对应金额</span></el-col>
<el-col :span="7">
<el-col :span="9">
<el-form-item>{{ formobj.corrMoneyTwo }}</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="3" class="tleftb"><span>政策3</span></el-col>
<el-col :span="4">
<el-col :span="3">
<el-form-item>{{ formobj.policyThree }}</el-form-item>
</el-col>
<el-col :span="3" class="tleftb"><span>可享受比例%</span></el-col>
<el-col :span="4">
<el-col :span="3">
<el-form-item>{{ formobj.eligibleProportionThree }}</el-form-item>
</el-col>
<el-col :span="3" class="tleftb"><span>对应金额</span></el-col>
<el-col :span="7">
<el-col :span="9">
<el-form-item>{{ formobj.corrMoneyThree }}</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="3" class="tleftb"><span>金额合计</span></el-col>
<el-col :span="4">
<el-col :span="3">
<el-form-item>{{ formobj.moneyCount }}</el-form-item>
</el-col>
<el-col :span="3" class="tleftb"><span>政策备注</span></el-col>
<el-col :span="14">
<el-col :span="15">
<el-form-item>{{ formobj.policyRemarks }}</el-form-item>
</el-col>
</el-row>

80
anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue

@ -60,7 +60,7 @@
</el-col>
<el-col :span="3" class="tleftb"><span>其中上装价格</span></el-col>
<el-col :span="5">
<el-form-item><el-input v-model="formobj.amongSzPrice" @keyup.native="UpNumber" @keydown.native="UpNumber" placeholder="" clearable class="addinputw"/></el-form-item>
<el-form-item><el-input v-model="formobj.amongSzPrice" @keyup.native="formobj.amongSzPrice = oninput(formobj.amongSzPrice,2)" placeholder="" clearable class="addinputw"/></el-form-item>
</el-col>
<el-col :span="3" class="tleftb"><span>上装价格计算依据</span></el-col>
<el-col :span="5">
@ -71,11 +71,11 @@
<el-col :span="8" class="tcenterb"><span>其中含运费</span></el-col>
<el-col :span="3" class="tleftb"><span>一次运费</span></el-col>
<el-col :span="5">
<el-form-item><el-input @input="inputOnceFreight" v-model="formobj.onceFreight" placeholder="" clearable @keyup.native="UpNumber" @keydown.native="UpNumber" class="addinputw"/></el-form-item>
<el-form-item><el-input @input="inputOnceFreight" v-model="formobj.onceFreight" placeholder="" clearable @keyup.native="formobj.onceFreight = oninput(formobj.onceFreight,2)" class="addinputw"/></el-form-item>
</el-col>
<el-col :span="3" class="tleftb"><span>二次运费</span></el-col>
<el-col :span="5">
<el-form-item><el-input @input="inputSecondaryFreight" v-model="formobj.secondaryFreight" placeholder="" clearable @keyup.native="UpNumber" @keydown.native="UpNumber" class="addinputw"/></el-form-item>
<el-form-item><el-input @input="inputSecondaryFreight" v-model="formobj.secondaryFreight" placeholder="" clearable @keyup.native="formobj.secondaryFreight = oninput(formobj.secondaryFreight,2)" class="addinputw"/></el-form-item>
</el-col>
</el-row>
<div class="title">
@ -84,50 +84,50 @@
</div>
<el-row>
<el-col :span="3" class="tleftb"><span>政策1</span></el-col>
<el-col :span="4">
<el-col :span="3">
<el-form-item><el-input v-model="formobj.policyOne" placeholder="" clearable class="addinputw"/></el-form-item>
</el-col>
<el-col :span="3" class="tleftb"><span>可享受金额</span></el-col>
<el-col :span="4">
<el-form-item><el-input @input="inputEligibleAmountOne" @keyup.native="UpNumber" @keydown.native="UpNumber" v-model="formobj.eligibleAmountOne" placeholder="" clearable class="addinputw"/></el-form-item>
<el-col :span="3">
<el-form-item><el-input @input="inputEligibleAmountOne" v-model="formobj.eligibleAmountOne" @keyup.native="formobj.eligibleAmountOne = oninput(formobj.eligibleAmountOne,2)" placeholder="" clearable class="addinputw"/></el-form-item>
</el-col>
<el-col :span="10" class="tcenterb"><span>计算政策2时:<el-checkbox @change="changePolicyOne" style="padding-left: 5px" v-model="policyOneChecked">扣减政策1</el-checkbox></span><span style="padding-left: 15px">计算政策3时:<el-checkbox @change="changePolicyTwo" style="padding-left: 5px" v-model="policyTwoChecked">扣减政策1</el-checkbox><el-checkbox @change="changePolicyThree" v-model="policyThreeChecked">扣减政策2</el-checkbox></span></el-col>
<el-col :span="12" class="tcenterb"><span>计算政策2时:<el-checkbox @change="changePolicyOne" style="padding-left: 5px" v-model="policyOneChecked">扣减政策1</el-checkbox></span><span style="padding-left: 15px">计算政策3时:<el-checkbox @change="changePolicyTwo" style="padding-left: 5px" v-model="policyTwoChecked">扣减政策1</el-checkbox><el-checkbox @change="changePolicyThree" v-model="policyThreeChecked">扣减政策2</el-checkbox></span></el-col>
</el-row>
<el-row>
<el-col :span="3" class="tleftb"><span>政策2</span></el-col>
<el-col :span="4">
<el-col :span="3">
<el-form-item><el-input v-model="formobj.policyTwo" placeholder="" clearable class="addinputw"/></el-form-item>
</el-col>
<el-col :span="3" class="tleftb"><span>可享受比例%</span></el-col>
<el-col :span="4">
<el-form-item><el-input @input="inputEligibleProportionTwo" v-model="formobj.eligibleProportionTwo" @keyup.native="UpNumberRatio" @keydown.native="UpNumberRatio" placeholder="" clearable class="addinputw"/></el-form-item>
<el-col :span="3">
<el-form-item><el-input @input="inputEligibleProportionTwo" v-model="formobj.eligibleProportionTwo" @keyup.native="formobj.eligibleProportionTwo = UpNumberRatio(formobj.eligibleProportionTwo,2)" placeholder="" clearable class="addinputw"/></el-form-item>
</el-col>
<el-col :span="3" class="tleftb"><span>对应金额</span></el-col>
<el-col :span="7">
<el-col :span="9">
<el-form-item>{{ formobj.corrMoneyTwo }}</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="3" class="tleftb"><span>政策3</span></el-col>
<el-col :span="4">
<el-col :span="3">
<el-form-item><el-input v-model="formobj.policyThree" placeholder="" clearable class="addinputw"/></el-form-item>
</el-col>
<el-col :span="3" class="tleftb"><span>可享受比例%</span></el-col>
<el-col :span="4">
<el-form-item><el-input @input="inputEligibleProportionThree" v-model="formobj.eligibleProportionThree" @keyup.native="UpNumberRatio" @keydown.native="UpNumberRatio" placeholder="" clearable class="addinputw"/></el-form-item>
<el-col :span="3">
<el-form-item><el-input @input="inputEligibleProportionThree" v-model="formobj.eligibleProportionThree" @keyup.native="formobj.eligibleProportionThree = UpNumberRatio(formobj.eligibleProportionThree,2)" placeholder="" clearable class="addinputw"/></el-form-item>
</el-col>
<el-col :span="3" class="tleftb"><span>对应金额</span></el-col>
<el-col :span="7">
<el-col :span="9">
<el-form-item>{{ formobj.corrMoneyThree }}</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="3" class="tleftb"><span>金额合计</span></el-col>
<el-col :span="4">
<el-form-item><el-input v-model="formobj.moneyCount" placeholder="" clearable class="addinputw"/></el-form-item>
<el-col :span="3">
<el-form-item><el-input v-model="formobj.moneyCount" @keyup.native="formobj.moneyCount = UpNumberRatio(formobj.moneyCount,2)" placeholder="" clearable class="addinputw"/></el-form-item>
</el-col>
<el-col :span="3" class="tleftb"><span>政策备注</span></el-col>
<el-col :span="14">
<el-col :span="15">
<el-form-item><el-input v-model="formobj.policyRemarks" placeholder="" clearable class="addinputw"/></el-form-item>
</el-col>
</el-row>
@ -277,19 +277,39 @@ export default {
}
})
},
UpNumber(e) {
e.target.value = e.target.value.replace(/[^\d]/g, '') // ."-"
//
oninput(val, limit = 0) {
val = val.replace(/[^\d]/g, '') //
val = val.replace(/^00/, '0'); // 0
/^0\d+/.test(val) ? val = val.slice(1) : '' // 0
const str = '^(\\d+)\\.(\\d{' + limit + '}).*$'
const reg = new RegExp(str)
if (limit === 0) {
//
val = val.replace(reg, '$1')
} else {
//
val = val.replace(reg, '$1.$2')
}
return val
},
UpNumberRatio(e) {
e.target.value = e.target.value.replace(/[^\d.]/g, '') // ."-"
e.target.value = e.target.value.replace(/^00/, '0.') // 0
e.target.value = e.target.value.replace(/\.{2,}/g, '.') // .
e.target.value = e.target.value.replace('.', '$#$').replace(/\./g, '').replace('$#$', '.')
e.target.value = e.target.value.replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3') //
if (e.target.value.indexOf('.') < 0 && e.target.value !== '') {
// 0102
e.target.value = parseFloat(e.target.value)
UpNumberRatio(val, limit = 2) {
val = val.replace(/[^\d.]/g, '') //
val = val.replace(/^00/, '0.') // 0
val = val.replace(/^\./g, '0.') // 0.
val = val.replace(/\.{2,}/g, '.') //
val = val.replace('.', '$#$').replace(/\./g, '').replace('$#$', '.'); //
/^0\d+/.test(val) ? val = val.slice(1) : '' // 0
const str = '^(\\d+)\\.(\\d{' + limit + '}).*$'
const reg = new RegExp(str)
if (limit === 0) {
//
val = val.replace(reg, '$1')
} else {
//
val = val.replace(reg, '$1.$2')
}
return val
},
inputOnceFreight() {
this.inputEligibleProportionTwo()
@ -393,7 +413,7 @@ export default {
this.formobj.corrMoneyThree = this.multiplication((parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.eligibleAmountOne)), (parseFloat(this.formobj.eligibleProportionThree) / 100))
}
} else {
this.formobj.corrMoneyThree = this.multiplication((parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.eligibleAmountOne) - parseFloat(this.formobj.corrMoneyTwo)), (parseFloat(this.formobj.eligibleProportionThree) / 100))
this.formobj.corrMoneyThree = this.multiplication((parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.eligibleAmountOne)), (parseFloat(this.formobj.eligibleProportionThree) / 100))
}
} else if (!this.policyTwoChecked && this.policyThreeChecked) {
if (this.freightChecked) {

22
anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangYiBanInfo.vue

@ -83,50 +83,50 @@
</div>
<el-row>
<el-col :span="3" class="tleftb"><span>政策1</span></el-col>
<el-col :span="4">
<el-col :span="3">
<el-form-item>{{ formobj.policyOne }}</el-form-item>
</el-col>
<el-col :span="3" class="tleftb"><span>可享受金额</span></el-col>
<el-col :span="4">
<el-col :span="3">
<el-form-item>{{ formobj.eligibleAmountOne }}</el-form-item>
</el-col>
<el-col :span="10" class="tcenterb"><span>计算政策2时:<el-checkbox style="padding-left: 5px" v-model="policyOneChecked">扣减政策1</el-checkbox></span><span style="padding-left: 15px">计算政策3时:<el-checkbox style="padding-left: 5px" v-model="policyTwoChecked">扣减政策1</el-checkbox><el-checkbox v-model="policyThreeChecked">扣减政策2</el-checkbox></span></el-col>
<el-col :span="12" class="tcenterb"><span>计算政策2时:<el-checkbox style="padding-left: 5px" v-model="policyOneChecked">扣减政策1</el-checkbox></span><span style="padding-left: 15px">计算政策3时:<el-checkbox style="padding-left: 5px" v-model="policyTwoChecked">扣减政策1</el-checkbox><el-checkbox v-model="policyThreeChecked">扣减政策2</el-checkbox></span></el-col>
</el-row>
<el-row>
<el-col :span="3" class="tleftb"><span>政策2</span></el-col>
<el-col :span="4">
<el-col :span="3">
<el-form-item>{{ formobj.policyTwo }}</el-form-item>
</el-col>
<el-col :span="3" class="tleftb"><span>可享受比例%</span></el-col>
<el-col :span="4">
<el-col :span="3">
<el-form-item>{{ formobj.eligibleProportionTwo }}</el-form-item>
</el-col>
<el-col :span="3" class="tleftb"><span>对应金额</span></el-col>
<el-col :span="7">
<el-col :span="9">
<el-form-item>{{ formobj.corrMoneyTwo }}</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="3" class="tleftb"><span>政策3</span></el-col>
<el-col :span="4">
<el-col :span="3">
<el-form-item>{{ formobj.policyThree }}</el-form-item>
</el-col>
<el-col :span="3" class="tleftb"><span>可享受比例%</span></el-col>
<el-col :span="4">
<el-col :span="3">
<el-form-item>{{ formobj.eligibleProportionThree }}</el-form-item>
</el-col>
<el-col :span="3" class="tleftb"><span>对应金额</span></el-col>
<el-col :span="7">
<el-col :span="9">
<el-form-item>{{ formobj.corrMoneyThree }}</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="3" class="tleftb"><span>金额合计</span></el-col>
<el-col :span="4">
<el-col :span="3">
<el-form-item>{{ formobj.moneyCount }}</el-form-item>
</el-col>
<el-col :span="3" class="tleftb"><span>政策备注</span></el-col>
<el-col :span="14">
<el-col :span="15">
<el-form-item>{{ formobj.policyRemarks }}</el-form-item>
</el-col>
</el-row>

5
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehicleexamine/AppExamineDetailsVo.java

@ -55,5 +55,8 @@ public class AppExamineDetailsVo implements Vo {
@ApiModelProperty("定位")
private String location;
@ApiModelProperty("项目内容")
private List<InspectionItemVo> inspectList;
}

Loading…
Cancel
Save