yunxi
/
SC-MOM
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改

Browse Source
product
杨世强 2 years ago
parent 126139a13c
commit aac7ca3003
9 changed files with 21688 additions and 201 deletions
Show Stats Download Patch File Download Diff File

5
SC-boot/linkage-scm/src/main/java/jnpf/collection/controller/CollectionController.java
Unescape View File

@ -144,6 +144,11 @@ public class CollectionController {
return ActionResult.success(vo);
}
@GetMapping("autoCreate")
public ActionResult autoCreate() throws DataException {
String document = generaterSwapUtil.getBillNumber("collection",false);
return ActionResult.success(document);
}
/**
* 创建

324
SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/controller/TradeuploadController.java
Unescape View File

@ -33,6 +33,7 @@ import jnpf.permission.entity.UserEntity;
import jnpf.utils.YozoUtils;
import jnpf.vehicle.entity.VehicleEntity;
import jnpf.vehicle.service.VehicleService;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.ss.formula.functions.T;
import org.bytedeco.opencv.presets.opencv_core;
import org.springframework.http.MediaType;
@ -127,133 +128,226 @@ public class TradeuploadController {
}
TradeuploadCrForm tradeuploadCrForm = new TradeuploadCrForm();
String result = VatInvoice.weightNote(file);
// Map<String,Object> map = JsonUtil.stringToMap(result);
JSONObject jsonObject = JSON.parseObject(result);
UploaderVO vo = uploaderVO(file, type);
JSONArray jsonArray = jsonObject.getJSONArray("words_result");
JSONObject object = jsonArray.getJSONObject(0);
Map<String, Object> map1 = new HashMap<>();
for (int i = 0;i<object.size();i++) {
// JSONObject object = jsonArray.getJSONObject(i);
JSONArray array = new JSONArray();
if (i == 0) {
array = object.getJSONArray("TareWeight");
}else if(i == 1){
array = object.getJSONArray("CrossWeight");
}else if(i == 2){
array = object.getJSONArray("PlateNum");
}else if (i == 3){
array = object.getJSONArray("SendingCompany");
}else if (i == 4){
array = object.getJSONArray("DeliveryNumber");
}else if (i == 5){
array = object.getJSONArray("ReceivingCompany");
}else if (i == 6){
array = object.getJSONArray("PrintTime");
}else if (i == 7){
array = object.getJSONArray("NetWeight");
}
Map<String, String> params = new HashMap<>();
if(array != null && array.size() > 0){
JSONObject object1 = array.getJSONObject(0);
params = JSONObject.parseObject(object1.toJSONString(), new TypeReference<Map<String, String>>() {
});
String TareWeight = "";
String CrossWeight = "";
String PlateNum = "";
String SendingCompany = "";
String DeliveryNumber = "";
String ReceivingCompany = "";
String PrintTime = "";
String NetWeight = "";
if (jsonArray.getJSONObject(0).getJSONArray("TareWeight")!=null && jsonArray.getJSONObject(0).getJSONArray("TareWeight").size()>0) {
TareWeight = jsonArray.getJSONObject(0).getJSONArray("TareWeight").getJSONObject(0).getString("word");
}
if (jsonArray.getJSONObject(0).getJSONArray("CrossWeight")!=null && jsonArray.getJSONObject(0).getJSONArray("CrossWeight").size()>0) {
CrossWeight = jsonArray.getJSONObject(0).getJSONArray("CrossWeight").getJSONObject(0).getString("word");
}
if (jsonArray.getJSONObject(0).getJSONArray("PlateNum")!=null && jsonArray.getJSONObject(0).getJSONArray("PlateNum").size()>0) {
PlateNum = jsonArray.getJSONObject(0).getJSONArray("PlateNum").getJSONObject(0).getString("word");
}
if (jsonArray.getJSONObject(0).getJSONArray("SendingCompany")!=null && jsonArray.getJSONObject(0).getJSONArray("SendingCompany").size()>0) {
SendingCompany = jsonArray.getJSONObject(0).getJSONArray("SendingCompany").getJSONObject(0).getString("word");
}
if (jsonArray.getJSONObject(0).getJSONArray("DeliveryNumber")!=null && jsonArray.getJSONObject(0).getJSONArray("DeliveryNumber").size()>0) {
DeliveryNumber = jsonArray.getJSONObject(0).getJSONArray("DeliveryNumber").getJSONObject(0).getString("word");
}
if (jsonArray.getJSONObject(0).getJSONArray("ReceivingCompany")!=null && jsonArray.getJSONObject(0).getJSONArray("ReceivingCompany").size()>0) {
ReceivingCompany = jsonArray.getJSONObject(0).getJSONArray("ReceivingCompany").getJSONObject(0).getString("word");
}
if (jsonArray.getJSONObject(0).getJSONArray("PrintTime")!=null && jsonArray.getJSONObject(0).getJSONArray("PrintTime").size()>0) {
PrintTime = jsonArray.getJSONObject(0).getJSONArray("PrintTime").getJSONObject(0).getString("word");
}
if (jsonArray.getJSONObject(0).getJSONArray("NetWeight")!=null && jsonArray.getJSONObject(0).getJSONArray("NetWeight").size()>0) {
NetWeight = jsonArray.getJSONObject(0).getJSONArray("NetWeight").getJSONObject(0).getString("word");
}
if (StringUtils.isNotEmpty(ReceivingCompany)) {
tradeuploadCrForm.setCustomerId(ReceivingCompany);
QueryWrapper<CustomerEntity> customerQueryWrapper = new QueryWrapper<>();
customerQueryWrapper.lambda().eq(CustomerEntity::getSupplierNm, tradeuploadCrForm.getCustomerId());
CustomerEntity customerEntity = customerService.getOne(customerQueryWrapper);
if (customerEntity != null) {
tradeuploadCrForm.setCustomerId(customerEntity.getId());
tradeuploadCrForm.setCustomerName(customerEntity.getSupplierNm());
tradeuploadCrForm.setClientId(customerEntity.getId());
QueryWrapper<ContractFileEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(ContractFileEntity::getCode, customerEntity.getId());
queryWrapper.lambda().eq(ContractFileEntity::getContractType, "1");
queryWrapper.lambda().eq(ContractFileEntity::getStatus, "1");
queryWrapper.lambda().orderByAsc(ContractFileEntity::getBidOpeningDate).last("limit 1");
ContractFileEntity contractFileEntity = contractFileService.getOne(queryWrapper);
if (contractFileEntity != null) {
tradeuploadCrForm.setSalesId(contractFileEntity.getId());
tradeuploadCrForm.setSalesName(contractFileEntity.getContractName());
}
}
if (i == 0) {
map1.put("TareWeight", params.get("word"));
}else if (i == 1){
map1.put("CrossWeight", params.get("word"));
}else if (i == 2){
map1.put("PlateNum", params.get("word"));
}else if (i == 3){
map1.put("SendingCompany", params.get("word"));
}else if (i == 4){
map1.put("DeliveryNumber", params.get("word"));
}else if (i == 5){
map1.put("ReceivingCompany", params.get("word"));
}else if (i == 6){
map1.put("PrintTime", params.get("word"));
}else if (i == 7){
map1.put("NetWeight", params.get("word"));
}
if (StringUtils.isNotEmpty(PlateNum)) {
tradeuploadCrForm.setVehicleId(PlateNum);
tradeuploadCrForm.setVehicleName(PlateNum);
QueryWrapper<VehicleEntity> vehicleQueryWrapper = new QueryWrapper<>();
vehicleQueryWrapper.lambda().eq(VehicleEntity::getTicketno, PlateNum);
VehicleEntity vehicleEntity = vehicleService.getOne(vehicleQueryWrapper);
if (vehicleEntity != null) {
tradeuploadCrForm.setVehicleId(vehicleEntity.getId());
tradeuploadCrForm.setVehicleName(vehicleEntity.getTicketno());
tradeuploadCrForm.setVehiclePictures(vehicleEntity.getVehiclephotos());
}
}
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
if(StringUtils.isNotEmpty(PrintTime) && PrintTime.length() == 10){
tradeuploadCrForm.setPoundDate(sdf.parse(PrintTime));
}else{
tradeuploadCrForm.setPoundDate(new Date());
}
if (StringUtils.isEmpty(DeliveryNumber)) {
tradeuploadCrForm.setPoundlistNo(String.valueOf(new Date()));
}else {
tradeuploadCrForm.setPoundlistNo(DeliveryNumber);
}
if (StringUtils.isNotEmpty(TareWeight)) {
tradeuploadCrForm.setTareWeight(TareWeight);
}
if (StringUtils.isNotEmpty(CrossWeight)) {
tradeuploadCrForm.setGrossWeight(CrossWeight);
}
if (StringUtils.isEmpty(NetWeight)) {
tradeuploadCrForm.setBuckleWeight("0");
}else {
tradeuploadCrForm.setBuckleWeight(NetWeight);
}
if (StringUtils.isNotEmpty(NetWeight)) {
tradeuploadCrForm.setNetWeight(NetWeight);
}
UserInfo userInfo = userProvider.get();
tradeuploadCrForm.setBusinessId(userInfo.getId());
tradeuploadCrForm.setBusinessName(userInfo.getUserName());
tradeuploadCrForm.setVo(vo);
return ActionResult.success(tradeuploadCrForm);
// JSONObject object = jsonArray.getJSONObject(0);
// Map<String, Object> map1 = new HashMap<>();
// for (int i = 0;i<object.size();i++) {
//// JSONObject object = jsonArray.getJSONObject(i);
// JSONArray array = new JSONArray();
// if (i == 0) {
// array = object.getJSONArray("TareWeight");
// }else if(i == 1){
// array = object.getJSONArray("CrossWeight");
// }else if(i == 2){
// array = object.getJSONArray("PlateNum");
// }else if (i == 3){
// array = object.getJSONArray("SendingCompany");
// }else if (i == 4){
// array = object.getJSONArray("DeliveryNumber");
// }else if (i == 5){
// array = object.getJSONArray("ReceivingCompany");
// }else if (i == 6){
// array = object.getJSONArray("PrintTime");
// }else if (i == 7){
// array = object.getJSONArray("NetWeight");
// }
// Map<String, String> params = new HashMap<>();
// if(array != null && array.size() > 0){
// JSONObject object1 = array.getJSONObject(0);
// params = JSONObject.parseObject(object1.toJSONString(), new TypeReference<Map<String, String>>() {
// });
// }
//
// if (i == 0) {
// map1.put("TareWeight", params.get("word"));
// }else if (i == 1){
// map1.put("CrossWeight", params.get("word"));
// }else if (i == 2){
// map1.put("PlateNum", params.get("word"));
// }else if (i == 3){
// map1.put("SendingCompany", params.get("word"));
// }else if (i == 4){
// map1.put("DeliveryNumber", params.get("word"));
// }else if (i == 5){
// map1.put("ReceivingCompany", params.get("word"));
// }else if (i == 6){
// map1.put("PrintTime", params.get("word"));
// }else if (i == 7){
// map1.put("NetWeight", params.get("word"));
// }
// }
// List<VehicleEntity> list = JSONObject.parseArray(array.toJSONString(),VehicleEntity.class);
// JSONObject jsonObject = (JSONObject) map.get("words_result");
// JSONArray jsonArray = jsonObject.getJSONArray("words_result");
// List<VehicleEntity> list = JSONObject.parseArray(jsonArray.toJSONString(),VehicleEntity.class);
if(map1.size()>0) {
if (map1.get("ReceivingCompany")!= null) {
tradeuploadCrForm.setCustomerId(String.valueOf(map1.get("ReceivingCompany")));
QueryWrapper<CustomerEntity> customerQueryWrapper = new QueryWrapper<>();
customerQueryWrapper.lambda().eq(CustomerEntity::getSupplierNm, tradeuploadCrForm.getCustomerId());
CustomerEntity customerEntity = customerService.getOne(customerQueryWrapper);
if (customerEntity != null) {
tradeuploadCrForm.setCustomerId(customerEntity.getId());
tradeuploadCrForm.setCustomerName(customerEntity.getSupplierNm());
tradeuploadCrForm.setClientId(customerEntity.getId());
QueryWrapper<ContractFileEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(ContractFileEntity::getCode, customerEntity.getId());
queryWrapper.lambda().eq(ContractFileEntity::getContractType, "1");
queryWrapper.lambda().eq(ContractFileEntity::getStatus, "1");
queryWrapper.lambda().orderByAsc(ContractFileEntity::getBidOpeningDate).last("limit 1");
ContractFileEntity contractFileEntity = contractFileService.getOne(queryWrapper);
if (contractFileEntity != null) {
tradeuploadCrForm.setSalesId(contractFileEntity.getId());
tradeuploadCrForm.setSalesName(contractFileEntity.getContractName());
}
}
}
if (map1.get("PlateNum")!= null) {
tradeuploadCrForm.setVehicleId(String.valueOf(map1.get("PlateNum")));
tradeuploadCrForm.setVehicleName(String.valueOf(map1.get("PlateNum")));
QueryWrapper<VehicleEntity> vehicleQueryWrapper = new QueryWrapper<>();
vehicleQueryWrapper.lambda().eq(VehicleEntity::getTicketno, map1.get("PlateNum"));
//vehicleQueryWrapper.lambda().eq(VehicleEntity::getTicketno, "鲁FEV620");
VehicleEntity vehicleEntity = vehicleService.getOne(vehicleQueryWrapper);
if (vehicleEntity != null) {
tradeuploadCrForm.setVehicleId(vehicleEntity.getId());
tradeuploadCrForm.setVehicleName(vehicleEntity.getTicketno());
tradeuploadCrForm.setVehiclePictures(vehicleEntity.getVehiclephotos());
}
}
if (map1.get("PrintTime") == null) {
tradeuploadCrForm.setPoundDate(new Date());
}
String printTime = String.valueOf(map1.get("PrintTime"));
//String sdf = "yyyy-MM-dd" ;
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
if(printTime != null && printTime.length() == 10){
tradeuploadCrForm.setPoundDate(sdf.parse(printTime));
}else{
tradeuploadCrForm.setPoundDate(new Date());
}
if (map1.get("DeliveryNumber") == null) {
tradeuploadCrForm.setPoundlistNo(String.valueOf(new Date()));
}
tradeuploadCrForm.setPoundlistNo(String.valueOf(map1.get("DeliveryNumber")));
if (map1.get("TareWeight")!=null) {
tradeuploadCrForm.setTareWeight(String.valueOf(map1.get("TareWeight")));
}
if (map1.get("CrossWeight")!=null) {
tradeuploadCrForm.setGrossWeight(String.valueOf(map1.get("CrossWeight")));
}
if (map1.get("NetWeight") == null) {
tradeuploadCrForm.setBuckleWeight("0");
}
tradeuploadCrForm.setBuckleWeight(String.valueOf(map1.get("NetWeight")));
if (map1.get("NetWeight") != null) {
tradeuploadCrForm.setNetWeight(String.valueOf(map1.get("NetWeight")));
}
UserInfo userInfo = userProvider.get();
tradeuploadCrForm.setBusinessId(userInfo.getId());
tradeuploadCrForm.setBusinessName(userInfo.getUserName());
}
tradeuploadCrForm.setVo(vo);
return ActionResult.success(tradeuploadCrForm);
// if(map1.size()>0) {
// if (map1.get("ReceivingCompany")!= null) {
// tradeuploadCrForm.setCustomerId(String.valueOf(map1.get("ReceivingCompany")));
// QueryWrapper<CustomerEntity> customerQueryWrapper = new QueryWrapper<>();
// customerQueryWrapper.lambda().eq(CustomerEntity::getSupplierNm, tradeuploadCrForm.getCustomerId());
// CustomerEntity customerEntity = customerService.getOne(customerQueryWrapper);
// if (customerEntity != null) {
// tradeuploadCrForm.setCustomerId(customerEntity.getId());
// tradeuploadCrForm.setCustomerName(customerEntity.getSupplierNm());
// tradeuploadCrForm.setClientId(customerEntity.getId());
// QueryWrapper<ContractFileEntity> queryWrapper = new QueryWrapper<>();
// queryWrapper.lambda().eq(ContractFileEntity::getCode, customerEntity.getId());
// queryWrapper.lambda().eq(ContractFileEntity::getContractType, "1");
// queryWrapper.lambda().eq(ContractFileEntity::getStatus, "1");
// queryWrapper.lambda().orderByAsc(ContractFileEntity::getBidOpeningDate).last("limit 1");
// ContractFileEntity contractFileEntity = contractFileService.getOne(queryWrapper);
// if (contractFileEntity != null) {
// tradeuploadCrForm.setSalesId(contractFileEntity.getId());
// tradeuploadCrForm.setSalesName(contractFileEntity.getContractName());
// }
// }
// }
// if (map1.get("PlateNum")!= null) {
// tradeuploadCrForm.setVehicleId(String.valueOf(map1.get("PlateNum")));
// tradeuploadCrForm.setVehicleName(String.valueOf(map1.get("PlateNum")));
// QueryWrapper<VehicleEntity> vehicleQueryWrapper = new QueryWrapper<>();
// vehicleQueryWrapper.lambda().eq(VehicleEntity::getTicketno, map1.get("PlateNum"));
// //vehicleQueryWrapper.lambda().eq(VehicleEntity::getTicketno, "鲁FEV620");
// VehicleEntity vehicleEntity = vehicleService.getOne(vehicleQueryWrapper);
// if (vehicleEntity != null) {
// tradeuploadCrForm.setVehicleId(vehicleEntity.getId());
// tradeuploadCrForm.setVehicleName(vehicleEntity.getTicketno());
// tradeuploadCrForm.setVehiclePictures(vehicleEntity.getVehiclephotos());
// }
// }
// if (map1.get("PrintTime") == null) {
// tradeuploadCrForm.setPoundDate(new Date());
// }
// String printTime = String.valueOf(map1.get("PrintTime"));
// //String sdf = "yyyy-MM-dd" ;
// SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
// if(printTime != null && printTime.length() == 10){
// tradeuploadCrForm.setPoundDate(sdf.parse(printTime));
// }else{
// tradeuploadCrForm.setPoundDate(new Date());
// }
// if (map1.get("DeliveryNumber") == null) {
// tradeuploadCrForm.setPoundlistNo(String.valueOf(new Date()));
// }
// tradeuploadCrForm.setPoundlistNo(String.valueOf(map1.get("DeliveryNumber")));
// if (map1.get("TareWeight")!=null) {
// tradeuploadCrForm.setTareWeight(String.valueOf(map1.get("TareWeight")));
// }
// if (map1.get("CrossWeight")!=null) {
// tradeuploadCrForm.setGrossWeight(String.valueOf(map1.get("CrossWeight")));
// }
// if (map1.get("NetWeight") == null) {
// tradeuploadCrForm.setBuckleWeight("0");
// }
// tradeuploadCrForm.setBuckleWeight(String.valueOf(map1.get("NetWeight")));
// if (map1.get("NetWeight") != null) {
// tradeuploadCrForm.setNetWeight(String.valueOf(map1.get("NetWeight")));
// }
//
// UserInfo userInfo = userProvider.get();
// tradeuploadCrForm.setBusinessId(userInfo.getId());
// tradeuploadCrForm.setBusinessName(userInfo.getUserName());
// }
// return ActionResult.success(vo);
}

21429
SC-web/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

24
SC-web/src/views/scm/basicInformation/arinvoices/index.vue
Unescape View File

@ -22,13 +22,13 @@
<div>
<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
</el-button>
<el-button type="text" icon="el-icon-download" @click="exportData()">导出
</el-button>
<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
</el-button>
<!-- <el-button type="text" icon="el-icon-download" @click="exportData()">导出-->
<!-- </el-button>-->
<!-- <el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除-->
<!-- </el-button>-->
<el-button type="text" icon="el-icon-plus" @click="1">编辑
</el-button>
<el-button type="text" icon="el-icon-plus" @click="1">删除
<el-button type="text" icon="el-icon-plus" @click="1">查看
</el-button>
<el-button type="text" icon="el-icon-plus" @click="1">审核
</el-button>
@ -81,17 +81,17 @@
<el-table-column prop="creatorUserName" label="制单人" width="120" sortable align="center"
/>
<el-table-column label="操作" fixed="right"
width="150">
<el-table-column label="操作" fixed="right" align="center"
width="200">
<template slot-scope="scope">
<el-button type="text"
@click="addOrUpdateHandle(scope.row.id)">编辑
</el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
</el-button>
<el-button type="text"
@click="goDetail(scope.row.id)">详情
</el-button>
<!-- <el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除-->
<!-- </el-button>-->
<!-- <el-button type="text"-->
<!-- @click="goDetail(scope.row.id)">详情-->
<!-- </el-button>-->
<el-button type="text"
@click="goDetail">撤回申请
</el-button>

9
SC-web/src/views/scm/basicInformation/collection/Form.vue
Unescape View File

@ -404,6 +404,15 @@
data[key] = "";
}
}
// request({
// url: '/api/collection/Collection/autoCreate',
// method: 'get'
// }).then(res => {
// debugger
// this.dataForm.documentNo = res.msg
// debugger
// this.loading = false
// });
},
init(id, isDetail) {
this.dataForm.id = id || 0;

27
SC-web/src/views/scm/basicInformation/invoices/index.vue
Unescape View File

@ -20,11 +20,11 @@
<div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head">
<div>
<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
</el-button>
<!-- <el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增-->
<!-- </el-button>-->
<el-button type="text" icon="el-icon-download" @click="">编辑
</el-button>
<el-button type="text" icon="el-icon-download" @click="">查看
<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
</el-button>
<el-button type="text" icon="el-icon-download" @click="">审核
</el-button>
@ -33,8 +33,6 @@
<el-button type="text" icon="el-icon-download" @click="">提交
</el-button>
<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
</el-button>
</div>
<div class="JNPF-common-head-right">
<el-tooltip effect="dark" content="刷新" placement="top">
@ -51,6 +49,8 @@
/>
<el-table-column prop="documentNo" label="单据编号" width="200" align="center" fixed="left" sortable
/>
<el-table-column prop="purchaseorderId" label="采购订单号" width="200" align="center" fixed="left" sortable
/>
<el-table-column prop="amount" label="金额" width="150" align="center" sortable
/>
<el-table-column prop="quantity" label="数量" width="120" align="center" sortable
@ -70,7 +70,10 @@
{{ scope.row.invoiceType | dynamicText(invoiceTypeOptions) }}
</template>
</el-table-column>
<el-table-column prop="contractId" label="合同名称" width="120" align="center" sortable
/>
<el-table-column prop="supplierId" label="供应商" width="200" align="center" sortable
/>
<el-table-column label="单据状态" width="120" sortable prop="status" align="center">
<template slot-scope="scope">
{{ scope.row.status | dynamicText(statusOptions) }}
@ -79,17 +82,17 @@
<el-table-column prop="creatorUserName" label="制单人" width="120" align="center" sortable
/>
<el-table-column label="操作" fixed="right"
<el-table-column label="操作" fixed="right" align="center"
width="200">
<template slot-scope="scope">
<el-button type="text"
@click="addOrUpdateHandle(scope.row.id)">编辑
</el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
</el-button>
<el-button type="text"
@click="goDetail(scope.row.id)">详情
</el-button>
<!-- <el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除-->
<!-- </el-button>-->
<!-- <el-button type="text"-->
<!-- @click="goDetail(scope.row.id)">详情-->
<!-- </el-button>-->
<el-button type="text"
@click="">撤回申请

52
SC-web/src/views/scm/basicInformation/paymentdoc/Form.vue
Unescape View File

@ -118,35 +118,35 @@
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="付款金额"
prop="paymentAmount">
<el-input v-model="dataForm.paymentAmount"
placeholder="请输入" clearable :style='{"width":"100%"}'>
<!-- <el-col :span="8">-->
<!-- <el-form-item label="付款金额"-->
<!-- prop="paymentAmount">-->
<!-- <el-input v-model="dataForm.paymentAmount"-->
<!-- placeholder="请输入" clearable :style='{"width":"100%"}'>-->
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="未付款金额"
prop="unpaymentAmount">
<el-input v-model="dataForm.unpaymentAmount"
placeholder="请输入" clearable :style='{"width":"100%"}'>
<!-- </el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="8">-->
<!-- <el-form-item label="未付款金额"-->
<!-- prop="unpaymentAmount">-->
<!-- <el-input v-model="dataForm.unpaymentAmount"-->
<!-- placeholder="请输入" clearable :style='{"width":"100%"}'>-->
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="单据状态 "
prop="status">
<el-select v-model="dataForm.status"
placeholder="请选择" clearable :style='{"width":"100%"}'>
<el-option v-for="(item, index) in statusOptions" :key="index" :label="item.fullName" :value="item.id"
:disabled="item.disabled"></el-option>
<!-- </el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="8">-->
<!-- <el-form-item label="单据状态 "-->
<!-- prop="status">-->
<!-- <el-select v-model="dataForm.status"-->
<!-- placeholder="请选择" clearable :style='{"width":"100%"}'>-->
<!-- <el-option v-for="(item, index) in statusOptions" :key="index" :label="item.fullName" :value="item.id"-->
<!-- :disabled="item.disabled"></el-option>-->
</el-select>
</el-form-item>
</el-col>
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="24">
<el-tabs v-model="activeshpeyb" tab-position="top" class="mb-20">
<el-tab-pane label="申请明细">

13
SC-web/src/views/scm/basicInformation/paymentdoc/index.vue
Unescape View File

@ -33,18 +33,17 @@
<el-button type="text" icon="el-icon-check" @click="addOrUpdateHandle(scope.row.id)">编辑
</el-button>
<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
</el-button>
<el-button type="text" icon="el-icon-download" @click="exportData()">导出
</el-button>
<!-- <el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增-->
<!-- </el-button>-->
<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
</el-button>
<!-- <el-button type="text" icon="el-icon-download" @click="exportData()">导出-->
<!-- </el-button>-->
<el-button type="text" icon="el-icon-check" @click="3">审核
</el-button>
<el-button type="text" icon="el-icon-close" @click="3">弃审
</el-button>
<el-button type="success" size="medium" @click="paymentapply()">付款
<el-button type="text" icon="el-icon-check" size="medium" @click="paymentapply()">付款
</el-button>
</div>
<div class="JNPF-common-head-right">
@ -104,7 +103,7 @@
</el-table-column>
<el-table-column prop="creatorUserName" label="制单人" width="100" align="center"sortable
/>
<el-table-column label="操作" fixed="right"
<el-table-column label="操作" fixed="right" align="center"
width="200">
<template slot-scope="scope">
<el-button type="text" @click="addOrUpdateHandle(scope.row.id)">编辑

6
SC-web/src/views/scm/basicInformation/tradeupload/Form.vue
Unescape View File

@ -436,7 +436,7 @@
if(grossWeight < tareWeight + buckleWeight + netWeight){
this.$message({
message: '毛重不得小于皮重+扣重+净重',
type: 'success',
type: 'warning',
duration: 1000
})
return
@ -444,7 +444,7 @@
if(buckleWeight >= netWeight){
this.$message({
message: '扣重不得大于净重',
type: 'success',
type: 'warning',
duration: 1000
})
return
@ -452,7 +452,7 @@
if(buckleWeight >= grossWeight){
this.$message({
message: '扣重不得大于毛重',
type: 'success',
type: 'warning',
duration: 1000
})
return

Write Preview
Loading…
Cancel
Save