UDI
/
udiwms-vue-frame
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

新增选入第三方单据，选入领用单据

Browse Source
prod
anthonywj 2 years ago
parent 17d6673cff
commit 9f7cf75456
5 changed files with 525 additions and 476 deletions
Show Stats Download Patch File Download Diff File

6
src/views/basic/busType/bussinessTypeModify.vue
Unescape Escape View File

@ -116,17 +116,19 @@
<el-form-item label="第三方单据类型" prop="prefix">
<el-select v-model="inputQuery.originAction"
size="small"
clearable
style="width: 90%"
filterable
placeholder="请选择第三方系统单据类型"
>
<el-option
v-for="item in originTypes"
:key="item.name"
:key="item.id"
:label="item.name"
:value="item.action">
<span style="float: left;font-size: 13px">{{ item.name }}</span>
<span style="float: right; color: #8492a6; font-size: 13px;margin-left: 10px">{{
item.action
item.thirdSysName
}}</span>
</el-option>
</el-select>

110
src/views/inout/DialogSelectReceiveOrder.vue
Unescape Escape View File

@ -2,23 +2,30 @@
<div>
<el-card class="el-card" style="margin-top: -15px">
<div>
<el-form :inline="true" :model="listQuery" style="display: flex;" size="mini">
<el-form :model="listQuery" size="mini"
v-show="showSearch"
label-width="100px">
<el-row>
<el-form-item class="query-form-item">
<el-col :span="6">
<el-form-item class="query-form-item" label="单据号:">
<el-input
v-model="listQuery.billNo"
placeholder="单据号"
clearable
></el-input>
</el-form-item>
<el-form-item class="query-form-item">
</el-col>
<el-col :span="6">
<el-form-item class="query-form-item" label="往来单位:">
<el-input
v-model="listQuery.corpName"
placeholder="往来单位"
clearable
></el-input>
</el-form-item>
<el-form-item class="query-form-item">
</el-col>
<el-col :span="6">
<el-form-item class="query-form-item" label="领用类型">
<el-select v-model="listQuery.billAction" placeholder="请选择领用类型" clearable="true">
<el-option
v-for="item in originTypes"
@ -32,10 +39,11 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item class="query-form-item">
<span style="color: #000; margin-left: 10px; margin-right: 6px"
>单据日期:</span
>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item class="query-form-item" label="单据日期:">
<el-date-picker
:picker-options="pickerOptions"
v-model="actDateRange"
@ -48,41 +56,48 @@
>
</el-date-picker>
</el-form-item>
<el-form-item style="display: flex">
</el-col>
</el-row>
</el-form>
<div class="top-right-btn">
<el-button-group>
<el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
<el-button
type="primary"
icon="el-icon-refresh"
@click="onReset"
></el-button>
<el-button type="primary" icon="search" @click="submitFind">查询</el-button>
<el-button type="primary" icon="search" @click="combine"
>重置
</el-button>
<el-button type="primary" icon="el-icon-search" @click="submitFind">查询</el-button>
<el-button type="primary" icon="el-icon-check" @click="combine"
>确定
</el-button
>
</el-button-group>
</el-form-item>
</el-row>
<el-row>
</el-row>
</el-form>
</div>
<el-table
:data="dataList"
style="width: 100%"
border
highlight-current-row="true"
v-loading="loading"
:row-class-name="tableRowClassName"
@current-change="handleChange"
@current-change="handleDetail"
>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="序号" type="index" width="60"></el-table-column>
<el-table-column label="领用类型" prop="billType"></el-table-column>
<el-table-column label="单据号" prop="billNo"></el-table-column>
<el-table-column label="往来单位" prop="corpName" width="300"
show-overflow-tooltip="true"></el-table-column>
<el-table-column label="单据类型" prop="billTypeName"></el-table-column>
<el-table-column label="单据状态" prop="billFlag" width="80"></el-table-column>
<el-table-column label="单据日期" prop="billdate"></el-table-column>
<el-table-column label="领用仓库" prop="invName"></el-table-column>
<el-table-column label="往来信息" prop="targetInvName" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="单据日期" prop="billDate"></el-table-column>
<el-table-column label="状态" prop="status">
<template slot-scope="scope">
<el-tag :type="(scope.row.status) | statusFilterType">
{{ statusMap[scope.row.status] }}
</el-tag>
</template>
</el-table-column>
</el-table>
<el-pagination
:page-size="listQuery.limit"
@ -97,9 +112,9 @@
<el-card class="el-card">
<el-table v-loading="loading" :data="detailList" style="width: 100%">
<el-table-column label="序号" type="index" width="120"></el-table-column>
<el-table-column label="产品编码" prop="productId"></el-table-column>
<el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="产品编码" prop="nameCode"></el-table-column>
<el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="批次号" prop="batchNo"></el-table-column>
<el-table-column label="生产日期" prop="productDate"></el-table-column>
<el-table-column label="失效日期" prop="expireDate"></el-table-column>
@ -132,7 +147,7 @@ import store from "../../store";
import {filterAllByUser} from "@/api/system/invWarehouse";
import selectInvDialog from "./DialogSelectInv";
import {getReceiveOrder} from "@/api/inout/receiveOrder";
import {getOrderDetail, getReceiveOrder} from "@/api/inout/receiveOrder";
import {getBusChange} from "@/api/basic/busTypeChange";
export default {
@ -162,6 +177,7 @@ export default {
allocateStatus: 0,
customerId: null,
},
showSearch: true,
detailList: [],
storageVisible: false,
dataList: [],
@ -176,6 +192,12 @@ export default {
originTypes: [],
storageList: [],
actDateRange: [],
statusMap: {
1: "草稿",
2: "未审核",
3: "已审核",
4: "已拒绝"
},
pickerOptions: {
shortcuts: [
{
@ -239,10 +261,21 @@ export default {
this.unionQuery.page = val;
this.getList();
},
handleChange(val) {
this.currentRow = val;
this.detailList = val.subErpOrders;
handleDetail(row) {
this.currentRow = row;
var query = {};
query.orderIdFk = row.billNo;
getOrderDetail(query) //查找该单号下的所有条码
.then((response) => {
this.detailList = response.data.list || [];
})
.catch(() => {
this.detailList = [];
});
},
handleErpPageChange(val) {
this.listQuery.page = val;
this.getList();
@ -287,14 +320,8 @@ export default {
if (this.$isBlank(this.currentRow.id)) {
return;
}
this.curLocInv = this.currentRow.locStorageCode;
if (this.$isBlank(this.curLocInv)) {
this.storageVisible = true;
} else {
let tQuery = {
id: this.currentRow.id,
locStorageCode: this.curLocInv,
invWarehouseCode: this.currentRow.invWarehouseCode,
}
addReceiveOrder(tQuery)
.then((response) => {
@ -306,8 +333,11 @@ export default {
})
.catch(() => {
});
}
},
hideSearch() {
this.showSearch = !this.showSearch;
},
submitFind() {
this.listQuery.page = 1;
this.getList();

49
src/views/inout/DialogSelectThrOrder.vue
Unescape Escape View File

@ -2,24 +2,31 @@
<div>
<el-card class="el-card" style="margin-top: -15px">
<div>
<el-form :inline="true" :model="listQuery" style="display: flex;" size="mini">
<el-form :model="listQuery" size="mini"
v-show="showSearch"
label-width="100px">
<el-row>
<el-form-item class="query-form-item">
<el-col :span="6">
<el-form-item class="query-form-item" label="单据号:">
<el-input
v-model="listQuery.billNo"
placeholder="单据号"
clearable
></el-input>
</el-form-item>
<el-form-item class="query-form-item">
</el-col>
<el-col :span="6">
<el-form-item class="query-form-item" label="往来单位:">
<el-input
v-model="listQuery.corpName"
placeholder="往来单位"
clearable
></el-input>
</el-form-item>
<el-form-item class="query-form-item">
<el-select v-model="listQuery.billAction" placeholder="请选择第三方系统单据类型" clearable="true">
</el-col>
<el-col :span="6">
<el-form-item class="query-form-item" label="单据类型:">
<el-select v-model="listQuery.billAction" placeholder="请选择第三方系统单据类型" filterable clearable="true">
<el-option
v-for="item in originTypes"
:key="item.name"
@ -32,10 +39,11 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item class="query-form-item">
<span style="color: #000; margin-left: 10px; margin-right: 6px"
>单据日期:</span
>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item class="query-form-item" label="单据日期:">
<el-date-picker
:picker-options="pickerOptions"
v-model="actDateRange"
@ -48,22 +56,27 @@
>
</el-date-picker>
</el-form-item>
<el-form-item style="display: flex">
</el-col>
</el-row>
</el-form>
<div class="top-right-btn">
<el-button-group>
<el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
<el-button
type="primary"
icon="el-icon-refresh"
@click="onReset"
></el-button>
<el-button type="primary" icon="search" @click="submitFind">查询</el-button>
<el-button type="primary" icon="search" @click="combine"
>重置
</el-button>
<el-button type="primary" icon="el-icon-search" @click="submitFind">查询</el-button>
<el-button type="primary" icon="el-icon-check" @click="combine"
>确定
</el-button
>
</el-button-group>
</el-form-item>
</el-row>
</el-form>
</div>
<el-divider style="margin: 15px"></el-divider>
<el-table
:data="dataList"
style="width: 100%"
@ -156,6 +169,7 @@ export default {
type: 0,
customerId: null,
},
showSearch: true,
detailList: [],
storageVisible: false,
dataList: [],
@ -301,6 +315,9 @@ export default {
});
}
},
hideSearch() {
this.showSearch = !this.showSearch;
},
submitFind() {
this.listQuery.page = 1;
this.getList();

0
src/views/inout/receive/thrOrderNew.vue → src/views/inout/receive/DialogNewReceive.vue
Unescape Escape View File

2
src/views/inout/receive/receiveAdd.vue
Unescape Escape View File

@ -128,7 +128,7 @@ import {getOriginBusType} from "@/api/basic/busOriginType";
import {delReceive} from "@/api/thrsys/thrOrderReceive";
import {filterDetailByKey} from "@/api/basic/basicThirdSys";
import {selectIp} from "@/api/param/systemParamConfig";
import thrOrderNew from "./thrOrderNew";
import thrOrderNew from "./DialogNewReceive";
import {getOrderDetail, getReceiveOrder} from "@/api/inout/receiveOrder";
export default {

Write Preview
Loading…
Cancel
Save