yunxi
/
jigangSCM2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

采购收货子表

Browse Source
jg-waiwang-pro
vayne 7 months ago
parent 0682523689
commit 4d8803abf4
6 changed files with 856 additions and 569 deletions
Show Stats Download Patch File Download Diff File

62
jnpf-java-boot/jnpf-web/src/views/scm/businessLineConfig/index.vue
Unescape View File

@ -16,7 +16,8 @@
</div> </div>
<el-tree :data="treeData" class="JNPF-common-el-tree" highlight-current ref="treeBox" <el-tree :data="treeData" class="JNPF-common-el-tree" highlight-current ref="treeBox"
:expand-on-click-node="false" @node-click="handleNodeClick" node-key="id" :props="treeProps" :expand-on-click-node="false" @node-click="handleNodeClick" node-key="id" :props="treeProps"
:default-expand-all="expandsTree" :filter-node-method="filterNode" :lazy="false" v-if="refreshTree"> :default-expand-all="expandsTree" :filter-node-method="filterNode" :lazy="false"
v-if="refreshTree">
<span class="custom-tree-node" slot-scope="{ node, data }"> <span class="custom-tree-node" slot-scope="{ node, data }">
<i :class="data.icon"></i> <i :class="data.icon"></i>
<span class="text">{{ node.label }}</span> <span class="text">{{ node.label }}</span>
@ -34,8 +35,8 @@
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="最后登录"> <el-form-item label="最后登录">
<JnpfDateRangePicker v-model="query.jnpf_base_user_jnpf_lastLogTime" format="yyyy-MM-dd" <JnpfDateRangePicker v-model="query.jnpf_base_user_jnpf_lastLogTime"
startPlaceholder="开始日期" endPlaceholder="结束日期"> format="yyyy-MM-dd" startPlaceholder="开始日期" endPlaceholder="结束日期">
</JnpfDateRangePicker> </JnpfDateRangePicker>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -56,7 +57,8 @@
<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="BusinessLineUserRelation()">关联员工 @click="BusinessLineUserRelation()">关联员工
</el-button> </el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()" v-has="'btn_download'">导出 <el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()"
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'">批量删除
@ -68,30 +70,40 @@
@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" @click="initData()" /> <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
@click="initData()" />
</el-tooltip> </el-tooltip>
</div> </div>
</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" custom-column border> @selection-change="handleSelectionChange" :span-method="arraySpanMethod" custom-column
<el-table-column prop="jnpf_base_user_jnpf_realName" label="姓名" sortable align="center" fixed="left"> border>
<el-table-column prop="jnpf_base_user_jnpf_realName" label="姓名" sortable align="center"
fixed="left">
</el-table-column> </el-table-column>
<el-table-column prop="jnpf_base_user_jnpf_positionName" label="职务" sortable align="center" fixed="left"> <el-table-column prop="jnpf_base_user_jnpf_positionName" label="职务" sortable
align="center" fixed="left">
</el-table-column> </el-table-column>
<el-table-column prop="jnpf_base_user_jnpf_businessLineName" label="业务线" sortable align="center"> <el-table-column prop="jnpf_base_user_jnpf_businessLineName" label="业务线" sortable
align="center">
</el-table-column> </el-table-column>
<el-table-column label="帐号状态" prop="jnpf_base_user_jnpf_enabledMark" sortable align="center"> <el-table-column label="帐号状态" prop="jnpf_base_user_jnpf_enabledMark" sortable
align="center">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.jnpf_base_user_jnpf_enabledMark }} {{ scope.row.jnpf_base_user_jnpf_enabledMark }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="jnpf_base_user_jnpf_mobilePhone" label="手机" sortable align="center"> <el-table-column prop="jnpf_base_user_jnpf_mobilePhone" label="手机" sortable
align="center">
</el-table-column> </el-table-column>
<el-table-column prop="jnpf_base_user_jnpf_lastLogTime" label="最后登录" sortable align="center"> <el-table-column prop="jnpf_base_user_jnpf_lastLogTime" label="最后登录" sortable
align="center">
</el-table-column> </el-table-column>
<el-table-column prop="jnpf_base_user_jnpf_creatorTime" label="创建时间" sortable align="center"> <el-table-column prop="jnpf_base_user_jnpf_creatorTime" label="创建时间" sortable
align="center">
</el-table-column> </el-table-column>
<el-table-column prop="jnpf_base_user_jnpf_lastModifyTime" label="更新时间" sortable align="center"> <el-table-column prop="jnpf_base_user_jnpf_lastModifyTime" label="更新时间" sortable
align="center">
</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">
@ -117,27 +129,32 @@
</template> </template>
</el-table-column> </el-table-column>
</JNPF-table> </JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" <pagination :total="total" :page.sync="listQuery.currentPage"
@pagination="initData" /> :limit.sync="listQuery.pageSize" @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 :visible.sync="flowListVisible" <el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body
class="JNPF-dialog template-dialog JNPF-dialog_center" lock-scroll width="400px"> :visible.sync="flowListVisible" class="JNPF-dialog template-dialog JNPF-dialog_center"
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" @click="selectFlow(item)">{{ item.fullName }} <div class="template-item" v-for="item in flowList" :key="item.id"
@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" @close="toFormDetailVisible = false" /> <ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail"
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson" @superQuery="superQuery" /> @close="toFormDetailVisible = false" />
<UserMultipleSelect v-if="userMultipleSelect" :multiple="true" ref="userMultipleSelect" @change="getUserIds" /> <SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
@superQuery="superQuery" />
<UserMultipleSelect v-if="userMultipleSelect" :multiple="true" ref="userMultipleSelect"
@change="getUserIds" />
</div> </div>
</template> </template>
@ -409,7 +426,6 @@ export default {
url: `/api/scm/BusinessLine/Tree`, url: `/api/scm/BusinessLine/Tree`,
method: 'get' method: 'get'
}).then(res => { }).then(res => {
debugger
this.treeData = res.data this.treeData = res.data
this.initSearchDataAndListData() this.initSearchDataAndListData()
}) })

543
jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/deliveryOrder/form.vue
View File

File diff suppressed because it is too large Load Diff

73
jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptOrder/form.vue
Unescape View File

@ -728,7 +728,7 @@
v-if="!judgeWrite('deliveryvoucherrelationList')"> v-if="!judgeWrite('deliveryvoucherrelationList')">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" class="JNPF-table-delBtn" <el-button size="mini" type="text" class="JNPF-table-delBtn"
@click="deldeliveryvoucherrelationList(scope.row)">删除</el-button> @click="deldeliveryvoucherrelationList(scope)">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -1633,11 +1633,7 @@ export default {
choiceProduct() { choiceProduct() {
this.BomgoodsBoxVisible = true; this.BomgoodsBoxVisible = true;
let excludeIdList = []; let excludeIdList = [];
for ( for (let i = 0; i < this.dataForm.deliveryProductRelationList.length; i++) {
let i = 0;
i < this.dataForm.deliveryProductRelationList.length;
i++
) {
excludeIdList.push( excludeIdList.push(
this.dataForm.deliveryProductRelationList[i].productId this.dataForm.deliveryProductRelationList[i].productId
); );
@ -1679,11 +1675,7 @@ export default {
} }
this.voucherBoxVisible = true; this.voucherBoxVisible = true;
let excludeIdList = []; let excludeIdList = [];
for ( for (let i = 0; i < this.dataForm.deliveryVoucherRelationList.length; i++) {
let i = 0;
i < this.dataForm.deliveryVoucherRelationList.length;
i++
) {
excludeIdList.push( excludeIdList.push(
this.dataForm.deliveryVoucherRelationList[i].voucherId this.dataForm.deliveryVoucherRelationList[i].voucherId
); );
@ -1700,6 +1692,7 @@ export default {
}); });
}, },
initVoucherList(list) { initVoucherList(list) {
for (let i = 0; i < list.length; i++) { for (let i = 0; i < list.length; i++) {
const e = list[i]; const e = list[i];
let item = { let item = {
@ -1721,34 +1714,35 @@ export default {
}; };
this.dataForm.deliveryVoucherRelationList.push(item); this.dataForm.deliveryVoucherRelationList.push(item);
let productEntity = {}; let productEntity = {};
e.productWarehouseEntityList.forEach(item => { e.productWarehouseEntityList.forEach(unit => {
if (item.orderMainUnitIds) { if (unit.orderMainUnitIds) {
var unitName = JSON.parse(item.orderMainUnitIds); var unitName = JSON.parse(unit.orderMainUnitIds);
var optArray = []; var optArray = [];
for (let i = 0; i < unitName.length; i++) { for (let i = 0; i < unitName.length; i++) {
item.deliveryUnit = unitName[0]; unit.deliveryUnit = unitName[0];
var opt = {}; var opt = {};
opt.fullName = unitName[i]; opt.fullName = unitName[i];
opt.id = unitName[i]; opt.id = unitName[i];
optArray.push(opt); optArray.push(opt);
} }
item.deliveryproductrelationdeliveryUnitOptions = optArray; unit.deliveryproductrelationdeliveryUnitOptions = optArray;
} }
const obj = const obj =
this.productByOrderList.find(e => e.productId == item.id) || {}; this.productByOrderList.find(e => e.productId == unit.id) || {};
item.salesMainUnitId = obj.salesMainUnitId; unit.salesMainUnitId = obj.salesMainUnitId;
item.saleNum = obj.businessNum; unit.saleNum = obj.businessNum;
item.productId = item.id; unit.productId = unit.id;
item.inventoryUnitId = item.inventoryUnitIds; unit.inventoryUnitId = unit.inventoryUnitIds;
item.businessType = "1"; unit.businessType = "1";
productEntity = item; productEntity = unit;
}); });
if (this.dataForm.deliveryProductRelationList.length == 0) { if (this.dataForm.deliveryProductRelationList.length == 0) {
this.dataForm.deliveryProductRelationList.push(productEntity); this.dataForm.deliveryProductRelationList.push(productEntity);
} else { } else {
this.dataForm.deliveryProductRelationList.filter(item => { this.dataForm.deliveryProductRelationList.forEach(net => {
if (item.id == productEntity.id) { if (net.id == productEntity.id) {
item.netWeight = this.jnpf.floatAdd(item.netWeight, productEntity.netWeight) net.netWeight = this.jnpf.floatAdd(net.netWeight, productEntity.netWeight)
// console.log(this.jnpf.floatAdd(net.netWeight, productEntity.netWeight));
} else { } else {
this.dataForm.deliveryProductRelationList.push(productEntity); this.dataForm.deliveryProductRelationList.push(productEntity);
} }
@ -1756,7 +1750,6 @@ export default {
); );
} }
} }
}, },
getPurchaseReceiptVoucher(val, val2) { getPurchaseReceiptVoucher(val, val2) {
val2.voucherId = val2.id; val2.voucherId = val2.id;
@ -1946,21 +1939,19 @@ export default {
deldeliveryvoucherrelationList(scope) { deldeliveryvoucherrelationList(scope) {
this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", { this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
type: "warning" type: "warning"
}) }).then(() => {
.then(() => { debugger
console.log(scope.list[0].id); var productId = scope.row.list[0].id
var productId = scope.list[0].id var productNetWeight = scope.row.list[0].netWeight
var productNetWeight = scope.list[0].netWeight this.dataForm.deliveryProductRelationList.find((e, index) => {
this.dataForm.deliveryProductRelationList.find((e, index) => { if (e.id == productId && e.netWeight == productNetWeight) {
if (e.id == productId && e.netWeight == productNetWeight) { this.dataForm.deliveryProductRelationList.splice(index, 1)
this.dataForm.deliveryProductRelationList.splice(index, 1) } else if (e.id == productId && e.netWeight != productNetWeight) {
} else if (e.id == productId && e.netWeight != productNetWeight) { e.netWeight = this.jnpf.floatSub(e.netWeight, productNetWeight)
e.netWeight = this.jnpf.floatSub(e.netWeight, productNetWeight) }
}
})
this.dataForm.deliveryVoucherRelationList.splice(scope.$index, 1);
}) })
.catch(() => { }); this.dataForm.deliveryVoucherRelationList.splice(scope.$index, 1);
}).catch(() => { });
}, },
getdeliveryvoucherrelationList(value) { getdeliveryvoucherrelationList(value) {
let item = { ...this.tableRows.deliveryVoucherRelationList, ...value }; let item = { ...this.tableRows.deliveryVoucherRelationList, ...value };

72
jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptVoucher/index.vue
Unescape View File

@ -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 :options="voucherTypeOptions" <JnpfSelect v-model="query.voucherType" placeholder="请选择" clearable
:props="voucherTypeProps" multiple> :options="voucherTypeOptions" :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" startPlaceholder="开始日期" <JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
endPlaceholder="结束日期"> startPlaceholder="开始日期" endPlaceholder="结束日期">
</JnpfDateRangePicker> </JnpfDateRangePicker>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -33,7 +33,8 @@
<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" v-if="!showAll"> <el-button type="text" icon="el-icon-arrow-down" @click="showAll = true"
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>
@ -46,9 +47,11 @@
<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'" @click="addOrUpdateHandle()">新增 <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
@click="addOrUpdateHandle()">新增
</el-button> </el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()" v-has="'btn_download'">导出 <el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()"
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'">批量删除
@ -69,20 +72,25 @@
@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" @click="initData()" /> <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
@click="initData()" />
</el-tooltip> </el-tooltip>
</div> </div>
</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" custom-column border> @selection-change="handleSelectionChange" :span-method="arraySpanMethod" custom-column
<el-table-column prop="voucherCode" label="凭证编号" sortable align="center" width="160" fixed="left"> border>
<el-table-column prop="voucherCode" label="凭证编号" sortable align="center" width="160"
fixed="left">
</el-table-column> </el-table-column>
<el-table-column label="单据类型" prop="documentType" sortable align="center" width="100" fixed="left"> <el-table-column label="单据类型" prop="documentType" sortable align="center" width="100"
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" sortable align="center" width="100" fixed="left"> <el-table-column label="凭证类型" prop="voucherType" sortable align="center" width="100"
fixed="left">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.voucherType1 }} {{ scope.row.voucherType1 }}
</template> </template>
@ -104,7 +112,8 @@
</el-table-column> </el-table-column>
<el-table-column prop="poundCode" label="磅单编号" sortable align="center" width="160"> <el-table-column prop="poundCode" label="磅单编号" sortable align="center" width="160">
</el-table-column> </el-table-column>
<el-table-column prop="associatedDocumentNo" label="关联单据号" sortable align="center" width="160"> <el-table-column prop="associatedDocumentNo" label="关联单据号" sortable align="center"
width="160">
</el-table-column> </el-table-column>
<el-table-column prop="vehicleNumber" label="车牌号" sortable align="center" width="100"> <el-table-column prop="vehicleNumber" label="车牌号" sortable align="center" width="100">
</el-table-column> </el-table-column>
@ -113,7 +122,8 @@
{{ scope.row.modeTransport1 }} {{ scope.row.modeTransport1 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="承运方式" prop="transportationMethod" sortable align="center" width="100"> <el-table-column label="承运方式" prop="transportationMethod" sortable align="center"
width="100">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.transportationMethod1 }} {{ scope.row.transportationMethod1 }}
</template> </template>
@ -126,7 +136,8 @@
</el-table-column> </el-table-column>
<el-table-column prop="destination" label="到达地" sortable align="center" width="200"> <el-table-column prop="destination" label="到达地" sortable align="center" width="200">
</el-table-column> </el-table-column>
<el-table-column prop="associateThirdSuppliers" label="三级供应商" sortable align="center" width="200"> <el-table-column prop="associateThirdSuppliers" label="三级供应商" sortable align="center"
width="200">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.thirdSupplyName }} {{ scope.row.thirdSupplyName }}
</template> </template>
@ -179,26 +190,30 @@
</template> </template>
</el-table-column> </el-table-column>
</JNPF-table> </JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" <pagination :total="total" :page.sync="listQuery.currentPage"
@pagination="initData" /> :limit.sync="listQuery.pageSize" @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 :visible.sync="flowListVisible" <el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body
class="JNPF-dialog template-dialog JNPF-dialog_center" lock-scroll width="400px"> :visible.sync="flowListVisible" class="JNPF-dialog template-dialog JNPF-dialog_center"
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" @click="selectFlow(item)">{{ item.fullName }} <div class="template-item" v-for="item in flowList" :key="item.id"
@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" @close="toFormDetailVisible = false" /> <ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail"
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson" @superQuery="superQuery" /> @close="toFormDetailVisible = false" />
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
@superQuery="superQuery" />
</div> </div>
</template> </template>
@ -360,18 +375,17 @@ export default {
let customerIdFlag = true; let customerIdFlag = true;
let purchaseFlag = true; let purchaseFlag = true;
selectData.forEach(function (item) { selectData.forEach(function (item) {
if(item.flowState != 2){ if (item.flowState != 2) {
stateFlag = false; stateFlag = false;
} }
if(item.customerId != customId){ if (item.customerId != customId) {
debugger
customerIdFlag = false; customerIdFlag = false;
} }
if(item.isTransfer != '1'){ if (item.isTransfer != '1') {
purchaseFlag = false; purchaseFlag = false;
} }
}); });
if(!stateFlag){ if (!stateFlag) {
this.$message({ this.$message({
type: 'error', type: 'error',
message: '请选择审核通过的数据', message: '请选择审核通过的数据',
@ -416,11 +430,11 @@ export default {
const selectData = this.multipleSelectionItem const selectData = this.multipleSelectionItem
let stateFlag = true; let stateFlag = true;
selectData.forEach(function (item) { selectData.forEach(function (item) {
if(item.flowState != 2){ if (item.flowState != 2) {
stateFlag = false; stateFlag = false;
} }
}); });
if(!stateFlag){ if (!stateFlag) {
this.$message({ this.$message({
type: 'error', type: 'error',
message: '请选择审核通过的数据', message: '请选择审核通过的数据',

561
jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/returnCargoOrder/form.vue
View File

File diff suppressed because it is too large Load Diff

114
jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/index.vue
Unescape View File

@ -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 :options="orderTypeOptions" <JnpfSelect v-model="query.orderType" placeholder="请选择" clearable
:props="orderTypeProps"> :options="orderTypeOptions" :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.deliveryType" placeholder="请选择" clearable :options="deliveryTypeOptions" <JnpfSelect v-model="query.deliveryType" placeholder="请选择" clearable
:props="deliveryTypeProps"> :options="deliveryTypeOptions" :props="deliveryTypeProps">
</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" startPlaceholder="开始日期" <JnpfDateRangePicker v-model="query.createOrderDate" format="yyyy-MM-dd"
endPlaceholder="结束日期" /> startPlaceholder="开始日期" 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.urgentOrder" placeholder="请选择" clearable :options="urgentOrderOptions" <JnpfSelect v-model="query.urgentOrder" placeholder="请选择" clearable
:props="urgentOrderProps"> :options="urgentOrderOptions" :props="urgentOrderProps">
</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 :options="statusOptions" <JnpfSelect v-model="query.status" placeholder="请选择" clearable
:props="statusProps" multiple> :options="statusOptions" :props="statusProps" multiple>
</JnpfSelect> </JnpfSelect>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -48,7 +48,8 @@
<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" v-if="!showAll"> <el-button type="text" icon="el-icon-arrow-down" @click="showAll = true"
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>
@ -61,17 +62,21 @@
<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'" @click="addOrUpdateHandle()">新增 <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
@click="addOrUpdateHandle()">新增
</el-button> </el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()" v-has="'btn_download'">导出 <el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()"
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>
<template v-if="this.deliveryType == '2'"> <template v-if="this.deliveryType == '2'">
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'" @click="boundCheck()">库存检查 <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
@click="boundCheck()">库存检查
</el-button> </el-button>
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'" @click="boundLock()">库存锁定 <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
@click="boundLock()">库存锁定
</el-button> </el-button>
</template> </template>
<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'"
@ -84,27 +89,33 @@
@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" @click="initData()" /> <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
@click="initData()" />
</el-tooltip> </el-tooltip>
</div> </div>
</div> </div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' hasC <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' hasC
@selection-change="handleSelectionChange" :span-method="arraySpanMethod" border> @selection-change="handleSelectionChange" :span-method="arraySpanMethod" border
<el-table-column prop="code" label="单据编号" sortable align="center" fixed="left" width="160"> custom-column>
<el-table-column prop="code" label="单据编号" sortable align="center" fixed="left"
width="160">
</el-table-column> </el-table-column>
<el-table-column prop="subjectName" label="客户名称" sortable align="center" fixed="left" width="200"> <el-table-column prop="subjectName" label="客户名称" sortable align="center" fixed="left"
width="200">
</el-table-column> </el-table-column>
<el-table-column label="单据类型" prop="orderType1" sortable align="center" fixed="left" width="100"> <el-table-column label="单据类型" prop="orderType1" sortable align="center" fixed="left"
width="100">
</el-table-column> </el-table-column>
<el-table-column label="单据状态" prop="saleStatus" sortable align="center" fixed="left" width="100"> <el-table-column label="单据状态" prop="saleStatus" sortable align="center" fixed="left"
width="100">
</el-table-column> </el-table-column>
<!-- <template v-if="this.deliveryType != '1'"> --> <!-- <template v-if="this.deliveryType != '1'"> -->
<el-table-column prop="deliveryType1" label="配送方式" sortable align="center" width="100"> <el-table-column prop="deliveryType1" label="配送方式" sortable align="center" width="100">
</el-table-column> </el-table-column>
<!-- </template> --> <!-- </template> -->
<!-- <template v-if="this.deliveryType != '1'"> --> <!-- <template v-if="this.deliveryType != '1'"> -->
<el-table-column prop="saleMode1" label="销售模式" sortable align="center" width="100"> <el-table-column prop="saleMode1" label="销售模式" sortable align="center" width="100">
</el-table-column> </el-table-column>
<!-- </template> --> <!-- </template> -->
<el-table-column prop="purchaseCode" label="关联单据号" sortable align="center" width="160"> <el-table-column prop="purchaseCode" label="关联单据号" sortable align="center" width="160">
</el-table-column> </el-table-column>
@ -124,38 +135,39 @@
<el-table-column prop="wareHouseName" label="发货仓库" sortable align="center" width="100"> <el-table-column prop="wareHouseName" label="发货仓库" sortable align="center" width="100">
</el-table-column> </el-table-column>
<!-- <template v-if="this.deliveryType != '1'"> --> <!-- <template v-if="this.deliveryType != '1'"> -->
<el-table-column prop="wareHouseName" label="计划销售数量" sortable align="center" width="140"> <el-table-column prop="wareHouseName" label="计划销售数量" sortable align="center" width="140">
</el-table-column> </el-table-column>
<!-- </template> --> <!-- </template> -->
<!-- <template v-if="this.deliveryType != '1'"> --> <!-- <template v-if="this.deliveryType != '1'"> -->
<el-table-column prop="wareHouseName" label="已发货数量" sortable align="center" width="120"> <el-table-column prop="wareHouseName" label="已发货数量" sortable align="center" width="120">
</el-table-column> </el-table-column>
<!-- </template> --> <!-- </template> -->
<!-- <template v-if="this.deliveryType != '1'"> --> <!-- <template v-if="this.deliveryType != '1'"> -->
<el-table-column prop="wareHouseName" label="发货次数" sortable align="center" width="100"> <el-table-column prop="wareHouseName" label="发货次数" sortable align="center" width="100">
</el-table-column> </el-table-column>
<!-- </template> --> <!-- </template> -->
<!-- <template v-if="this.deliveryType != '1'"> --> <!-- <template v-if="this.deliveryType != '1'"> -->
<el-table-column prop="wareHouseName" label="结算方式" sortable align="center" width="100"> <el-table-column prop="wareHouseName" label="结算方式" sortable align="center" width="100">
</el-table-column> </el-table-column>
<!-- </template> --> <!-- </template> -->
<!-- <template v-if="this.deliveryType != '1'"> --> <!-- <template v-if="this.deliveryType != '1'"> -->
<el-table-column prop="wareHouseName" label="运输方式" sortable align="center" width="100"> <el-table-column prop="wareHouseName" label="运输方式" sortable align="center" width="100">
</el-table-column> </el-table-column>
<!-- </template> --> <!-- </template> -->
<!-- <template v-if="this.deliveryType != '1'"> --> <!-- <template v-if="this.deliveryType != '1'"> -->
<el-table-column prop="wareHouseName" label="承运类型" sortable align="center" width="100"> <el-table-column prop="wareHouseName" label="承运类型" sortable align="center" width="100">
</el-table-column> </el-table-column>
<!-- </template> --> <!-- </template> -->
<!-- <template v-if="this.deliveryType != '1'"> --> <!-- <template v-if="this.deliveryType != '1'"> -->
<el-table-column prop="wareHouseName" label="承运商" sortable align="center" width="100"> <el-table-column prop="wareHouseName" label="承运商" sortable align="center" width="100">
</el-table-column> </el-table-column>
<!-- </template> --> <!-- </template> -->
<!-- <template v-if="this.deliveryType != '1'"> --> <!-- <template v-if="this.deliveryType != '1'"> -->
<el-table-column prop="wareHouseName" label="是否补送" sortable align="center" width="100"> <el-table-column prop="wareHouseName" label="是否补送" sortable align="center" width="100">
</el-table-column> </el-table-column>
<!-- </template> --> <!-- </template> -->
<el-table-column prop="expectArriveDateStart" label="期望送达" sortable align="center" width="100"> <el-table-column prop="expectArriveDateStart" label="期望送达" sortable align="center"
width="100">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.expectArriveDateStart | toDate("yyyy-MM-dd") }} {{ scope.row.expectArriveDateStart | toDate("yyyy-MM-dd") }}
</template> </template>
@ -207,26 +219,30 @@
</template> </template>
</el-table-column> </el-table-column>
</JNPF-table> </JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" <pagination :total="total" :page.sync="listQuery.currentPage"
@pagination="initData" /> :limit.sync="listQuery.pageSize" @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 :visible.sync="flowListVisible" <el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body
class="JNPF-dialog template-dialog JNPF-dialog_center" lock-scroll width="400px"> :visible.sync="flowListVisible" class="JNPF-dialog template-dialog JNPF-dialog_center"
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" @click="selectFlow(item)">{{ item.fullName }} <div class="template-item" v-for="item in flowList" :key="item.id"
@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" @close="toFormDetailVisible = false" /> <ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail"
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson" @superQuery="superQuery" /> @close="toFormDetailVisible = false" />
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
@superQuery="superQuery" />
<BoundCheck v-if="boundCheckVisible" ref="BoundCheck" @refresh="initData" /> <BoundCheck v-if="boundCheckVisible" ref="BoundCheck" @refresh="initData" />
<BoundLock v-if="boundLockVisible" ref="BoundLock" @refresh="initData" /> <BoundLock v-if="boundLockVisible" ref="BoundLock" @refresh="initData" />
</div> </div>

Write Preview
Loading…
Cancel
Save