Merge remote-tracking branch 'origin/main'

product
chuang 2 years ago
commit 3c4f5f7c38

@ -169,8 +169,9 @@ public class ArinvoicesController {
List<String> poundlistIdList = salesorder_item0Service.listObjs(queryWrapper).stream().map(o -> (String) o).collect(Collectors.toList());
List<PoundlistEntity> poundlistEntityList = poundlistService.queryPoundListByIds(poundlistIdList);
for (PoundlistEntity poundlistEntity: poundlistEntityList) {
poundlistEntity.setIsInvoicing("1");
poundlistEntity.setInputDate(new Date());
poundlistEntity.setSalesStatus("2");//修改磅单状态
poundlistEntity.setIsExpense("1");//修改销项票状态
poundlistEntity.setOutputDate(new Date());//修改销项票日期
}
poundlistService.updateBatchById(poundlistEntityList);
}else {
@ -490,8 +491,8 @@ public class ArinvoicesController {
List<String> poundlistIdList = salesorder_item0Service.listObjs(queryWrapper3).stream().map(o -> (String) o).collect(Collectors.toList());
List<PoundlistEntity> poundlistEntityList = poundlistService.queryPoundListByIds(poundlistIdList);
for (PoundlistEntity poundlistEntity: poundlistEntityList) {
poundlistEntity.setIsInvoicing("1");
poundlistEntity.setInputDate(new Date());
poundlistEntity.setIsExpense("1");//修改销项票状态
poundlistEntity.setOutputDate(new Date());//修改销项票日期
}
poundlistService.updateBatchById(poundlistEntityList);
}else {

@ -49,6 +49,7 @@ import javax.validation.Valid;
import java.io.FileOutputStream;
import java.io.IOException;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.*;
import java.util.stream.Collectors;
import org.springframework.util.CollectionUtils;
@ -214,7 +215,7 @@ public class CollectionController {
List<PoundlistEntity> poundlist1 = new ArrayList<>();
for (PoundlistEntity pound : poundlist){
if (pound.getSalesPrice()!=null && pound.getSettlement()!=null) {
amount = amount.add(pound.getSalesPrice().multiply(pound.getSettlement()));
amount = amount.add(pound.getSalesPrice().multiply(pound.getSettlement())).setScale(2, RoundingMode.HALF_UP);
if (amount.compareTo(sum) < 1) {
poundlist1.add(pound);
}else{
@ -235,8 +236,8 @@ public class CollectionController {
collectionEntity.setStatus("2");
collectionEntity.setBusinessDate(new Date());
collectionService.updateById(collectionEntity);
return ActionResult.success("认款成功");
}
return ActionResult.success("认款成功");
}
}
return ActionResult.fail("请选择一条数据");

@ -21,6 +21,7 @@ public class CollectionPagination extends Pagination {
private String contractNm;
private String customerNm;
private String status;
/**
*
*/

@ -162,7 +162,17 @@ public class ContractFileServiceImpl extends ServiceImpl<ContractFileMapper, Con
contract_item0Num++;
contractFileQueryWrapper.lambda().like(ContractFileEntity::getContractType,contractFilePagination.getContractType());
}
if(StringUtil.isNotEmpty(contractFilePagination.getKeyword())){
contract_item0Num++;
contractFileQueryWrapper.lambda().and(wq -> {
// 拼接sql
wq.like(ContractFileEntity::getContractCode,contractFilePagination.getKeyword())
.or()
.like(ContractFileEntity::getContractName,contractFilePagination.getKeyword())
.or()
.like(ContractFileEntity::getName,contractFilePagination.getKeyword());
});
}
if (AllIdList.size() > 0) {
contractFileQueryWrapper.lambda().in(ContractFileEntity::getId, AllIdList);
}

@ -176,6 +176,7 @@ public class InvoicesController {
List<PoundlistEntity> poundlistEntityList = purchaseorderitemService.getPoundList(entity.getPurchaseorderId());
if (purchaseorderEntity.getAmount().compareTo(entity.getInvoiceAmount()) == 0) {
for (PoundlistEntity poundlistEntity: poundlistEntityList) {
poundlistEntity.setPurchaseStatus("1");
poundlistEntity.setIsInvoicing("1");
poundlistEntity.setInputDate(new Date());
}
@ -509,6 +510,7 @@ public class InvoicesController {
List<PoundlistEntity> poundlistEntityList = purchaseorderitemService.getPoundList(subentity.getPurchaseorderId());
if (purchaseorderEntity.getAmount().compareTo(entity.getInvoiceAmount()) == 0) {
for (PoundlistEntity poundlistEntity: poundlistEntityList) {
poundlistEntity.setPurchaseStatus("1");
poundlistEntity.setIsInvoicing("1");
poundlistEntity.setInputDate(new Date());
}

@ -55,7 +55,9 @@ public class InvoicesItem0ServiceImpl extends ServiceImpl<InvoicesItem0Mapper, I
dataRowMap.put("invoiceCode", model.getInvoiceCode());
dataRowMap.put("invoiceNo", model.getInvoiceNo());
dataRowMap.put("invoiceQuantity", model.getInvoiceQuantity());
dataRowMap.put("invoiceAmount", model.getInvoiceAmount().add(model.getTaxAmount()));//金额 + 税额=发票金额
if(model.getInvoiceAmount()!=null && model.getTaxAmount()!=null) {
dataRowMap.put("invoiceAmount", model.getInvoiceAmount().add(model.getTaxAmount()));//金额 + 税额=发票金额
}
dataRowMap.put("taxRate", model.getTaxRate());
dataRowMap.put("taxAmount", model.getTaxAmount());
dataRowMap.put("amountNotTax", model.getInvoiceAmount());

@ -24,6 +24,7 @@ public class PaymentPagination extends Pagination {
private List<String> duedate;
private String applicantName;
private String paymentdocNum;
private String status;
private Date startDate;
private Date endDate;

@ -24,6 +24,8 @@ public class PaymentdocPagination extends Pagination {
private String ramount;
/** 结算重量*/
private String num;
/** 创建人*/
private String creatorUserName;
/**
* id
*/

@ -183,6 +183,10 @@ public class PaymentdocServiceImpl extends ServiceImpl<PaymentdocMapper, Payment
paymentdocNum++;
paymentdocQueryWrapper.lambda().like(PaymentdocEntity::getNum,paymentdocPagination.getNum());
}
if(StringUtil.isNotEmpty(paymentdocPagination.getCreatorUserName())){
paymentdocNum++;
paymentdocQueryWrapper.lambda().like(PaymentdocEntity::getCreatorUserName,paymentdocPagination.getCreatorUserName());
}
if(StringUtil.isNotEmpty(paymentdocPagination.getSupplierName())){
QueryWrapper<SupplierEntity> customerQueryWrapper =new QueryWrapper<>();
customerQueryWrapper.lambda().like(SupplierEntity::getSupplierName, paymentdocPagination.getSupplierName());

@ -722,7 +722,7 @@ public class PurchaseorderController {
List<Purchaseorder_item0Entity> purchaseorder_item0EntityList = purchaseorderitemService.GetPurchaseorder_item0List(id);
for (Purchaseorder_item0Entity purchaseorder_item0Entity : purchaseorder_item0EntityList) {
PoundlistEntity poundlistEntity = poundlistService.getById(purchaseorder_item0Entity.getPoundlistId());
if (StringUtil.isEmpty(poundlistEntity.getIsPay()) && poundlistEntity.getPayDate()==null){
if (poundlistEntity.getPayDate()==null){
poundlistEntity.setIsPay("1");
poundlistEntity.setPayDate(new Date());
}

@ -26,6 +26,9 @@ public class PurchaseorderPagination extends Pagination {
private String status;
private Date startDate;
private Date endDate;
private String num;
private String amount;
private String creatorUserName;
/**

@ -384,7 +384,7 @@ public class SaleorderitemController {
for (Salesorder_item0Entity salesorder_item0Entity : salesorder_item0EntityList){
PoundlistEntity poundlistEntity = poundlistService.getInfo(salesorder_item0Entity.getPoundlistId());
if (ObjectUtils.isNotEmpty(poundlistEntity)){
if (StringUtil.isEmpty(poundlistEntity.getIsCollection()) && poundlistEntity.getPaymentDate() == null){
if (poundlistEntity.getPaymentDate() == null){
poundlistEntity.setIsCollection("1");
poundlistEntity.setPaymentDate(new Date());
}

@ -25,6 +25,9 @@ public class SaleorderitemPagination extends Pagination {
private String status;
private String contractName;
private String num;
private String price;
private String creatorUserName;
private String customerName;
private Date startDate;

@ -153,4 +153,10 @@ public class TradeuploadInfoVO{
@JsonProperty("purchaseName")
private String purchaseName;
@JsonProperty("salesStatus")
private String salesStatus;
@JsonProperty("purchaseStatus")
private String purchaseStatus;
}

@ -185,4 +185,10 @@ public class TradeuploadListVO{
/** 收货单价 **/
@JsonProperty("collectPrice")
private String collectPrice;
@JsonProperty("salesStatus")
private String salesStatus;
@JsonProperty("purchaseStatus")
private String purchaseStatus;
}

@ -35,6 +35,9 @@
<if test="paymentPagination.paymentdocNum != null and paymentPagination.paymentdocNum != ''">
and a.paymentdoc_num LIKE CONCAT('%',#{paymentPagination.paymentdocNum},'%')
</if>
<if test="paymentPagination.status != null and paymentPagination.status != ''">
and a.status = #{paymentPagination.status}
</if>
<!-- <if test="paymentPagination.startDate != null and paymentPagination.endDate != null">-->
<!-- and a.duedate &gt; #{paymentPagination.startDate} AND a.duedate &lt;= #{paymentPagination.endDate}-->
<!-- </if>-->

@ -27,6 +27,9 @@
<if test="collectionPagination.customerNm != null and collectionPagination.customerNm != ''">
and b.supplier_nm LIKE CONCAT('%',#{collectionPagination.customerNm},'%')
</if>
<if test="collectionPagination.status != null and collectionPagination.status != ''">
and a.status = #{collectionPagination.status}
</if>
<if test="collectionPagination.sidx != null and collectionPagination.sidx != ''">
ORDER BY ${collectionPagination.sidx} ${collectionPagination.sort}
</if>

@ -278,6 +278,15 @@
<if test="purchaseorderPagination.status != null and purchaseorderPagination.status != ''">
AND a.status = #{purchaseorderPagination.status}
</if>
<if test="purchaseorderPagination.num != null and purchaseorderPagination.num != ''">
AND a.num LIKE CONCAT('%',#{purchaseorderPagination.num},'%')
</if>
<if test="purchaseorderPagination.amount != null and purchaseorderPagination.amount != ''">
AND a.amount LIKE CONCAT('%',#{purchaseorderPagination.amount},'%')
</if>
<if test="purchaseorderPagination.creatorUserName != null and purchaseorderPagination.creatorUserName != ''">
AND a.creator_user_name LIKE CONCAT('%',#{purchaseorderPagination.creatorUserName},'%')
</if>
<if test="purchaseorderPagination.sidx != null and purchaseorderPagination.sidx != ''">
ORDER BY ${purchaseorderPagination.sidx} ${purchaseorderPagination.sort}
</if>

@ -16,7 +16,7 @@
and a.document_no LIKE CONCAT('%',#{saleorderitemPagination.documentNo},'%')
</if>
<if test="saleorderitemPagination.status != null and saleorderitemPagination.status != ''">
and a.status LIKE CONCAT('%',#{saleorderitemPagination.status},'%')
and a.status = #{saleorderitemPagination.status}
</if>
<if test="saleorderitemPagination.contractName != null and saleorderitemPagination.contractName != ''">
and b.contract_name LIKE CONCAT('%',#{saleorderitemPagination.contractName},'%')
@ -24,6 +24,15 @@
<if test="saleorderitemPagination.customerName != null and saleorderitemPagination.customerName != ''">
and c.supplier_nm LIKE CONCAT('%',#{saleorderitemPagination.customerName},'%')
</if>
<if test="saleorderitemPagination.num != null and saleorderitemPagination.num != ''">
and a.num LIKE CONCAT('%',#{saleorderitemPagination.num},'%')
</if>
<if test="saleorderitemPagination.price != null and saleorderitemPagination.price != ''">
and a.price LIKE CONCAT('%',#{saleorderitemPagination.price},'%')
</if>
<if test="saleorderitemPagination.creatorUserName != null and saleorderitemPagination.creatorUserName != ''">
and a.creator_user_name LIKE CONCAT('%',#{saleorderitemPagination.creatorUserName},'%')
</if>
<if test="saleorderitemPagination.startDate != null and saleorderitemPagination.endDate != null">
and a.creator_time &gt; #{saleorderitemPagination.startDate} AND a.creator_time &lt;= #{saleorderitemPagination.endDate}
</if>

@ -147,7 +147,7 @@ public class FlowBeforeController {
FlowTaskOperatorEntity operator = flowTaskOperatorService.getInfo(id);
FlowTaskNodeEntity flowTaskNodeEntity = flowTaskNodeService.getById(operator.getTaskNodeId());
FlowTaskEntity flowTask = flowTaskService.getInfo(operator.getTaskId());
if("end".equals(flowTaskNodeEntity.getNodeNext()) && "398482034802139205".equals(flowTask.getFlowId())){
/*if("end".equals(flowTaskNodeEntity.getNodeNext()) && "398482034802139205".equals(flowTask.getFlowId())){
//判断当前采购订单的磅单有没有是否垫资为否,并且是否回款为否
//判断是否开进项票
Map<String, Object> map = flowHandleModel.getFormData();
@ -165,7 +165,7 @@ public class FlowBeforeController {
return ActionResult.fail("存在磅单未垫资且未回款,无法审批通过!");
}
}
}
}*/
flowTaskNewService.permissions(operator.getHandleId(), flowTask, operator, "");
if (FlowNature.ProcessCompletion.equals(operator.getCompletion())) {
FlowModel flowModel = JsonUtil.getJsonToBean(flowHandleModel, FlowModel.class);

@ -205,7 +205,7 @@
<template slot-scope="scope">
<el-input v-model="scope.row.amount"
placeholder="请输入" clearable :style='{"width":"100%"}'
@change="amountChange(scope.row)" readonly>
@change="amountChange(scope.row)" >
</el-input>
</template>
</el-table-column>

@ -308,7 +308,7 @@
</JNPF-UploadFz>
</template>
</el-table-column>
<el-table-column label="操作" width="50" >
<el-table-column label="操作" width="50" align="center" >
<template slot-scope="scope">
<el-button size="mini" type="text" class="JNPF-table-delBtn" @click="delarinvoices_item0List(scope.$index)"></el-button>
</template>

@ -152,17 +152,19 @@
width="150"
align="center"
/>
<el-table-column
label="币别 "
width="150"
label="币别"
prop="currency"
algin="center"
sortable
width="150"
align="center"
>
<template slot-scope="scope">
{{ scope.row.currency | dynamicText(currencyOptions) }}
</template>
</el-table-column>
<el-table-column
prop="invoiceAmount"
label="发票金额"
@ -223,7 +225,7 @@
width="150"
align="center"
/>
<el-table-column label="操作" fixed="right" width="150">
<el-table-column label="操作" fixed="right" width="150" align="center">
<template slot-scope="scope">
<el-button
type="text"

@ -13,6 +13,7 @@
</el-input>
</el-form-item>
</el-col>
<template v-if="showAll">
<el-col :span="6">
<el-form-item label="客户名称">
<el-input
@ -33,6 +34,24 @@
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="单据状态">
<el-select
v-model="query.status"
placeholder="请选择"
clearable
:style="{ width: '100%' }"
>
<el-option
v-for="(item, index) in statusOptions"
:key="index"
:label="item.fullName"
:value="item.id"
></el-option>
</el-select>
</el-form-item>
</el-col>
</template>
<el-col :span="6">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()"
@ -41,6 +60,10 @@
<el-button icon="el-icon-refresh-right" @click="resetAll()"
>重置</el-button
>
<el-button type="text" icon="el-icon-arrow-down" @click="showAll=true"
v-if="!showAll">展开</el-button>
<el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else>
收起</el-button>
</el-form-item>
</el-col>
</el-form>
@ -212,7 +235,7 @@
width="150"
align="center"
/>
<el-table-column label="操作" fixed="right" width="150">
<el-table-column label="操作" fixed="right" width="150" align="center">
<template slot-scope="scope">
<el-button
type="text"
@ -415,10 +438,6 @@ export default {
fullName: "已保存",
id: "0",
},
{
fullName: "已提交",
id: "1",
},
{
fullName: "已认款",
id: "2",

@ -250,7 +250,7 @@
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" width="150">
<el-table-column label="操作" fixed="right" width="150" align="center">
<template slot-scope="scope">
<el-button type="text" v-has="'btn_upload'" @click="exportData()"
>导出

@ -232,7 +232,7 @@
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" width="80">
<el-table-column label="操作" fixed="right" width="80" align="center">
<template slot-scope="scope">
<!-- <el-button type="text" v-has="'btn_edit'"-->
<!-- @click="addOrUpdateHandle(scope.row.id)">编辑-->

@ -195,7 +195,7 @@
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" width="80">
<el-table-column label="操作" fixed="right" width="80" align="center">
<template slot-scope="scope">
<!-- <el-button type="text" v-has="'btn_edit'"-->
<!-- @click="addOrUpdateHandle(scope.row.id)">编辑-->

@ -14,6 +14,7 @@
</el-input>
</el-form-item>
</el-col>
<template v-if="showAll">
<el-col :span="6">
<el-form-item label="来源单号">
<el-input
@ -57,7 +58,24 @@
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="单据状态">
<el-select
v-model="query.status"
placeholder="请选择"
clearable
:style="{ width: '100%' }"
>
<el-option
v-for="(item, index) in statusOptions"
:key="index"
:label="item.fullName"
:value="item.id"
></el-option>
</el-select>
</el-form-item>
</el-col>
</template>
<el-col :span="6">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()"
@ -66,6 +84,10 @@
<el-button icon="el-icon-refresh-right" @click="resetAll()"
>重置</el-button
>
<el-button type="text" icon="el-icon-arrow-down" @click="showAll=true"
v-if="!showAll">展开</el-button>
<el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else>
收起</el-button>
</el-form-item>
</el-col>
</el-form>
@ -357,6 +379,7 @@ export default {
},
data() {
return {
showAll: false,
detailVisible: false,
query: {
documentno: undefined,

@ -2,7 +2,7 @@
<div>
<el-row :gutter="15">
<el-form ref="elForm" :model="dataForm" :rules="dataRule" size="small" label-width="100px" label-position="right"
:disabled="setting.readonly">
>
<template v-if="!loading && formOperates">
<el-col :span="8" v-if="judgeShow('documentNo')">
<el-form-item label="单据编号" prop="documentNo">

@ -41,6 +41,15 @@
></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="创建人">
<el-input
v-model="query.creatorUserName"
placeholder="请输入"
clearable
></el-input>
</el-form-item>
</el-col>
</template>
<el-col :span="6">
<el-form-item>

@ -13,7 +13,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="车辆图片" prop="vehiclePictures">
<JNPF-UploadImg v-model="dataForm.vehiclePictures" :fileSize="500" sizeUnit="MB" :limit="9">
<JNPF-UploadImg v-model="dataForm.vehiclePictures" :fileSize="500" sizeUnit="MB" :limit="9" :disabled="true">
</JNPF-UploadImg>
</el-form-item>
@ -70,7 +70,7 @@
</el-col>
<el-col :span="6">
<el-form-item label="采购价格" prop="purchasePrice">
<el-input-number v-model="dataForm.purchasePrice" :style='{"width":"100%"}' :precision="6"></el-input-number>
<el-input-number v-model="dataForm.purchasePrice" :style='{"width":"100%"}' :precision="6" disabled></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
@ -86,38 +86,38 @@
<el-col :span="6">
<el-form-item label="收货价格" prop="collectPrice">
<el-input-number v-model="dataForm.collectPrice" :style='{"width":"100%"}' :precision="6"></el-input-number>
<el-input-number v-model="dataForm.collectPrice" :style='{"width":"100%"}' :precision="6" disabled></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="销售价格" prop="salesPrice">
<el-input-number v-model="dataForm.salesPrice" :style='{"width":"100%"}' :precision="6"></el-input-number>
<el-input-number v-model="dataForm.salesPrice" :style='{"width":"100%"}' :precision="6" disabled></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="毛重" prop="grossWeight">
<el-input-number v-model="dataForm.grossWeight" :style='{"width":"100%"}' :precision="6"></el-input-number>
<el-input-number v-model="dataForm.grossWeight" :style='{"width":"100%"}' :precision="6" disabled></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="皮重" prop="tareWeight">
<el-input-number v-model="dataForm.tareWeight" :style='{"width":"100%"}' :precision="6"></el-input-number>
<el-input-number v-model="dataForm.tareWeight" :style='{"width":"100%"}' :precision="6" disabled></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="扣重" prop="buckleWeight">
<el-input-number v-model="dataForm.buckleWeight" :style='{"width":"100%"}' :precision="6"></el-input-number>
<el-input-number v-model="dataForm.buckleWeight" :style='{"width":"100%"}' :precision="6" disabled></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="净重" prop="netWeight">
<el-input-number v-model="dataForm.netWeight" :style='{"width":"100%"}' :precision="6"></el-input-number>
<el-input-number v-model="dataForm.netWeight" :style='{"width":"100%"}' :precision="6" disabled></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="磅单时间" prop="poundDate">
<el-date-picker v-model="dataForm.poundDate" placeholder="请选择" clearable :style='{"width":"100%"}'
type="date" format="yyyy-MM-dd" value-format="timestamp">
type="date" format="yyyy-MM-dd" value-format="timestamp" disabled>
</el-date-picker>
</el-form-item>
@ -131,7 +131,7 @@
</el-col>
<el-col :span="6">
<el-form-item label="单位 " prop="unit">
<el-select v-model="unit" placeholder="请选择" clearable :style='{"width":"100%"}' @change="unitChange">
<el-select v-model="unit" placeholder="请选择" clearable :style='{"width":"100%"}' @change="unitChange" disabled>
<el-option v-for="(item, index) in unitOptions" :key="index" :label="item.fullName" :value="item.id"
:disabled="item.disabled"></el-option>
@ -140,7 +140,7 @@
</el-col>
<el-col :span="6">
<el-form-item label="运输类型" prop="transportType">
<el-select v-model="transportType" placeholder="请选择" clearable :style='{"width":"100%"}' @change="transportTypeChange">
<el-select v-model="transportType" placeholder="请选择" clearable :style='{"width":"100%"}' @change="transportTypeChange" disabled>
<el-option v-for="(item, index) in transportTypeOptions" :key="index" :label="item.fullName"
:value="item.id" :disabled="item.disabled"></el-option>
@ -149,7 +149,7 @@
</el-col>
<el-col :span="6">
<el-form-item label="是否垫资" prop="advance">
<el-select v-model="advance" placeholder="请选择" clearable :style='{"width":"100%"}' @change="advanceChange">
<el-select v-model="advance" placeholder="请选择" clearable :style='{"width":"100%"}' @change="advanceChange" disabled>
<el-option v-for="(item, index) in advanceOptions" :key="index" :label="item.fullName" :value="item.id"
:disabled="item.disabled"></el-option>
@ -158,12 +158,12 @@
</el-col>
<el-col :span="6">
<el-form-item label="运费" prop="transportPrice">
<el-input-number v-model="dataForm.transportPrice" :style='{"width":"100%"}' :precision="6"></el-input-number>
<el-input-number v-model="dataForm.transportPrice" :style='{"width":"100%"}' :precision="6" disabled></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="起始地" prop="originPlace">
<JNPF-Address v-model="dataForm.originPlace" placeholder="请选择省市区" clearable :level='2' >
<JNPF-Address v-model="dataForm.originPlace" placeholder="请选择省市区" clearable :level='2' :disabled="true">
</JNPF-Address>
</el-form-item>
</el-col>
@ -172,7 +172,7 @@
<popupSelect v-model="dataForm.businessId" placeholder="请选择业务员" clearable field="businessId"
interfaceId="ebcc44be142e43b795c0d769abd6d25a" :columnOptions="businessIdcolumnOptions"
propsValue="F_Id" relationField="F_RealName" popupType="dialog" popupTitle="选择数据" popupWidth="800px"
hasPage :pageSize="20" :bissId="dataForm.businessId">
hasPage :pageSize="20" :bissId="dataForm.businessId" disabled>
</popupSelect>
</el-form-item>
@ -188,7 +188,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="备注" prop="remark">
<el-input v-model="dataForm.remark" placeholder="请输入备注信息" clearable :style='{"width":"100%"}'>
<el-input v-model="dataForm.remark" placeholder="请输入备注信息" clearable :style='{"width":"100%"}' disabled>
</el-input>
</el-form-item>

@ -1,12 +1,12 @@
<template>
<el-dialog :title="!dataForm.id ? '添加车辆图片' : isDetail ? '添加车辆图片':'添加车辆图片'" :close-on-click-modal="false" append-to-body
<el-dialog :title="!dataForm.id ? '编辑合同与图片' : isDetail ? '编辑合同与图片':'编辑合同与图片'" :close-on-click-modal="false" append-to-body
:visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll width="1500px">
<el-row :gutter="15" class="">
<el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px" label-position="right">
<template v-if="!loading">
<el-col :span="12">
<el-form-item label="磅单上传" disabled prop="poundPictures">
<JNPF-UploadImgB disabled v-model="dataForm.poundPictures" :fileSize="500" sizeUnit="MB" :limit="1" :disabled="true">
<el-form-item label="磅单上传" prop="poundPictures">
<JNPF-UploadImgB v-model="dataForm.poundPictures" :fileSize="500" sizeUnit="MB" :limit="1">
</JNPF-UploadImgB>
</el-form-item>
</el-col>
@ -37,7 +37,7 @@
</el-col>
<el-col :span="6">
<el-form-item label="销售合同" prop="salesId">
<popupSelect disabled v-model="dataForm.salesId" placeholder="请选择合同" clearable field="salesId"
<popupSelect v-model="dataForm.salesId" placeholder="请选择合同" clearable field="salesId"
interfaceId="396203872441416837" :columnOptions="salesIdcolumnOptions" propsValue="id"
relationField="contract_name" popupType="dialog" popupTitle="选择数据" popupWidth="800px" :bissId="dataForm.customerId"
hasPage :pageSize="20">
@ -46,7 +46,7 @@
</el-col>
<el-col :span="6">
<el-form-item label="采购合同" prop="purchaseId">
<popupSelect disabled v-model="dataForm.purchaseId" placeholder="请选择合同" clearable field="purchaseId"
<popupSelect v-model="dataForm.purchaseId" placeholder="请选择合同" clearable field="purchaseId"
interfaceId="397408984857931205" :columnOptions="salesIdcolumnOptions" propsValue="id"
relationField="contract_name" popupType="dialog" popupTitle="选择数据" popupWidth="800px"
hasPage :pageSize="20" @change="customerSelect2">
@ -198,6 +198,7 @@
export default {
components: {},
props: [],
data() {
return {
submitDisabled: false,
@ -238,6 +239,13 @@
remark: '',
creatorTime: "",
isExamine: "",
purchaseStatus: 0,
salesStatus: 0,
purchaseIdOld:0,
purchaseId:0,
salesIdOld:0,
salesId:0,
},
rules: {
materialId: [{
@ -477,6 +485,7 @@
this.dataForm.buckleWeight = res.data.buckleWeight;
this.dataForm.netWeight = res.data.netWeight;
this.dataForm.vehiclePictures = JSON.parse(res.data.vehiclePictures);
},
changePicture(a, b) {
this.dataForm.vehiclePictures = JSON.parse(b.vehiclephotos);
@ -516,19 +525,7 @@
}
})
},
// poundAI(){
// let formData = new FormData();
// let file = this.dataForm.poundPictures
// formData.append('file',file);
// request({
// url: '/api/tradeupload/Tradeupload/poundai',
// method: 'post',
// data: formData
// }).then(res => {
// this.dataInfo(res.data)
// this.loading = false
// });
// },
clearData(data) {
for (let key in data) {
if (data[key] instanceof Array) {
@ -566,38 +563,112 @@
},
//
dataFormSubmit() {
var tareWeight = this.dataForm.tareWeight;//
var grossWeight = this.dataForm.grossWeight;//
var buckleWeight = this.dataForm.buckleWeight;//
var netWeight = this.dataForm.netWeight;//
var purchaseStatus = this.dataForm.purchaseStatus;//
var salesStatus = this.dataForm.salesStatus;//
this.dataForm.isExamine = '1';
this.dataForm.unit = this.dataForm.unit ? this.dataForm.unit : 0;
this.dataForm.transportType = this.dataForm.transportType ? this.dataForm.transportType : 0;
this.dataForm.advance = this.dataForm.advance ? this.dataForm.advance : 0;
if(grossWeight < tareWeight + buckleWeight + netWeight){
this.$message({
message: '毛重不得小于皮重+扣重+净重',
type: 'success',
duration: 1000
})
return
}
if(buckleWeight >= netWeight){
this.$message({
message: '扣重不得大于净重',
type: 'success',
duration: 1000
})
return
// var purchaseName1=this.dataForm.purchaseName;
var purchaseIdOld=this.dataForm.purchaseIdOld;
var salesIdOld=this.dataForm.salesIdOld;
if (purchaseIdOld !=this.dataForm.purchaseId ){
if (purchaseStatus==0){
this.$message({
message: '采购订单已经生成,现在是待开票状态',
type: 'success',
duration: 1000
})
return
}
if (purchaseStatus==1){
this.$message({
message: '采购订单已经生成,现在是开票中状态',
type: 'success',
duration: 1000
})
return
}
if (purchaseStatus==2){
this.$message({
message: '采购订单已经生成,现在是已入库状态',
type: 'success',
duration: 1000
})
return
}
if (purchaseStatus==3){
this.$message({
message: '采购订单已经生成,现在是归档状态',
type: 'success',
duration: 1000
})
return
}
}
if(buckleWeight >= grossWeight){
this.$message({
message: '扣重不得大于毛重',
type: 'success',
duration: 1000
})
return
if (salesIdOld !=this.dataForm.salesId ){
if (salesStatus==0){
this.$message({
message: '销售订单已经生成,现在是待发货状态',
type: 'success',
duration: 1000
})
return
}
if (salesStatus==1){
this.$message({
message: '销售订单已经生成,现在是待开票状态',
type: 'success',
duration: 1000
})
return
}
if (salesStatus==2){
this.$message({
message: '销售订单已经生成,现在是待回款状态',
type: 'success',
duration: 1000
})
return
}
if (salesStatus==3){
this.$message({
message: '销售订单已经生成,现在是归档状态',
type: 'success',
duration: 1000
})
return
}
}
// if(grossWeight < tareWeight + buckleWeight + netWeight){
// this.$message({
// message: '++',
// type: 'success',
// duration: 1000
// })
// return
// }
// if(buckleWeight >= netWeight){
// this.$message({
// message: '',
// type: 'success',
// duration: 1000
// })
// return
// }
// if(buckleWeight >= grossWeight){
// this.$message({
// message: '',
// type: 'success',
// duration: 1000
// })
// return
// }
this.$refs['elForm'].validate((valid) => {
if (valid) {
this.request2()
@ -736,6 +807,9 @@
}else{
_dataAll.originPlace = []
}
_dataAll.purchaseIdOld = _dataAll.purchaseId;
_dataAll.salesIdOld = _dataAll.salesId;
console.log(_dataAll)
this.dataForm = _dataAll
},
},

@ -649,7 +649,7 @@
type="text"
@click="addOvheicle(scope.row.id)"
v-has="'btn_addOvheicle'"
>添加车辆图片
>编辑合同与图片
</el-button>
</template>
</el-table-column>
@ -1275,10 +1275,10 @@ export default {
this.$refs.JNPFForm.init(id, false);
});
},
addOvheicle(id, isDetail) {
addOvheicle(id, isDetail,salesStatus) {
this.formVisible6 = true;
this.$nextTick(() => {
this.$refs.JNPFForm6.init(id, isDetail);
this.$refs.JNPFForm6.init(id, isDetail,salesStatus);
});
},
exportData() {

@ -8,7 +8,7 @@
<el-col :span="8">
<el-form-item label="单据编号" prop="documentNo">
<el-input v-model="dataForm.documentNo" placeholder="请输入" clearable
:style='{"width":"100%"}' :disabled="true">
:style='{"width":"100%"}' readonly>
</el-input>
</el-form-item>
@ -21,7 +21,7 @@
relationField="document_no" popupType="dialog" popupTitle="选择数据" popupWidth="800px" @change="popupSelectChange">
</popupSelect>-->
<el-input v-model="dataForm.purchaseOrderName" clearable :style='{"width":"100%"}' :disabled="true">
<el-input v-model="dataForm.purchaseOrderName" clearable :style='{"width":"100%"}' readonly>
</el-input>
</el-form-item>
@ -29,7 +29,7 @@
<el-col :span="8">
<el-form-item label="币别 " prop="currency">
<el-select v-model="dataForm.currency" placeholder="请选择" clearable
:style='{"width":"100%"}'>
:style='{"width":"100%"}' disabled>
<el-option v-for="(item, index) in currencyOptions" :key="index" :label="item.fullName"
:value="item.id" :disabled="item.disabled"></el-option>
@ -38,21 +38,21 @@
</el-col>
<el-col :span="8">
<el-form-item label="退货金额" prop="refundAmount">
<el-input v-model="dataForm.refundAmount" clearable :style='{"width":"100%"}' :disabled="true">
<el-input v-model="dataForm.refundAmount" clearable :style='{"width":"100%"}' readonly>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="退货数量" prop="refundNum">
<el-input v-model="dataForm.refundNum" clearable :style='{"width":"100%"}' :disabled="true">
<el-input v-model="dataForm.refundNum" clearable :style='{"width":"100%"}' readonly>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="备注" prop="remark">
<el-input v-model="dataForm.remark" placeholder="请输入" clearable :style='{"width":"100%"}'>
<el-input v-model="dataForm.remark" placeholder="请输入" clearable :style='{"width":"100%"}' readonly>
</el-input>
</el-form-item>
@ -75,7 +75,7 @@
relationField="ticketno" popupType="dialog" popupWidth="800px" hasPage :pageSize="20">
</popupSelect>-->
<el-input v-model="scope.row.vehicleName" placeholder="请输入" clearable
:style='{"width":"100%"}' :disabled="true">
:style='{"width":"100%"}' readonly>
</el-input>
</template>
</el-table-column>
@ -88,14 +88,14 @@
:disabled="true">
</popupSelect>-->
<el-input v-model="scope.row.materialName" placeholder="请输入" clearable
:style='{"width":"100%"}' :disabled="true">
:style='{"width":"100%"}' readonly>
</el-input>
</template>
</el-table-column>
<el-table-column prop="settlement" label="结算重量 ">
<template slot-scope="scope">
<el-input v-model="scope.row.settlement" placeholder="请输入" clearable
:style='{"width":"100%"}' :disabled="true">
:style='{"width":"100%"}' readonly>
</el-input>
</template>
</el-table-column>
@ -112,7 +112,7 @@
<el-table-column prop="price" label="采购单价">
<template slot-scope="scope">
<el-input v-model="scope.row.price" placeholder="请输入" clearable
:style='{"width":"100%"}' :disabled="true">
:style='{"width":"100%"}' readonly>
</el-input>
</template>
</el-table-column>
@ -129,21 +129,21 @@
<el-table-column prop="amount" label="应退金额">
<template slot-scope="scope">
<el-input v-model="scope.row.amount" placeholder="请输入" clearable
:style='{"width":"100%"}' :disabled="true">
:style='{"width":"100%"}' readonly>
</el-input>
</template>
</el-table-column>
<el-table-column prop="notAmount" label="税额">
<template slot-scope="scope">
<el-input v-model="scope.row.notAmount" placeholder="请输入" clearable
:style='{"width":"100%"}' :disabled="true">
:style='{"width":"100%"}' readonly>
</el-input>
</template>
</el-table-column>
<el-table-column prop="pountUser" label="业务员">
<template slot-scope="scope">
<el-input v-model="scope.row.pountUser" placeholder="请输入" clearable
:style='{"width":"100%"}' :disabled="true">
:style='{"width":"100%"}' readonly>
</el-input>
</template>
</el-table-column>
@ -157,16 +157,16 @@
</el-select>
</template>
</el-table-column>
<el-table-column label="操作" width="50">
<template slot-scope="scope">
<el-button size="mini" type="text" class="JNPF-table-delBtn"
@click="delpurchaseback_item0List(scope.$index)">删除</el-button>
</template>
</el-table-column>
<!-- <el-table-column label="操作" width="50">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button size="mini" type="text" class="JNPF-table-delBtn"-->
<!-- @click="delpurchaseback_item0List(scope.$index)">删除</el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
<div class="table-actions" @click="addpurchaseback_item0List()">
<el-button type="text" icon="el-icon-plus">添加</el-button>
</div>
<!-- <div class="table-actions" @click="addpurchaseback_item0List()">-->
<!-- <el-button type="text" icon="el-icon-plus">添加</el-button>-->
<!-- </div>-->
</el-form-item>
</el-col>
</el-tab-pane>

@ -170,7 +170,7 @@
align="center"
sortable
/>
<el-table-column label="操作" fixed="right" width="150">
<el-table-column label="操作" fixed="right" width="150" align="center">
<template slot-scope="scope">
<el-button
type="text"

@ -41,14 +41,14 @@
<el-form-item label="币种" prop="currency">
<el-select v-model="dataForm.currency" placeholder="请选择" clearable :style='{"width":"100%"}'>
<el-option v-for="(item, index) in currencyOptions" :key="index" :label="item.fullName" :value="item.id"
:disabled="item.disabled"></el-option>
:disabled="item.disabled" disabled></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="对方合同号" prop="contractNo">
<el-input v-model="dataForm.contractNo" placeholder="请输入" clearable :style='{"width":"100%"}'>
<el-input v-model="dataForm.contractNo" placeholder="请输入" clearable :style='{"width":"100%"}' disabled>
</el-input>
</el-form-item>
@ -56,7 +56,7 @@
<el-col :span="8">
<el-form-item label="垫资金额" prop="advanceAmount">
<el-input-number v-model="dataForm.advanceAmount" placeholder="数字文本" :step="1" :precision="6"
:style='{"width":"100%"}'>
:style='{"width":"100%"}' disabled>
</el-input-number>
</el-form-item>
@ -64,7 +64,7 @@
<el-col :span="8">
<el-form-item label="重量" prop="num">
<el-input-number v-model="dataForm.num" placeholder="数字文本" :step="1" :precision="6"
:style='{"width":"100%"}'>
:style='{"width":"100%"}' disabled>
</el-input-number>
</el-form-item>
@ -72,7 +72,7 @@
<el-col :span="8">
<el-form-item label="金额" prop="amount">
<el-input-number v-model="dataForm.amount" placeholder="数字文本" :step="1"
:style='{"width":"100%"}'>
:style='{"width":"100%"}' disabled>
</el-input-number>
</el-form-item>
@ -80,14 +80,14 @@
<el-col :span="8">
<el-form-item label="不含税金额" prop="notAmount">
<el-input-number v-model="dataForm.notAmount" placeholder="数字文本" :step="1" :precision="6"
:style='{"width":"100%"}'>
:style='{"width":"100%"}' disabled>
</el-input-number>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="税额" prop="rate">
<el-input-number v-model="dataForm.rate" placeholder="数字文本" :step="1" :precision="6" :style='{"width":"100%"}'>
<el-input-number v-model="dataForm.rate" placeholder="数字文本" :step="1" :precision="6" :style='{"width":"100%"}' disabled>
</el-input-number>
</el-form-item>
@ -145,7 +145,7 @@
</el-col> -->
<el-col :span="16">
<el-form-item label="备注信息" prop="remark">
<el-input v-model="dataForm.remark" placeholder="请输入" clearable :style='{"width":"100%"}'>
<el-input v-model="dataForm.remark" placeholder="请输入" clearable :style='{"width":"100%"}' disabled>
</el-input>
</el-form-item>
@ -168,7 +168,7 @@
relationField="ticketno" popupType="dialog" popupWidth="800px" hasPage :pageSize="20">
</popupSelect>-->
<el-input v-model="scope.row.vehicleName" placeholder="请输入" clearable :style='{"width":"100%"}'
:disabled="true">
readonly>
</el-input>
</template>
</el-table-column>
@ -181,7 +181,7 @@
:disabled="true">
</popupSelect>-->
<el-input v-model="scope.row.materialName" placeholder="请输入" clearable :style='{"width":"100%"}'
:disabled="true">
readonly>
</el-input>
</template>
</el-table-column>
@ -197,7 +197,7 @@
<el-table-column prop="netWeight" label="净重" align="center" width="130">
<template slot-scope="scope">
<el-input v-model="scope.row.netWeight" placeholder="请输入" clearable :style='{"width":"100%"}'
:disabled="true">
readonly>
</el-input>
</template>
</el-table-column>
@ -222,21 +222,21 @@
<el-table-column prop="price" label="单价" align="center" width="130">
<template slot-scope="scope">
<el-input v-model="scope.row.price" placeholder="请输入" clearable :style='{"width":"100%"}'
@change="priceChange(scope.row)">
@change="priceChange(scope.row)" readonly>
</el-input>
</template>
</el-table-column>
<el-table-column prop="settlement" label="结算重量 " align="center" width="130">
<template slot-scope="scope">
<el-input v-model="scope.row.settlement" placeholder="请输入" clearable :style='{"width":"100%"}'
@change="settlementChange(scope.row)">
@change="settlementChange(scope.row)" readonly>
</el-input>
</template>
</el-table-column>
<el-table-column prop="rate" label="税率 " align="center" width="130">
<template slot-scope="scope">
<el-select v-model="scope.row.rate" placeholder="请选择" clearable :style='{"width":"100%"}'
@change="rateChange(scope.row)">
@change="rateChange(scope.row)" disabled>
<el-option v-for="(item, index) in rateOptions" :key="index" :label="item.fullName"
:value="item.id" :disabled="item.disabled"></el-option>
</el-select>
@ -245,20 +245,20 @@
<el-table-column prop="amount" label="金额" align="center" width="130">
<template slot-scope="scope">
<el-input v-model="scope.row.amount" placeholder="请输入" clearable :style='{"width":"100%"}'
:disabled="true">
readonly>
</el-input>
</template>
</el-table-column>
<el-table-column prop="notAmount" label="不含税金额" align="center" width="130">
<template slot-scope="scope">
<el-input v-model="scope.row.notAmount" placeholder="请输入" clearable :style='{"width":"100%"}'
:disabled="true">
readonly>
</el-input>
</template>
</el-table-column>
<el-table-column prop="remark" label="备注" align="center" width="130">
<template slot-scope="scope">
<el-input v-model="scope.row.remark" placeholder="请输入" clearable :style='{"width":"100%"}'>
<el-input v-model="scope.row.remark" placeholder="请输入" clearable :style='{"width":"100%"}' readonly>
</el-input>
</template>
</el-table-column>

@ -228,14 +228,14 @@
<el-table-column prop="settlement" label="结算重量 " align="center" width="130">
<template slot-scope="scope">
<el-input v-model="scope.row.settlement" placeholder="请输入" clearable :style='{"width":"100%"}'
@change="settlementChange(scope.row)">
@change="priceChange(scope.row)">
</el-input>
</template>
</el-table-column>
<el-table-column prop="rate" label="税率 " align="center" width="130">
<template slot-scope="scope">
<el-select v-model="scope.row.rate" placeholder="请选择" clearable :style='{"width":"100%"}'
@change="rateChange(scope.row)">
@change="priceChange(scope.row)">
<el-option v-for="(item, index) in rateOptions" :key="index" :label="item.fullName"
:value="item.id" :disabled="item.disabled"></el-option>
</el-select>
@ -825,13 +825,41 @@
created() {},
mounted() {},
methods: {
priceChange(row) {},
rateChange(row) {
},
settlementChange(row) {
priceChange(row) {
var advanceAmount = 0;
var settlement = 0;
var amount = 0;
var notAmount = 0;
var rate = 13;
this.rateOptions.forEach((item, index)=>{
if(item.id == row.rate){
rate = parseInt(item.fullName);
}
});
this.dataForm.purchaseorder_item0List.forEach((item, index)=>{
if(row.vehicleId == item.vehicleId){
item.amount = this.jnpf.floatMul(item.settlement, item.price).toFixed(2);//
item.notAmount = this.jnpf.floatDiv(item.amount, this.jnpf.floatAdd(1, this.jnpf.floatDiv(rate,100))).toFixed(2);//
}
if(item.advance == '1'){//
advanceAmount = this.jnpf.floatAdd(advanceAmount, item.amount);//
}
settlement = this.jnpf.floatAdd(settlement, item.settlement);//
amount = this.jnpf.floatAdd(amount, item.amount);//
notAmount = this.jnpf.floatAdd(notAmount, item.notAmount);//
});
this.dataForm.advanceAmount = advanceAmount;
this.dataForm.num = settlement;
this.dataForm.amount = amount;
this.dataForm.notAmount = notAmount;
this.dataForm.rate = this.jnpf.floatSub(amount, notAmount).toFixed(2);
},
// rateChange(row) {
//
// },
// settlementChange(row) {
//
// },
changeContract(a, b) {
this.dataForm.supplierId = b.code;
},

@ -32,6 +32,33 @@
></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="重量">
<el-input
v-model="query.num"
placeholder="请输入"
clearable
></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="金额">
<el-input
v-model="query.amount"
placeholder="请输入"
clearable
></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="制单人">
<el-input
v-model="query.creatorUserName"
placeholder="请输入"
clearable
></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="制单日期">
<el-date-picker
@ -880,14 +907,14 @@ export default {
.catch(() => {});
},
toSaleHandle() {
// if (!this.multipleSelectionItem.length || this.multipleSelectionItem.length != 1) {
// this.$message({
// type: 'error',
// message: '',
// duration: 2500
// })
// return
// }
if (!this.multipleSelectionItem.length) {
this.$message({
type: 'error',
message: '请选择一条数据',
duration: 2500
})
return
}
var flag = true;
this.multipleSelectionItem.forEach((item, index) => {
if (item.isTransfer == "1") {
@ -920,6 +947,7 @@ export default {
url: `/api/poundlist/Poundlist/createsale/${ids}`,
method: "post",
}).then((res) => {
debugger
var purchaseOrderIds = [];
this.multipleSelectionItem.forEach((item, index) => {
purchaseOrderIds.push(item.id);

@ -13,7 +13,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="业务类型" required prop="type">
<el-select v-model="dataForm.type" placeholder="请选择业务类型" clearable :style='{"width":"100%"}'>
<el-select v-model="dataForm.type" placeholder="请选择业务类型" clearable :style='{"width":"100%"}' disabled>
<el-option v-for="(item, index) in typeOptions" :key="index" :label="item.fullName" :value="item.id"
:disabled="item.disabled"></el-option>
@ -37,7 +37,7 @@
:pageSize="20">
</popupSelect>-->
<el-input v-model="dataForm.soucenoName" placeholder="请输入来源单号" clearable :style='{"width":"100%"}' disabled>
<el-input v-model="dataForm.soucenoName" placeholder="请输入来源单号" clearable :style='{"width":"100%"}' readonly>
</el-input>
</el-form-item>
@ -51,7 +51,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="币别" prop="currency">
<el-select v-model="dataForm.currency" placeholder="请选择币别" readonly>
<el-select v-model="dataForm.currency" placeholder="请选择币别" disabled>
<el-option v-for="(item, index) in currencyOptions" :key="index" :label="item.fullName" :value="item.id"
:disabled="item.disabled"></el-option>
@ -78,14 +78,14 @@
:pageSize="20">
</popupSelect>-->
<el-input v-model="dataForm.suppliername" placeholder="请输入供应商" clearable :style='{"width":"100%"}' disabled>
<el-input v-model="dataForm.suppliername" placeholder="请输入供应商" clearable :style='{"width":"100%"}' readonly>
</el-input>
</el-form-item>
</el-col>
<el-col :span="16">
<el-form-item label="备注" prop="remark">
<el-input v-model="dataForm.remark" placeholder="请输入供应商名称" clearable :style='{"width":"100%"}'>
<el-input v-model="dataForm.remark" placeholder="请输入供应商名称" clearable :style='{"width":"100%"}' readonly>
</el-input>
</el-form-item>
@ -140,7 +140,7 @@
hasPage :pageSize="20" :disabled="true">
</popupSelect>-->
<el-input v-model="scope.row.vehicleName" placeholder="请输入" clearable
:disabled="true">
readonly>
</el-input>
</template>
</el-table-column>
@ -152,7 +152,7 @@
relationField="item_name" popupType="dialog" popupWidth="800px" hasPage :pageSize="20" :disabled="true">
</popupSelect>-->
<el-input v-model="scope.row.materialname" placeholder="请输入" clearable
:disabled="true">
readonly>
</el-input>
</template>
</el-table-column>
@ -176,7 +176,7 @@
<popupSelect v-model="scope.row.reservoirareaId" placeholder="请选择" clearable
:field="'reservoirareaId'+scope.$index" interfaceId="392939299932268421"
:columnOptions="jg_receiptin_item0reservoirareaIdcolumnOptions" propsValue="id"
relationField="areaname" popupType="dialog" popupWidth="800px" @change="popupSelect3">
relationField="areaname" popupType="dialog" popupWidth="800px" @change="popupSelect3" disabled>
</popupSelect>
</template>
</el-table-column>
@ -185,7 +185,7 @@
<popupSelect v-model="scope.row.warehouseId" placeholder="请选择" clearable
:field="'warehouseId'+scope.$index" interfaceId="398450221434116485"
:columnOptions="jg_receiptin_item0warehouseIdcolumnOptions" propsValue="id"
relationField="name" popupType="dialog" popupWidth="800px" hasPage :pageSize="20" :disabled="true">
relationField="name" popupType="dialog" popupWidth="800px" hasPage :pageSize="20" disabled>
</popupSelect>
</template>
</el-table-column>
@ -199,7 +199,7 @@
<el-table-column prop="num" width="140" label="入库重量" align="center">
<template slot-scope="scope">
<el-input v-model="scope.row.num" placeholder="请输入" clearable @input="inputChange()"
:disabled="true">
readonly>
</el-input>
</template>
</el-table-column>
@ -213,7 +213,7 @@
</el-table-column>
<el-table-column prop="price" width="140" label="单价" align="center">
<template slot-scope="scope">
<el-input v-model="scope.row.price" placeholder="请输入" clearable :disabled="true">
<el-input v-model="scope.row.price" placeholder="请输入" clearable readonly>
</el-input>
</template>
</el-table-column>
@ -228,13 +228,13 @@
<el-table-column prop="amount" width="140" label="金额" align="center">
<template slot-scope="scope">
<el-input v-model="scope.row.amount" placeholder="请输入" clearable @input="inputChange()"
:disabled="true">
readonly>
</el-input>
</template>
</el-table-column>
<el-table-column prop="rateamount" width="140" label="税额" align="center">
<template slot-scope="scope">
<el-input v-model="scope.row.rateamount" placeholder="请输入" clearable :disabled="true">
<el-input v-model="scope.row.rateamount" placeholder="请输入" clearable readonly>
</el-input>
</template>
</el-table-column>

@ -232,7 +232,7 @@
width="120"
align="center"
/>
<el-table-column label="操作" fixed="right" width="150">
<el-table-column label="操作" fixed="right" width="150" align="center">
<template slot-scope="scope">
<el-button
type="text"

@ -200,7 +200,7 @@
align="center"
sortable
/>
<el-table-column label="操作" fixed="right" width="150">
<el-table-column label="操作" fixed="right" width="150" align="center">
<template slot-scope="scope">
<el-button
type="text"

@ -32,6 +32,33 @@
></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="重量">
<el-input
v-model="query.num"
placeholder="请输入"
clearable
></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="金额">
<el-input
v-model="query.price"
placeholder="请输入"
clearable
></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="制单人">
<el-input
v-model="query.creatorUserName"
placeholder="请输入"
clearable
></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="单据状态 ">
<el-select
@ -207,10 +234,10 @@
/>
<el-table-column
label="币别"
width="0"
prop="currency"
algin="center"
sortable
width="150"
align="center"
>
<template slot-scope="scope">
{{ scope.row.currency | dynamicText(currencyOptions) }}
@ -298,7 +325,7 @@
<el-table-column
label="操作"
fixed="right"
algin="center"
align="center"
width="150"
>
<template slot-scope="scope">

@ -321,7 +321,7 @@
sortable
/>
<el-table-column label="操作" fixed="right" width="80">
<el-table-column label="操作" fixed="right" width="80" align="center">
<template slot-scope="scope">
<!-- <el-button type="text" v-has="'btn_edit'"-->
<!-- @click="addOrUpdateHandle(scope.row.id)">编辑-->

@ -104,7 +104,7 @@
this.listQuery.contractCode = this.contractCode
this.listQuery.contractName = this.contractName
this.listQuery.contractType = param.contractType
this.listQuery.menuId = param.menuId
this.listQuery.menuId = '380264320186993413'
let listQuery = this.listQuery
request({
url: `/api/example/ContractFile/getList`,

@ -13,7 +13,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="车辆图片" prop="vehiclePictures">
<JNPF-UploadImg v-model="dataForm.vehiclePictures" :fileSize="500" sizeUnit="MB" :limit="9">
<JNPF-UploadImg v-model="dataForm.vehiclePictures" :fileSize="500" sizeUnit="MB" :limit="9" :disabled="true">
</JNPF-UploadImg>
</el-form-item>
@ -44,33 +44,33 @@
</el-col>
<el-col :span="6">
<el-form-item label="销售价格" prop="salesPrice">
<el-input-number v-model="dataForm.salesPrice" :style='{"width":"100%"}' :precision="6"></el-input-number>
<el-input-number v-model="dataForm.salesPrice" :style='{"width":"100%"}' :precision="6" disabled></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="毛重" prop="grossWeight">
<el-input-number v-model="dataForm.grossWeight" :style='{"width":"100%"}' @change="grossWeightChange" :precision="6"></el-input-number>
<el-input-number v-model="dataForm.grossWeight" :style='{"width":"100%"}' @change="grossWeightChange" :precision="6" disabled></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="皮重" prop="tareWeight">
<el-input-number v-model="dataForm.tareWeight" :style='{"width":"100%"}' :precision="6"></el-input-number>
<el-input-number v-model="dataForm.tareWeight" :style='{"width":"100%"}' :precision="6" disabled></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="扣重" prop="buckleWeight">
<el-input-number v-model="dataForm.buckleWeight" :style='{"width":"100%"}' :precision="6"></el-input-number>
<el-input-number v-model="dataForm.buckleWeight" :style='{"width":"100%"}' :precision="6" disabled></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="净重" prop="netWeight">
<el-input-number v-model="dataForm.netWeight" :style='{"width":"100%"}' :precision="6"></el-input-number>
<el-input-number v-model="dataForm.netWeight" :style='{"width":"100%"}' :precision="6" disabled></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="磅单时间" prop="poundDate">
<el-date-picker v-model="dataForm.poundDate" placeholder="请选择" clearable :style='{"width":"100%"}'
type="date" format="yyyy-MM-dd" value-format="timestamp">
type="date" format="yyyy-MM-dd" value-format="timestamp" readonly>
</el-date-picker>
</el-form-item>
@ -84,7 +84,7 @@
</el-col>
<el-col :span="6">
<el-form-item label="单位 " prop="unit">
<el-select v-model="unit" placeholder="请选择" clearable :style='{"width":"100%"}' @change="unitChange">
<el-select v-model="unit" placeholder="请选择" clearable :style='{"width":"100%"}' @change="unitChange" disabled>
<el-option v-for="(item, index) in unitOptions" :key="index" :label="item.fullName" :value="item.id"
:disabled="item.disabled"></el-option>
</el-select>
@ -92,7 +92,7 @@
</el-col>
<el-col :span="6">
<el-form-item label="运输类型" prop="transportType">
<el-select v-model="transportType" placeholder="请选择" clearable :style='{"width":"100%"}' @change="transportTypeChange">
<el-select v-model="transportType" placeholder="请选择" clearable :style='{"width":"100%"}' @change="transportTypeChange" disabled>
<el-option v-for="(item, index) in transportTypeOptions" :key="index" :label="item.fullName"
:value="item.id" :disabled="item.disabled"></el-option>
</el-select>
@ -100,7 +100,7 @@
</el-col>
<el-col :span="6">
<el-form-item label="是否垫资" prop="advance">
<el-select v-model="advance" placeholder="请选择" clearable :style='{"width":"100%"}' @change="advanceChange">
<el-select v-model="advance" placeholder="请选择" clearable :style='{"width":"100%"}' @change="advanceChange" disabled>
<el-option v-for="(item, index) in advanceOptions" :key="index" :label="item.fullName" :value="item.id"
:disabled="item.disabled"></el-option>
@ -109,12 +109,12 @@
</el-col>
<el-col :span="6">
<el-form-item label="运费" prop="transportPrice">
<el-input-number v-model="dataForm.transportPrice" :style='{"width":"100%"}' :precision="6"></el-input-number>
<el-input-number v-model="dataForm.transportPrice" :style='{"width":"100%"}' :precision="6" disabled></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="起始地" prop="originPlace">
<JNPF-Address v-model="dataForm.originPlace" placeholder="请选择省市区" clearable :level='2' >
<JNPF-Address v-model="dataForm.originPlace" placeholder="请选择省市区" clearable :level='2' :disabled="true">
</JNPF-Address>
</el-form-item>
</el-col>
@ -123,7 +123,7 @@
<popupSelect v-model="dataForm.businessId" placeholder="请选择业务员1" clearable field="businessId"
interfaceId="ebcc44be142e43b795c0d769abd6d25a" :columnOptions="businessIdcolumnOptions"
propsValue="F_Id" relationField="F_RealName" popupType="dialog" popupTitle="选择数据" popupWidth="800px"
hasPage :pageSize="20" :bissId="dataForm.businessId">
hasPage :pageSize="20" :bissId="dataForm.businessId" disabled>
</popupSelect>
</el-form-item>
@ -138,13 +138,13 @@
<el-col :span="6">
<el-form-item label="收货价格" prop="collectPrice">
<el-input-number v-model="dataForm.collectPrice" :style='{"width":"100%"}' :precision="6"></el-input-number>
<el-input-number v-model="dataForm.collectPrice" :style='{"width":"100%"}' :precision="6" disabled></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="备注" prop="remark">
<el-input v-model="dataForm.remark" placeholder="请输入备注信息" clearable :style='{"width":"100%"}'>
<el-input v-model="dataForm.remark" placeholder="请输入备注信息" clearable :style='{"width":"100%"}' readonly>
</el-input>
</el-form-item>

@ -148,7 +148,7 @@
align="center"
sortable
/>
<el-table-column label="操作" fixed="right" width="150">
<el-table-column label="操作" fixed="right" width="150" align="center">
<template slot-scope="scope">
<el-button
type="text"

Loading…
Cancel
Save