列表字段调整

jg-waiwang-pro
vayne 8 months ago
parent 5948042908
commit d64748c627

@ -27,6 +27,7 @@
<result column="supplyName" property="supplyName"></result> <result column="supplyName" property="supplyName"></result>
<result column="relationOrder" property="relationOrder"></result> <result column="relationOrder" property="relationOrder"></result>
<result column="warehouseName" property="warehouseName"></result> <result column="warehouseName" property="warehouseName"></result>
<result column="saleOrder" property="saleOrder"></result>
</resultMap> </resultMap>
<resultMap id="deliveryOrderInfo" type="jnpf.model.deliveryorder.BusinessOrderInfoModel"> <resultMap id="deliveryOrderInfo" type="jnpf.model.deliveryorder.BusinessOrderInfoModel">
@ -63,11 +64,13 @@
end as deliveryStatus1, end as deliveryStatus1,
b.name as supplyName, b.name as supplyName,
c.return_cargo_code as relationOrder, c.return_cargo_code as relationOrder,
d.name as warehouseName d.name as warehouseName,
e.code as saleOrder
from jg_delivery_order a from jg_delivery_order a
left join jg_subject_basic b on a.subject_id = b.id and b.f_delete_mark is null left join jg_subject_basic b on a.subject_id = b.id and b.f_delete_mark is null
left join jg_return_cargo_order c on a.business_id = c.id and c.f_delete_mark is null left join jg_return_cargo_order c on a.business_id = c.id and c.f_delete_mark is null
left join jg_business_line d on a.warehouse_id = d.id and d.f_delete_mark is null left join jg_business_line d on a.warehouse_id = d.id and d.f_delete_mark is null
left join jg_business_order e on a.business_id = e.id and e.f_delete_mark is null
${ew.customSqlSegment} ${ew.customSqlSegment}
<if test="deliveryOrderPagination.sidx != null and deliveryOrderPagination.sidx != ''"> <if test="deliveryOrderPagination.sidx != null and deliveryOrderPagination.sidx != ''">
ORDER BY ${deliveryOrderPagination.sidx} ${deliveryOrderPagination.sort} ORDER BY ${deliveryOrderPagination.sidx} ${deliveryOrderPagination.sort}

@ -71,18 +71,18 @@
'已取消' '已取消'
END AS receiptStatus1, END AS receiptStatus1,
b.return_cargo_code AS returnCargoOrder, b.return_cargo_code AS returnCargoOrder,
c.CODE AS receiptWarehouse, c.name AS receiptWarehouse,
d.NAME AS subjectName, d.NAME AS subjectName,
e.CODE AS purchaseOrder e.CODE AS purchaseOrder
FROM FROM
jg_receipt_order a jg_receipt_order a
LEFT JOIN jg_return_cargo_order b ON a.business_id = b.id LEFT JOIN jg_return_cargo_order b ON a.business_id = b.id
AND b.f_delete_mark is null AND b.f_delete_mark is null
IS NULL LEFT JOIN jg_business_line c ON a.warehouse_id = c.id LEFT JOIN jg_business_line c ON a.warehouse_id = c.id
AND c.f_delete_mark is null AND c.f_delete_mark is null
IS NULL LEFT JOIN jg_subject_basic d ON a.subject_id = d.id LEFT JOIN jg_subject_basic d ON a.subject_id = d.id
AND d.f_delete_mark is null AND d.f_delete_mark is null
IS NULL LEFT JOIN jg_business_order e ON a.business_id = e.id LEFT JOIN jg_business_order e ON a.business_id = e.id
AND e.f_delete_mark IS NULL AND e.f_delete_mark IS NULL
${ew.customSqlSegment} ${ew.customSqlSegment}
<if test="receiptOrderPagination.sidx != null and receiptOrderPagination.sidx != ''"> <if test="receiptOrderPagination.sidx != null and receiptOrderPagination.sidx != ''">

@ -32,6 +32,13 @@
<result column="purchaseOrder" property="purchaseOrder"/> <result column="purchaseOrder" property="purchaseOrder"/>
<result column="warehouseName" property="warehouseName"/> <result column="warehouseName" property="warehouseName"/>
<result column="returnCargoWay1" property="returnCargoWay1"/> <result column="returnCargoWay1" property="returnCargoWay1"/>
<result column="fixPriceMode1" property="fixPriceMode1"/>
<result column="deliveryType1" property="deliveryType1"/>
<result column="transportMode1" property="transportMode1"/>
<result column="carriageMode1" property="carriageMode1"/>
<result column="carrier1" property="carrier1"/>
<result column="urgentOrder1" property="urgentOrder1"/>
<result column="saleMode1" property="saleMode1"/>
</resultMap> </resultMap>
<select id="queryReturnCargoOrderList" resultMap="returnCargoOrder"> <select id="queryReturnCargoOrderList" resultMap="returnCargoOrder">
@ -65,16 +72,68 @@
WHEN '3' THEN WHEN '3' THEN
'其他退货' '其他退货'
END AS documentType1, END AS documentType1,
case a.return_cargo_way CASE
WHEN '1' THEN '仅退款' a.return_cargo_way
WHEN '2' THEN '退货退款' WHEN '1' THEN
'仅退款'
WHEN '2' THEN
'退货退款'
END AS returnCargoWay1, END AS returnCargoWay1,
b.NAME AS supplyName, b.NAME AS supplyName,
c.code AS purchaseOrder, c.CODE AS purchaseOrder,
case c.urgent_order
when '1' then '否'
when '2' then '是'
end as urgentOrder1,
case c.sale_mode
when '1' then '以销定采'
when '2' then '以采定销'
end as saleMode1,
CASE
c.fix_price_mode
WHEN '1' THEN
'锁价模式'
WHEN '2' THEN
'后结算模式'
END AS fixPriceMode1,
CASE
c.delivery_type
WHEN '1' THEN
'无'
WHEN '2' THEN
'仓配'
WHEN '3' THEN
'直送'
END AS deliveryType1,
CASE
c.transport_mode
WHEN '1' THEN
'公路'
WHEN '2' THEN
'铁路'
WHEN '3' THEN
'轮船'
WHEN '4' THEN
'空运'
WHEN '5' THEN
'无'
END AS transportMode1,
CASE
c.carriage_mode
WHEN '1' THEN
'仓库承运(DC)'
WHEN '2' THEN
'承运商'
WHEN '3' THEN
'供应商'
WHEN '4' THEN
'自提'
END AS carriageMode1,
c.carrier as carrier1,
d.NAME AS warehouseName d.NAME AS warehouseName
FROM FROM
jg_return_cargo_order a jg_return_cargo_order a
LEFT JOIN jg_subject_basic b ON a.subject_id = a.id and b.f_delete_mark is null LEFT JOIN jg_subject_basic b ON a.subject_id = b.id and b.f_delete_mark is null
LEFT JOIN jg_business_order c ON a.business_id = c.id and c.f_delete_mark is null LEFT JOIN jg_business_order c ON a.business_id = c.id and c.f_delete_mark is null
LEFT JOIN jg_business_line d ON a.warehouse_id = d.id and d.f_delete_mark is null LEFT JOIN jg_business_line d ON a.warehouse_id = d.id and d.f_delete_mark is null
${ew.customSqlSegment} ${ew.customSqlSegment}

@ -57,6 +57,7 @@
<result column="modeTransport1" property="modeTransport1"/> <result column="modeTransport1" property="modeTransport1"/>
<result column="transportationMethod1" property="transportationMethod1"/> <result column="transportationMethod1" property="transportationMethod1"/>
<result column="thirdSupplyName" property="thirdSupplyName"/> <result column="thirdSupplyName" property="thirdSupplyName"/>
<result column="purchaseDeliveryOrder" property="purchaseDeliveryOrder"/>
</resultMap> </resultMap>
<select id="querySaleDeliveryVoucher" resultMap="voucherList"> <select id="querySaleDeliveryVoucher" resultMap="voucherList">
SELECT SELECT
@ -182,9 +183,11 @@
when '3' then '供应商' when '3' then '供应商'
when '4' then '自提' when '4' then '自提'
end as transportationMethod1, end as transportationMethod1,
b.name as thirdSupplyName b.name as thirdSupplyName,
c.delivery_code as purchaseDeliveryOrder
from jg_voucher a from jg_voucher a
left join jg_subject_basic b on a.associate_third_suppliers = b.id and b.f_delete_mark is null left join jg_subject_basic b on a.associate_third_suppliers = b.id and b.f_delete_mark is null
left join jg_delivery_order c on a.associated_document_no = c.id and c.f_delete_mark is null
${ew.customSqlSegment} ${ew.customSqlSegment}
<if test="voucherPagination.sidx != null and voucherPagination.sidx != ''"> <if test="voucherPagination.sidx != null and voucherPagination.sidx != ''">
ORDER BY ${voucherPagination.sidx} ${voucherPagination.sort} ORDER BY ${voucherPagination.sidx} ${voucherPagination.sort}

@ -103,7 +103,7 @@ public class DeliveryOrderController {
realList.add(deliveryOrderMap); realList.add(deliveryOrderMap);
} }
//数据转换 //数据转换
realList = generaterSwapUtil.swapDataList(realList, DeliveryOrderConstant.getFormData(), DeliveryOrderConstant.getColumnData(), deliveryOrderPagination.getModuleId(),false); // realList = generaterSwapUtil.swapDataList(realList, DeliveryOrderConstant.getFormData(), DeliveryOrderConstant.getColumnData(), deliveryOrderPagination.getModuleId(),false);
//流程状态添加 //流程状态添加
for(Map<String, Object> vo:realList){ for(Map<String, Object> vo:realList){

@ -91,6 +91,8 @@ public class DeliveryOrderEntity {
private String relationOrder; private String relationOrder;
@TableField(exist = false) @TableField(exist = false)
private String warehouseName; private String warehouseName;
@TableField(exist = false)
private String saleOrder;
} }

@ -131,4 +131,18 @@ public class ReturnCargoOrderEntity {
private String warehouseName; private String warehouseName;
@TableField(exist = false) @TableField(exist = false)
private String returnCargoWay1; private String returnCargoWay1;
@TableField(exist = false)
private String fixPriceMode1;
@TableField(exist = false)
private String deliveryType1;
@TableField(exist = false)
private String transportMode1;
@TableField(exist = false)
private String carriageMode1;
@TableField(exist = false)
private String carrier1;
@TableField(exist = false)
private String urgentOrder1;
@TableField(exist = false)
private String saleMode1;
} }

@ -165,4 +165,6 @@ public class VoucherEntity {
private String transportationMethod1; private String transportationMethod1;
@TableField(exist = false) @TableField(exist = false)
private String thirdSupplyName; private String thirdSupplyName;
@TableField(exist = false)
private String purchaseDeliveryOrder;
} }

@ -72,9 +72,9 @@
{{ scope.row.deliveryType1 }} {{ scope.row.deliveryType1 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="relationOrder" label="关联退货" align="left"> <el-table-column prop="relationOrder" label="关联单据号" align="left">
</el-table-column> </el-table-column>
<el-table-column prop="warehouseOrder" label="发货仓库" align="left"> <el-table-column prop="warehouseName" label="发货仓库" align="left">
</el-table-column> </el-table-column>
<el-table-column prop="warehouseOrder" label="发货数量" align="left"> <el-table-column prop="warehouseOrder" label="发货数量" align="left">
</el-table-column> </el-table-column>

@ -10,15 +10,15 @@
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="凭证类型"> <el-form-item label="凭证类型">
<JnpfSelect v-model="query.voucherType" placeholder="请选择" clearable <JnpfSelect v-model="query.voucherType" placeholder="请选择" clearable :options="voucherTypeOptions"
:options="voucherTypeOptions" :props="voucherTypeProps" multiple> :props="voucherTypeProps" multiple>
</JnpfSelect> </JnpfSelect>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="制单时间"> <el-form-item label="制单时间">
<JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd" <JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd" startPlaceholder="开始日期"
startPlaceholder="开始日期" endPlaceholder="结束日期"> endPlaceholder="结束日期">
</JnpfDateRangePicker> </JnpfDateRangePicker>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -33,11 +33,10 @@
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()"></el-button> <el-button type="primary" icon="el-icon-search" @click="search()"></el-button>
<el-button icon="el-icon-refresh-right" @click="reset()"></el-button> <el-button icon="el-icon-refresh-right" @click="reset()"></el-button>
<el-button type="text" icon="el-icon-arrow-down" @click="showAll=true" <el-button type="text" icon="el-icon-arrow-down" @click="showAll = true" v-if="!showAll">
v-if="!showAll">
展开 展开
</el-button> </el-button>
<el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else> <el-button type="text" icon="el-icon-arrow-up" @click="showAll = false" v-else>
收起 收起
</el-button> </el-button>
</el-form-item> </el-form-item>
@ -47,11 +46,9 @@
<div class="JNPF-common-layout-main JNPF-flex-main"> <div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head"> <div class="JNPF-common-head">
<div> <div>
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'" <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'" @click="addOrUpdateHandle()">
@click="addOrUpdateHandle()">新增
</el-button> </el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()" <el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()" v-has="'btn_download'">
v-has="'btn_download'">导出
</el-button> </el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()" <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
v-has="'btn_batchRemove'">批量删除 v-has="'btn_batchRemove'">批量删除
@ -62,12 +59,10 @@
</div> </div>
<div class="JNPF-common-head-right"> <div class="JNPF-common-head-right">
<el-tooltip content="高级查询" placement="top" v-if="true"> <el-tooltip content="高级查询" placement="top" v-if="true">
<el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false" <el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false" @click="openSuperQuery()" />
@click="openSuperQuery()" />
</el-tooltip> </el-tooltip>
<el-tooltip effect="dark" :content="$t('common.refresh')" placement="top"> <el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" @click="initData()" />
@click="initData()" />
</el-tooltip> </el-tooltip>
</div> </div>
</div> </div>
@ -77,33 +72,33 @@
</el-table-column> </el-table-column>
<el-table-column label="单据类型" prop="documentType1" algin="left"> <el-table-column label="单据类型" prop="documentType1" algin="left">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.documentType1}} {{ scope.row.documentType1 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="凭证类型" prop="voucherType1" algin="left"> <el-table-column label="凭证类型" prop="voucherType1" algin="left">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.voucherType1}} {{ scope.row.voucherType1 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="凭证状态" prop="voucherStatus1" algin="left"> <el-table-column label="凭证状态" prop="voucherStatus1" algin="left">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.voucherStatus1}} {{ scope.row.voucherStatus1 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="poundCode" label="磅单编号" align="left"> <el-table-column prop="poundCode" label="磅单编号" align="left">
</el-table-column> </el-table-column>
<el-table-column prop="associatedDocumentNo" label="关联单据号" align="left"> <el-table-column prop="purchaseDeliveryOrder" label="关联单据号" align="left">
</el-table-column> </el-table-column>
<el-table-column prop="vehicleName" label="车牌号" align="left"> <el-table-column prop="vehicleName" label="车牌号" align="left">
</el-table-column> </el-table-column>
<el-table-column label="运输方式" prop="modeTransport1" algin="left"> <el-table-column label="运输方式" prop="modeTransport1" algin="left">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.modeTransport1}} {{ scope.row.modeTransport1 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="承运方式" prop="transportationMethod1" algin="left"> <el-table-column label="承运方式" prop="transportationMethod1" algin="left">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.transportationMethod1}} {{ scope.row.transportationMethod1 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="carrier" label="承运商" align="left"> <el-table-column prop="carrier" label="承运商" align="left">
@ -120,52 +115,47 @@
</el-table-column> </el-table-column>
<el-table-column prop="flowState" label="状态" width="100"> <el-table-column prop="flowState" label="状态" width="100">
<template slot-scope="scope" v-if="!scope.row.top"> <template slot-scope="scope" v-if="!scope.row.top">
<el-tag v-if="scope.row.flowState==1"></el-tag> <el-tag v-if="scope.row.flowState == 1"></el-tag>
<el-tag type="success" v-else-if="scope.row.flowState==2">审核通过</el-tag> <el-tag type="success" v-else-if="scope.row.flowState == 2">审核通过</el-tag>
<el-tag type="danger" v-else-if="scope.row.flowState==3">审核驳回</el-tag> <el-tag type="danger" v-else-if="scope.row.flowState == 3">审核驳回</el-tag>
<el-tag type="info" v-else-if="scope.row.flowState==4">流程撤回</el-tag> <el-tag type="info" v-else-if="scope.row.flowState == 4">流程撤回</el-tag>
<el-tag type="info" v-else-if="scope.row.flowState==5">审核终止</el-tag> <el-tag type="info" v-else-if="scope.row.flowState == 5">审核终止</el-tag>
<el-tag type="warning" v-else></el-tag> <el-tag type="warning" v-else></el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" fixed="right" width="150"> <el-table-column label="操作" fixed="right" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" :disabled="[1,2,4,5].indexOf(scope.row.flowState)>-1" <el-button type="text" :disabled="[1, 2, 4, 5].indexOf(scope.row.flowState) > -1"
@click="updateHandle(scope.row)" v-has="'btn_edit'">编辑 @click="updateHandle(scope.row)" v-has="'btn_edit'">编辑
</el-button> </el-button>
<el-button type="text" class="JNPF-table-delBtn" <el-button type="text" class="JNPF-table-delBtn" :disabled="[1, 2, 3, 5].indexOf(scope.row.flowState) > -1"
:disabled="[1,2,3,5].indexOf(scope.row.flowState)>-1" v-has="'btn_remove'" v-has="'btn_remove'" @click="handleDel(scope.row.id)">删除
@click="handleDel(scope.row.id)">删除
</el-button> </el-button>
<el-button size="mini" type="text" :disabled="!scope.row.flowState" <el-button size="mini" type="text" :disabled="!scope.row.flowState"
@click="updateHandle(scope.row,scope.row.flowState)">详情</el-button> @click="updateHandle(scope.row, scope.row.flowState)">详情</el-button>
</template> </template>
</el-table-column> </el-table-column>
</JNPF-table> </JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage" <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
:limit.sync="listQuery.pageSize" @pagination="initData" /> @pagination="initData" />
</div> </div>
</div> </div>
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" /> <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" /> <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
<FlowBox v-if="flowVisible" ref="FlowBox" @close="colseFlow" /> <FlowBox v-if="flowVisible" ref="FlowBox" @close="colseFlow" />
<el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body <el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body :visible.sync="flowListVisible"
:visible.sync="flowListVisible" class="JNPF-dialog template-dialog JNPF-dialog_center" class="JNPF-dialog template-dialog JNPF-dialog_center" lock-scroll width="400px">
lock-scroll width="400px">
<el-scrollbar class="template-list"> <el-scrollbar class="template-list">
<div class="template-item" v-for="item in flowList" :key="item.id" <div class="template-item" v-for="item in flowList" :key="item.id" @click="selectFlow(item)">{{ item.fullName }}
@click="selectFlow(item)">{{item.fullName}}
</div> </div>
</el-scrollbar> </el-scrollbar>
</el-dialog> </el-dialog>
<ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" /> <ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false" /> <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible = false" />
<ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" <ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" />
@close="toFormDetailVisible = false" /> <SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson" @superQuery="superQuery" />
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
@superQuery="superQuery" />
</div> </div>
</template> </template>

@ -5,8 +5,8 @@
<el-form @submit.native.prevent> <el-form @submit.native.prevent>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="单据类型"> <el-form-item label="单据类型">
<JnpfSelect v-model="query.orderType" placeholder="请选择" clearable <JnpfSelect v-model="query.orderType" placeholder="请选择" clearable :options="orderTypeOptions"
:options="orderTypeOptions" :props="orderTypeProps"> :props="orderTypeProps">
</JnpfSelect> </JnpfSelect>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -17,29 +17,29 @@
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="是否紧急"> <el-form-item label="是否紧急">
<JnpfSelect v-model="query.urgentOrder" placeholder="请选择" clearable <JnpfSelect v-model="query.urgentOrder" placeholder="请选择" clearable :options="urgentOrderOptions"
:options="urgentOrderOptions" :props="urgentOrderProps"> :props="urgentOrderProps">
</JnpfSelect> </JnpfSelect>
</el-form-item> </el-form-item>
</el-col> </el-col>
<template v-if="showAll"> <template v-if="showAll">
<el-col :span="6"> <el-col :span="6">
<el-form-item label="制单时间"> <el-form-item label="制单时间">
<JnpfDateRangePicker v-model="query.createOrderDate" format="yyyy-MM-dd" <JnpfDateRangePicker v-model="query.createOrderDate" format="yyyy-MM-dd" startPlaceholder="开始日期"
startPlaceholder="开始日期" endPlaceholder="结束日期" /> endPlaceholder="结束日期" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="配送方式"> <el-form-item label="配送方式">
<JnpfSelect v-model="query.deliveryType" placeholder="请选择" clearable <JnpfSelect v-model="query.deliveryType" placeholder="请选择" clearable :options="deliveryTypeOptions"
:options="deliveryTypeOptions" :props="deliveryTypeProps" multiple> :props="deliveryTypeProps" multiple>
</JnpfSelect> </JnpfSelect>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="单据状态"> <el-form-item label="单据状态">
<JnpfSelect v-model="query.status" placeholder="请选择" clearable <JnpfSelect v-model="query.status" placeholder="请选择" clearable :options="statusOptions"
:options="statusOptions" :props="statusProps" multiple> :props="statusProps" multiple>
</JnpfSelect> </JnpfSelect>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -48,11 +48,10 @@
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()"></el-button> <el-button type="primary" icon="el-icon-search" @click="search()"></el-button>
<el-button icon="el-icon-refresh-right" @click="reset()"></el-button> <el-button icon="el-icon-refresh-right" @click="reset()"></el-button>
<el-button type="text" icon="el-icon-arrow-down" @click="showAll=true" <el-button type="text" icon="el-icon-arrow-down" @click="showAll = true" v-if="!showAll">
v-if="!showAll">
展开 展开
</el-button> </el-button>
<el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else> <el-button type="text" icon="el-icon-arrow-up" @click="showAll = false" v-else>
收起 收起
</el-button> </el-button>
</el-form-item> </el-form-item>
@ -62,27 +61,22 @@
<div class="JNPF-common-layout-main JNPF-flex-main"> <div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head"> <div class="JNPF-common-head">
<div> <div>
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'" <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'" @click="addOrUpdateHandle()">
@click="addOrUpdateHandle()">新增
</el-button> </el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()" <el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()" v-has="'btn_download'">
v-has="'btn_download'">导出
</el-button> </el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()" <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
v-has="'btn_batchRemove'">批量删除 v-has="'btn_batchRemove'">批量删除
</el-button> </el-button>
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'" <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'" @click="addSaleHandle()">
@click="addSaleHandle()">生成销售订单
</el-button> </el-button>
</div> </div>
<div class="JNPF-common-head-right"> <div class="JNPF-common-head-right">
<el-tooltip content="高级查询" placement="top" v-if="true"> <el-tooltip content="高级查询" placement="top" v-if="true">
<el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false" <el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false" @click="openSuperQuery()" />
@click="openSuperQuery()" />
</el-tooltip> </el-tooltip>
<el-tooltip effect="dark" :content="$t('common.refresh')" placement="top"> <el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" @click="initData()" />
@click="initData()" />
</el-tooltip> </el-tooltip>
</div> </div>
</div> </div>
@ -90,38 +84,35 @@
@selection-change="handleSelectionChange" :span-method="arraySpanMethod"> @selection-change="handleSelectionChange" :span-method="arraySpanMethod">
<el-table-column prop="code" label="单据编号" align="left"> <el-table-column prop="code" label="单据编号" align="left">
</el-table-column> </el-table-column>
<el-table-column prop="subjectName" label="一级供应商" align="left"> <el-table-column prop="subjectName" label="供应商名称" align="left">
</el-table-column> </el-table-column>
<el-table-column label="单据类型" prop="orderType" algin="left"> <el-table-column label="单据类型" prop="orderType1" algin="left">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.orderType1}} {{ scope.row.orderType1 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="单据状态" prop="status" algin="left"> <el-table-column label="单据状态" prop="purchaseStatus" algin="left">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.purchaseStatus}} {{ scope.row.purchaseStatus }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="saleCode" label="关联销售" align="left"> <el-table-column prop="saleCode" label="关联销售" align="left">
</el-table-column> </el-table-column>
<el-table-column prop="saleStatus" label="关联单据状态" align="left"> <el-table-column prop="saleStatus" label="关联单据状态" align="left">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.saleStatus}} {{ scope.row.saleStatus }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="contractName" label="关联合同号" align="left"> <el-table-column prop="contractName" label="关联合同号" align="left">
</el-table-column> </el-table-column>
<el-table-column label="是否紧急" prop="urgentOrder" algin="left"> <el-table-column label="是否紧急" prop="urgentOrder1" algin="left">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.urgentOrder1}} {{ scope.row.urgentOrder1 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="wareHouseName" label="收货仓库" align="left"> <el-table-column prop="wareHouseName" label="收货仓库" align="left">
</el-table-column> </el-table-column>
<el-table-column prop="expectArriveDateStart" label="期望送达" align="left">
</el-table-column>
<el-table-column prop="businessNum" label="计划采购数量" align="left"> <el-table-column prop="businessNum" label="计划采购数量" align="left">
</el-table-column> </el-table-column>
<el-table-column prop="storageNumber" label="已收货数量" align="left"> <el-table-column prop="storageNumber" label="已收货数量" align="left">
@ -129,38 +120,38 @@
<el-table-column prop="storageNum" label="收货次数" align="left"> <el-table-column prop="storageNum" label="收货次数" align="left">
</el-table-column> </el-table-column>
<el-table-column label="采购模式" prop="saleMode" algin="left"> <el-table-column label="采购模式" prop="saleMode1" algin="left">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.saleMode1}} {{ scope.row.saleMode1 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="结算方式" prop="fixPriceMode" algin="left"> <el-table-column label="结算方式" prop="fixPriceMode1" algin="left">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.fixPriceMode1}} {{ scope.row.fixPriceMode1 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="配送方式" prop="deliveryType" algin="left"> <el-table-column label="配送方式" prop="deliveryType1" algin="left">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.deliveryType1}} {{ scope.row.deliveryType1 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="运输方式" prop="transportMode" algin="left"> <el-table-column label="运输方式" prop="transportMode1" algin="left">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.transportMode1}} {{ scope.row.transportMode1 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="承运类型" prop="carriageMode" algin="left"> <el-table-column label="承运类型" prop="carriageMode1" algin="left">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.carriageMode1}} {{ scope.row.carriageMode1 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="承运商" prop="carrier" algin="left"> <el-table-column label="承运商" prop="carrier" algin="left">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.carrier}} {{ scope.row.carrier }}
</template> </template>
</el-table-column> </el-table-column>
@ -173,7 +164,6 @@
<el-table-column prop="creatorTime" label="创建时间" align="left"> <el-table-column prop="creatorTime" label="创建时间" align="left">
</el-table-column> </el-table-column>
<el-table-column prop="realName" label="创建人" align="left"> <el-table-column prop="realName" label="创建人" align="left">
</el-table-column> </el-table-column>
<el-table-column prop="lastModifyTime" label="更新时间" align="left"> <el-table-column prop="lastModifyTime" label="更新时间" align="left">
@ -183,52 +173,47 @@
<el-table-column prop="flowState" label="状态" width="100"> <el-table-column prop="flowState" label="状态" width="100">
<template slot-scope="scope" v-if="!scope.row.top"> <template slot-scope="scope" v-if="!scope.row.top">
<el-tag v-if="scope.row.flowState==1"></el-tag> <el-tag v-if="scope.row.flowState == 1"></el-tag>
<el-tag type="success" v-else-if="scope.row.flowState==2">审核通过</el-tag> <el-tag type="success" v-else-if="scope.row.flowState == 2">审核通过</el-tag>
<el-tag type="danger" v-else-if="scope.row.flowState==3">审核驳回</el-tag> <el-tag type="danger" v-else-if="scope.row.flowState == 3">审核驳回</el-tag>
<el-tag type="info" v-else-if="scope.row.flowState==4">流程撤回</el-tag> <el-tag type="info" v-else-if="scope.row.flowState == 4">流程撤回</el-tag>
<el-tag type="info" v-else-if="scope.row.flowState==5">审核终止</el-tag> <el-tag type="info" v-else-if="scope.row.flowState == 5">审核终止</el-tag>
<el-tag type="warning" v-else></el-tag> <el-tag type="warning" v-else></el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" fixed="right" width="150"> <el-table-column label="操作" fixed="right" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" :disabled="[1,2,4,5].indexOf(scope.row.flowState)>-1" <el-button type="text" :disabled="[1, 2, 4, 5].indexOf(scope.row.flowState) > -1"
@click="updateHandle(scope.row)" v-has="'btn_edit'">编辑 @click="updateHandle(scope.row)" v-has="'btn_edit'">编辑
</el-button> </el-button>
<el-button type="text" class="JNPF-table-delBtn" <el-button type="text" class="JNPF-table-delBtn" :disabled="[1, 2, 3, 5].indexOf(scope.row.flowState) > -1"
:disabled="[1,2,3,5].indexOf(scope.row.flowState)>-1" v-has="'btn_remove'" v-has="'btn_remove'" @click="handleDel(scope.row.id)">删除
@click="handleDel(scope.row.id)">删除
</el-button> </el-button>
<el-button size="mini" type="text" :disabled="!scope.row.flowState" <el-button size="mini" type="text" :disabled="!scope.row.flowState"
@click="updateHandle(scope.row,scope.row.flowState)">详情</el-button> @click="updateHandle(scope.row, scope.row.flowState)">详情</el-button>
</template> </template>
</el-table-column> </el-table-column>
</JNPF-table> </JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage" <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
:limit.sync="listQuery.pageSize" @pagination="initData" /> @pagination="initData" />
</div> </div>
</div> </div>
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" /> <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" /> <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
<FlowBox v-if="flowVisible" ref="FlowBox" @close="colseFlow" /> <FlowBox v-if="flowVisible" ref="FlowBox" @close="colseFlow" />
<el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body <el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body :visible.sync="flowListVisible"
:visible.sync="flowListVisible" class="JNPF-dialog template-dialog JNPF-dialog_center" class="JNPF-dialog template-dialog JNPF-dialog_center" lock-scroll width="400px">
lock-scroll width="400px">
<el-scrollbar class="template-list"> <el-scrollbar class="template-list">
<div class="template-item" v-for="item in flowList" :key="item.id" <div class="template-item" v-for="item in flowList" :key="item.id" @click="selectFlow(item)">{{ item.fullName }}
@click="selectFlow(item)">{{item.fullName}}
</div> </div>
</el-scrollbar> </el-scrollbar>
</el-dialog> </el-dialog>
<ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" /> <ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false" /> <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible = false" />
<ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" <ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" />
@close="toFormDetailVisible = false" /> <SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson" @superQuery="superQuery" />
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
@superQuery="superQuery" />
<SaleFlowBox v-if="saleFlowVisible" ref="SaleFlowBox" @close="colseFlow" /> <SaleFlowBox v-if="saleFlowVisible" ref="SaleFlowBox" @close="colseFlow" />
</div> </div>
</template> </template>

@ -10,15 +10,15 @@
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="凭证类型"> <el-form-item label="凭证类型">
<JnpfSelect v-model="query.voucherType" placeholder="请选择" clearable <JnpfSelect v-model="query.voucherType" placeholder="请选择" clearable :options="voucherTypeOptions"
:options="voucherTypeOptions" :props="voucherTypeProps" multiple> :props="voucherTypeProps" multiple>
</JnpfSelect> </JnpfSelect>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="制单时间"> <el-form-item label="制单时间">
<JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd" <JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd" startPlaceholder="开始日期"
startPlaceholder="开始日期" endPlaceholder="结束日期"> endPlaceholder="结束日期">
</JnpfDateRangePicker> </JnpfDateRangePicker>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -33,11 +33,10 @@
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()"></el-button> <el-button type="primary" icon="el-icon-search" @click="search()"></el-button>
<el-button icon="el-icon-refresh-right" @click="reset()"></el-button> <el-button icon="el-icon-refresh-right" @click="reset()"></el-button>
<el-button type="text" icon="el-icon-arrow-down" @click="showAll=true" <el-button type="text" icon="el-icon-arrow-down" @click="showAll = true" v-if="!showAll">
v-if="!showAll">
展开 展开
</el-button> </el-button>
<el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else> <el-button type="text" icon="el-icon-arrow-up" @click="showAll = false" v-else>
收起 收起
</el-button> </el-button>
</el-form-item> </el-form-item>
@ -47,11 +46,9 @@
<div class="JNPF-common-layout-main JNPF-flex-main"> <div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head"> <div class="JNPF-common-head">
<div> <div>
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'" <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'" @click="addOrUpdateHandle()">
@click="addOrUpdateHandle()">新增
</el-button> </el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()" <el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()" v-has="'btn_download'">
v-has="'btn_download'">导出
</el-button> </el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()" <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
v-has="'btn_batchRemove'">批量删除 v-has="'btn_batchRemove'">批量删除
@ -59,8 +56,7 @@
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'" <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
@click="createPurchaseOrder()">生成采购单 @click="createPurchaseOrder()">生成采购单
</el-button> </el-button>
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'" <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'" @click="createReceiptOrder()">
@click="createReceiptOrder()">生成收货单
</el-button> </el-button>
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'" <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
@click="createSaleDeliveryVoucher()">生成销售发货凭证 @click="createSaleDeliveryVoucher()">生成销售发货凭证
@ -68,12 +64,10 @@
</div> </div>
<div class="JNPF-common-head-right"> <div class="JNPF-common-head-right">
<el-tooltip content="高级查询" placement="top" v-if="true"> <el-tooltip content="高级查询" placement="top" v-if="true">
<el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false" <el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false" @click="openSuperQuery()" />
@click="openSuperQuery()" />
</el-tooltip> </el-tooltip>
<el-tooltip effect="dark" :content="$t('common.refresh')" placement="top"> <el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" @click="initData()" />
@click="initData()" />
</el-tooltip> </el-tooltip>
</div> </div>
</div> </div>
@ -83,17 +77,17 @@
</el-table-column> </el-table-column>
<el-table-column label="单据类型" prop="documentType" algin="left"> <el-table-column label="单据类型" prop="documentType" algin="left">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.documentType1}} {{ scope.row.documentType1 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="凭证类型" prop="voucherType" algin="left"> <el-table-column label="凭证类型" prop="voucherType" algin="left">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.voucherType1}} {{ scope.row.voucherType1 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="凭证状态" prop="voucherStatus" algin="left"> <el-table-column label="凭证状态" prop="voucherStatus" algin="left">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.voucherStatus1}} {{ scope.row.voucherStatus1 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="poundCode" label="磅单编号" align="left"> <el-table-column prop="poundCode" label="磅单编号" align="left">
@ -104,12 +98,12 @@
</el-table-column> </el-table-column>
<el-table-column label="运输方式" prop="modeTransport" algin="left"> <el-table-column label="运输方式" prop="modeTransport" algin="left">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.modeTransport1}} {{ scope.row.modeTransport1 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="承运方式" prop="transportationMethod" algin="left"> <el-table-column label="承运方式" prop="transportationMethod" algin="left">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.transportationMethod1}} {{ scope.row.transportationMethod1 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="carrier" label="承运商" align="left"> <el-table-column prop="carrier" label="承运商" align="left">
@ -122,59 +116,64 @@
</el-table-column> </el-table-column>
<el-table-column prop="associateThirdSuppliers" label="三级供应商" align="left"> <el-table-column prop="associateThirdSuppliers" label="三级供应商" align="left">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.thirdSupplyName}} {{ scope.row.thirdSupplyName }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="poundlistTime" label="磅单时间" align="left">
</el-table-column>
<el-table-column prop="preparationTime" label="制单时间" align="left"> <el-table-column prop="preparationTime" label="制单时间" align="left">
</el-table-column> </el-table-column>
<el-table-column prop="creatorUserId" label="提交人" align="left">
</el-table-column>
<el-table-column prop="creatorTime" label="提交时间" align="left">
</el-table-column>
<el-table-column prop="lastModifyUserId" label="修改人" align="left">
</el-table-column>
<el-table-column prop="lastModifyTime" label="修改时间" align="left">
</el-table-column>
<el-table-column prop="flowState" label="状态" width="100"> <el-table-column prop="flowState" label="状态" width="100">
<template slot-scope="scope" v-if="!scope.row.top"> <template slot-scope="scope" v-if="!scope.row.top">
<el-tag v-if="scope.row.flowState==1"></el-tag> <el-tag v-if="scope.row.flowState == 1"></el-tag>
<el-tag type="success" v-else-if="scope.row.flowState==2">审核通过</el-tag> <el-tag type="success" v-else-if="scope.row.flowState == 2">审核通过</el-tag>
<el-tag type="danger" v-else-if="scope.row.flowState==3">审核驳回</el-tag> <el-tag type="danger" v-else-if="scope.row.flowState == 3">审核驳回</el-tag>
<el-tag type="info" v-else-if="scope.row.flowState==4">流程撤回</el-tag> <el-tag type="info" v-else-if="scope.row.flowState == 4">流程撤回</el-tag>
<el-tag type="info" v-else-if="scope.row.flowState==5">审核终止</el-tag> <el-tag type="info" v-else-if="scope.row.flowState == 5">审核终止</el-tag>
<el-tag type="warning" v-else></el-tag> <el-tag type="warning" v-else></el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" fixed="right" width="150"> <el-table-column label="操作" fixed="right" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" :disabled="[1,2,4,5].indexOf(scope.row.flowState)>-1" <el-button type="text" :disabled="[1, 2, 4, 5].indexOf(scope.row.flowState) > -1"
@click="updateHandle(scope.row)" v-has="'btn_edit'">编辑 @click="updateHandle(scope.row)" v-has="'btn_edit'">编辑
</el-button> </el-button>
<el-button type="text" class="JNPF-table-delBtn" <el-button type="text" class="JNPF-table-delBtn" :disabled="[1, 2, 3, 5].indexOf(scope.row.flowState) > -1"
:disabled="[1,2,3,5].indexOf(scope.row.flowState)>-1" v-has="'btn_remove'" v-has="'btn_remove'" @click="handleDel(scope.row.id)">删除
@click="handleDel(scope.row.id)">删除
</el-button> </el-button>
<el-button size="mini" type="text" :disabled="!scope.row.flowState" <el-button size="mini" type="text" :disabled="!scope.row.flowState"
@click="updateHandle(scope.row,scope.row.flowState)">详情</el-button> @click="updateHandle(scope.row, scope.row.flowState)">详情</el-button>
</template> </template>
</el-table-column> </el-table-column>
</JNPF-table> </JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage" <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
:limit.sync="listQuery.pageSize" @pagination="initData" /> @pagination="initData" />
</div> </div>
</div> </div>
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" /> <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" /> <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
<FlowBox v-if="flowVisible" ref="FlowBox" @close="colseFlow" /> <FlowBox v-if="flowVisible" ref="FlowBox" @close="colseFlow" />
<el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body <el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body :visible.sync="flowListVisible"
:visible.sync="flowListVisible" class="JNPF-dialog template-dialog JNPF-dialog_center" class="JNPF-dialog template-dialog JNPF-dialog_center" lock-scroll width="400px">
lock-scroll width="400px">
<el-scrollbar class="template-list"> <el-scrollbar class="template-list">
<div class="template-item" v-for="item in flowList" :key="item.id" <div class="template-item" v-for="item in flowList" :key="item.id" @click="selectFlow(item)">{{ item.fullName }}
@click="selectFlow(item)">{{item.fullName}}
</div> </div>
</el-scrollbar> </el-scrollbar>
</el-dialog> </el-dialog>
<ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" /> <ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false" /> <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible = false" />
<ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" <ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" />
@close="toFormDetailVisible = false" /> <SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson" @superQuery="superQuery" />
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
@superQuery="superQuery" />
</div> </div>
</template> </template>

@ -51,7 +51,7 @@
</div> </div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
@selection-change="handleSelectionChange" :span-method="arraySpanMethod"> @selection-change="handleSelectionChange" :span-method="arraySpanMethod">
<el-table-column prop="returnCargoCode" label="单编号" align="left"> <el-table-column prop="returnCargoCode" label="编号" align="left">
</el-table-column> </el-table-column>
<el-table-column prop="supplyName" label="供应商名称" align="left"> <el-table-column prop="supplyName" label="供应商名称" align="left">
</el-table-column> </el-table-column>
@ -65,7 +65,7 @@
{{ scope.row.documentStatus1 }} {{ scope.row.documentStatus1 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="purchaseOrder" label="采购订单" align="left"> <el-table-column prop="purchaseOrder" label="关联单据号" align="left">
</el-table-column> </el-table-column>
<el-table-column prop="warehouseName" label="发货仓库" align="left"> <el-table-column prop="warehouseName" label="发货仓库" align="left">
</el-table-column> </el-table-column>
@ -80,15 +80,15 @@
</el-table-column> </el-table-column>
<el-table-column prop="3" label="发货次数" align="left"> <el-table-column prop="3" label="发货次数" align="left">
</el-table-column> </el-table-column>
<el-table-column prop="4" label="结算方式" align="left"> <el-table-column prop="fixPriceMode1" label="结算方式" align="left">
</el-table-column> </el-table-column>
<el-table-column prop="5" label="配送方式" align="left"> <el-table-column prop="deliveryType1" label="配送方式" align="left">
</el-table-column> </el-table-column>
<el-table-column prop="6" label="运输方式" align="left"> <el-table-column prop="transportMode1" label="运输方式" align="left">
</el-table-column> </el-table-column>
<el-table-column prop="7" label="承运类型" align="left"> <el-table-column prop="carriageMode1" label="承运类型" align="left">
</el-table-column> </el-table-column>
<el-table-column prop="8" label="承运商" align="left"> <el-table-column prop="carrier1" label="承运商" align="left">
</el-table-column> </el-table-column>
<el-table-column prop="preparationTime" label="制单时间" align="left"> <el-table-column prop="preparationTime" label="制单时间" align="left">
</el-table-column> </el-table-column>

@ -17,15 +17,15 @@
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="业务类型"> <el-form-item label="业务类型">
<JnpfSelect v-model="query.deliveryType" placeholder="请选择" clearable <JnpfSelect v-model="query.deliveryType" placeholder="请选择" clearable :options="deliveryTypeOptions"
:options="deliveryTypeOptions" :props="deliveryTypeProps"> :props="deliveryTypeProps">
</JnpfSelect> </JnpfSelect>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="制单时间"> <el-form-item label="制单时间">
<JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd" <JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd" startPlaceholder="开始日期"
startPlaceholder="开始日期" endPlaceholder="结束日期" /> endPlaceholder="结束日期" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
@ -39,11 +39,9 @@
<div class="JNPF-common-layout-main JNPF-flex-main"> <div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head"> <div class="JNPF-common-head">
<div> <div>
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'" <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'" @click="addOrUpdateHandle()">
@click="addOrUpdateHandle()">新增
</el-button> </el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()" <el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()" v-has="'btn_download'">
v-has="'btn_download'">导出
</el-button> </el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()" <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
v-has="'btn_batchRemove'">批量删除 v-has="'btn_batchRemove'">批量删除
@ -51,12 +49,10 @@
</div> </div>
<div class="JNPF-common-head-right"> <div class="JNPF-common-head-right">
<el-tooltip content="高级查询" placement="top" v-if="true"> <el-tooltip content="高级查询" placement="top" v-if="true">
<el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false" <el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false" @click="openSuperQuery()" />
@click="openSuperQuery()" />
</el-tooltip> </el-tooltip>
<el-tooltip effect="dark" :content="$t('common.refresh')" placement="top"> <el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" @click="initData()" />
@click="initData()" />
</el-tooltip> </el-tooltip>
</div> </div>
</div> </div>
@ -68,24 +64,16 @@
</el-table-column> </el-table-column>
<el-table-column label="单据类型" prop="deliveryType" algin="left" fixed="left"> <el-table-column label="单据类型" prop="deliveryType" algin="left" fixed="left">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.deliveryType}} {{ scope.row.deliveryType }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="deliveryStatus" label="单据状态" align="left" fixed="left"> <el-table-column prop="deliveryStatus1" label="单据状态" align="left" fixed="left">
</el-table-column> </el-table-column>
<el-table-column prop="businessId" label="关联单据号" align="left"> <el-table-column prop="saleOrder" label="关联单据号" align="left">
</el-table-column> </el-table-column>
<el-table-column prop="deliveryAddress" label="发货数量" align="left"> <el-table-column prop="1" label="发货数量" align="left">
</el-table-column> </el-table-column>
<el-table-column prop="deliveryAddress" label="已发货数量" align="left"> <el-table-column prop="2" label="已发货数量" align="left">
</el-table-column>
<el-table-column prop="deliveryAddress" label="收货地址" align="left">
</el-table-column>
<el-table-column prop="enterpriseId" label="机构名称" align="left">
</el-table-column>
<el-table-column prop="warehouseId" label="发货仓库" align="left">
</el-table-column>
<el-table-column prop="shippingAddress" label="发货地址" align="left">
</el-table-column> </el-table-column>
<el-table-column prop="preparationTime" label="制单时间" align="left"> <el-table-column prop="preparationTime" label="制单时间" align="left">
</el-table-column> </el-table-column>
@ -99,52 +87,47 @@
</el-table-column> </el-table-column>
<el-table-column prop="flowState" label="状态" width="100"> <el-table-column prop="flowState" label="状态" width="100">
<template slot-scope="scope" v-if="!scope.row.top"> <template slot-scope="scope" v-if="!scope.row.top">
<el-tag v-if="scope.row.flowState==1"></el-tag> <el-tag v-if="scope.row.flowState == 1"></el-tag>
<el-tag type="success" v-else-if="scope.row.flowState==2">审核通过</el-tag> <el-tag type="success" v-else-if="scope.row.flowState == 2">审核通过</el-tag>
<el-tag type="danger" v-else-if="scope.row.flowState==3">审核驳回</el-tag> <el-tag type="danger" v-else-if="scope.row.flowState == 3">审核驳回</el-tag>
<el-tag type="info" v-else-if="scope.row.flowState==4">流程撤回</el-tag> <el-tag type="info" v-else-if="scope.row.flowState == 4">流程撤回</el-tag>
<el-tag type="info" v-else-if="scope.row.flowState==5">审核终止</el-tag> <el-tag type="info" v-else-if="scope.row.flowState == 5">审核终止</el-tag>
<el-tag type="warning" v-else></el-tag> <el-tag type="warning" v-else></el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" fixed="right" width="150"> <el-table-column label="操作" fixed="right" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" :disabled="[1,2,4,5].indexOf(scope.row.flowState)>-1" <el-button type="text" :disabled="[1, 2, 4, 5].indexOf(scope.row.flowState) > -1"
@click="updateHandle(scope.row)" v-has="'btn_edit'">编辑 @click="updateHandle(scope.row)" v-has="'btn_edit'">编辑
</el-button> </el-button>
<el-button type="text" class="JNPF-table-delBtn" <el-button type="text" class="JNPF-table-delBtn" :disabled="[1, 2, 3, 5].indexOf(scope.row.flowState) > -1"
:disabled="[1,2,3,5].indexOf(scope.row.flowState)>-1" v-has="'btn_remove'" v-has="'btn_remove'" @click="handleDel(scope.row.id)">删除
@click="handleDel(scope.row.id)">删除
</el-button> </el-button>
<el-button size="mini" type="text" :disabled="!scope.row.flowState" <el-button size="mini" type="text" :disabled="!scope.row.flowState"
@click="updateHandle(scope.row,scope.row.flowState)">详情</el-button> @click="updateHandle(scope.row, scope.row.flowState)">详情</el-button>
</template> </template>
</el-table-column> </el-table-column>
</JNPF-table> </JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage" <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
:limit.sync="listQuery.pageSize" @pagination="initData" /> @pagination="initData" />
</div> </div>
</div> </div>
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" /> <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" /> <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
<FlowBox v-if="flowVisible" ref="FlowBox" @close="colseFlow" /> <FlowBox v-if="flowVisible" ref="FlowBox" @close="colseFlow" />
<el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body <el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body :visible.sync="flowListVisible"
:visible.sync="flowListVisible" class="JNPF-dialog template-dialog JNPF-dialog_center" class="JNPF-dialog template-dialog JNPF-dialog_center" lock-scroll width="400px">
lock-scroll width="400px">
<el-scrollbar class="template-list"> <el-scrollbar class="template-list">
<div class="template-item" v-for="item in flowList" :key="item.id" <div class="template-item" v-for="item in flowList" :key="item.id" @click="selectFlow(item)">{{ item.fullName }}
@click="selectFlow(item)">{{item.fullName}}
</div> </div>
</el-scrollbar> </el-scrollbar>
</el-dialog> </el-dialog>
<ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" /> <ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false" /> <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible = false" />
<ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" <ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" />
@close="toFormDetailVisible = false" /> <SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson" @superQuery="superQuery" />
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
@superQuery="superQuery" />
</div> </div>
</template> </template>

@ -75,33 +75,33 @@
@selection-change="handleSelectionChange" :span-method="arraySpanMethod" border> @selection-change="handleSelectionChange" :span-method="arraySpanMethod" border>
<el-table-column prop="voucherCode" label="凭证编号" align="left" fixed="left"> <el-table-column prop="voucherCode" label="凭证编号" align="left" fixed="left">
</el-table-column> </el-table-column>
<el-table-column label="单据类型" prop="documentType" algin="left" fixed="left"> <el-table-column label="单据类型" prop="documentType1" algin="left" fixed="left">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.documentType1 }} {{ scope.row.documentType1 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="凭证类型" prop="voucherType" algin="left" fixed="left"> <el-table-column label="凭证类型" prop="voucherType1" algin="left" fixed="left">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.voucherType1 }} {{ scope.row.voucherType1 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="凭证状态" prop="voucherStatus" algin="left" fixed="left"> <el-table-column label="凭证状态" prop="voucherStatus1" algin="left" fixed="left">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.voucherStatus1 }} {{ scope.row.voucherStatus1 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="poundCode" label="磅单编号" align="left"> <el-table-column prop="poundCode" label="磅单编号" align="left">
</el-table-column> </el-table-column>
<el-table-column prop="associatedDocumentNo" label="关联单据号" align="left"> <el-table-column prop="purchaseDeliveryOrder" label="关联单据号" align="left">
</el-table-column> </el-table-column>
<el-table-column prop="vehicleName" label="车牌号" align="left"> <el-table-column prop="vehicleName" label="车辆信息" align="left">
</el-table-column> </el-table-column>
<el-table-column label="运输方式" prop="modeTransport" algin="left"> <el-table-column label="运输方式" prop="modeTransport1" algin="left">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.modeTransport1 }} {{ scope.row.modeTransport1 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="承运方式" prop="transportationMethod" algin="left"> <el-table-column label="承运方式" prop="transportationMethod1" algin="left">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.transportationMethod1 }} {{ scope.row.transportationMethod1 }}
</template> </template>

@ -53,7 +53,7 @@
@selection-change="handleSelectionChange" :span-method="arraySpanMethod"> @selection-change="handleSelectionChange" :span-method="arraySpanMethod">
<el-table-column prop="receiptCode" label="订单编号" align="left"> <el-table-column prop="receiptCode" label="订单编号" align="left">
</el-table-column> </el-table-column>
<el-table-column prop="supplyName" label="客户名称" align="left"> <el-table-column prop="subjectName" label="客户名称" align="left">
</el-table-column> </el-table-column>
<el-table-column label="单据类型" prop="receiptType1" algin="left"> <el-table-column label="单据类型" prop="receiptType1" algin="left">
<template slot-scope="scope"> <template slot-scope="scope">

@ -121,6 +121,8 @@
</el-table-column> </el-table-column>
<el-table-column prop="supplyName" label="三级供应商" align="left"> <el-table-column prop="supplyName" label="三级供应商" align="left">
</el-table-column> </el-table-column>
<el-table-column prop="poundlistTime" label="磅单时间" align="left">
</el-table-column>
<el-table-column prop="preparationTime" label="制单时间" align="left"> <el-table-column prop="preparationTime" label="制单时间" align="left">
</el-table-column> </el-table-column>
<el-table-column prop="creatorUserId" label="提交人" align="left"> <el-table-column prop="creatorUserId" label="提交人" align="left">

@ -67,7 +67,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="purchaseOrder" label="关联单据号" align="left"> <el-table-column prop="purchaseOrder" label="关联单据号" align="left">
</el-table-column> </el-table-column>
<el-table-column prop="purchaseOrder" label="紧急订单" align="left"> <el-table-column prop="urgentOrder1" label="紧急订单" align="left">
</el-table-column> </el-table-column>
<el-table-column prop="warehouseName" label="收货仓库" align="left"> <el-table-column prop="warehouseName" label="收货仓库" align="left">
</el-table-column> </el-table-column>
@ -76,28 +76,28 @@
{{ scope.row.returnCargoWay1 }} {{ scope.row.returnCargoWay1 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="warehouseName" label="计划退货数量" align="left"> <el-table-column prop="1" label="计划退货数量" align="left">
</el-table-column> </el-table-column>
<el-table-column prop="warehouseName" label="已收货数量" align="left"> <el-table-column prop="2" label="已收货数量" align="left">
</el-table-column> </el-table-column>
<el-table-column prop="warehouseName" label="收货次数" align="left"> <el-table-column prop="3" label="收货次数" align="left">
</el-table-column> </el-table-column>
<el-table-column prop="1" label="销售模式" align="left"> <el-table-column prop="saleMode1" label="销售模式" align="left">
</el-table-column> </el-table-column>
<el-table-column prop="2" label="结算模式" align="left"> <el-table-column prop="fixPriceMode1" label="结算模式" align="left">
</el-table-column> </el-table-column>
<el-table-column prop="3" label="配送方式" align="left"> <el-table-column prop="deliveryType1" label="配送方式" align="left">
</el-table-column> </el-table-column>
<el-table-column prop="4" label="运输方式" align="left"> <el-table-column prop="transportMode1" label="运输方式" align="left">
</el-table-column> </el-table-column>
<el-table-column prop="5" label="运输方式" align="left"> <el-table-column prop="carriageMode1" label="承运类型" align="left">
</el-table-column> </el-table-column>
<el-table-column prop="6" label="承运类型" align="left"> <el-table-column prop="carrier1" label="承运商" align="left">
</el-table-column>
<el-table-column prop="warehouseName" label="承运商" align="left">
</el-table-column> </el-table-column>
<el-table-column prop="preparationTime" label="制单时间" align="left"> <el-table-column prop="preparationTime" label="制单时间" align="left">
</el-table-column> </el-table-column>
<el-table-column prop="poundlistTime" label="磅单时间" align="left">
</el-table-column>
<el-table-column prop="creatorUserId" label="提交人" align="left"> <el-table-column prop="creatorUserId" label="提交人" align="left">
</el-table-column> </el-table-column>
<el-table-column prop="creatorTime" label="提交时间" align="left"> <el-table-column prop="creatorTime" label="提交时间" align="left">

@ -78,8 +78,8 @@
<el-col :span="8" v-if="judgeShow('deliveryType')"> <el-col :span="8" v-if="judgeShow('deliveryType')">
<jnpf-form-tip-item label="配送方式" v-if="judgeShow('deliveryType')" prop="deliveryType"> <jnpf-form-tip-item label="配送方式" v-if="judgeShow('deliveryType')" prop="deliveryType">
<JnpfSelect v-model="dataForm.deliveryType" @change="changeData('deliveryType', -1)" placeholder="请选择" <JnpfSelect v-model="dataForm.deliveryType" @change="changeData('deliveryType', -1)" placeholder="请选择"
:disabled="judgeWrite('deliveryType')" clearable :style='{ "width": "100%" }' :options="deliveryTypeOptions" :disabled="judgeWrite('deliveryType')" clearable :style='{ "width": "100%" }'
:props="deliveryTypeProps"> :options="deliveryTypeOptions" :props="deliveryTypeProps">
</JnpfSelect> </JnpfSelect>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
@ -787,8 +787,9 @@
<JnpfPopupSelect v-model="scope.row.productId" @change="productInfo2" :rowIndex="scope.$index" <JnpfPopupSelect v-model="scope.row.productId" @change="productInfo2" :rowIndex="scope.$index"
:formData="dataForm" :templateJson="interfaceRes.businessorderproductrelationalproductId" :formData="dataForm" :templateJson="interfaceRes.businessorderproductrelationalproductId"
placeholder="请选择" propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog" placeholder="请选择" propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
relationField='commodity_name' :field="'productId' + scope.$index" interfaceId="523160915206474309" relationField='commodity_name' :field="'productId' + scope.$index"
:pageSize="20" :columnOptions="businessorderproductrelationalproductIdcolumnOptions" clearable interfaceId="523160915206474309" :pageSize="20"
:columnOptions="businessorderproductrelationalproductIdcolumnOptions" clearable
:style='{ "width": "100%" }'> :style='{ "width": "100%" }'>
</JnpfPopupSelect> </JnpfPopupSelect>
</template> </template>
@ -1275,7 +1276,7 @@ export default {
settlementinfooverdueInterestRateProps: { "label": "fullName", "value": "id" }, settlementinfooverdueInterestRateProps: { "label": "fullName", "value": "id" },
businessorderproductrelationalproductIdcolumnOptions: [{ "label": "商品编码", "value": "commodity_code" }, { "label": "商品名称", "value": "commodity_name" }, { "label": "商品规格", "value": "specifications" },], businessorderproductrelationalproductIdcolumnOptions: [{ "label": "商品编码", "value": "commodity_code" }, { "label": "商品名称", "value": "commodity_name" }, { "label": "商品规格", "value": "specifications" },],
businessorderproductrelationalproductIdcolumnOptions2: [{ "label": "商品编码", "value": "code" }, { "label": "商品名称", "value": "name" }, { "label": "商品规格", "value": "spec" },], businessorderproductrelationalproductIdcolumnOptions2: [{ "label": "商品编码", "value": "code" }, { "label": "商品名称", "value": "name" }, { "label": "商品规格", "value": "spec" },],
businessorderproductrelationalsalesMainUnitIdOptions: [{ "fullName": "选项一", "id": "1" }, { "fullName": "选项二", "id": "2" }], businessorderproductrelationalsalesMainUnitIdOptions: [{ "fullName": "", "id": "1" }, { "fullName": "千克", "id": "2" }],
businessorderproductrelationalsalesMainUnitIdProps: { "label": "fullName", "value": "id" }, businessorderproductrelationalsalesMainUnitIdProps: { "label": "fullName", "value": "id" },
costBearingMianOptions: [{ "fullName": "甲方", "id": "1" }, { "fullName": "乙方", "id": "2" }], costBearingMianOptions: [{ "fullName": "甲方", "id": "1" }, { "fullName": "乙方", "id": "2" }],
costBearingMianProps: { "label": "fullName", "value": "id" }, costBearingMianProps: { "label": "fullName", "value": "id" },

Loading…
Cancel
Save