Browse Source

Merge remote-tracking branch 'origin/master'

zhanglei
yxt_djz 3 years ago
parent
commit
5e958820ea
  1. 15
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java
  2. 2
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/ScmVehiclePatrolinspection.java
  3. 2
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetDto.java
  4. 3
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java
  5. 4
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.xml
  6. 1
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionService.java
  7. 2
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetService.java
  8. 2
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthService.java
  9. 4
      anrui-scm/anrui-scm-ui/src/api/kucunguanli/panku.js
  10. 10
      anrui-scm/anrui-scm-ui/src/views/anruiscm/scmwarehouse/scmwarehouse.vue
  11. 10
      anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangAdd.vue
  12. 125
      anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangChu.vue
  13. 6
      anrui-scm/anrui-scm-ui/src/views/kucunguanli/panku/pankubaogao/pankubaogaoAdd.vue
  14. 2
      anrui-scm/anrui-scm-ui/src/views/kucunguanli/panku/pankubaogao/pankubaogaoInfo.vue

15
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java

@ -28,6 +28,7 @@ import com.yxt.anrui.base.biz.basevehiclemodel.BaseVehicleModelService;
import com.yxt.anrui.base.biz.basevehicletempstate.BaseVehicleTempstateService;
import com.yxt.anrui.base.biz.basevehmodelconfig.BaseVehmodelConfigService;
import com.yxt.anrui.base.biz.busvehicleinquiry.BusVehicleInquiryService;
import com.yxt.anrui.base.common.enums.CertificState;
import com.yxt.anrui.base.common.enums.ManPurOrderType;
import com.yxt.anrui.base.common.enums.OperVehicleState;
import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
@ -206,14 +207,18 @@ public class BaseVehicleRest implements BaseVehicleFeign {
baseVehicle.setWitPinState(dto.getWitPinState());
baseVehicle.setWitPinStateValue(dto.getWitPinStateValue());
boolean isSave = baseVehicleService.save(baseVehicle);
BaseVehicleCertificate baseVehicleCertificate = new BaseVehicleCertificate();
if (StringUtils.isNotBlank(dto.getVinNo())) {
BaseVehicleCertificate baseVehicleCertificate = new BaseVehicleCertificate();
baseVehicleCertificate.setVinNo(dto.getVinNo());
baseVehicleCertificate.setCertificateState(dto.getCertificateState());
baseVehicleCertificate.setCertificateStateValue(dto.getCertificateStateValue());
baseVehicleCertificate.setCertificateState(CertificState.CertificateState.CERSTATE_XN.getCode());
baseVehicleCertificate.setCertificateStateValue(CertificState.CertificateState.CERSTATE_XN.getRemarks());
baseVehicleCertificate.setVehicleSid(baseVehicle.getSid());
baseVehicleCertificate.setTransferStateKey("001");
baseVehicleCertificate.setTransferStateValue("未接收");
baseVehicleCertificate.setTransferStateKey(CertificState.TransferState.TRANSTATE_WJS.getCode());
baseVehicleCertificate.setTransferStateValue(CertificState.TransferState.TRANSTATE_WJS.getRemarks());
baseVehicleCertificate.setCreateOrgSid(baseVehicle.getCreateOrgSid());
baseVehicleCertificate.setCreateOrgName(baseVehicle.getCreateOrgName());
baseVehicleCertificate.setUseOrgSid(baseVehicle.getUseOrgSid());
baseVehicleCertificate.setUseOrgName(baseVehicle.getUseOrgName());
baseVehicleCertificateService.save(baseVehicleCertificate);
} else {
return rb.setMsg("车架号不能为空");

2
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/ScmVehiclePatrolinspection.java

@ -71,5 +71,7 @@ public class ScmVehiclePatrolinspection extends BaseEntity {
private String createOrgSid; // 创建组织
@ApiModelProperty("使用组织")
private String useOrgSid; // 使用组织
@ApiModelProperty("推送状态 0 未推送 1 已推送")
private int pushState;
}

2
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetDto.java

@ -100,4 +100,6 @@ public class ScmVehiclePatrolinspectionsheetDto implements Dto {
private String warehouseSid;
@ApiModelProperty("存放地点")
private String warehouse;
@ApiModelProperty("推送状态 0 未推送 1 已推送")
private int pushState;
}

3
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java

@ -367,7 +367,7 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
String inventoryName = dto.getInventoryName();
String inventoryStateKey = dto.getInventoryStateKey();
String remarks = dto.getRemarks();
if (StringUtils.isBlank(inventoryStateKey)){
if (StringUtils.isBlank(inventoryStateKey)) {
return rb.setMsg("请选择盘库状态");
}
if ("002".equals(inventoryStateKey) && StringUtils.isBlank(remarks)) {
@ -480,6 +480,7 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
patrolinspectionsheetDto.setUserName(dto.getLoginName());
patrolinspectionsheetDto.setLocation(dto.getAddressCode());
patrolinspectionsheetDto.setAddress(dto.getAddress());
patrolinspectionsheetDto.setPushState(1);
scmVehiclePatrolinspectionsheetService.savePatrolinspectionsheet(patrolinspectionsheetDto);
}
return rb.success().setMsg("保存成功");

4
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.xml

@ -46,9 +46,9 @@
resultType="com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth.VehPatrolinspectionmonthVo">
SELECT count(*),
(SELECT count(*) FROM scm_vehicle_patrolinspection svp WHERE svp.state = '1' and svp.mainSid = #{mainSid}) AS totalNumber,
(SELECT count(*) FROM scm_vehicle_patrolinspection svp WHERE svp.patrolInspectionStateKey = '001' and svp.mainSid = #{mainSid}) AS unHandledNumber,
(SELECT count(*) FROM scm_vehicle_patrolinspection svp WHERE svp.patrolInspectionStateKey = '001' and svp.pushState = 1 and svp.mainSid = #{mainSid}) AS unHandledNumber,
(SELECT count(*) FROM scm_vehicle_patrolinspection svp WHERE svp.patrolInspectionStateKey = '002' and svp.mainSid = #{mainSid}) AS processedNumber,
(SELECT count(*) FROM scm_vehicle_patrolinspection svp WHERE svp.patrolInspectionStateKey = '000' and svp.mainSid = #{mainSid}) AS notHandledNumber,
(SELECT count(*) FROM scm_vehicle_patrolinspection svp WHERE svp.patrolInspectionStateKey = '000' and svp.isDelete = 0 and svp.mainSid = #{mainSid}) AS notHandledNumber,
(SELECT count(*) FROM scm_vehicle_patrolinspection svp WHERE svp.patrolInspectionStateKey = '000' and svp.mainSid = #{mainSid}) AS surplusNumber,
(SELECT count(*) FROM scm_vehicle_patrolinspection svp WHERE svp.patrolInspectionStateKey = '003' and svp.mainSid = #{mainSid}) AS normalNumber
FROM scm_vehicle_patrolinspection svp

1
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionService.java

@ -264,6 +264,7 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService<ScmVeh
paramsQuery.setPatrolinspectionEndDate(s[1]);
}
QueryWrapper<AppScmVehiclePatrolinspectionPageVo> qw = new QueryWrapper<>();
qw.eq("svp.isDelete", 0);
if (StringUtils.isNotBlank(pagerQuery.getParams().getUseOrgSid())) {
qw.eq("svp.createOrgSid", pagerQuery.getParams().getUseOrgSid());
}

2
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetService.java

@ -441,8 +441,10 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
scmVehiclePatrolinspection.setPatrolInspectionState(oneValue);
scmVehiclePatrolinspection.setPatrolInspectionStateKey(oneKey);
scmVehiclePatrolinspection.setCreateOrgSid(useOrgSid);
scmVehiclePatrolinspection.setCreateBySid(dto.getUserSid());
scmVehiclePatrolinspection.setUseOrgSid(useOrgSid);
scmVehiclePatrolinspection.setState(0);
scmVehiclePatrolinspection.setPushState(dto.getPushState());
scmVehiclePatrolinspectionService.save(scmVehiclePatrolinspection);
BeanUtil.copyProperties(dto, scmVehiclePatrolinspectionsheet, "sid");

2
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthService.java

@ -241,6 +241,7 @@ public class ScmVehPatrolinspectionmonthService extends MybatisBaseService<ScmVe
scmVehiclePatrolinspection.setCreateOrgSid(useOrgSid);
scmVehiclePatrolinspection.setCreateBySid(userSid);
scmVehiclePatrolinspection.setUseOrgSid(useOrgSid);
scmVehiclePatrolinspection.setPushState(0);
scmVehiclePatrolinspectionService.save(scmVehiclePatrolinspection);
}
if (mainList.size() > 0) {
@ -258,6 +259,7 @@ public class ScmVehPatrolinspectionmonthService extends MybatisBaseService<ScmVe
scmVehiclePatrolinspection.setCreateOrgSid(useOrgSid);
scmVehiclePatrolinspection.setUseOrgSid(useOrgSid);
scmVehiclePatrolinspection.setCreateBySid(userSid);
scmVehiclePatrolinspection.setPushState(0);
scmVehiclePatrolinspectionService.save(scmVehiclePatrolinspection);
ScmVehiclePatrolinspectionsheet scmVehiclePatrolinspectionsheet = new ScmVehiclePatrolinspectionsheet();
scmVehiclePatrolinspectionsheet.setDutyName(inspection.getLiableName());

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

@ -45,9 +45,9 @@ export default {
})
},
// 盘库报告(查看盘库报告)
getCarInventoryReport: function(data) {
getCarInventoryReport: function(sid, userSid) {
return request({
url: '/scm/v1/scmvehinventorymonth/getCarInventoryReport/' + data,
url: '/scm/v1/scmvehinventorymonth/getCarInventoryReport/' + sid + '/' + userSid,
method: 'get'
})
},

10
anrui-scm/anrui-scm-ui/src/views/anruiscm/scmwarehouse/scmwarehouse.vue

@ -15,9 +15,6 @@
<el-option v-for="item in useOrg_list" :key="item.sid" :label="item.name" :value="item.sid"/>
</el-select>
</el-form-item>
<!-- <el-form-item label="编码">-->
<!-- <el-input v-model="queryParams.params.warehouseCode" placeholder="请输入编码" clearable/>-->
<!-- </el-form-item>-->
<el-form-item label="名称">
<el-input v-model="queryParams.params.warehouseName" placeholder="请输入名称" clearable/>
</el-form-item>
@ -53,11 +50,6 @@
@selection-change="handleSelectionChange">
<el-table-column width="50" type="selection" align="center"/>
<el-table-column width="80" label="序号" type="index" :index="indexMethod" align="center"/>
<!-- <el-table-column width="160px" label="编码" align="center">-->
<!-- <template slot-scope="scope">-->
<!-- <span class="bluezi" @click="toInfo(scope.row)">{{ scope.row.warehouseCode }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column width="240" prop="gressionCode" label="编码" align="center"/>
<el-table-column width="200" prop="warehouseName" label="名称" align="center">
<template slot-scope="scope">
@ -132,7 +124,6 @@ export default {
params: {
sids: [], // SID
useOrgSid: '', // 使sid
warehouseCode: '', //
warehouseName: '', //
warehouseAttribute: '', //
warehouseContract: '', //
@ -272,7 +263,6 @@ export default {
sids: [], // SID
useOrg: this.useOrg,
useOrgSid: this.useOrgSid,
warehouseCode: '', //
warehouseName: '', //
warehouseAttribute: '', //
warehouseContract: '', //

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

@ -48,7 +48,7 @@
<el-col :span="8">
<el-form-item prop="vinNo">
<span slot="label">车架号</span>
<el-input v-model="temp.vinNo" maxlength="17" placeholder="" class="addinputw" clearable/>
<el-input v-model="temp.vinNo" maxlength="17" placeholder="车架号位数与金蝶系统一致" class="addinputw" clearable/>
</el-form-item>
</el-col>
<el-col :span="8">
@ -428,6 +428,14 @@ export default {
})
this.dialogStatus = 'add'
this.viewTitle = '【新增】车辆台账'
this.temp.lockedState = '03'
this.temp.lockedStateValue = '未锁定'
this.temp.vehicleState = '0001'
this.temp.vehicleStateValue = '库存'
this.temp.settlementStatus = '0'
this.temp.settlementStatusValue = '未买断'
this.temp.freight = 0
this.temp.isProblemVeh = '0'
this.getType()
this.getPathSid()
},

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

@ -18,7 +18,7 @@
<el-form-item><span>{{ temp.vinNo }}</span></el-form-item>
</el-col>
<el-col :span="4" class="tleftb">
<span>销售类型</span>
<span><span class="icon">*</span>销售类型</span>
</el-col>
<el-col :span="8">
<el-form-item prop="type">
@ -30,7 +30,7 @@
</el-row>
<el-row>
<el-col :span="4" class="tleftb">
<span>销售部门</span>
<span><span class="icon">*</span>销售部门</span>
</el-col>
<el-col :span="8">
<el-form-item prop="orgName">
@ -40,7 +40,7 @@
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb">
<span>销售专员</span>
<span><span class="icon">*</span>销售专员</span>
</el-col>
<el-col :span="8">
<el-form-item prop="staffName">
@ -52,25 +52,25 @@
</el-row>
<el-row>
<el-col :span="4" class="tleftb">
<span>销售日期</span>
<span><span class="icon">*</span>销售日期</span>
</el-col>
<el-col :span="8">
<el-form-item>
<el-form-item prop="saleDate">
<el-date-picker v-model="temp.saleDate" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb">
<span>成交价()</span>
<span><span class="icon">*</span>成交价()</span>
</el-col>
<el-col :span="8">
<el-form-item>
<el-form-item prop="price">
<el-input v-model="temp.price" maxlength="125" placeholder="" class="addinputw" clearable @keyup.native="temp.price = oninput(temp.price,2)"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="tleftb">
<span>合同编号</span>
<span><span class="icon">*</span>合同编号</span>
</el-col>
<el-col :span="8">
<el-form-item prop="concatNo">
@ -78,18 +78,20 @@
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb">
<span>是否为终端客户</span>
<span><span class="icon">*</span>是否为终端客户</span>
</el-col>
<el-col :span="8">
<el-form-item>
<el-radio v-model="temp.isTerminal" label="1"></el-radio>
<el-radio v-model="temp.isTerminal" label="0"></el-radio>
<el-form-item prop="isTerminal">
<el-radio-group v-model="temp.isTerminal">
<el-radio label="1"></el-radio>
<el-radio label="0"></el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="tleftb">
<span>客户名称</span>
<span><span class="icon">*</span>客户名称</span>
</el-col>
<el-col :span="8">
<el-form-item prop="customerName">
@ -102,18 +104,18 @@
<span>手机号码</span>
</el-col>
<el-col :span="8">
<el-form-item prop="mobile">
<el-form-item>
<span>{{ temp.mobile }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="tleftb">
<span>赠品说明</span>
<span>赠品价值()</span>
</el-col>
<el-col :span="8">
<el-form-item>
<el-input v-model="temp.giftsDescription" maxlength="125" placeholder="" class="addinputw" clearable/>
<el-input v-model="temp.giftsDescription" maxlength="125" placeholder="" class="addinputw" clearable @keyup.native="temp.giftsDescription = oninput(temp.giftsDescription,2)"/>
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb">
@ -130,7 +132,7 @@
<span>中介人1</span>
</el-col>
<el-col :span="8">
<el-form-item prop="">
<el-form-item>
<el-select v-model="temp.middleOne" class="addinputw" clearable placeholder="" @change="changeDistributorOne">
<el-option v-for="item in distributor_list" :key="item.middleSid" :label="item.middleName" :value="item.middleName"/>
</el-select>
@ -140,7 +142,7 @@
<span>返利金额1()</span>
</el-col>
<el-col :span="8">
<el-form-item prop="mobile">
<el-form-item>
<el-input v-model="temp.rebateMoneyOne" maxlength="125" placeholder="" class="addinputw" clearable @keyup.native="temp.rebateMoneyOne = oninput(temp.rebateMoneyOne,2)"/>
</el-form-item>
</el-col>
@ -150,7 +152,7 @@
<span>中介人2</span>
</el-col>
<el-col :span="8">
<el-form-item prop="">
<el-form-item>
<el-select v-model="temp.middleTwo" class="addinputw" clearable placeholder="" @change="changeDistributorTwo">
<el-option v-for="item in distributor_list" :key="item.middleSid" :label="item.middleName" :value="item.middleName"/>
</el-select>
@ -160,7 +162,7 @@
<span>返利金额2()</span>
</el-col>
<el-col :span="8">
<el-form-item prop="mobile">
<el-form-item>
<el-input v-model="temp.rebateMoneyTwo" maxlength="125" placeholder="" class="addinputw" clearable @keyup.native="temp.rebateMoneyTwo = oninput(temp.rebateMoneyTwo,2)"/>
</el-form-item>
</el-col>
@ -171,7 +173,7 @@
</el-col>
<el-col :span="20">
<el-form-item>
<el-input v-model="temp.remarks" placeholder="" clearable class="addinputw"/>
<el-input v-model="temp.remarks" placeholder="请写明赠品情况" clearable class="addinputw"/>
</el-form-item>
</el-col>
</el-row>
@ -188,19 +190,19 @@ import { typeValues } from '@/api/cheliang/dictcommons'
export default {
name: 'cheliangtaizhangChu',
data() {
var checkSubmit = (rule, value, callback) => {
const Submit =
/^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/
if (value) {
//
if (!Submit.test(value)) {
callback(new Error('请输入正确的手机号'))
}
callback()
} else {
callback()
}
}
// var checkSubmit = (rule, value, callback) => {
// const Submit =
// /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/
// if (value) {
// //
// if (!Submit.test(value)) {
// callback(new Error(''))
// }
// callback()
// } else {
// callback()
// }
// }
return {
temp: {
vinNo: '',
@ -237,13 +239,14 @@ export default {
customer_list: [], //
distributor_list: [], //
rules: {
mobile: [
{
required: true,
validator: checkSubmit,
trigger: 'blur'
}
]
type: [{ required: true, message: '销售类型不能为空', trigger: 'change' }],
orgName: [{ required: true, message: '销售部门不能为空', trigger: 'change' }],
staffName: [{ required: true, message: '销售专员不能为空', trigger: 'change' }],
saleDate: [{ required: true, message: '销售日期不能为空', trigger: 'blur' }],
price: [{ required: true, message: '成交价不能为空', trigger: 'blur' }],
concatNo: [{ required: true, message: '合同编号不能为空', trigger: 'blur' }],
isTerminal: [{ required: true, message: '是否为终端客户不能为空', trigger: 'change' }],
customerName: [{ required: true, message: '客户名称不能为空', trigger: 'change' }],
}
}
},
@ -265,7 +268,7 @@ export default {
return val
},
getType() {
typeValues({type: 'payType'}).then((res) => {
typeValues({ type: 'payType' }).then((res) => {
if (res.success) {
this.payType_list = res.data
}
@ -320,32 +323,44 @@ export default {
this.temp.middleCodeTwo = choosetItem[0].middleCode
},
showChu(multipleSelection, createOrgSid) {
this.$nextTick(() => {
this.$refs['dataForm'].clearValidate()
})
this.temp.vinNo = multipleSelection[0].vinNo
this.temp.vinSid = multipleSelection[0].sid
this.temp.createOrgSid = createOrgSid
this.temp.giftsDescription = 0
this.temp.rebateMoneyOne = 0
this.temp.rebateMoneyTwo = 0
this.temp.salesAllowance = 0
this.getType()
},
//
handleCreate() {
const tip = '请确认是否临时出库?'
this.$confirm(tip, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
vehicleOutLibrary(this.temp).then((response) => {
if (response.success) {
this.$message({ showClose: true, type: 'success', message: '保存成功' })
this.handleReturn('true')
}
}).catch(e => {
})
this.$refs['dataForm'].validate((valid) => {
if (valid) {
const tip = '请确认是否临时出库?'
this.$confirm(tip, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
vehicleOutLibrary(this.temp).then((response) => {
if (response.success) {
this.$message({ showClose: true, type: 'success', message: '保存成功' })
this.handleReturn('true')
}
}).catch(e => {
})
})
}
})
},
//
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.temp = {}
this.$refs['dataForm'].resetFields()
this.$emit('doback')
}
}

6
anrui-scm/anrui-scm-ui/src/views/kucunguanli/panku/pankubaogao/pankubaogaoAdd.vue

@ -123,13 +123,13 @@ export default {
})
this.formobj.mainSid = row.sid
this.formobj.userSid = window.sessionStorage.getItem('userSid')
req.getCarInventoryReport(row.sid).then((resp) => {
req.getCarInventoryReport(row.sid, window.sessionStorage.getItem('userSid')).then((resp) => {
if (resp.success) {
this.formobj.totalNumber = resp.data.totalNumber
this.formobj.actualNumber = resp.dataactualNumber
this.formobj.actualNumber = resp.data.actualNumber
this.formobj.profitNumber = resp.data.profitNumber
this.formobj.damageNumber = resp.data.damageNumber
this.formobj.lossNumber = resp.datalossNumber
this.formobj.lossNumber = resp.data.lossNumber
this.formobj.profitRemarks = resp.data.profitRemarks
this.formobj.damageRemarks = resp.data.damageRemarks
this.formobj.lossRemarks = resp.data.lossRemarks

2
anrui-scm/anrui-scm-ui/src/views/kucunguanli/panku/pankubaogao/pankubaogaoInfo.vue

@ -101,7 +101,7 @@ export default {
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
req.getCarInventoryReport(row.sid).then((resp) => {
req.getCarInventoryReport(row.sid, window.sessionStorage.getItem('userSid')).then((resp) => {
if (resp.success) {
this.formobj = resp.data
}

Loading…
Cancel
Save