Browse Source

Merge remote-tracking branch 'origin/master'

zhanglei
God 3 years ago
parent
commit
3494602cc4
  1. 17
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java
  2. 4
      anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshangguanliAdd.vue
  3. 4
      anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshanglook.vue
  4. 4
      anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/relation/changshangBankInfo.vue
  5. 4
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/stktransferdirect/StkTransferDirect.java
  6. 9
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/BdMaterialCastToKingDeeBillFields.java
  7. 3
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/BdMaterialService.java
  8. 6
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java
  9. 7
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java
  10. 4
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java
  11. 19
      anrui-scm/anrui-scm-ui/src/api/cheliang/basevehicle.js
  12. 4
      anrui-scm/anrui-scm-ui/src/api/kucunguanli/polling.js
  13. 2
      anrui-scm/anrui-scm-ui/src/views/anruiscm/scmwarehouse/scmwarehouseAdd.vue
  14. 673
      anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhang.vue
  15. 1245
      anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangAdd.vue
  16. 240
      anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangInfo.vue
  17. 23
      anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangChu.vue
  18. 17
      anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangxiaoshou/cheliangxiaoshouguanli.vue
  19. 5
      anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/chexingguanlianchangyong.vue
  20. 2
      anrui-scm/anrui-scm-ui/src/views/kucunguanli/cheliangweihu/richangxunjian/relation/xunjianbaogaoAdd.vue
  21. 53
      anrui-scm/anrui-scm-ui/src/views/kucunguanli/cheliangweihu/richangxunjian/xunjianresolved.vue

17
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java

@ -180,17 +180,26 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
} }
fEntity.setF_PAEZ_Decimal4(dto.getGiftsDescription()); fEntity.setF_PAEZ_Decimal4(dto.getGiftsDescription());
//返利金额 //返利金额
fEntity.setF_PAEZ_Decimal(dto.getRebateMoneyOne()); fEntity.setF_PAEZ_Decimal("0");//dto.getRebateMoneyOne()
String remarks = dto.getRemarks();
String note=remarks+" ";
//备注 //备注
if (StringUtils.isNotBlank(dto.getRebateMoneyOne())) { if (StringUtils.isNotBlank(dto.getRebateMoneyOne())) {
if (StringUtils.isNotBlank(dto.getRebateMoneyTwo())) { if (StringUtils.isNotBlank(dto.getRebateMoneyTwo())) {
fEntity.setFEntrynote(new BigDecimal(dto.getRebateMoneyOne()).add(new BigDecimal(dto.getRebateMoneyTwo())).toString()); note=note+ dto.getMiddleOne()+":"+dto.getRebateMoneyOne()+"," + dto.getMiddleTwo()+":"+dto.getRebateMoneyTwo();
fEntity.setFEntrynote(note);
//返利金额
fEntity.setF_PAEZ_Decimal(new BigDecimal(dto.getRebateMoneyOne()).add(new BigDecimal(dto.getRebateMoneyTwo())).toString());//dto.getRebateMoneyOne()
} else { } else {
fEntity.setFEntrynote(dto.getRebateMoneyOne()); fEntity.setFEntrynote(note+ dto.getMiddleOne()+":"+dto.getRebateMoneyOne()+" ");
//返利金额
fEntity.setF_PAEZ_Decimal(new BigDecimal(dto.getRebateMoneyOne()).toString());//dto.getRebateMoneyOne()
} }
} else { } else {
if (StringUtils.isNotBlank(dto.getRebateMoneyTwo())) { if (StringUtils.isNotBlank(dto.getRebateMoneyTwo())) {
fEntity.setFEntrynote(dto.getRebateMoneyTwo()); fEntity.setFEntrynote( note+ dto.getMiddleTwo()+":"+dto.getRebateMoneyTwo());
//返利金额
fEntity.setF_PAEZ_Decimal(new BigDecimal(dto.getRebateMoneyTwo()).toString());//dto.getRebateMoneyOne()
} }
} }
fEntityList.add(fEntity); fEntityList.add(fEntity);

4
anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshangguanliAdd.vue

@ -323,14 +323,14 @@
<el-table-column prop="depositBank" width="180px" label="开户银行" align="center"/> <el-table-column prop="depositBank" width="180px" label="开户银行" align="center"/>
<el-table-column prop="bankAccount" width="160px" label="银行账号" align="center"/> <el-table-column prop="bankAccount" width="160px" label="银行账号" align="center"/>
<el-table-column prop="accountName" width="130px" label="账号名称" align="center"/> <el-table-column prop="accountName" width="130px" label="账号名称" align="center"/>
<el-table-column prop="actualPay" width="240px" label="厂家回款通路" align="center"/>
<el-table-column prop="paymentAccessNoValue" width="240px" label="付款通路" align="center"/>
<el-table-column prop="bankingOutlets" width="180px" label="银行网点" align="center"/> <el-table-column prop="bankingOutlets" width="180px" label="银行网点" align="center"/>
<el-table-column prop="bankAddress" width="260px" label="开户行地址" align="center"/> <el-table-column prop="bankAddress" width="260px" label="开户行地址" align="center"/>
<el-table-column prop="paymentLines" width="160px" label="联行号" align="center"/> <el-table-column prop="paymentLines" width="160px" label="联行号" align="center"/>
<el-table-column prop="swiftCode" width="200px" label="swiftcode(银行代码)" align="center"/> <el-table-column prop="swiftCode" width="200px" label="swiftcode(银行代码)" align="center"/>
<el-table-column prop="currency" width="130px" label="币种" align="center"/> <el-table-column prop="currency" width="130px" label="币种" align="center"/>
<el-table-column prop="remarks" width="240px" label="描述" align="center"/> <el-table-column prop="remarks" width="240px" label="描述" align="center"/>
<el-table-column prop="actualPay" width="240px" label="厂家销售通路" align="center"/>
<el-table-column prop="paymentAccessNoValue" width="240px" label="付款通路编码" align="center"/>
</el-table> </el-table>
</el-form> </el-form>
</div> </div>

4
anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshanglook.vue

@ -304,14 +304,14 @@
<el-table-column prop="depositBank" width="180px" label="开户银行" align="center"/> <el-table-column prop="depositBank" width="180px" label="开户银行" align="center"/>
<el-table-column prop="bankAccount" width="160px" label="银行账号" align="center"/> <el-table-column prop="bankAccount" width="160px" label="银行账号" align="center"/>
<el-table-column prop="accountName" width="130px" label="账号名称" align="center"/> <el-table-column prop="accountName" width="130px" label="账号名称" align="center"/>
<el-table-column prop="actualPay" width="240px" label="厂家回款通路" align="center"/>
<el-table-column prop="paymentAccessNoValue" width="240px" label="付款通路" align="center"/>
<el-table-column prop="bankingOutlets" width="180px" label="银行网点" align="center"/> <el-table-column prop="bankingOutlets" width="180px" label="银行网点" align="center"/>
<el-table-column prop="bankAddress" width="260px" label="开户行地址" align="center"/> <el-table-column prop="bankAddress" width="260px" label="开户行地址" align="center"/>
<el-table-column prop="paymentLines" width="160px" label="联行号" align="center"/> <el-table-column prop="paymentLines" width="160px" label="联行号" align="center"/>
<el-table-column prop="swiftCode" width="200px" label="swiftcode(银行代码)" align="center"/> <el-table-column prop="swiftCode" width="200px" label="swiftcode(银行代码)" align="center"/>
<el-table-column prop="currency" width="130px" label="币种" align="center"/> <el-table-column prop="currency" width="130px" label="币种" align="center"/>
<el-table-column prop="remarks" width="240px" label="描述" align="center"/> <el-table-column prop="remarks" width="240px" label="描述" align="center"/>
<el-table-column prop="actualPay" width="240px" label="厂家销售通路" align="center"/>
<el-table-column prop="paymentAccessNoValue" width="240px" label="付款通路编码" align="center"/>
</el-table> </el-table>
</el-form> </el-form>
</div> </div>

4
anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/relation/changshangBankInfo.vue

@ -113,7 +113,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<span>厂家销售通路</span> <span>厂家回款通路</span>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item> <el-form-item>
@ -125,7 +125,7 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="4"> <el-col :span="4">
<span>付款通路编码</span> <span>付款通路</span>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item> <el-form-item>

4
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/stktransferdirect/StkTransferDirect.java

@ -91,9 +91,9 @@ public class StkTransferDirect {
//public String FUnitID; //public String FUnitID;
} }
/* 调入货主:FOwnerIdHead (必填项)*/ /* 调入货主:FOwnerIdHead (必填项)*/
@JsonProperty("FOwnerIdHead") /* @JsonProperty("FOwnerIdHead")
@NotBlank(message = "FOwnerIdHead不能为空") @NotBlank(message = "FOwnerIdHead不能为空")
public String FOwnerIdHead; public String FOwnerIdHead;*/
/* 调出库存组织:FStockOutOrgId (必填项)*/ /* 调出库存组织:FStockOutOrgId (必填项)*/
@JsonProperty("FStockOutOrgId") @JsonProperty("FStockOutOrgId")
@NotBlank(message = "FStockOutOrgId不能为空") @NotBlank(message = "FStockOutOrgId不能为空")

9
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/BdMaterialCastToKingDeeBillFields.java

@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.parser.Feature; import com.alibaba.fastjson.parser.Feature;
import com.yxt.anrui.fin.biz.kingdee.KingDeeUtils; import com.yxt.anrui.fin.biz.kingdee.KingDeeUtils;
import com.yxt.common.base.utils.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -42,7 +43,13 @@ public class BdMaterialCastToKingDeeBillFields {
fEntityModel_ =KingDeeUtils.replaceTemplateParams(fEntityModel_, map_fEntityModel_); fEntityModel_ =KingDeeUtils.replaceTemplateParams(fEntityModel_, map_fEntityModel_);
JSONObject jsonFEntityModel_= JSONObject.parseObject(fEntityModel_,Feature.OrderedField); JSONObject jsonFEntityModel_= JSONObject.parseObject(fEntityModel_,Feature.OrderedField);
String fields = map_fEntityModel_.get("fields");
if(StringUtils.isBlank(fields)){
jsonFEntityData_.put("NeedUpDateFields",JSONArray.parseArray(JSON.toJSONString(new ArrayList<>())));
}else{
String[] split = fields.split(",");
jsonFEntityData_.put("NeedUpDateFields",JSONArray.parseArray(JSON.toJSONString(split)));
}
jsonFEntityData_.put("Model",JSONObject.parseObject(JSON.toJSONString(jsonFEntityModel_),Feature.OrderedField)); jsonFEntityData_.put("Model",JSONObject.parseObject(JSON.toJSONString(jsonFEntityModel_),Feature.OrderedField));
jsonObj.put("data",jsonFEntityData_.toJSONString()); jsonObj.put("data",jsonFEntityData_.toJSONString());

3
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/BdMaterialService.java

@ -1,6 +1,8 @@
package com.yxt.anrui.fin.biz.kingdee.bdmaterial; package com.yxt.anrui.fin.biz.kingdee.bdmaterial;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.yxt.anrui.fin.api.kingdee.KingDeeBillId; import com.yxt.anrui.fin.api.kingdee.KingDeeBillId;
import com.yxt.anrui.fin.api.kingdee.KingDeeBillUrl; import com.yxt.anrui.fin.api.kingdee.KingDeeBillUrl;
@ -115,6 +117,7 @@ public class BdMaterialService extends FinKingDeeService {
return stringResultBean1; return stringResultBean1;
} }
map_fEntityModel_.put("IsDeleteEntry","False"); map_fEntityModel_.put("IsDeleteEntry","False");
map_fEntityModel_.put("fields","FName,FNumber,FMaterialGroup,F_PAEZ_Base");
map_fEntityModel_.put("FMATERIALID",FMATERIALID); map_fEntityModel_.put("FMATERIALID",FMATERIALID);
rb= saveBdMaterial(map_fEntityModel_); rb= saveBdMaterial(map_fEntityModel_);
if (rb.getSuccess()) { if (rb.getSuccess()) {

6
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java

@ -168,8 +168,10 @@ public class SysOrganizationRest implements SysOrganizationFeign {
if(!orgList.contains(orgSid1)){ if(!orgList.contains(orgSid1)){
//根据staffSid查询token //根据staffSid查询token
String token = sysUserService.selectByStaffsid(s).getToken(); String token = sysUserService.selectByStaffsid(s).getToken();
//清空该token if(StringUtils.isNotBlank(token)){
redisUtil.remove(token); //清空该token
redisUtil.remove(token);
}
} }
} }

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

@ -332,7 +332,8 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle
String businessSid = scmVehicleEnterlibrary.getBusinessSid(); String businessSid = scmVehicleEnterlibrary.getBusinessSid();
//排产 //排产
if (ManPurOrderType.ManOrderType.PC_ORDER.getCode().equals(scmVehicleEnterlibrary.getPurchaseTypeKey()) || ManPurOrderType.ManOrderType.TC_ORDER.getCode().equals(scmVehicleEnterlibrary.getPurchaseTypeKey())) { if (ManPurOrderType.ManOrderType.PC_ORDER.getCode().equals(scmVehicleEnterlibrary.getPurchaseTypeKey()) ||
ManPurOrderType.ManOrderType.TC_ORDER.getCode().equals(scmVehicleEnterlibrary.getPurchaseTypeKey())) {
BaseVehicleDto baseVehicleDto = new BaseVehicleDto(); BaseVehicleDto baseVehicleDto = new BaseVehicleDto();
baseVehicleDto.setVinNo(dto.getVin()); baseVehicleDto.setVinNo(dto.getVin());
baseVehicleDto.setVehicleState(VehicleState.StockEnum.STOCK.getCode()); baseVehicleDto.setVehicleState(VehicleState.StockEnum.STOCK.getCode());
@ -362,10 +363,10 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle
StkTransferDirect.FBillEntry fBillEntry = new StkTransferDirect.FBillEntry(); StkTransferDirect.FBillEntry fBillEntry = new StkTransferDirect.FBillEntry();
ScmWarehouse scmWarehouse = scmWarehouseService.fetchBySid(scmVehicleEnterlibrary.getLocationSid()); ScmWarehouse scmWarehouse = scmWarehouseService.fetchBySid(scmVehicleEnterlibrary.getLocationSid());
// fBillEntry.setFDestStockId("CK003");//调入仓库 // fBillEntry.setFDestStockId("CK003");//调入仓库
fBillEntry.setFDestStockId(scmWarehouse.getWarehouseCode());//调入仓库 fBillEntry.setFDestStockId(scmWarehouse.getGressionCode());//调入仓库
fBillEntry.setFMaterialId(scmVehicleEnterlibrary.getVinNo());//物料编码 fBillEntry.setFMaterialId(scmVehicleEnterlibrary.getVinNo());//物料编码
// fBillEntry.setFSrcStockId("CK001");//调出仓库 // fBillEntry.setFSrcStockId("CK001");//调出仓库
fBillEntry.setFSrcStockId(scmWarehouse.getWarehouseCode());//调出仓库 fBillEntry.setFSrcStockId("ARZTCK");//调出仓库 在途
FPAYBILLENTRYs.add(fBillEntry); FPAYBILLENTRYs.add(fBillEntry);
stkTransferDirect.setFBillEntry(FPAYBILLENTRYs); stkTransferDirect.setFBillEntry(FPAYBILLENTRYs);
ResultBean<String> resultBean = finKingDeeFeign.draftStkTransferDirect(stkTransferDirect); ResultBean<String> resultBean = finKingDeeFeign.draftStkTransferDirect(stkTransferDirect);

4
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java

@ -909,10 +909,10 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
StkTransferDirect.FBillEntry fBillEntry = new StkTransferDirect.FBillEntry(); StkTransferDirect.FBillEntry fBillEntry = new StkTransferDirect.FBillEntry();
ScmWarehouse scmWarehouse = scmWarehouseService.fetchBySid(scmVehicleGression.getTargetLocationSid()); ScmWarehouse scmWarehouse = scmWarehouseService.fetchBySid(scmVehicleGression.getTargetLocationSid());
// fBillEntry.setFDestStockId("CK003");//调入仓库 // fBillEntry.setFDestStockId("CK003");//调入仓库
fBillEntry.setFDestStockId(scmWarehouse.getWarehouseCode());//调入仓库 fBillEntry.setFDestStockId(scmWarehouse.getGressionCode());//调入仓库
fBillEntry.setFMaterialId(s);//物料编码 fBillEntry.setFMaterialId(s);//物料编码
scmWarehouse = scmWarehouseService.fetchBySid(scmVehicleGression.getLocationSid()); scmWarehouse = scmWarehouseService.fetchBySid(scmVehicleGression.getLocationSid());
fBillEntry.setFSrcStockId(scmWarehouse.getWarehouseCode());//调出仓库 fBillEntry.setFSrcStockId(scmWarehouse.getGressionCode());//调出仓库
// fBillEntry.setFSrcStockId("CK001");//调出仓库 // fBillEntry.setFSrcStockId("CK001");//调出仓库
FPAYBILLENTRYs.add(fBillEntry); FPAYBILLENTRYs.add(fBillEntry);
stkTransferDirect.setFBillEntry(FPAYBILLENTRYs); stkTransferDirect.setFBillEntry(FPAYBILLENTRYs);

19
anrui-scm/anrui-scm-ui/src/api/cheliang/basevehicle.js

@ -190,3 +190,22 @@ export function updateVehRemarks(data) {
}) })
} }
// 获取厂家销售通路
export function actualList(data) {
return request({
url: '/base/v1/basemanufacturer/selectNameByOrg',
method: 'get',
params: data
})
}
// 条件查询
export function selVehModelByUseOrgSidAll(data) {
return request({
url: '/base/basevehmodelconfig/selVehModelByUseOrgSidAll',
data: data,
method: 'post',
headers: { 'Content-Type': 'application/json' }
})
}

4
anrui-scm/anrui-scm-ui/src/api/kucunguanli/polling.js

@ -70,9 +70,9 @@ export default {
}) })
}, },
// 巡检报告(查看巡检报告) // 巡检报告(查看巡检报告)
getCarInspectionReport: function(data) { getCarInspectionReport: function(sid, userSid) {
return request({ return request({
url: '/scm/v1/scmvehpatrolinspectionmonth/getCarInspectionReport/' + data, url: '/scm/v1/scmvehpatrolinspectionmonth/getCarInspectionReport/' + sid + '/' + userSid,
method: 'get' method: 'get'
}) })
}, },

2
anrui-scm/anrui-scm-ui/src/views/anruiscm/scmwarehouse/scmwarehouseAdd.vue

@ -70,7 +70,7 @@
</el-col> </el-col>
<el-col :span="9"> <el-col :span="9">
<el-form-item prop="libTubeName"> <el-form-item prop="libTubeName">
<el-select v-model="formobj.libTubeName" placeholder="请选择" @change="changeLibTube" clearable class="addinputw"> <el-select v-model="formobj.libTubeName" placeholder="请选择" @change="changeLibTube" filterable clearable class="addinputw">
<el-option v-for="item in libTube_list" :key="item.userSid" :label="item.userName" :value="item.userName"/> <el-option v-for="item in libTube_list" :key="item.userSid" :label="item.userName" :value="item.userName"/>
</el-select> </el-select>
</el-form-item> </el-form-item>

673
anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhang.vue

@ -6,28 +6,230 @@
<div class="searchcon"> <div class="searchcon">
<el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button> <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
<div v-show="isSearchShow" class="search"> <div v-show="isSearchShow" class="search">
<el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header"> <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="109px" class="tab-header">
<el-form-item label="存放地点"> <div class="divStyle" style="padding-bottom: 5px;border-bottom: 1px solid #E0E3EB;">
<el-select v-model="listQuery.params.location" class="addinputw" clearable placeholder=""> <div>
<el-option v-for="item in location_list" :key="item.sid" :label="item.warehouseName" :value="item.sid"/> <el-form-item label="车型查询"></el-form-item>
</el-select> </div>
</el-form-item> <div>
<el-form-item label="车型名称"> <el-row>
<el-input v-model="listQuery.params.modelName" placeholder="请输入车型名称" clearable class="filter-item"/> <el-form-item label="品牌">
</el-form-item> <el-select v-model="listQuery.params.carBrand" placeholder="请选择" filterable clearable class="addinputw">
<el-form-item label="库存状态"> <el-option v-for="item in carBrand_list" :key="item.sid" :label="item.brandName" :value="item.sid"/>
<el-select v-model="listQuery.params.vehicleState" class="addinputw" clearable placeholder=""> </el-select>
<el-option v-for="item in vehicleState_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/> </el-form-item>
</el-select> <el-form-item label="功能">
</el-form-item> <el-select v-model="listQuery.params.vehicleType" placeholder="请选择" filterable clearable class="addinputw">
<el-form-item label="车架号"> <el-option v-for="item in vehicleFunction_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
<el-input v-model="listQuery.params.vinNo" placeholder="请输入车架号" clearable class="filter-item"/> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="合格证状态"> <el-form-item label="系列">
<el-select v-model="listQuery.params.certificateStateValue" class="addinputw" clearable placeholder=""> <el-select v-model="listQuery.params.productLine" placeholder="请选择" filterable clearable class="addinputw">
<el-option v-for="item in certificateState_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/> <el-option v-for="item in productLine_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="驱动">
<el-select v-model="listQuery.params.driveForm" placeholder="请选择" filterable clearable class="addinputw">
<el-option v-for="item in driveForm_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="马力">
<el-select v-model="listQuery.params.power" placeholder="请选择" filterable clearable class="addinputw">
<el-option v-for="item in power_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="版本">
<el-select v-model="listQuery.params.vehicleVersion" placeholder="请选择" filterable clearable class="addinputw">
<el-option v-for="item in vehicleVersion_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="燃料">
<el-select v-model="listQuery.params.fuelType" placeholder="请选择" filterable clearable class="addinputw">
<el-option v-for="item in fuelType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="变速箱">
<el-select v-model="listQuery.params.gearboxType" placeholder="请选择" filterable clearable class="addinputw">
<el-option v-for="item in gearboxType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="排放标准">
<el-select v-model="listQuery.params.emissionStandard" placeholder="请选择" filterable clearable class="addinputw">
<el-option v-for="item in emissionStandard_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="发动机型号">
<el-select v-model="listQuery.params.engineType" placeholder="请选择" filterable clearable class="addinputw">
<el-option v-for="item in engineType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="细分市场">
<el-select v-model="listQuery.params.marketSegments" placeholder="请选择" filterable clearable class="addinputw">
<el-option v-for="item in marketSegments_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="车型编码">
<el-input v-model="listQuery.params.vehicleTypeCode" maxlength="125" placeholder="请输入车型编码" class="addinputw" clearable/>
</el-form-item>
<el-form-item label="规格型号">
<el-input v-model="listQuery.params.specifications" maxlength="125" placeholder="请输入规格型号" class="addinputw" clearable/>
</el-form-item>
</el-row>
</div>
</div>
<div class="divStyle" style="padding: 5px 0;border-bottom: 1px solid #E0E3EB;">
<div>
<el-form-item label="车型配置查询"></el-form-item>
</div>
<div>
<el-row>
<el-form-item label="颜色">
<el-select v-model="listQuery.params.carColorKey" placeholder="请选择" filterable clearable class="addinputw">
<el-option v-for="item in carColor_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="缓速器">
<el-select v-model="listQuery.params.slowMachineKey" placeholder="请选择" filterable clearable class="addinputw">
<el-option v-for="item in slowMachine_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="后视镜">
<el-select v-model="listQuery.params.rearViewMirrorKey" placeholder="请选择" filterable clearable class="addinputw">
<el-option v-for="item in rearViewMirror_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="轮胎">
<el-select v-model="listQuery.params.tireSizeKey" placeholder="请选择" filterable clearable class="addinputw">
<el-option v-for="item in tireSize_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="驾驶室">
<el-select v-model="listQuery.params.specificationKey" placeholder="请选择" filterable clearable class="addinputw">
<el-option v-for="item in specification_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="后桥速比">
<el-select v-model="listQuery.params.rearAxleRatioKey" placeholder="请选择" filterable clearable class="addinputw">
<el-option v-for="item in rearAxleRatio_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="空调">
<el-select v-model="listQuery.params.airConditionerKey" placeholder="请选择" filterable clearable class="addinputw">
<el-option v-for="item in airConditioner_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="轮毂材质">
<el-select v-model="listQuery.params.hubMaterialKey" placeholder="请选择" filterable clearable class="addinputw">
<el-option v-for="item in hubMaterial_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="导流罩">
<el-select v-model="listQuery.params.baffleModelKey" placeholder="请选择" filterable clearable class="addinputw">
<el-option v-for="item in baffleModel_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="悬架">
<el-select v-model="listQuery.params.suspensionKey" placeholder="请选择" filterable clearable class="addinputw">
<el-option v-for="item in suspension_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="座椅">
<el-select v-model="listQuery.params.seatKey" placeholder="请选择" filterable clearable class="addinputw">
<el-option v-for="item in seat_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="护轮罩">
<el-select v-model="listQuery.params.tireCoverKey" placeholder="请选择" filterable clearable class="addinputw">
<el-option v-for="item in tireCover_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="鞍座">
<el-select v-model="listQuery.params.saddleKey" placeholder="请选择" filterable clearable class="addinputw">
<el-option v-for="item in saddle_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="轴距">
<el-select v-model="listQuery.params.wheelbaseKey" placeholder="请选择" filterable clearable class="addinputw">
<el-option v-for="item in wheelbase_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="保险杠">
<el-select v-model="listQuery.params.bumperKey" placeholder="请选择" filterable clearable class="addinputw">
<el-option v-for="item in bumper_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="配置包">
<el-select v-model="listQuery.params.configuringBaoKey" placeholder="请选择" filterable clearable class="addinputw">
<el-option v-for="item in configuringBao_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="独立热源">
<el-select v-model="listQuery.params.independentSourcesKey" placeholder="请选择" filterable clearable class="addinputw">
<el-option v-for="item in independentSources_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="燃料箱">
<el-select v-model="listQuery.params.fuelTankKey" placeholder="请选择" filterable clearable class="addinputw">
<el-option v-for="item in fuelTank_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="多媒体">
<el-select v-model="listQuery.params.multimediaKey" placeholder="请选择" filterable clearable class="addinputw">
<el-option v-for="item in multimedia_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="常用配置">
<el-input v-model="listQuery.params.configName" maxlength="125" placeholder="请输入常用配置名称" class="addinputw" clearable/>
</el-form-item>
</el-row>
</div>
</div>
<div class="divStyle" style="padding-top: 5px">
<div>
<el-form-item label="常用查询"></el-form-item>
</div>
<div>
<el-row>
<el-form-item label="存放地点">
<el-select v-model="listQuery.params.location" class="addinputw" clearable placeholder="">
<el-option v-for="item in location_list" :key="item.sid" :label="item.warehouseName" :value="item.sid"/>
</el-select>
</el-form-item>
<!-- <el-form-item label="车型名称">-->
<!-- <el-input v-model="listQuery.params.modelName" placeholder="请输入车型名称" clearable class="addinputw"/>-->
<!-- </el-form-item>-->
<el-form-item label="库存状态">
<el-select v-model="listQuery.params.vehicleState" class="addinputw" clearable placeholder="">
<el-option v-for="item in vehicleState_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="车架号">
<el-input v-model="listQuery.params.vinNo" placeholder="请输入车架号" clearable class="addinputw"/>
</el-form-item>
<el-form-item label="合格证状态">
<el-select v-model="listQuery.params.certificateStateValue" class="addinputw" clearable placeholder="">
<el-option v-for="item in certificateState_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
</el-select>
</el-form-item>
<el-form-item label="采购类型">
<el-select v-model="listQuery.params.manPurOrderTypeKey" class="addinputw" clearable placeholder="">
<el-option v-for="item in manPurOrderType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="买断状态">
<el-select v-model="listQuery.params.settlementStatus" class="addinputw" clearable placeholder="">
<el-option v-for="item in settlementStatus_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="厂家入库日期">
<el-date-picker value-format="yyyy-MM-dd" v-model="listQuery.params.applicationDateStart" clearable type="date" placeholder="开始日期"/>
<span style="padding: 0 8px"></span>
<el-date-picker value-format="yyyy-MM-dd" v-model="listQuery.params.applicationDateEnd" clearable type="date" placeholder="结束日期"/>
</el-form-item>
</el-row>
</div>
</div>
</el-form> </el-form>
<div class="btn" style="text-align: center;"> <div class="btn" style="text-align: center;">
<el-button type="primary" icon="el-icon-search" size="small" @click="handleFilter">查询</el-button> <el-button type="primary" icon="el-icon-search" size="small" @click="handleFilter">查询</el-button>
@ -146,7 +348,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="createOrgName" width="130" label="创建组织名称" align="center"/> <el-table-column prop="createOrgName" width="130" label="创建组织名称" align="center"/>
<el-table-column width="100" label="车辆状态" align="center"> <el-table-column width="110" label="是否问题车" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.isProblemVeh === '0' ? '无问题' : '有问题' }}</span> <span>{{ scope.row.isProblemVeh === '0' ? '无问题' : '有问题' }}</span>
</template> </template>
@ -245,15 +447,7 @@
</template> </template>
<script> <script>
import { import { basefinbankExportExcel, deleteBySids, fetchByUseOrgSid, getUseOrgByUserSid, pagerList, selectCarTransferListAll, updateVehRemarks } from '@/api/cheliang/basevehicle'
basefinbankExportExcel,
deleteBySids,
fetchByUseOrgSid,
getUseOrgByUserSid,
pagerList,
selectCarTransferListAll,
updateVehRemarks
} from '@/api/cheliang/basevehicle'
import { typeValues } from '@/api/cheliang/dictcommons' import { typeValues } from '@/api/cheliang/dictcommons'
import cheliangtaizhangAdd from './cheliangtaizhangAdd' import cheliangtaizhangAdd from './cheliangtaizhangAdd'
import Pagination from '@/components/pagination' import Pagination from '@/components/pagination'
@ -261,7 +455,7 @@ import pageye from '@/components/pagination/pageye'
import CheliangtaizhangInfo from './cheliangtaizhangInfo' import CheliangtaizhangInfo from './cheliangtaizhangInfo'
import vehicleconfiguration from '@/views/cheliang/cheliangtaizhang/relation/vehicleconfiguration' import vehicleconfiguration from '@/views/cheliang/cheliangtaizhang/relation/vehicleconfiguration'
import ButtonBar from '@/components/ButtonBar' import ButtonBar from '@/components/ButtonBar'
import { getPathSidByUserSid } from '@/api/cheliang/basevehiclemodel' import { brandDown, getPathSidByUserSid } from '@/api/cheliang/basevehiclemodel'
import cheliangtaizhangChu from '@/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangChu' import cheliangtaizhangChu from '@/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangChu'
import cheliangtaizhangMai from '@/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangMai' import cheliangtaizhangMai from '@/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangMai'
import cheliangtaizhangMaiInfo from '@/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangMaiInfo' import cheliangtaizhangMaiInfo from '@/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangMaiInfo'
@ -375,7 +569,40 @@ export default {
vehicleState: '', vehicleState: '',
certificateStateValue: '', certificateStateValue: '',
vinNo: '', vinNo: '',
createOrgSid: '' createOrgSid: '',
carBrand: '',
vehicleType: '',
productLine: '',
driveForm: '',
power: '',
vehicleVersion: '',
fuelType: '',
vehicleTypeCode: '',
gearboxType: '',
emissionStandard: '',
engineType: '',
marketSegments: '',
specifications: '',
airConditionerKey: '', // key
baffleModelKey: '',
bumperKey: '',
carColorKey: '',
configName: '',
configuringBaoKey: '',
fuelTankKey: '',
hubMaterialKey: '',
independentSourcesKey: '',
multimediaKey: '',
rearAxleRatioKey: '',
rearViewMirrorKey: '',
saddleKey: '',
seatKey: '',
slowMachineKey: '',
specificationKey: '',
suspensionKey: '',
tireCoverKey: '',
tireSizeKey: '',
wheelbaseKey: ''
}, },
current: 1, current: 1,
size: 5 size: 5
@ -390,9 +617,6 @@ export default {
} }
}, },
sids: [], sids: [],
selectDate: undefined,
temp: {}, //
templook: {}, //
textMap: { textMap: {
sid: '', sid: '',
remarks: '' remarks: ''
@ -404,7 +628,41 @@ export default {
typeOptions: [], typeOptions: [],
location_list: [], location_list: [],
vehicleState_list: [], vehicleState_list: [],
certificateState_list: [] certificateState_list: [],
manPurOrderType_list: [],
settlementStatus_list: [],
//
carBrand_list: [], //
vehicleFunction_list: [], //
productLine_list: [], //
driveForm_list: [], //
power_list: [], //
vehicleVersion_list: [], //
fuelType_list: [], //
gearboxType_list: [], //
emissionStandard_list: [], //
engineType_list: [], //
marketSegments_list: [], //
//
carColor_list: [], //
slowMachine_list: [], //
rearViewMirror_list: [], //
tireSize_list: [], //
specification_list: [], //
rearAxleRatio_list: [], //
airConditioner_list: [], //
hubMaterial_list: [], //
baffleModel_list: [], //
suspension_list: [], //
seat_list: [], //
tireCover_list: [], //
saddle_list: [], //
wheelbase_list: [], //
bumper_list: [], //
configuringBao_list: [], //
independentSources_list: [], //
fuelTank_list: [], //
multimedia_list: [] //
} }
}, },
created() { created() {
@ -484,6 +742,18 @@ export default {
} }
}, },
setDater() { setDater() {
//
typeValues({ type: 'purchaseOrderType' }).then((res) => {
if (res.success) {
this.manPurOrderType_list = res.data
}
})
//
typeValues({ type: 'settlementStatus' }).then((res) => {
if (res.success) {
this.settlementStatus_list = res.data
}
})
typeValues({ type: 'vehicleState' }).then((res) => { typeValues({ type: 'vehicleState' }).then((res) => {
if (res.code === '200') { if (res.code === '200') {
this.vehicleState_list = res.data this.vehicleState_list = res.data
@ -494,6 +764,268 @@ export default {
this.certificateState_list = res.data this.certificateState_list = res.data
} }
}) })
// -
typeValues({
type: 'vehicleFunction'
}).then((res) => {
if (res.code === '200') {
this.vehicleFunction_list = res.data
console.log('下拉框请求功能', res.data)
}
})
// -
typeValues({
type: 'driver'
}).then((res) => {
if (res.code === '200') {
this.driveForm_list = res.data
console.log('下拉框请求驱动', res.data)
}
})
// -
typeValues({
type: 'productLine'
}).then((res) => {
if (res.code === '200') {
this.productLine_list = res.data
console.log('下拉框请求系列', res.data)
}
})
// -
typeValues({
type: 'horsepower'
}).then((res) => {
if (res.code === '200') {
this.power_list = res.data
console.log('下拉框请求马力', res.data)
}
})
// -
typeValues({
type: 'vehicleVersion'
}).then((res) => {
if (res.code === '200') {
this.vehicleVersion_list = res.data
console.log('下拉框请求版本', res.data)
}
})
// -
typeValues({
type: 'fuelType'
}).then((res) => {
if (res.code === '200') {
this.fuelType_list = res.data
console.log('下拉框请求燃料', res.data)
}
})
// -
typeValues({
type: 'gearbox'
}).then((res) => {
if (res.code === '200') {
this.gearboxType_list = res.data
console.log('下拉框请求变速箱', res.data)
}
})
// -
typeValues({
type: 'emissionStandard'
}).then((res) => {
if (res.code === '200') {
this.emissionStandard_list = res.data
console.log('下拉框请求排放标准', res.data)
}
})
// -
typeValues({
type: 'engineType'
}).then((res) => {
if (res.code === '200') {
this.engineType_list = res.data
console.log('下拉框请求发动机型号', res.data)
}
})
// -
typeValues({
type: 'marketSegments'
}).then((res) => {
if (res.code === '200') {
this.marketSegments_list = res.data
console.log('下拉框请求细分市场', res.data)
}
})
// -
typeValues({
type: 'bodyColor'
}).then((res) => {
if (res.code === '200') {
this.carColor_list = res.data
console.log('下拉框请求111', res.data)
}
})
//
typeValues({
type: 'slowMachine '
}).then((res) => {
if (res.code === '200') {
this.slowMachine_list = res.data
console.log('下拉框请求缓速器', res.data)
}
})
//
typeValues({
type: 'rearviewMirror '
}).then((res) => {
if (res.code === '200') {
this.rearViewMirror_list = res.data
console.log('下拉框请求后视镜', res.data)
}
})
//
typeValues({
type: 'tiresize '
}).then((res) => {
if (res.code === '200') {
this.tireSize_list = res.data
console.log('下拉框请求轮胎规格', res.data)
}
})
//
typeValues({
type: 'specification '
}).then((res) => {
if (res.code === '200') {
this.specification_list = res.data
console.log('下拉框请求驾驶室', res.data)
}
})
//
typeValues({
type: 'rearAxleRatio'
}).then((res) => {
if (res.code === '200') {
this.rearAxleRatio_list = res.data
console.log('下拉框请求后桥速比', res.data)
}
})
//
typeValues({
type: 'airConditioner'
}).then((res) => {
if (res.code === '200') {
this.airConditioner_list = res.data
console.log('下拉框请求空调', res.data)
}
})
//
typeValues({
type: 'hubMaterial'
}).then((res) => {
if (res.code === '200') {
this.hubMaterial_list = res.data
console.log('下拉框请求轮毂材质', res.data)
}
})
//
typeValues({
type: 'baffleModel'
}).then((res) => {
if (res.code === '200') {
this.baffleModel_list = res.data
console.log('下拉框请求导流罩', res.data)
}
})
//
typeValues({
type: 'suspension'
}).then((res) => {
if (res.code === '200') {
this.suspension_list = res.data
console.log('下拉框请求悬架', res.data)
}
})
//
typeValues({
type: 'seat'
}).then((res) => {
if (res.code === '200') {
this.seat_list = res.data
console.log('下拉框请求座椅', res.data)
}
})
//
typeValues({
type: 'tireCover'
}).then((res) => {
if (res.code === '200') {
this.tireCover_list = res.data
console.log('下拉框请求护轮罩', res.data)
}
})
//
typeValues({
type: 'saddle'
}).then((res) => {
if (res.code === '200') {
this.saddle_list = res.data
console.log('下拉框请求护鞍座', res.data)
}
})
//
typeValues({
type: 'wheelbase'
}).then((res) => {
if (res.code === '200') {
this.wheelbase_list = res.data
console.log('下拉框请求护轴距', res.data)
}
})
//
typeValues({
type: 'bumper'
}).then((res) => {
if (res.code === '200') {
this.bumper_list = res.data
console.log('下拉框请求护保险杠', res.data)
}
})
//
typeValues({
type: 'configuringBao'
}).then((res) => {
if (res.code === '200') {
this.configuringBao_list = res.data
console.log('下拉框请求护配置包', res.data)
}
})
//
typeValues({
type: 'independentSources'
}).then((res) => {
if (res.code === '200') {
this.independentSources_list = res.data
console.log('下拉框请求护独立热源', res.data)
}
})
// -
typeValues({
type: 'fuelTank'
}).then((res) => {
if (res.code === '200') {
this.fuelTank_list = res.data
console.log('下拉框请求111', res.data)
}
})
//
typeValues({
type: 'multimedia'
}).then((res) => {
if (res.code === '200') {
this.multimedia_list = res.data
console.log('下拉框请求多媒体', res.data)
}
})
}, },
getUseOrg() { getUseOrg() {
const userSid = window.sessionStorage.getItem('userSid') const userSid = window.sessionStorage.getItem('userSid')
@ -523,6 +1055,13 @@ export default {
if (res.code === '200') { if (res.code === '200') {
this.listQuery.params.createOrgSid = res.data this.listQuery.params.createOrgSid = res.data
this.queryParams.params.useOrgSid = res.data this.queryParams.params.useOrgSid = res.data
// -
brandDown({ useOrg: res.data }).then((res) => {
if (res.code === '200') {
this.carBrand_list = res.data
console.log('下拉框请求品牌', res.data)
}
})
this.getList() this.getList()
} }
}) })
@ -571,25 +1110,46 @@ export default {
vehicleState: '', vehicleState: '',
certificateStateValue: '', certificateStateValue: '',
vinNo: '', vinNo: '',
createOrgSid: '' createOrgSid: '',
carBrand: '',
vehicleType: '',
productLine: '',
driveForm: '',
power: '',
vehicleVersion: '',
fuelType: '',
vehicleTypeCode: '',
gearboxType: '',
emissionStandard: '',
engineType: '',
marketSegments: '',
specifications: '',
airConditionerKey: '', // key
baffleModelKey: '',
bumperKey: '',
carColorKey: '',
configName: '',
configuringBaoKey: '',
fuelTankKey: '',
hubMaterialKey: '',
independentSourcesKey: '',
multimediaKey: '',
rearAxleRatioKey: '',
rearViewMirrorKey: '',
saddleKey: '',
seatKey: '',
slowMachineKey: '',
specificationKey: '',
suspensionKey: '',
tireCoverKey: '',
tireSizeKey: '',
wheelbaseKey: ''
}, },
current: 1, current: 1,
size: 5 size: 5
} }
this.getPathSid() this.getPathSid()
}, },
// ------------------------------------------------------
//
resetTemp() {
this.temp = {
jc: '', // false string
organizationId: '', // false string
qc: '', // false string
remark: '', // false
string: '', //
state: '' //
}
},
handleSelectionChange(row) { handleSelectionChange(row) {
this.multipleSelection = row this.multipleSelection = row
const aa = [] const aa = []
@ -625,7 +1185,7 @@ export default {
} }
} }
this.viewState = 6 this.viewState = 6
this.$refs['divChu'].showChu(this.multipleSelection) this.$refs['divChu'].showChu(this.multipleSelection, this.listQuery.params.createOrgSid)
} }
}, },
// //
@ -830,4 +1390,13 @@ export default {
} }
</script> </script>
<style scoped> <style scoped>
.addinputw {
width: 99%;
}
.divStyle {
display: flex;
flex-direction: row;
justify-content: flex-start;
align-items: center;
}
</style> </style>

1245
anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangAdd.vue

File diff suppressed because it is too large

240
anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangInfo.vue

@ -3,188 +3,211 @@
<div class="tab-header webtop"> <div class="tab-header webtop">
<div>车辆台账信息详情</div> <div>车辆台账信息详情</div>
<div> <div>
<el-button type="info" size="small" @click="handleReturn()">返回</el-button> <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div> </div>
</div> </div>
<div class="listconadd"> <div class="listconadd">
<el-form ref="dataForm" :model="temp" label-position="right" class="forminfo"> <el-form ref="dataForm" :model="temp" label-position="right" label-width="170px" class="formadd">
<div class="title">车辆台账信息</div> <div class="title">车辆台账信息</div>
<el-row> <el-row>
<el-col :span="4" class="trightb">车型名称</el-col> <el-col :span="24" class="tleftb">金额单位</el-col>
<el-col :span="8"> </el-row>
<el-row>
<el-col :span="12">
<el-form-item>
<span slot="label">采购系统</span>
<span>{{ temp.purchaseSystemName }}</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item> <el-form-item>
<span slot="label">车型(配置简述)</span>
<span>{{ temp.modelName }}</span> <span>{{ temp.modelName }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" class="trightb">常用配置</el-col> </el-row>
<el-col :span="8" class="configName_sty"> <el-row>
<el-col :span="24" class="tlineheightb">
<el-form-item> <el-form-item>
<span slot="label">常用配置</span>
<span>{{ temp.configName }}</span> <span>{{ temp.configName }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="4" class="trightb">库存状态</el-col> <el-col :span="8">
<el-col :span="8" class="tleft">
<el-form-item> <el-form-item>
<span>{{ temp.vehicleStateValue }}</span> <span slot="label">车架号</span>
<span>{{ temp.vinNo }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" class="trightb">车架号</el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item> <el-form-item>
<span>{{ temp.vinNo }}</span> <span slot="label">内部编码</span>
<span>{{ temp.insideCode }}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item>
<span slot="label">发动机号</span>
<span>{{ temp.engineNo }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="4" class="trightb">内部编码</el-col> <el-col :span="8">
<el-col :span="8" class="tleft">
<el-form-item> <el-form-item>
<span>{{ temp.insideCode }}</span> <span slot="label">采购类型</span>
<span>{{ temp.manPurOrderTypeValue }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <el-col :span="4" class="trightb">发动机号/许可证号</el-col>--> <el-col :span="8">
<!-- <el-col :span="8" class="tleft">-->
<!-- <el-form-item>-->
<!-- <span>{{ temp.engineNo }}</span>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="4" class="trightb">厂家订单编码</el-col>
<el-col :span="8" class="tleft">
<el-form-item> <el-form-item>
<span slot="label">排产订单编号</span>
<span>{{ temp.orderingNo }}</span> <span>{{ temp.orderingNo }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8">
<el-form-item>
<span slot="label">是否为问题车辆</span>
<span>{{ temp.isProblemVeh === '1' ? '是' : '否' }}</span>
</el-form-item>
</el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="4" class="trightb">厂家采购订单类型</el-col> <el-col :span="8">
<el-col :span="8" class="tleft">
<el-form-item> <el-form-item>
<span>{{ temp.manPurOrderTypeValue }}</span> <span slot="label">锁定状态</span>
<span>{{ temp.lockedStateValue }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" class="trightb">厂家入库日期</el-col> <el-col :span="8">
<el-col :span="8" class="tleft">
<el-form-item> <el-form-item>
<span slot="label">库存状态</span>
<span>{{ temp.vehicleStateValue }}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item>
<span slot="label">厂家入库日期</span>
<span>{{ temp.priceDate }}</span> <span>{{ temp.priceDate }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="4" class="trightb">发车日期</el-col> <el-col :span="8">
<el-col :span="8" class="tleft">
<el-form-item> <el-form-item>
<span slot="label">物流发车日期</span>
<span>{{ temp.departureDate }}</span> <span>{{ temp.departureDate }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" class="trightb">到货日期</el-col> <el-col :span="8">
<el-col :span="8" class="tleft">
<el-form-item> <el-form-item>
<span slot="label">物流到车日期</span>
<span>{{ temp.arrivalDate }}</span> <span>{{ temp.arrivalDate }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> <el-col :span="8">
<el-row>
<el-col :span="4" class="trightb">销售日期</el-col>
<el-col :span="8" class="tleft">
<el-form-item> <el-form-item>
<span>{{ temp.salesDate }}</span> <span slot="label">退库日期</span>
<span>{{ temp.returnDate }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" class="trightb">买断日期</el-col> </el-row>
<el-col :span="8" class="tleft"> <el-row>
<el-col :span="8">
<el-form-item> <el-form-item>
<span>{{ temp.solidDate }}</span> <span slot="label">存放地点</span>
<span>{{ temp.locationName }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> <el-col :span="8">
<el-row>
<el-col :span="4" class="trightb">结算状态</el-col>
<el-col :span="8" class="tleft">
<el-form-item> <el-form-item>
<span>{{ temp.settlementStatus }}</span> <span slot="label">厂家回款通路</span>
<span>{{ temp.manufSaleAccessName }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" class="trightb">采购退库日期</el-col> <el-col :span="8">
<el-col :span="8" class="tleft">
<el-form-item> <el-form-item>
<span>{{ temp.returnDate }}</span> <span slot="label">保修卡号</span>
<span>{{ temp.warrantyCardNo }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="4" class="trightb">存放地点</el-col> <el-col :span="8">
<el-col :span="8" class="tleft">
<el-form-item> <el-form-item>
<span>{{ temp.locationName }}</span> <span slot="label">厂家合同价(含运费)</span>
<span>{{ temp.contractPrice }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" class="trightb">厂家入库价</el-col> <el-col :span="8">
<el-col :span="8" class="tleft">
<el-form-item> <el-form-item>
<span slot="label">厂家结算价(含运费)</span>
<span>{{ temp.costPrice }}</span> <span>{{ temp.costPrice }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8">
<el-form-item>
<span slot="label">运费</span>
<span>{{ temp.freight }}</span>
</el-form-item>
</el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="4" class="trightb">成交价</el-col> <el-col :span="8">
<el-col :span="8" class="tleft">
<el-form-item> <el-form-item>
<span>{{ temp.salePrice }}</span> <span slot="label">买断状态</span>
<span>{{ temp.settlementStatus }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" class="trightb">保修卡号</el-col> <el-col :span="8">
<el-col :span="8" class="tleft">
<el-form-item> <el-form-item>
<span>{{ temp.warrantyCardNo }}</span> <span slot="label">买断备注</span>
<span>{{ temp.rebate1 }}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item>
<span slot="label">买断日期</span>
<span>{{ temp.solidDate }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="4" class="trightb">锁定状态</el-col> <el-col :span="8">
<el-col :span="8" class="tleft">
<el-form-item> <el-form-item>
<span>{{ temp.lockedStateValue }}</span> <span slot="label">全款/贷款销售指导价</span>
<span>{{ temp.price }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" class="trightb">使用组织</el-col> <el-col :span="8">
<el-col :span="8" class="tleft">
<el-form-item> <el-form-item>
<span>{{ temp.useOrgName }}</span> <span slot="label">销售成交价</span>
<span>{{ temp.salePrice }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> <el-col :span="8">
<el-row>
<el-col :span="4" class="trightb">创建组织</el-col>
<el-col :span="8" class="tleft">
<el-form-item> <el-form-item>
<span>{{ temp.createOrgName }}</span> <span slot="label">销售日期</span>
<span>{{ temp.salesDate }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" class="trightb">特殊说明</el-col> </el-row>
<el-col :span="8" class="tleft"> <el-row>
<el-col :span="24">
<el-form-item> <el-form-item>
<span>{{ temp.specialInstructions }}</span> <span slot="label">备注</span>
<span>{{ temp.remarks }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<!-- <el-row>-->
<!-- <el-col :span="4" class="trightb">内部编码</el-col>-->
<!-- <el-col :span="8" class="tleft">-->
<!-- <el-form-item>-->
<!-- <span>{{ temp.insideCode }}</span>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="12" class="trightb"/>-->
<!-- </el-row>-->
</el-form> </el-form>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import { mapGetters } from 'vuex'
import { details } from '@/api/cheliang/basevehicle' import { details } from '@/api/cheliang/basevehicle'
export default { export default {
@ -195,50 +218,22 @@ export default {
// --------- // ---------
FormLoading: false, FormLoading: false,
temp: {}, // temp: {}, //
// ------------------------------------
} }
}, },
computed: {
...mapGetters([
'id',
'roles',
'rolesIds',
'departmentId',
'departmentCode'
])
},
created() {
// this.tempDate.sid = this.$route.query.sid
// console.log('', this.tempDate.sid)
// this.handleCheck()
//
// this.init()
},
methods: { methods: {
init() {},
// ------------------------------------------------------
// //
handleReturn() { handleReturn() {
this.temp = {} this.temp = {}
// this.$router.go(-1)
this.$emit('doback') this.$emit('doback')
}, },
// //
showInfo(sid) { showInfo(sid) {
console.log('112233445566')
this.FormLoading = true this.FormLoading = true
details(sid).then((response) => { details(sid).then((response) => {
console.log('查询', response) console.log('查询', response)
this.FormLoading = false this.FormLoading = false
if (response.code === '200') { if (response.code === '200') {
this.temp = response.data this.temp = response.data
if (this.temp.settlementStatus == '0'){
this.temp.settlementStatus = '未买断'
} else if (this.temp.settlementStatus == '1'){
this.temp.settlementStatus = '预买断'
} else {
this.temp.settlementStatus = '买断'
}
} else { } else {
this.$notify({ this.$notify({
title: '失败', title: '失败',
@ -252,23 +247,16 @@ export default {
} }
</script> </script>
<style scoped> <style scoped>
/deep/ .lookimg .img{ .tlineheightb {
width: 100px; display: flex;
margin: 10px; flex-direction: row;
} justify-content: flex-start;
.listconadd { align-items: center;
width: 100%;
}
/deep/ .el-form-item{
padding-top: 5px;
margin-bottom: 0;
} }
/deep/ .el-form-item__content { /deep/ .tlineheightb .el-form-item .el-form-item__content {
/*line-height: 37px;*/ line-height: 15px !important;
position: relative;
font-size: 14px;
} }
.configName_sty /deep/ .el-form-item__content{ /deep/ .tlineheightb .el-form-item .el-form-item__label {
line-height: 27px; line-height: 15px !important;
} }
</style> </style>

23
anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangChu.vue

@ -229,6 +229,7 @@ export default {
staffSid: '', // sid staffSid: '', // sid
type: '', // type: '', //
typeKey: '', // Key typeKey: '', // Key
createOrgSid: ''
}, },
payType_list: [], // payType_list: [], //
org_list: [], // org_list: [], //
@ -318,19 +319,27 @@ export default {
this.temp.middleTwoSid = choosetItem[0].middleSid this.temp.middleTwoSid = choosetItem[0].middleSid
this.temp.middleCodeTwo = choosetItem[0].middleCode this.temp.middleCodeTwo = choosetItem[0].middleCode
}, },
showChu(multipleSelection) { showChu(multipleSelection, createOrgSid) {
this.temp.vinNo = multipleSelection[0].vinNo this.temp.vinNo = multipleSelection[0].vinNo
this.temp.vinSid = multipleSelection[0].sid this.temp.vinSid = multipleSelection[0].sid
this.temp.createOrgSid = createOrgSid
this.getType() this.getType()
}, },
// //
handleCreate() { handleCreate() {
vehicleOutLibrary(this.temp).then((response) => { const tip = '请确认是否临时出库?'
if (response.success) { this.$confirm(tip, '提示', {
this.$message({ showClose: true, type: 'success', message: '保存成功' }) confirmButtonText: '确定',
this.handleReturn('true') cancelButtonText: '取消',
} type: 'warning'
}).catch(e => { }).then(() => {
vehicleOutLibrary(this.temp).then((response) => {
if (response.success) {
this.$message({ showClose: true, type: 'success', message: '保存成功' })
this.handleReturn('true')
}
}).catch(e => {
})
}) })
}, },
// //

17
anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangxiaoshou/cheliangxiaoshouguanli.vue

@ -152,7 +152,7 @@ import { pagerList } from '@/api/cheliang/cheliangxiaoshou'
import Pagination from '@/components/pagination' import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye' import pageye from '@/components/pagination/pageye'
import ButtonBar from '@/components/ButtonBar' import ButtonBar from '@/components/ButtonBar'
import { typeValues } from '@/api/cheliang/dictcommons' import { typeValues, getPathSidByUserSid } from '@/api/cheliang/dictcommons'
import chelaingxiaoshouInfo from './chelaingxiaoshouInfo' import chelaingxiaoshouInfo from './chelaingxiaoshouInfo'
export default { export default {
@ -191,7 +191,8 @@ export default {
saleDateEnd: '', saleDateEnd: '',
saleDateStart: '', saleDateStart: '',
typeKey: '', typeKey: '',
vinNo: '' vinNo: '',
createOrgSid: ''
}, },
current: 1, current: 1,
size: 5, size: 5,
@ -202,7 +203,6 @@ export default {
}, },
created() { created() {
// //
this.getList()
this.init() this.init()
}, },
mounted() { mounted() {
@ -215,6 +215,12 @@ export default {
this.payType_list = res.data this.payType_list = res.data
} }
}) })
getPathSidByUserSid({ userSid: window.sessionStorage.getItem('userSid') }).then((resp) => {
if (resp.success) {
this.listQuery.params.createOrgSid = resp.data
this.getList()
}
})
}, },
// //
clicksearchShow() { clicksearchShow() {
@ -269,13 +275,14 @@ export default {
saleDateEnd: '', saleDateEnd: '',
saleDateStart: '', saleDateStart: '',
typeKey: '', typeKey: '',
vinNo: '' vinNo: '',
createOrgSid: ''
}, },
current: 1, current: 1,
size: 5, size: 5,
total: 0 total: 0
} }
this.getList() this.init()
}, },
toInfo(row) { toInfo(row) {
this.viewState = 2 this.viewState = 2

5
anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/chexingguanlianchangyong.vue

@ -147,6 +147,11 @@
<span>{{ scope.row.manufactorSettlementPrice }}</span> <span>{{ scope.row.manufactorSettlementPrice }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="130px" label="配置编码" align="center">
<template slot-scope="scope">
<span>{{ scope.row.configCode }}</span>
</template>
</el-table-column>
<el-table-column width="130px" label="最新更新日期" align="center"> <el-table-column width="130px" label="最新更新日期" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.modifyTime }}</span> <span>{{ scope.row.modifyTime }}</span>

2
anrui-scm/anrui-scm-ui/src/views/kucunguanli/cheliangweihu/richangxunjian/relation/xunjianbaogaoAdd.vue

@ -80,7 +80,7 @@ export default {
}) })
this.formobj.mainSid = row.sid this.formobj.mainSid = row.sid
this.formobj.userSid = window.sessionStorage.getItem('userSid') this.formobj.userSid = window.sessionStorage.getItem('userSid')
req.getCarInspectionReport(row.sid).then((resp) => { req.getCarInspectionReport(row.sid, window.sessionStorage.getItem('userSid')).then((resp) => {
if (resp.success) { if (resp.success) {
this.formobj.totalNumber = resp.data.totalNumber this.formobj.totalNumber = resp.data.totalNumber
this.formobj.actualNumber = resp.data.actualNumber this.formobj.actualNumber = resp.data.actualNumber

53
anrui-scm/anrui-scm-ui/src/views/kucunguanli/cheliangweihu/richangxunjian/xunjianresolved.vue

@ -190,28 +190,39 @@ export default {
// this.$message({ showClose: true, type: 'error', message: '' }) // this.$message({ showClose: true, type: 'error', message: '' })
// return // return
// } // }
if (this.formobj.results === '') {
this.$message({ showClose: true, type: 'error', message: '处理结果不能为空' })
return
}
console.log(this.formobj) console.log(this.formobj)
this.formobj.carConditionValue = '问题已解决' const tip = '请确认问题是否已解决?'
this.formobj.carConditionKey = '002' this.$confirm(tip, '提示', {
this.$refs['form_obj'].validate((valid) => { confirmButtonText: '确定',
if (valid) { cancelButtonText: '取消',
this.submitdisabled = true type: 'warning'
req.submitInspection(this.formobj).then((resp) => { }).then(() => {
this.submitdisabled = false this.formobj.carConditionValue = '问题已解决'
if (resp.success) { this.formobj.carConditionKey = '002'
this.$message({ this.$refs['form_obj'].validate((valid) => {
showClose: true, if (valid) {
type: 'success', this.submitdisabled = true
message: resp.msg req.submitInspection(this.formobj).then((resp) => {
}) this.submitdisabled = false
this.handleReturn('true') if (resp.success) {
} this.$message({
}).catch(() => { showClose: true,
this.submitdisabled = false type: 'success',
}) message: resp.msg
} else { })
return false this.handleReturn('true')
} }
}).catch(() => {
this.submitdisabled = false
})
} else {
return false
}
})
}) })
}, },
// === // ===

Loading…
Cancel
Save