问题修复

product
杨世强 2 years ago
parent 47facc1c73
commit 6480ebf735

@ -243,4 +243,6 @@ public class PoundlistEntity {
private String collectionAccount;
@TableField(exist = false)
private String colectionBank;
@TableField(exist = false)
private String poundlistId;
}

@ -122,7 +122,7 @@ public class PoundlistServiceImpl extends ServiceImpl<PoundlistMapper, Poundlist
}
if (StringUtil.isEmpty(poundlistPagination.getSidx())) {
poundlistPagination.setSidx("CREATOR_TIME");
poundlistPagination.setSort("DESC");
poundlistPagination.setSort("ASC");
} else {
try {
String sidx = poundlistPagination.getSidx();

@ -877,6 +877,9 @@ public class SaleorderitemController {
}
vo.setPaymentsoitemList(jg_paymentModelList);
List<PoundlistEntity> poundlist = saleorderitemService.GetPoundlistList(id);
for (PoundlistEntity poundlistEntity : poundlist){
poundlistEntity.setPoundlistId(poundlistEntity.getId());
}
vo.setPoundlistentityList(poundlist);
//附表数据转换

@ -71,7 +71,7 @@ public class Salesorder_item0Model {
@JsonProperty("remark")
private String remark;
@TableField(exist = false)
@TableField("poundlistId")
private String poundlistId;
@JsonProperty("businessId")

@ -533,7 +533,7 @@ public class TradeuploadController {
queryWrapper.lambda().eq(TradeuploadEntity::getCustomerId,entity.getCustomerId());
List<TradeuploadEntity> list = tradeuploadService.list(queryWrapper);
if (list != null && list.size()>0){
return ActionResult.fail("磅单重复");
return ActionResult.success("磅单重复");
}
entity.setId(mainId);
tradeuploadService.save(entity);

@ -10,9 +10,9 @@
d.document_no sourceOrderNo
FROM
jg_arinvoices a
LEFT JOIN jg_customer b ON a.customer_id = b.id
LEFT JOIN jg_contract c ON a.contract_id = c.id
LEFT JOIN jg_salesorder d ON a.sales_order_id = d.id
LEFT JOIN jg_customer b ON a.customer_id = b.id and b.delete_mark = '0'
LEFT JOIN jg_contract c ON a.contract_id = c.id and c.delete_mark = '0'
LEFT JOIN jg_salesorder d ON a.sales_order_id = d.id and d.delete_mark = '0'
WHERE 1=1
and a.delete_mark = '0'
/*添加权限*/

@ -15,10 +15,10 @@
c.contract_name contractNm
FROM
jg_collection a
LEFT JOIN jg_customer b ON a.customer_id = b.id
LEFT JOIN jg_contract c ON a.contract_id = c.id
LEFT JOIN jg_customer b ON a.customer_id = b.id and b.delete_mark = '0'
LEFT JOIN jg_contract c ON a.contract_id = c.id and c.delete_mark = '0'
where 1=1
and a.delete_mark = '0' and b.delete_mark = '0' and c.delete_mark = '0'
and a.delete_mark = '0'
/*添加权限*/
<if test="collectionPagination.departmentId != null and collectionPagination.departmentId != ''">
AND a.department_id = #{collectionPagination.departmentId}
@ -52,6 +52,7 @@
select * from jg_contract
where contract_type = '1'
and status = '1'
and delete_mark = '0'
<if test="code!=null and code!=''">
and code = #{code}
</if>

@ -9,10 +9,10 @@
c.document_no sourceOrderNo
from
jg_receiptout a
LEFT JOIN jg_customer b on a.customer_id = b.id
LEFT JOIN jg_salesorder c on a.source_no = c.id
LEFT JOIN jg_customer b on a.customer_id = b.id and b.delete_mark = '0'
LEFT JOIN jg_salesorder c on a.source_no = c.id and c.delete_mark = '0'
where 1=1
and a.delete_mark = '0' and b.delete_mark = '0' and c.delete_mark = '0'
and a.delete_mark = '0'
/*添加权限*/
<if test="receiptoutPagination.departmentId != null and receiptoutPagination.departmentId != ''">
AND a.department_id = #{receiptoutPagination.departmentId}

@ -9,11 +9,11 @@
d.supplier_nm customerName
from
jg_salesback a
LEFT JOIN jg_salesorder b on a.sales_order_id = b.id
LEFT JOIN jg_contract c on b.contract_id = c.id
LEFT JOIN jg_customer d on b.customer_id = d.id
LEFT JOIN jg_salesorder b on a.sales_order_id = b.id and b.delete_mark = '0'
LEFT JOIN jg_contract c on b.contract_id = c.id and c.delete_mark = '0'
LEFT JOIN jg_customer d on b.customer_id = d.id and d.delete_mark = '0'
where 1 = 1
and a.delete_mark = '0' and b.delete_mark = '0' and c.delete_mark = '0' and d.delete_mark = '0'
and a.delete_mark = '0'
/*添加权限*/
<if test="salebackPagination.departmentId != null and salebackPagination.departmentId != ''">
AND a.department_id = #{salebackPagination.departmentId}
@ -55,14 +55,13 @@ SELECT
g.supplier_nm as customerName
FROM
jg_salesback_item0 a
LEFT JOIN jg_salesorder_item0 b ON a.salesorder_item0_id = b.id
LEFT JOIN jg_poundlist c ON b.poundlist_id = c.id
LEFT JOIN jg_vehicle d ON c.vehicle_id = d.id
LEFT JOIN jg_material e ON c.material_id = e.id
LEFT JOIN jg_salesorder_item0 b ON a.salesorder_item0_id = b.id and b.delete_mark = '0'
LEFT JOIN jg_poundlist c ON b.poundlist_id = c.id and c.delete_mark = '0'
LEFT JOIN jg_vehicle d ON c.vehicle_id = d.id and d.delete_mark = '0'
LEFT JOIN jg_material e ON c.material_id = e.id and e.delete_mark = '0'
LEFT JOIN base_user f ON c.business_id = f.F_Id
LEFT JOIN jg_customer g ON c.customer_id = g.id
WHERE a.delete_mark = '0' and b.delete_mark = '0' and c.delete_mark = '0' and d.delete_mark = '0' and e.delete_mark = '0' and g.delete_mark = '0'
LEFT JOIN jg_customer g ON c.customer_id = g.id and g.delete_mark = '0'
WHERE a.delete_mark = '0'
and a.sales_back_id = #{id}
and a.delete_mark = '0'
</select>
</mapper>

@ -9,10 +9,10 @@
c.supplier_nm customerName
FROM
jg_salesorder a
left join jg_contract b on a.contract_id = b.id
left join jg_customer c on a.customer_id = c.id
left join jg_contract b on a.contract_id = b.id and b.delete_mark = '0'
left join jg_customer c on a.customer_id = c.id and c.delete_mark = '0'
where 1=1
and a.delete_mark = '0' and b.delete_mark = '0' and c.delete_mark = '0'
and a.delete_mark = '0'
/*添加权限*/
<if test="saleorderitemPagination.departmentId != null and saleorderitemPagination.departmentId != ''">
AND a.department_id = #{saleorderitemPagination.departmentId}
@ -55,15 +55,15 @@
g.contract_no purchaseContractNo
FROM
jg_poundlist a
LEFT JOIN jg_vehicle b ON a.vehicle_id = b.id
LEFT JOIN jg_supplier c ON a.supplier_id = c.id
LEFT JOIN jg_customer d ON a.customer_id = d.id
LEFT JOIN jg_material e ON a.material_id = e.id
LEFT JOIN jg_contract f ON a.sales_id = f.id
LEFT JOIN jg_contract g ON a.purchase_id = g.id
LEFT JOIN base_user h ON a.business_id = h.f_id
LEFT JOIN jg_natural i ON a.natural_id = i.id
where a.delete_mark = '0' and b.delete_mark = '0' and c.delete_mark = '0' and d.delete_mark = '0' and e.delete_mark = '0' and f.delete_mark = '0' and g.delete_mark = '0' and i.delete_mark = '0'
LEFT JOIN jg_vehicle b ON a.vehicle_id = b.id and b.delete_mark = '0'
LEFT JOIN jg_supplier c ON a.supplier_id = c.id and c.delete_mark = '0'
LEFT JOIN jg_customer d ON a.customer_id = d.id and d.delete_mark = '0'
LEFT JOIN jg_material e ON a.material_id = e.id and e.delete_mark = '0'
LEFT JOIN jg_contract f ON a.sales_id = f.id and f.delete_mark = '0'
LEFT JOIN jg_contract g ON a.purchase_id = g.id and g.delete_mark = '0'
LEFT JOIN base_user h ON a.business_id = h.F_Id
LEFT JOIN jg_natural i ON a.natural_id = i.id and i.delete_mark = '0'
where a.delete_mark = '0'
and a.id = #{poundlistId}
</select>
@ -74,9 +74,9 @@ FROM
c.item_name materialName
FROM
jg_salesorder_item0 a
LEFT JOIN jg_vehicle b ON a.vehicle_id = b.id
LEFT JOIN jg_material c ON a.material_id = c.id
WHERE a.delete_mark = '0' and b.delete_mark = '0' and c.delete_mark = '0'
LEFT JOIN jg_vehicle b ON a.vehicle_id = b.id and b.delete_mark = '0'
LEFT JOIN jg_material c ON a.material_id = c.id and c.delete_mark = '0'
WHERE a.delete_mark = '0'
and a.sales_order_id = #{id}
</select>
@ -89,11 +89,11 @@ FROM
e.areaname areaName
FROM
jg_receiptout_item0 a
LEFT JOIN jg_vehicle b ON a.vehicle_id = b.id
LEFT JOIN jg_material c ON a.material_id = c.id
LEFT JOIN jg_warehouse d ON a.warehouse_id = d.id
LEFT JOIN jg_reservoirarea e ON a.reservoirarea_id = e.id
WHERE a.delete_mark = '0' and b.delete_mark = '0' and c.delete_mark = '0' and d.delete_mark = '0' and e.delete_mark = '0'
LEFT JOIN jg_vehicle b ON a.vehicle_id = b.id and b.delete_mark = '0'
LEFT JOIN jg_material c ON a.material_id = c.id and c.delete_mark = '0'
LEFT JOIN jg_warehouse d ON a.warehouse_id = d.id and d.delete_mark = '0'
LEFT JOIN jg_reservoirarea e ON a.reservoirarea_id = e.id and e.delete_mark = '0'
WHERE a.delete_mark = '0'
and a.receiptin_id = #{id}
</select>

@ -1083,16 +1083,15 @@
dataFormSubmit(eventType) {
var statusFlag = true;
this.dataForm.paymentdocitem0List.forEach((item, index) => {
if (this.jnpf.floatAdd(item.amount,item.paymentAmount) > item.allAmount) {
if (this.jnpf.floatAdd(item.amount,item.payPrice) > item.allAmount) {
statusFlag = false;
return
}
});
if (!statusFlag) {
this.$message({
type: 'error',
message: '已超出订单金额,请核查',
duration: 1000
duration: 3000
});
return
}

@ -47,7 +47,7 @@
<el-table-column prop="creatorusername" label="创建人名称" width="300" sortable align="center"/>
<el-table-column prop="lastmodifytime" label="修改时间" width="300" sortable align="center"/>
<el-table-column prop="lastmodifyusername" label="修改人名称" width="300"sortable align="center"/>
<el-table-column label="操作" width="100">
<el-table-column label="操作" fixed="right" width="100">
<template slot-scope="scope">
<el-button type="text" v-has="'btn_edit'" @click="addOrUpdateHandle(scope.row.id)">
</el-button>

@ -51,7 +51,7 @@
<div>
<!-- <el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">-->
<!-- </el-button>-->
<el-button type="text" icon="el-icon-download" @click="exportData()"v-has="'btn_download'" >导出
<el-button type="text" icon="el-icon-download" @click="exportData()" >导出
</el-button>
<!-- <el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()" >批量删除
</el-button> -->
@ -89,16 +89,22 @@
/>
<el-table-column prop="contractNm" label="合同名称" width="200" align="center"
/>
<el-table-column label="单据状态 " width="150" prop="status" algin="center"
>
<template slot-scope="scope">
{{ scope.row.status | dynamicText(statusOptions) }}
</template>
</el-table-column>
<!-- <el-table-column label="单据状态 " width="150" prop="status" algin="center"-->
<!--&gt;-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.status | dynamicText(statusOptions) }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column prop="status" label="单据状态" sortable width="150" align="center">
<template slot-scope="scope">
<el-tag type="success" v-if="scope.row.status==0"></el-tag>
<el-tag type="info" v-else-if="scope.row.status==1">审批中</el-tag>
<el-tag type="warning" v-else-if="scope.row.status==2">已审批</el-tag>
</template>
</el-table-column>
<el-table-column prop="remark" label="备注" width="150" align="center"
/>
<el-table-column label="操作"
width="150" >
<el-table-column label="操作" fixed="right" width="150" >
<template slot-scope="scope">
<el-button type="text"
@click="addOrUpdateHandle(scope.row.id)" v-has="'btn_edit'">编辑

@ -603,9 +603,9 @@
})
},
request() {
this.submitDisabled = true;
var _data = this.dataList()
if (!this.dataForm.id) {
this.submitDisabled = true;
request({
url: '/api/collection/Collection',
method: 'post',
@ -623,14 +623,16 @@
})
})
} else {
this.submitDisabled = true;
request({
url: '/api/collection/Collection/' + this.dataForm.id,
method: 'PUT',
data: _data
}).then((res) => {
debugger
this.$message({
message: res.msg,
type: 'success',
type: 'error',
duration: 1000,
onClose: () => {
this.submitDisabled = false;

@ -76,13 +76,20 @@
{{ scope.row.settlementType | dynamicText(settlementTypeOptions) }}
</template>
</el-table-column>
<el-table-column label="单据状态" sortable width="150" prop="status" align="center" >
<!-- <el-table-column label="单据状态" sortable width="150" prop="status" align="center" >-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.status | dynamicText(statusOptions) }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column prop="status" label="单据状态" sortable width="150" align="center">
<template slot-scope="scope">
{{ scope.row.status | dynamicText(statusOptions) }}
<el-tag type="success" v-if="scope.row.status==0"></el-tag>
<el-tag type="info" v-else-if="scope.row.status==1">已提交</el-tag>
<el-tag type="warning" v-else-if="scope.row.status==2">已认款</el-tag>
</template>
</el-table-column>
<el-table-column prop="creatorUserName" sortable label="制单人" width="150" align="center" />
<el-table-column label="操作" width="150">
<el-table-column label="操作" fixed="right" width="150">
<template slot-scope="scope">
<el-button type="text" @click="addOrUpdateHandle(scope.row)"v-has="'btn_edit'">
</el-button>

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

@ -116,7 +116,7 @@
</el-table-column>
<el-table-column label="操作"
<el-table-column label="操作" fixed="right"
width="80">
<template slot-scope="scope">
<!-- <el-button type="text" v-has="'btn_edit'"-->

@ -45,7 +45,7 @@
/>
<el-table-column prop="companyId" label="所属组织" width="0" align="left"
/>
<el-table-column label="操作"
<el-table-column label="操作" fixed="right"
width="100">
<template slot-scope="scope">
<!-- <el-button type="text" v-has="'btn_edit'"-->

@ -47,7 +47,7 @@
/>
<el-table-column prop="creatorTime" label="创建时间" width="0" align="left"
/>
<el-table-column label="操作"
<el-table-column label="操作" fixed="right"
width="100">
<template slot-scope="scope">
<!-- <el-button type="text" v-has="'btn_edit'"-->

@ -85,13 +85,20 @@
</el-table-column>
<el-table-column prop="invoiceAmount" label="发票金额" width="150" align="center" sortable="custom" />
<el-table-column prop="invoiceQuantity" label="发票数量" width="150" align="center" sortable="custom" />
<el-table-column label="单据状态" width="150" prop="status"sortable="custom" align="center" >
<!-- <el-table-column label="单据状态" width="150" prop="status"sortable="custom" align="center" >-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.status | dynamicText(statusOptions) }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column prop="status" label="单据状态" sortable width="150" align="center">
<template slot-scope="scope">
{{ scope.row.status | dynamicText(statusOptions) }}
<el-tag type="success" v-if="scope.row.status==0"></el-tag>
<el-tag type="info" v-else-if="scope.row.status==1">审批中</el-tag>
<el-tag type="warning" v-else-if="scope.row.status==2">已审批</el-tag>
</template>
</el-table-column>
<el-table-column prop="remark" label="备注" width="150" align="center" sortable="custom" />
<el-table-column label="操作" width="150" align="center" >
<el-table-column label="操作" fixed="right" width="150" align="center" >
<template slot-scope="scope">
<el-button type="text" @click="addOrUpdateHandle(scope.row)" v-has="'btn_edit'">
</el-button>

@ -74,7 +74,7 @@
v-if="jnpf.hasP('status')"/>
<el-table-column prop="approval" label="集团审批" width="0" align="left"
v-if="jnpf.hasP('approval')"/>
<el-table-column label="操作"
<el-table-column label="操作" fixed="right"
width="150">
<template slot-scope="scope">
<el-button type="text"

@ -136,7 +136,7 @@
</el-table-column>
<el-table-column prop="supplierSiteCode" label="供应商地点" width="0" align="left"
sortable="custom" />
<el-table-column label="操作"
<el-table-column label="操作" fixed="right"
width="150" >
<template slot-scope="scope">
<el-button type="text"

@ -91,7 +91,7 @@
</el-table-column>
<el-table-column label="操作"
<el-table-column label="操作" fixed="right"
width="80">
<template slot-scope="scope">
<!-- <el-button type="text" v-has="'btn_edit'"-->

@ -74,7 +74,7 @@
</template>
</el-table-column>
<el-table-column label="操作"
<el-table-column label="操作" fixed="right"
width="100">
<template slot-scope="scope">
<el-button type="text" v-has="'btn_edit'"

@ -69,7 +69,7 @@
<el-table-column prop="bankAccount" label="银行账户" width="0" align="center" sortable />
<el-table-column prop="bank" label="开户行" width="0" align="center" sortable />
<el-table-column prop="bankNo" label="行号" width="0" align="center" sortable />
<el-table-column label="操作" width="100">
<el-table-column label="操作" fixed="right" width="100">
<template slot-scope="scope">
<el-button type="text" @click="addOrUpdateHandle(scope.row.id)" v-has="'btn_edit'">
</el-button>

@ -58,9 +58,16 @@
<el-table-column prop="documentno" label="单据编号" sortable width="200" align="center" />
<el-table-column prop="paymentno" label="来源单号" sortable width="200" align="center" />
<el-table-column prop="suppliername" label="供应商" sortable width="200" align="center" />
<el-table-column label="单据状态" sortable width="140" prop="status" align="center" >
<!-- <el-table-column label="单据状态" sortable width="140" prop="status" align="center" >-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.status | dynamicText(statusOptions) }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column prop="status" label="单据状态" sortable width="140" align="center">
<template slot-scope="scope">
{{ scope.row.status | dynamicText(statusOptions) }}
<el-tag type="success" v-if="scope.row.status==0"></el-tag>
<el-tag type="info" v-else-if="scope.row.status==1">已提交</el-tag>
<el-tag type="warning" v-else-if="scope.row.status==2">已认款</el-tag>
</template>
</el-table-column>
<!-- <el-table-column prop="suppliername" label="供应商" sortable width="150" align="center" /> -->
@ -85,7 +92,7 @@
{{ scope.row.settlementtype | dynamicText(settlementtypeOptions) }}
</template>
</el-table-column>
<el-table-column label="操作" width="150" align="center" >
<el-table-column label="操作" fixed="right" width="150" align="center" >
<template slot-scope="scope">
<el-button v-if="scope.row.status == 0" type="text" @click="addOrUpdateHandle(scope.row.id)" v-has="'btn_edit'">
</el-button>

@ -80,7 +80,7 @@
<el-table-column prop="colectionBank" label="收款银行" width="150" align="center" sortable="custom" />
<el-table-column prop="dueDate" label="应付日期" width="150" align="center" sortable="custom" />
<el-table-column prop="remark" label="备注" width="150" align="center" sortable="custom" />
<el-table-column prop="flowState" label="状态" width="100">
<el-table-column prop="flowState" label="状态" width="150" align="center" sortable="custom">
<template slot-scope="scope">
<el-tag v-if="scope.row.flowState==1"></el-tag>
<el-tag type="success" v-else-if="scope.row.flowState==2">审核通过</el-tag>
@ -90,7 +90,7 @@
<el-tag type="warning" v-else></el-tag>
</template>
</el-table-column>
<el-table-column label="操作" width="200">
<el-table-column label="操作" fixed="right" width="200" align="center" sortable="custom">
<template slot-scope="scope">
<el-button type="text"
:disabled="[1,2,4,5].indexOf(scope.row.flowState)>-1"
@ -412,20 +412,32 @@
},
fukuanHandle(id, flowState, isSubmit, isStop) {
var flag = true;
var Falg = true;
this.list.forEach((item,index) => {
if (item.id == id) {
item.poundlistEntityList.forEach((item1, index) => {
if (item1.isInvoicing == '0' || (item1.advance == '0' && item1.isCollection == '0')) {
if (item1.isInvoicing == '0') {
flag = false;
}
if (item1.advance == '0' && item1.isCollection == '0'){
Falg = false;
}
})
}
})
if (!flag){
this.$message({
type: 'error',
message: '不满足付款条件',
duration: 1000
message: '未开票,无法付款',
duration: 3000
});
return
}
if (!Falg){
this.$message({
type: 'error',
message: '存在未回款不垫资的磅单,无法付款',
duration: 3000
});
return
}

@ -115,14 +115,32 @@
@selection-change="handleSelectionChange" border show-summary :summary-method="getSummaries">
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column prop="vehicleName" label="车号" sortable width="120" align="center" />
<el-table-column prop="purchaseStatus" label="采购状态" sortable width="100" align="center" >
<!-- <el-table-column prop="purchaseStatus" label="采购状态" sortable width="100" align="center" >-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.purchaseStatus | dynamicText(purchaseStatusOptions) }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column prop="purchaseStatus" label="采购状态" sortable width="100" align="center">
<template slot-scope="scope">
{{ scope.row.purchaseStatus | dynamicText(purchaseStatusOptions) }}
<el-tag v-if="scope.row.purchaseStatus==99"></el-tag>
<el-tag type="success" v-else-if="scope.row.purchaseStatus==0">待开票</el-tag>
<el-tag type="info" v-else-if="scope.row.purchaseStatus==1">开票中</el-tag>
<el-tag type="warning" v-else-if="scope.row.purchaseStatus==2">已入库</el-tag>
<el-tag type="danger" v-else-if="scope.row.purchaseStatus==3">归档</el-tag>
</template>
</el-table-column>
<el-table-column prop="salesStatus" label="销售状态" sortable width="100" align="center" >
<!-- <el-table-column prop="salesStatus" label="销售状态" sortable width="100" align="center" >-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.salesStatus | dynamicText(salesStatusOptions) }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column prop="salesStatus" label="销售状态" sortable width="100" align="center">
<template slot-scope="scope">
{{ scope.row.salesStatus | dynamicText(salesStatusOptions) }}
<el-tag v-if="scope.row.salesStatus==99"></el-tag>
<el-tag type="success" v-else-if="scope.row.salesStatus==0">待发货</el-tag>
<el-tag type="info" v-else-if="scope.row.salesStatus==1">待开票</el-tag>
<el-tag type="warning" v-else-if="scope.row.salesStatus==2">待回款</el-tag>
<el-tag type="danger" v-else-if="scope.row.salesStatus==3">归档</el-tag>
</template>
</el-table-column>
<el-table-column prop="materialName" label="物料名称" sortable width="150" align="center" />
@ -132,8 +150,8 @@
<el-table-column prop="collectPrice" sortable label="收货价格" width="100" align="center" />
<el-table-column prop="grossWeight" sortable label="毛重" width="100" align="center" />
<el-table-column prop="tareWeight" sortable label="皮重" width="100" align="center" />
<el-table-column prop="netWeight" sortable label="净重" width="100" align="center" />
<el-table-column prop="buckleWeight" sortable label="扣重" width="100" align="center" />
<el-table-column prop="netWeight" sortable label="净重" width="100" align="center" />
<el-table-column prop="unit" label="单位" sortable width="100" align="center" >
<template slot-scope="scope">
{{ scope.row.unit | dynamicText(unitOptions) }}
@ -208,7 +226,7 @@
</span>
</template>
</el-table-column>
<el-table-column label="操作" width="150" align="center">
<el-table-column label="操作" fixed="right" width="150" align="center">
<template slot-scope="scope">
<el-button type="text" @click="addOrUpdateHandle(scope.row)" v-has="'btn_edit'">
</el-button>
@ -483,7 +501,7 @@
return;
}
const values = data.map(item => Number(item[column.property]));
if (!values.every(value => isNaN(value)) && (index === 7 || index === 8 || index === 9 || index === 10|| index === 11)) {
if (!values.every(value => isNaN(value)) && (index === 10 || index === 11 || index === 12 || index === 13)) {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr);
if (!isNaN(value)) {

@ -55,17 +55,23 @@
</template>
</el-table-column>
<el-table-column prop="refundNum" label="退货数量" width="120" align="center"sortable/>
<el-table-column label="单据状态" width="120" sortable prop="status" align="center">
<!-- <el-table-column prop="refundNum" label="退货数量" width="120" align="center"sortable/>-->
<!-- <el-table-column label="单据状态" width="120" sortable prop="status" align="center">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.status | dynamicText(statusOptions) }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column prop="status" label="单据状态" sortable width="120" align="center">
<template slot-scope="scope">
{{ scope.row.status | dynamicText(statusOptions) }}
<el-tag type="success" v-if="scope.row.status==0"></el-tag>
<el-tag type="info" v-else-if="scope.row.status==1">审批中</el-tag>
<el-tag type="warning" v-else-if="scope.row.status==2">已审批</el-tag>
</template>
</el-table-column>
<el-table-column prop="creatorTime" label="创建时间" width="120" align="center"sortable/>
<el-table-column prop="creatorUserName" label="创建人" width="120" align="center"sortable/>
<el-table-column prop="remark" label="备注" width="0" align="center"sortable/>
<el-table-column label="操作" width="150">
<el-table-column label="操作" fixed="right" width="150">
<template slot-scope="scope">
<el-button type="text" @click="addOrUpdateHandle(scope.row.id)" v-has="'btn_edit'">
</el-button>

@ -81,9 +81,17 @@
@selection-change="handleSelectionChange" border>
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column prop="documentNo" label="单据编号" sortable width="200" align="center" />
<el-table-column label="单据状态 " sortable width="150" prop="status" align="center" >
<!-- <el-table-column label="单据状态 " sortable width="150" prop="status" align="center" >-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.status | dynamicText(statusOptions) }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column prop="status" label="单据状态" sortable width="150" align="center">
<template slot-scope="scope">
{{ scope.row.status | dynamicText(statusOptions) }}
<el-tag type="success" v-if="scope.row.status==0"></el-tag>
<el-tag type="info" v-else-if="scope.row.status==1">开票中</el-tag>
<el-tag type="warning" v-else-if="scope.row.status==2">已入库</el-tag>
<el-tag type="danger" v-else-if="scope.row.status==3">归档</el-tag>
</template>
</el-table-column>
<!-- <el-table-column prop="erpNo" label="ERP订单号" sortable width="200" align="center" /> -->
@ -105,7 +113,7 @@
<!-- <el-table-column prop="contractNo" label="对方合同号" width="0" align="center" />
<el-table-column prop="notAmount" label="不含税金额" width="0" align="center" />
<el-table-column prop="remark" label="备注信息" width="0" align="center" /> -->
<el-table-column label="操作" width="200" align="center" >
<el-table-column label="操作" fixed="right" width="200" align="center" >
<template slot-scope="scope">
<el-button type="text" @click="addOrUpdateHandle(scope.row)" v-has="'btn_edit'">
</el-button>

@ -86,14 +86,21 @@
</template>
</el-table-column>
<el-table-column prop="remark" sortable label="备注" width="120" align="center" />
<el-table-column prop="status" sortable label="单据状态" width="120" align="center">
<!-- <el-table-column prop="status" sortable label="单据状态" width="120" align="center">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.status | dynamicText(statusOptions) }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column prop="status" label="单据状态" sortable width="120" align="center">
<template slot-scope="scope">
{{ scope.row.status | dynamicText(statusOptions) }}
<el-tag type="success" v-if="scope.row.status==0"></el-tag>
<el-tag type="info" v-else-if="scope.row.status==1">审批中</el-tag>
<el-tag type="warning" v-else-if="scope.row.status==2">已审批</el-tag>
</template>
</el-table-column>
<el-table-column prop="creatorTime" sortable label="创建日期" width="120" align="center" />
<el-table-column prop="creatorUserName" sortable label="创建人" width="120" align="center" />
<el-table-column label="操作" width="150" align="center">
<el-table-column label="操作" fixed="right" width="150" align="center">
<template slot-scope="scope">
<el-button type="text" @click="addOrUpdateHandle(scope.row)"v-has="'btn_edit'">
</el-button>

@ -71,43 +71,50 @@
</div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
@selection-change="handleSelectionChange" border>
<el-table-column prop="documentNo" label="单据编号" width="0" align="left"
<el-table-column prop="documentNo" label="单据编号" sortable width="200" align="center"
/>
<el-table-column prop="customerNm" label="客户名称" width="0" align="left"
<el-table-column prop="customerNm" label="客户名称" sortable width="200" align="center"
/>
<el-table-column prop="amount" label="出库金额" width="0" align="left"
<el-table-column prop="amount" label="出库金额" sortable width="120" align="center"
/>
<el-table-column prop="num" label="出库数量" width="0" align="left"
<el-table-column prop="num" label="出库数量" sortable width="120" align="center"
/>
<el-table-column label="币别" width="0" prop="currency" algin="left"
<el-table-column label="币别" prop="currency" sortable width="120" align="center"
>
<template slot-scope="scope">
{{ scope.row.currency | dynamicText(currencyOptions) }}
</template>
</el-table-column>
<el-table-column prop="issueDate" label="出库日期" width="0" align="left"
<el-table-column prop="issueDate" label="出库日期" width="120" align="center"
sortable="custom"/>
<el-table-column prop="sourceOrderNo" label="来源单号" width="0" align="left"
<el-table-column prop="sourceOrderNo" label="来源单号" sortable width="200" align="center"
/>
<el-table-column label="业务类型" width="0" prop="type" algin="left"
<el-table-column label="业务类型" prop="type" sortable width="120" align="center"
>
<template slot-scope="scope">
{{ scope.row.type | dynamicText(typeOptions) }}
</template>
</el-table-column>
<el-table-column prop="remark" label="备注" width="0" align="left"
<el-table-column prop="remark" label="备注" sortable width="120" align="center"
/>
<el-table-column label="单据状态" width="0" prop="status" algin="left"
>
<!-- <el-table-column label="单据状态" width="0" prop="status" algin="left"-->
<!-- >-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.status | dynamicText(statusOptions) }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column prop="status" label="单据状态" sortable width="120" align="center">
<template slot-scope="scope">
{{ scope.row.status | dynamicText(statusOptions) }}
<el-tag type="success" v-if="scope.row.status==0"></el-tag>
<el-tag type="info" v-else-if="scope.row.status==1">审批中</el-tag>
<el-tag type="warning" v-else-if="scope.row.status==2">已审批</el-tag>
</template>
</el-table-column>
<el-table-column prop="creatorTime" label="创建时间" width="0" align="left"
<el-table-column prop="creatorTime" label="创建时间" sortable width="120" align="center"
/>
<el-table-column prop="creatorUserName" label="创建人名称" width="0" align="left"
<el-table-column prop="creatorUserName" label="创建人名称" sortable width="120" align="center"
/>
<el-table-column label="操作"
<el-table-column label="操作" fixed="right"
width="150">
<template slot-scope="scope">
<el-button type="text" @click="addOrUpdateHandle(scope.row.id)"v-has="'btn_edit'">
@ -221,6 +228,9 @@
var _list = [];
for (let i = 0; i < res.data.list.length; i++) {
let _data = res.data.list[i];
let format = "YYYY-MM-DD"
_data.creatorTime = this.jnpf.dateFormat(res.data.list[i].creatorTime,format)
_data.issueDate = this.jnpf.dateFormat(res.data.list[i].issueDate,format)
_list.push(_data)
}
this.list = _list

@ -66,7 +66,7 @@
<el-table-column prop="warehouseId" label="仓库" width="200" align="center" sortable
/>
<el-table-column label="操作"
<el-table-column label="操作" fixed="right"
width="100">
<template slot-scope="scope">
<el-button type="text" v-has="'btn_edit'"

@ -83,28 +83,34 @@
<el-table-column prop="refundNum" label="退货数量" width="120" align="center" sortable
/>
<el-table-column label="单据状态" width="120" sortable prop="status" align="center" >
<!-- <el-table-column label="单据状态" width="120" sortable prop="status" align="center" >-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.status | dynamicText(statusOptions) }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column prop="status" label="单据状态" sortable width="120" align="center">
<template slot-scope="scope">
{{ scope.row.status | dynamicText(statusOptions) }}
<el-tag type="success" v-if="scope.row.status==0"></el-tag>
<el-tag type="info" v-else-if="scope.row.status==1">审批中</el-tag>
<el-tag type="warning" v-else-if="scope.row.status==2">已审批</el-tag>
</template>
</el-table-column>
<el-table-column prop="creatorTime" label="创建时间" width="120" align="center" sortable
/>
<el-table-column prop="creatorUserName" label="创建人" width="120" align="center" sortable
/>
<el-table-column prop="remark" label="备注" width="120" align="center" sortable
/>
<el-table-column label="操作"
<el-table-column label="操作" fixed="right"
width="150">
<template slot-scope="scope">
<el-button type="text"
@click="addOrUpdateHandle(scope.row.id)"v-has="'btn_edit'">编辑
<el-button type="text" v-has="'btn_edit'"
@click="addOrUpdateHandle(scope.row.id)">编辑
</el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)"v-has="'btn_remove'">
<el-button type="text" v-has="'btn_remove'" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">
</el-button>
<el-button type="text"
@click="goDetail(scope.row.id)"v-has="'btn_detail'">详情
<el-button type="text" v-has="'btn_detail'"
@click="goDetail(scope.row.id)">详情
</el-button>
</template>
</el-table-column>
@ -250,7 +256,7 @@
this.$message({
type: 'error',
message: '请选择一条数据',
duration: 2500
duration: 1500
})
return
}

@ -116,15 +116,23 @@
<el-table-column prop="creatorTime" label="制单时间" width="140" align="center"
/>
<el-table-column label="单据状态 " width="0" prop="status" algin="center"
>
<!-- <el-table-column label="单据状态 " width="0" prop="status" algin="center"-->
<!-- >-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.status | dynamicText(statusOptions) }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column prop="status" label="单据状态" sortable width="130" align="center">
<template slot-scope="scope">
{{ scope.row.status | dynamicText(statusOptions) }}
<el-tag type="success" v-if="scope.row.status==0"></el-tag>
<el-tag type="info" v-else-if="scope.row.status==1">待开票</el-tag>
<el-tag type="warning" v-else-if="scope.row.status==2">待回款</el-tag>
<el-tag type="danger" v-else-if="scope.row.status==3">归档</el-tag>
</template>
</el-table-column>
<el-table-column prop="creatorUserName" label="制单人" width="130" align="center"
/>
<el-table-column label="操作" algin="center"
<el-table-column label="操作" fixed="right" algin="center"
width="150">
<template slot-scope="scope">
<el-button type="text"

@ -138,7 +138,7 @@
<el-table-column prop="supplierSiteCode" label="供应商地点" width="120" align="center" sortable sortable="custom" />
<el-table-column prop="erpCode" label="ERP编码" width="120" align="center" sortable />
<el-table-column label="操作" width="80">
<el-table-column label="操作" fixed="right" width="80">
<template slot-scope="scope">
<!-- <el-button type="text" v-has="'btn_edit'"-->
<!-- @click="addOrUpdateHandle(scope.row.id)">编辑-->

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

@ -66,7 +66,7 @@
<el-table-column prop="contact" label="手机号" width="0" align="center" sortable/>
<el-table-column prop="creatorusername" label="录入人" width="0" align="center" sortable/>
<el-table-column prop="creatortime" label="创建时间" width="0" align="center" sortable/>
<el-table-column label="操作" width="150">
<el-table-column label="操作" fixed="right" width="150">
<template slot-scope="scope">
<el-button type="text" v-has="'btn_edit'" @click="addOrUpdateHandle(scope.row.id)">
</el-button>

@ -72,7 +72,7 @@
<el-table-column prop="remark" label="备注" width="0" align="center" sortable
/>
<el-table-column label="操作"
<el-table-column label="操作" fixed="right"
width="100">
<template slot-scope="scope">
<el-button type="text" v-has="'btn_edit'"

Loading…
Cancel
Save