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

单据，单据类型流程相关移到UDI管理系统

Browse Source
prod
anthonywj 2 years ago
parent f6a7b40674
commit 811e72b96c
37 changed files with 4005 additions and 1917 deletions
Show Stats Download Patch File Download Diff File

2
.env.production
Unescape Escape View File

@ -4,7 +4,7 @@ VUE_APP_TITLE = UDI管理系统
# 生产环境配置 # 生产环境配置
ENV = 'production' ENV = 'production'
# VUE_APP_BASE_API = 'http://116.204.71.86:9150/UDI_WMS_MC/' # VUE_APP_BASE_API = 'http://116.204.71.86:9150/UDI_WMS_MC/'
VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_WMS_MC/' VUE_APP_BASE_API = 'http://101.43.77.55:9150/UDI_WMS_MC/'
# VUE_APP_BASE_API = 'http://192.168.0.66:9160/UDI_WMS_MC/' # VUE_APP_BASE_API = 'http://192.168.0.66:9160/UDI_WMS_MC/'
# 应用访问路径 例如使用前缀 /admin/ # 应用访问路径 例如使用前缀 /admin/
VUE_APP_CONTEXT_PATH = '/UDI_WMS_NEW/' VUE_APP_CONTEXT_PATH = '/UDI_WMS_NEW/'

2
src/api/basic/busOriginType.js
Unescape Escape View File

@ -1,4 +1,4 @@
import axios from "../../utils/request"; import axios from "@/utils/request";
export function getOriginBusType(query) { export function getOriginBusType(query) {
return axios({ return axios({

2
src/api/basic/busType.js
Unescape Escape View File

@ -1,4 +1,4 @@
import axios from "../../utils/request"; import axios from "@/utils/request";
export function getBusTypeList(params) { export function getBusTypeList(params) {
return axios({ return axios({

2
src/api/basic/busTypeChange.js
Unescape Escape View File

@ -1,4 +1,4 @@
import axios from "../../utils/request"; import axios from "@/utils/request";
export function getBusTypeChangeList(params) { export function getBusTypeChangeList(params) {
return axios({ return axios({

2
src/api/basic/busTypePre.js
Unescape Escape View File

@ -1,4 +1,4 @@
import axios from "../../utils/request"; import axios from "@/utils/request";
export function getBusTypePreResList(params) { export function getBusTypePreResList(params) {
return axios({ return axios({

2
src/api/basic/bussinessType.js
Unescape Escape View File

@ -1,4 +1,4 @@
import axios from "../../utils/request"; import axios from "@/utils/request";
export function getBussinessType(query) { export function getBussinessType(query) {
return axios({ return axios({

9
src/api/inout/acceptOrder.js
Unescape Escape View File

@ -26,3 +26,12 @@ export function acceptAddCode(query) {
data: query data: query
}); });
} }
export function getAcceptStatus(query) {
return axios({
url: "/udiwms/stock/order/accept/getStatus",
method: "get",
params: query
});
}

17
src/api/inout/code.js
Unescape Escape View File

@ -16,6 +16,23 @@ export function tabCode(query) {
}); });
} }
export function getCodeLost(query) {
return axios({
url: "/warehouse/inout/getCodeLost",
method: "post",
data: query
});
}
export function updateCodeLost(query) {
return axios({
url: "/warehouse/inout/updateCodeLost",
method: "post",
data: query
});
}
export function findByCode(query) { export function findByCode(query) {
return axios( return axios(

17
src/api/inout/order.js
Unescape Escape View File

@ -58,6 +58,14 @@ export function saveOrderWeb(query) {
}); });
} }
export function filterInvoice(params) {
return axios({
url: "/udiwms/inout/order/filterInvoice",
method: "get",
params: params
});
}
export function orderListError(query) { export function orderListError(query) {
return axios({ return axios({
@ -423,6 +431,15 @@ export function updateStatus(query) {
}); });
} }
export function thirdUpdateStatus(query) {
return axios({
url: "/spms/inout/order/third/updateStatus",
method: "post",
data: query
});
}
export function filterOrderTrace(params) { export function filterOrderTrace(params) {
return axios({ return axios({
url: "/udiwms/inout/order/filterOrderTrace", url: "/udiwms/inout/order/filterOrderTrace",

34
src/api/inout/orderDetailBiz.js
Unescape Escape View File

@ -8,6 +8,40 @@ export function getBizDetailList(params) {
}); });
} }
export function filterListInvoice(params) {
return axios({
url: "/udiwms/inout/bizDetail/filterListInvoice",
method: "get",
params: params
});
}
export function deleteById(params) {
return axios({
url: "/udiwms/inout/biz/deleteById",
method: "get",
params: params
});
}
export function updateById(data) {
return axios({
url: "/udiwms/inout/biz/updateById",
method: "post",
data: data
});
}
export function insertInvoice(params) {
return axios({
url: "/udiwms/inout/biz/insertInvoice",
method: "post",
data: params
});
}
export function getCheckDetailList(params) { export function getCheckDetailList(params) {
return axios({ return axios({
url: "/udiwms/inout/wditCheck/filterList", url: "/udiwms/inout/wditCheck/filterList",

8
src/api/inout/orderDetailResult.js
Unescape Escape View File

@ -7,3 +7,11 @@ export function getResultDetailList(params) {
params: params params: params
}); });
} }
export function getResultOrderList(params) {
return axios({
url: "/udiwms/inout/resultDetail/filterOrderList",
method: "get",
params: params
});
}

1833
src/views/basic/busType/busTypeAdvancedSettings.vue
View File

File diff suppressed because it is too large Load Diff

102
src/views/basic/busType/bussinessType.vue
Unescape Escape View File

@ -60,12 +60,17 @@
<span>{{ enableMap[scope.row.enable] }}</span> <span>{{ enableMap[scope.row.enable] }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="一次校验" prop="checkEnable"> <el-table-column label="校验业务单" prop="checkEnable">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ enableMap[scope.row.checkEnable] }}</span> <span>{{ enableMap[scope.row.checkEnable] }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="二次核对" prop="secCheckEnable"> <el-table-column label="一次审核" prop="thrCheckEnable">
<template slot-scope="scope">
<span>{{ enableMap[scope.row.thrCheckEnable] }}</span>
</template>
</el-table-column>
<el-table-column label="二次审核" prop="secCheckEnable">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ enableMap[scope.row.secCheckEnable] }}</span> <span>{{ enableMap[scope.row.secCheckEnable] }}</span>
</template> </template>
@ -123,7 +128,7 @@
v-if="modifyDialogVisible" v-if="modifyDialogVisible"
> >
<modifyDialog :inputQuery="inputQuery" :modifySubmit="onModifySubmit"></modifyDialog> <modifyDialog :inputQuery="inputQuery" :modifySubmit="onModifySubmit"></modifyDialog>
<div style="text-align: center"> <div style="text-align: center;margin-top: 12px">
<el-button type="primary" size="small" icon="search" @click="onModifySubmit" <el-button type="primary" size="small" icon="search" @click="onModifySubmit"
:disabled="!configParams.typeScan" :disabled="!configParams.typeScan"
>提交 >提交
@ -218,9 +223,27 @@ export default {
originAction: null, originAction: null,
checkBalance: null, checkBalance: null,
secCheckBalance: null, secCheckBalance: null,
preInBack:null, preInBack: true,
vailDispatch:null, vailDispatch: null,
vailGroupBuy:null, vailGroupBuy: null,
inStock: false,
actionType: 0,
fillCodeRel: false,
thrCheckEnable: null,
thrCheckWebNew: null,
thrCheckPdaUn: null,
thrCheckPdaEd: null,
thrCheckUdims: null,
thrCheckPc: null,
thrCheckSp: null,
thrCheckChange: null,
thrCheckBalance: null,
thrCheckCopy: null,
checkVailDate:true, //校验近效期
checkExpire:true, //校验过期
checkCertExpire:true, //校验证书过期
}, },
enableMap: { enableMap: {
true: "是", true: "是",
@ -288,18 +311,32 @@ export default {
}, },
onAddSubmit() { onAddSubmit() {
//默认初始化
this.inputQuery.corpType = 2;
if (isBlank(this.inputQuery.name)) { if (isBlank(this.inputQuery.name)) {
this.$message.error("单据类型名称不能为空！"); this.$message.error("单据类型名称不能为空！");
return; return;
} }
if (this.$isBlank(this.inputQuery.corpType)) {
this.$message.error("往来信息类型不能为空！");
return;
}
if (this.inputQuery.mainAction == "" || this.inputQuery.mainAction == null) { if (this.inputQuery.mainAction == "" || this.inputQuery.mainAction == null) {
this.$message.error("出入库类型不能为空！"); this.$message.error("出入库类型不能为空！");
return; return;
} }
if (isBlank(this.inputQuery.name)) {
this.$message.error("单据类型名称不能为空！");
return;
}
// if (isBlank(this.inputQuery.actionType)) {
// this.$message.error("请选择单据类型！");
// return;
// }
if (isBlank(this.inputQuery.inStock)) {
this.$message.error("请选择是否更改库存！");
return;
}
// if (isBlank(this.inputQuery.busType)) {
// this.$message.error("请选择特定页面！");
// return;
// }
insertBusType(this.inputQuery) insertBusType(this.inputQuery)
.then((response) => { .then((response) => {
if (response.code == 20000) { if (response.code == 20000) {
@ -316,14 +353,32 @@ export default {
}, },
onModifySubmit() { onModifySubmit() {
if (this.inputQuery.name == "" || this.inputQuery.name == null) {
this.$message.error("单据类型不能为空！"); if (isBlank(this.inputQuery.name)) {
this.$message.error("单据类型名称不能为空！");
return; return;
} }
if (this.inputQuery.mainAction == "" || this.inputQuery.mainAction == null) { if (this.inputQuery.mainAction == "" || this.inputQuery.mainAction == null) {
this.$message.error("出入库类型不能为空！"); this.$message.error("出入库类型不能为空！");
return; return;
} }
if (isBlank(this.inputQuery.name)) {
this.$message.error("单据类型名称不能为空！");
return;
}
// if (isBlank(this.inputQuery.actionType)) {
// this.$message.error("请选择单据类型！");
// return;
// }
if (isBlank(this.inputQuery.inStock)) {
this.$message.error("请选择是否更改库存！");
return;
}
// if (isBlank(this.inputQuery.busType)) {
// this.$message.error("请选择特定页面！");
// return;
// }
updateBusType(this.inputQuery) updateBusType(this.inputQuery)
.then((response) => { .then((response) => {
if (response.code == 20000) { if (response.code == 20000) {
@ -412,9 +467,26 @@ export default {
advanceType: null, advanceType: null,
preIn: null, preIn: null,
originAction: null, originAction: null,
preInBack:null, preInBack: true,
vailDispatch:null, vailDispatch: null,
vailGroupBuy:null, vailGroupBuy: null,
inStock: false,
actionType: 0,
fillCodeRel: false,
thrCheckEnable: null,
thrCheckWebNew: null,
thrCheckPdaUn: null,
thrCheckPdaEd: null,
thrCheckUdims: null,
thrCheckPc: null,
thrCheckSp: null,
thrCheckChange: null,
thrCheckBalance: null,
thrCheckCopy: null,
checkVailDate:true, //校验近效期
checkExpire:true, //校验过期
checkCertExpire:true, //校验证书过期
} }
this.addDialogVisible = true; this.addDialogVisible = true;
}, },

1233
src/views/basic/busType/bussinessTypeModify.vue
View File

File diff suppressed because it is too large Load Diff

143
src/views/basic/business/stockOrder.vue
Unescape Escape View File

@ -4,47 +4,44 @@
<el-form :model="query" label-width="100px" v-show="showSearch"> <el-form :model="query" label-width="100px" v-show="showSearch">
<el-row style="width: 100%"> <el-row style="width: 100%">
<el-col :span="6"> <el-col :span="6">
<el-form-item label="单据号:"> <el-form-item label="单号:">
<el-input v-model="query.billNo" style="width: 90%" placeholder="请输入单据号" clearable></el-input> <el-input v-model="query.billNo" style="width: 90%" placeholder="请输入单号" clearable></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="业务类型:">
<el-select v-model="query.action" style="width: 90%" placeholder="请选择业务类型" clearable="true" size="mini"> <el-form-item label="状态：" prop="inCodeStatus">
<el-option <el-select v-model="query.inCodeStatus" style="width: 90%">
v-for="item in busTypes" <el-option label="未打印" value="1"></el-option>
:key="item.name" <el-option label="已打印" value="2"></el-option>
:label="item.name"
:value="item.action">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <el-col :span="8">-->
<!-- <el-form-item label="送货单位:">-->
<!-- <el-input v-model="query.corpName" style="width: 90%" placeholder="请输入送货单位" clearable></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="6"> <el-col :span="6">
<el-form-item label="往来单位:"> <el-form-item class="query-form-item" label="单据类型:">
<el-input v-model="query.corpName" style="width: 90%" placeholder="请输入往来单位" clearable></el-input> <el-select v-model="query.action" placeholder="请选择单据类型"
</el-form-item> style="width: 90%"
</el-col> clearable>
<el-col :span="6">
<el-form-item label="当前仓库:">
<el-select v-model="query.invCode" style="width: 90%" placeholder="请选择当前仓库" clearable="true"
@change="subInvChange"
size="mini">
<el-option <el-option
v-for="item in subInvList" v-for="item in busTypes"
:key="item.name" :key="item.name"
:label="item.name" :label="item.name"
:value="item.code"> :value="item.action">
<span style="float: left">{{ item.name }}</span> <span style="float: left">{{ item.name }}</span>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="单据日期:"> <el-form-item label="创建时间:">
<el-date-picker <el-date-picker
:picker-options="pickerOptions" :picker-options="pickerOptions"
v-model="actDateRange" v-model="actDateRange"
@ -59,9 +56,10 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form>
</el-form>
<div class="top-right-btn"> <div class="top-right-btn">
@ -75,29 +73,28 @@
<el-divider style="margin: 15px"></el-divider> <el-divider style="margin: 15px"></el-divider>
<el-table v-loading="loading" :data="list" style="width: 100%;" border highlight-current-row @row-click="getStockOrderDetailList" ref="multipleTable"> <el-table v-loading="loading" :data="list" style="width: 100%;" border highlight-current-row
@row-click="getStockOrderDetailList" ref="multipleTable">
<el-table-column type="selection" width="55"> <el-table-column type="selection" width="55">
</el-table-column> </el-table-column>
<el-table-column type="index" label="序号" width="50"></el-table-column> <el-table-column type="index" label="序号" width="50"></el-table-column>
<el-table-column label="单据号" prop="billNo" show-overflow-tooltip></el-table-column> <el-table-column label="单据号" prop="billNo" width="140" show-overflow-tooltip></el-table-column>
<el-table-column label="往来单位" prop="fromInvName" show-overflow-tooltip></el-table-column> <el-table-column label="单据类型" prop="billTypeName" width="120">
<el-table-column label="单据来源" prop="fromType" width="150">
<template slot-scope="scope">
<span>{{ sourceMap[scope.row.fromType] }}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column label="单据日期" prop="createTime"></el-table-column> <el-table-column label="创建时间" prop="createTime" width="150"></el-table-column>
<el-table-column label="单据状态"> <el-table-column label="打印状态" width="100" prop="inCodeStatus">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.status | statusFilterName }} <span>{{ enableMap[scope.row.inCodeStatus] }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="业务类型" prop="billTypeName" width="150"> <el-table-column label="所属部门" prop="deptName" width="120">
</el-table-column> </el-table-column>
<el-table-column label="当前仓库" prop="invName" width="150"> <el-table-column label="所属仓库" prop="invName" width="150">
</el-table-column> </el-table-column>
<el-table-column label="单据来源" prop="fromType" width="120">
<el-table-column label="所属科室" prop="deptName" width="120"> <template slot-scope="scope">
<span>{{ sourceMap[scope.row.fromType] }}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column label="操作" width="200"> <el-table-column label="操作" width="200">
<template slot-scope="scope"> <template slot-scope="scope">
@ -105,7 +102,7 @@
type="text" type="text"
size="small" size="small"
@click.native="qrcodeDetail(scope.row)" @click.native="qrcodeDetail(scope.row)"
>内部码详情 >内部码
</el-button </el-button
> >
</template> </template>
@ -125,9 +122,11 @@
<el-card class="el-card"> <el-card class="el-card">
<el-table v-loading="detailLoading" :data="detailList" style="width: 100%" border> <el-table v-loading="detailLoading" :data="detailList" style="width: 100%" border>
<el-table-column type="index" label="序号" width="50"></el-table-column> <el-table-column type="index" label="序号" width="50"></el-table-column>
<el-table-column label="产品通用名" prop="coName"></el-table-column> <el-table-column label="物资名称" prop="coName"></el-table-column>
<el-table-column label="规格型号" prop="spec"></el-table-column> <el-table-column label="规格型号" prop="spec"></el-table-column>
<el-table-column label="批次号" prop="batchNo"></el-table-column> <el-table-column label="批次号" prop="batchNo"></el-table-column>
<el-table-column label="单据数量" prop="count"></el-table-column>
<el-table-column label="实际数量" prop="reCount"></el-table-column>
<el-table-column label="生产日期" prop="productDate"> <el-table-column label="生产日期" prop="productDate">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ convertDateFun(scope.row.productDate) }}</span> <span>{{ convertDateFun(scope.row.productDate) }}</span>
@ -138,10 +137,9 @@
<span>{{ convertDateFun(scope.row.expireDate) }}</span> <span>{{ convertDateFun(scope.row.expireDate) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="实际数量" prop="reCount"></el-table-column>
<el-table-column label="单据数量" prop="count"></el-table-column>
<el-table-column label="价格" prop="price"></el-table-column> <el-table-column label="价格" prop="price"></el-table-column>
<el-table-column label="生产厂家" prop="ylqxzcrbarmc"></el-table-column> <el-table-column label="生产企业" prop="ylqxzcrbarmc"></el-table-column>
<el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh"></el-table-column> <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh"></el-table-column>
</el-table> </el-table>
@ -161,6 +159,7 @@
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false" :close-on-press-escape="false"
width="70%" width="70%"
append-to-body
v-if="qrcodeDetailVisible" v-if="qrcodeDetailVisible"
@close='closeQRCodeDetailDialog' @close='closeQRCodeDetailDialog'
> >
@ -174,7 +173,8 @@
</template> </template>
<script> <script>
import {stockOrderList, stockOrderDetail, deleteStockOrderById, deleteStockOrderDetailById, import {
stockOrderList, stockOrderDetail, deleteStockOrderById, deleteStockOrderDetailById,
copyStockOrderDetail, submitStockOrder, copyStockOrderDetail, submitStockOrder,
uploadStockOrderDetail, uploadStockOrderDetailCount, uploadStockOrderDetail, uploadStockOrderDetailCount,
generateStockOrderQRCodeText generateStockOrderQRCodeText
@ -187,8 +187,9 @@ import {inspectionStockOrderPDFFromTemplateFile, stockOrderPDFFromTemplateFile}
import store from "@/store"; import store from "@/store";
import {getLocalJoinBusType, getLocalJoinByUser} from "@/api/basic/busLocalType"; import {getLocalJoinBusType, getLocalJoinByUser} from "@/api/basic/busLocalType";
import {filterAll, filterAllByUser} from "@/api/system/invWarehouse"; import {filterAll, filterAllByUser} from "@/api/system/invWarehouse";
import {filterSubByInv} from "@/api/system/invSubWarehouse"; import {filterSubByInv, findInvByUser} from '@/api/system/invSubWarehouse'
import {convertDate} from "@/utils/date" import {convertDate} from "@/utils/date"
import {filterOrder} from "@/api/inout/order";
export default { export default {
name: "stockOrder", name: "stockOrder",
@ -207,6 +208,7 @@ export default {
limit: 10, limit: 10,
startTime: "", startTime: "",
endTime: "", endTime: "",
inCodeStatus: null,
}, },
detailQuery: { detailQuery: {
orderIdFk: "", orderIdFk: "",
@ -223,6 +225,10 @@ export default {
detailTotal: 0, detailTotal: 0,
loading: false, loading: false,
detailLoading: false, detailLoading: false,
enableMap: {
1: "已打印",
0: "未打印",
},
sourceMap: { sourceMap: {
"1": "UDIMS平台", "1": "UDIMS平台",
"2": "网页新增", "2": "网页新增",
@ -267,6 +273,7 @@ export default {
qrcodeExportVisible: false, qrcodeExportVisible: false,
filterUDIType: true, filterUDIType: true,
actDateRange: [], actDateRange: [],
auditDateRange: [],
pickerOptions: { pickerOptions: {
shortcuts: [ shortcuts: [
{ {
@ -322,7 +329,22 @@ export default {
this.showSearch = !this.showSearch; this.showSearch = !this.showSearch;
}, },
onSubmit() { onSubmit() {
this.query.page=1; this.query.page = 1;
if (this.actDateRange !== null) {
this.query.startTime = this.actDateRange[0];
this.query.endTime = this.actDateRange[1];
} else {
this.query.startTime = null;
this.query.endTime = null;
}
if (this.auditDateRange !== null) {
this.query.startAduditTime = this.auditDateRange[0];
this.query.endAduditTime = this.auditDateRange[1];
} else {
this.query.startAduditTime = null;
this.query.endAduditTime = null;
}
this.getList(); this.getList();
this.haveDistributionVisible = true; this.haveDistributionVisible = true;
}, },
@ -354,8 +376,7 @@ export default {
this.query.startTime = null; this.query.startTime = null;
this.query.endTime = null; this.query.endTime = null;
} }
this.query.status=3 filterOrder(this.query)
stockOrderList(this.query)
.then(response => { .then(response => {
this.loading = false; this.loading = false;
if (response.code == 20000) { if (response.code == 20000) {
@ -414,7 +435,6 @@ export default {
}, },
getBusType() { getBusType() {
let query = { let query = {
code: this.query.invWarehouseCode,
enabled: true, enabled: true,
}; };
getLocalJoinByUser(query) getLocalJoinByUser(query)
@ -426,27 +446,8 @@ export default {
.catch(() => { .catch(() => {
}); });
}, },
invChange() {
this.query.invWarehouseCode = "";
this.subInvList = [];
let query = {
pcode: this.query.locStorageCode
};
filterSubByInv(query)
.then((response) => {
this.subInvList = response.data || [];
})
.catch(() => {
});
},
getSubInvList() { getSubInvList() {
let query = { findInvByUser()
filter: 3
};
filterSubByInv(query)
.then((response) => { .then((response) => {
this.subInvList = response.data || []; this.subInvList = response.data || [];
}) })

2
src/views/basic/business/stockOrderDistribution.vue
Unescape Escape View File

@ -79,7 +79,7 @@
<el-table v-loading="loading" :data="codeArray" style="width: 100%;" border max-height="350" height="350" ref="multipleTable"> <el-table v-loading="loading" :data="codeArray" style="width: 100%;" border max-height="350" height="350" ref="multipleTable">
<el-table-column label="序号" type="index" width="50"></el-table-column> <el-table-column label="序号" type="index" width="50"></el-table-column>
<el-table-column label="产品通用名" prop="productName" show-overflow-tooltip width="200"></el-table-column> <el-table-column label="物资名称" prop="productName" show-overflow-tooltip width="200"></el-table-column>
<el-table-column label="包装规格" prop="spec" show-overflow-tooltip width="200"></el-table-column> <el-table-column label="包装规格" prop="spec" show-overflow-tooltip width="200"></el-table-column>
<el-table-column label="批次号" prop="batchNo" show-overflow-tooltip></el-table-column> <el-table-column label="批次号" prop="batchNo" show-overflow-tooltip></el-table-column>
<el-table-column label="生产日期" prop="productDate" show-overflow-tooltip></el-table-column> <el-table-column label="生产日期" prop="productDate" show-overflow-tooltip></el-table-column>

2
src/views/basic/business/stockOrderQRCodeDetail.vue
Unescape Escape View File

@ -24,7 +24,7 @@
<el-row> <el-row>
<el-col :span="11"> <el-col :span="11">
<el-form-item label="供应商名称" prop="corpName"> <el-form-item label="往来单位" prop="corpName">
<el-input v-model="formData.customerName" style="width: 90%" auto-complete="off" :disabled="true"></el-input> <el-input v-model="formData.customerName" style="width: 90%" auto-complete="off" :disabled="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>

42
src/views/inout/DialogCreateOrder.vue
Unescape Escape View File

@ -15,7 +15,7 @@
size="mini" size="mini"
type="primary" type="primary"
@click.native="submit()" @click.native="submit()"
>提交订单 >立即提交
</el-button </el-button
> >
</el-button-group> </el-button-group>
@ -44,39 +44,41 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="11"> <el-col :span="11">
<el-form-item prop="invCode" label="当前仓库:"> <el-form-item prop="action" label="单据类型:">
<el-select v-model="orderFormData.invCode" placeholder="当前仓库信息" <el-select v-model="orderFormData.action" placeholder="请选择单据类型"
:disabled="corpOrderIdDisabled"
style="width: 90%" style="width: 90%"
:disabled="corpOrderIdDisabled" @change="changeInv" filterable> @change="actionChange">
<el-option <el-option
v-for="item in curInvOptions" v-for="item in busTypeOptions"
:key="item.name" :key="item.name"
:label="item.name" :label="item.name"
:value="item.code"> :value="item.action">
<span style="float: left">{{ item.name }}</span> <span style="float: left">{{ item.name }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{
item.code
}}</span>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="11"> <el-col :span="11">
<el-form-item prop="action" label="单据类型:"> <el-form-item prop="invCode" label="当前仓库:">
<el-select v-model="orderFormData.action" placeholder="请选择单据类型" <el-select v-model="orderFormData.invCode" placeholder="当前仓库"
:disabled="corpOrderIdDisabled"
style="width: 90%" style="width: 90%"
@change="actionChange"> :disabled="corpOrderIdDisabled" @change="changeInv" filterable>
<el-option <el-option
v-for="item in busTypeOptions" v-for="item in curInvOptions"
:key="item.name" :key="item.name"
:label="item.name" :label="item.name"
:value="item.action"> :value="item.code">
<span style="float: left">{{ item.name }}</span> <span style="float: left">{{ item.name }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{
item.warehouseName
}}</span>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="11"> <el-col :span="11">
@ -161,7 +163,7 @@
</el-row> </el-row>
<el-row v-if="viewType!=1"> <el-row v-if="viewType!=1">
<el-col :span="20"> <el-col :span="20">
<el-form-item prop="code" label="扫码录入:"> <el-form-item prop="code" label="扫码录入校验:">
<el-input <el-input
id="inputer" id="inputer"
@focus="getInputFocus($event)" @focus="getInputFocus($event)"
@ -184,6 +186,8 @@
> >
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
</el-card> </el-card>
<el-tabs type="border-card" style="margin: 5px"> <el-tabs type="border-card" style="margin: 5px">
@ -327,7 +331,7 @@ export default {
isScan: true, isScan: true,
scanText: "扫码录入：", scanText: "扫码录入：",
corpOrderIdDisabled: false, corpOrderIdDisabled: false,
isSupVesion: false,
loading: false, loading: false,
index: null, index: null,
formLoading: false, formLoading: false,
@ -451,6 +455,7 @@ export default {
//1.切换往来单位 //1.切换往来单位
this.orderFormData.fromCorp = null; this.orderFormData.fromCorp = null;
this.findMethod(); this.findMethod();
} else if (this.curAction.corpType == 3) { } else if (this.curAction.corpType == 3) {
//2. 切换往来仓库 //2. 切换往来仓库
this.orderFormData.fromInvCode = null; this.orderFormData.fromInvCode = null;
@ -791,7 +796,6 @@ export default {
event.preventDefault(); event.preventDefault();
event.stopPropagation(); event.stopPropagation();
}; };
if (this.viewType !== 1) {
var that = this; var that = this;
var inputer = document.getElementById("inputer"); var inputer = document.getElementById("inputer");
window.sc = new A.KeyScaner(inputer);//传入要监听的DOM节点 window.sc = new A.KeyScaner(inputer);//传入要监听的DOM节点
@ -813,9 +817,9 @@ export default {
} }
}; };
inputer.focus(); inputer.focus();
}
}, },
created() { created() {
//页面初始化 //页面初始化
this.codeFormData.code = ''; this.codeFormData.code = '';

98
src/views/inout/DialogReviewOrder.vue
Unescape Escape View File

@ -5,14 +5,14 @@
<el-button-group style="display: flex;margin: 0px 0 10px 80%; height: 35px"> <el-button-group style="display: flex;margin: 0px 0 10px 80%; height: 35px">
<el-button <el-button
type="primary" type="primary"
@click.native="finishAccept()" @click.native="checkFinish()"
>完成验收 >完成审核
</el-button </el-button
> >
<el-button <el-button
type="primary" type="primary"
@click.native="renewAccept()" @click.native="renewAccept()"
>重新验收 >重新审核
</el-button </el-button
> >
</el-button-group> </el-button-group>
@ -42,7 +42,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="11"> <el-col :span="11">
<el-form-item prop="fromCorp" label="当前仓库:"> <el-form-item prop="fromCorp" label="收货仓库:">
<el-input v-model="formData.invName" auto-complete="off" <el-input v-model="formData.invName" auto-complete="off"
disabled disabled
></el-input> ></el-input>
@ -52,7 +52,7 @@
<el-row> <el-row>
<el-col :span="11"> <el-col :span="11">
<el-form-item prop="fromCorp" label="往来信息:"> <el-form-item prop="fromCorp" label="送货单位:">
<el-input v-model="formData.fromCorpName" auto-complete="off" <el-input v-model="formData.fromCorpName" auto-complete="off"
disabled disabled
></el-input> ></el-input>
@ -61,7 +61,7 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="20"> <el-col :span="20">
<el-form-item prop="code" label="UDI码:"> <el-form-item prop="code" label="扫码校验:">
<el-input <el-input
id="inputer" id="inputer"
placeholder="请输入UDI码" placeholder="请输入UDI码"
@ -96,15 +96,18 @@
:cell-style="{padding:6+'px'}" :cell-style="{padding:6+'px'}"
style="width: 100%"> style="width: 100%">
<el-table-column type="index" label="序号" width="50"></el-table-column> <el-table-column type="index" label="序号" width="50"></el-table-column>
<el-table-column label="产品通用名" width="160" prop="coName"></el-table-column> <el-table-column label="物资名称" width="160" prop="coName"></el-table-column>
<el-table-column label="包装规格" width="160" prop="spec"></el-table-column> <el-table-column label="规格型号" width="160" prop="spec"></el-table-column>
<el-table-column label="批次号" width="100" prop="batchNo"></el-table-column> <el-table-column label="批次号" width="100" prop="batchNo"></el-table-column>
<el-table-column label="注册/备案凭证号" width="150" prop="certCode"></el-table-column> <el-table-column label="单据数量" width="100" prop="count"></el-table-column>
<el-table-column label="审核数量" width="100" prop="acceptCount"></el-table-column>
<el-table-column label="生产日期" width="120" prop="productDate"></el-table-column> <el-table-column label="生产日期" width="120" prop="productDate"></el-table-column>
<el-table-column label="失效日期" width="120" prop="expireDate"></el-table-column> <el-table-column label="失效日期" width="120" prop="expireDate"></el-table-column>
<el-table-column label="单据数量" width="100" prop="count"></el-table-column>
<el-table-column label="验收数量" width="100" prop="acceptCount"></el-table-column>
<el-table-column label="价格" width="120" prop="price"></el-table-column> <el-table-column label="价格" width="120" prop="price"></el-table-column>
<el-table-column width="100" label="计量单位" prop="measname">
</el-table-column>
<el-table-column label="注册/备案号" width="150" prop="certCode"></el-table-column>
<el-table-column label="销售清单号（第二票）" width="180" prop="secSalesListNo"> <el-table-column label="销售清单号（第二票）" width="180" prop="secSalesListNo">
</el-table-column> </el-table-column>
<el-table-column label="销售发票号（第一票）" width="180" prop="firstSalesInvNo"> <el-table-column label="销售发票号（第一票）" width="180" prop="firstSalesInvNo">
@ -121,8 +124,8 @@
<script> <script>
import A from "../../plugins/KeyScaner" import A from "../../plugins/KeyScaner"
import {updateStatus, enterCodeWeb} from "@/api/inout/order"; import {updateStatus, enterCodeWeb, thirdUpdateStatus} from "@/api/inout/order";
import {getAcceptOrder, acceptClear, acceptAddCode} from "@/api/inout/acceptOrder"; import {getAcceptOrder, acceptClear, acceptAddCode, getAcceptStatus} from "@/api/inout/acceptOrder";
export default { export default {
@ -136,6 +139,11 @@ export default {
type: Object, type: Object,
required: true, required: true,
}, },
reviewType: {
type: Object,
required: true,
}
}, },
data() { data() {
return { return {
@ -244,17 +252,17 @@ export default {
this.detailLoading = false; this.detailLoading = false;
this.detailList = response.data.orderDetailEntities || []; this.detailList = response.data.orderDetailEntities || [];
if (response.data.finishAccept) { if (response.data.finishAccept) {
this.$confirm("校验完成，是否立即完成验收?", "提示", { this.$confirm("审核结果正确，是否立即完成审核?", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning", type: "warning",
}) })
.then(() => { .then(() => {
this.finishAccept(); this.postAccept();
}) })
.catch(() => { .catch(() => {
}); });
}else { } else {
this.$message.success("匹配成功！"); this.$message.success("匹配成功！");
} }
@ -275,35 +283,75 @@ export default {
event.currentTarget.select(); event.currentTarget.select();
}, },
finishAccept() {
this.$confirm('是否确定完成验收此单据？', '提示', { checkFinish() {
let query = {
orderId: this.orderQuery.billNo,
};
getAcceptStatus(query)
.then((response) => {
if (response.code == 20000) {
let tip = "审核结果正确，是否立即完成审核?";
this.finishAccept(tip);
} else {
let tip = "审核未完成,是否强制完成审核此单据？";
this.finishAccept(tip);
}
})
.catch(() => {
});
},
finishAccept(tip) {
this.$confirm(tip, '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.postAccept();
}).catch(() => {
// this.$message.info('回退失败');
});
},
postAccept() {
let query = { let query = {
orderId: this.orderQuery.billNo, orderId: this.orderQuery.billNo,
}; };
updateStatus(query) if (this.reviewType != null && this.reviewType == 2) {
thirdUpdateStatus(query)
.then((response) => { .then((response) => {
if (response.code == 20000) { if (response.code == 20000) {
this.$message.success("验收成功！"); this.$message.success("核对成功！");
this.closeDialog(); this.closeDialog();
this.$emit('childByValue', 1) this.$emit('childByValue', 1)
} else { } else {
this.$message.error(response.message); this.$message.error(response.message);
} }
}) })
.catch(() => { .catch(() => {
}); });
}).catch(() => {
// this.$message.info('回退失败');
});
} else {
updateStatus(query)
.then((response) => {
if (response.code == 20000) {
this.$message.success("审核成功！");
this.closeDialog();
this.$emit('childByValue', 1)
} else {
this.$message.error(response.message);
}
})
.catch(() => {
});
}
}, },
renewAccept() { renewAccept() {
let query = { let query = {
billNo: this.orderQuery.billNo, billNo: this.orderQuery.billNo,

447
src/views/inout/DialogThrReviewOrder.vue
Unescape Escape View File

@ -0,0 +1,447 @@
<template>
<div>
<el-card style="margin-top: -20px">
<el-form :model="formData" ref="dataForm" label-width="100px">
<el-button-group style="display: flex;margin: 0px 0 10px 80%; height: 35px">
<el-button
type="primary"
@click.native="checkFinish()"
>完成核对
</el-button
>
<el-button
type="primary"
@click.native="renewAccept()"
>重新核对
</el-button
>
</el-button-group>
<el-row>
<el-col :span="11">
<el-form-item prop="fromCorp" label="单据编号:">
<el-input v-model="formData.billNo" auto-complete="off"
disabled
></el-input>
</el-form-item>
</el-col>
<el-col :span="11">
<el-form-item prop="fromCorp" label="单据时间:">
<el-input v-model="formData.createTime" auto-complete="off"
disabled
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item prop="fromCorp" label="单据类型:">
<el-input v-model="formData.billTypeName" auto-complete="off"
disabled
clearable
></el-input>
</el-form-item>
</el-col>
<el-col :span="11">
<el-form-item prop="fromCorp" label="收货仓库:">
<el-input v-model="formData.invName" auto-complete="off"
disabled
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item prop="fromCorp" label="送货单位:">
<el-input v-model="formData.fromCorpName" auto-complete="off"
disabled
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="20">
<el-form-item prop="code" label="扫码校验:">
<el-input
id="inputer"
placeholder="请输入UDI码"
@focus="getInputFocus($event)"
@keypress.enter.native="enterKey($event)"
ref='inputRef'
style="ime-mode:disabled"
type="tel"
v-model="udiCode"
></el-input>
</el-form-item>
</el-col>
<el-col :span="2">
<el-button
type="primary"
size="small"
@click.native.stop="addCode()"
style="height: 31px; margin-left: 20px"
>添加
</el-button
>
</el-col>
</el-row>
</el-form>
</el-card>
<el-card>
<el-table v-loading="detailLoading"
:data="detailList"
border
:row-style="rowStyle"
:cell-style="{padding:6+'px'}"
style="width: 100%">
<el-table-column type="index" label="序号" width="50"></el-table-column>
<el-table-column label="物资名称" width="160" prop="coName"></el-table-column>
<el-table-column label="规格型号" width="160" prop="spec"></el-table-column>
<el-table-column label="批次号" width="100" prop="batchNo"></el-table-column>
<el-table-column label="单据数量" width="100" prop="count"></el-table-column>
<el-table-column label="审核数量" width="100" prop="acceptCount"></el-table-column>
<el-table-column label="生产日期" width="120" prop="productDate"></el-table-column>
<el-table-column label="失效日期" width="120" prop="expireDate"></el-table-column>
<el-table-column label="价格" width="120" prop="price"></el-table-column>
<el-table-column width="100" label="计量单位" prop="measname">
</el-table-column>
<el-table-column label="注册/备案凭证号" width="150" prop="certCode"></el-table-column>
<el-table-column label="销售清单号（第二票）" width="180" prop="secSalesListNo">
</el-table-column>
<el-table-column label="销售发票号（第一票）" width="180" prop="firstSalesInvNo">
</el-table-column>
<el-table-column label="销售发票号（第二票）" width="180" prop="secSalesInvNo">
</el-table-column>
<el-table-column label="发票日期" width="150" prop="invoiceDate">
</el-table-column>
</el-table>
</el-card>
</div>
</template>
<script>
import A from "../../plugins/KeyScaner"
import {updateStatus, enterCodeWeb, thirdUpdateStatus} from "@/api/inout/order";
import {getAcceptOrder, acceptClear, acceptAddCode, getAcceptStatus} from "@/api/inout/acceptOrder";
export default {
name: "acceptOrder",
props: {
closeDialog: {
type: Function,
required: true,
},
orderQuery: {
type: Object,
required: true,
},
reviewType: {
type: Object,
required: true,
}
},
data() {
return {
formData: {},
loading: false,
detailLoading: false,
udiCode: null,
sictomText: "",
originCode: "",
checkSuccess: false,
detailList: [],
query: {
code: "",
corpOrderId: "",
page: 1,
limit: 10,
},
}
},
components: {},
methods: {
rowStyle({row, rowIndex}) {
let rowBackground = {};
if (row.reCount != row.acceptCount) {
rowBackground.color = '#f60303';
}
return rowBackground;
},
handleCurrentChange(val) {
this.query.page = val;
this.getCodeList();
},
enterKey(event) {
this.checkSuccess = true;
let tQuery = {
originCode: this.originCode,
code: this.udiCode.trim(),
}
enterCodeWeb(tQuery).then((response) => {
if (response.code === 20000) {
this.$refs.inputRef.focus();
this.$refs.inputRef.select();
this.udiCode = response.data;
this.addCode();
} else {
if (response.code == 502) {
this.checkSuccess = false;
this.udiCode = response.data;
this.originCode = this.udiCode;
} else if (response.code == 501) {
this.checkSuccess = false;
this.$message.error(response.message);
} else if (response.code == 503) {
this.checkSuccess = false;
this.udiCode = response.data;
this.$confirm(response.message, "提示", {
type: "warning",
})
.then(() => {
this.udiCode = response.data;
this.addCode();
})
.catch(() => {
this.udiCode = this.originCode;
});
} else if (response.code == 508) {
this.originCode = "";
this.udiCode = "01" + response.data.nameCode;
this.originCode = this.udiCode;
} else {
this.$alert(response.message, '提示', {
confirmButtonText: '确定',
type: 'warning',
closeOnClickModal: true,
callback: action => {
this.$refs.inputRef.focus();
this.$refs.inputRef.select();
}
});
}
}
this.loading = false;
});
},
addCode() {
if (this.$isBlank(this.udiCode)) {
this.$message.error("UDI码不能为空！");
}
let postQuery = {
billNo: this.orderQuery.billNo,
orderDetailEntities: this.detailList,
code: this.udiCode,
}
acceptAddCode(postQuery)
.then((response) => {
if (response.code == 20000) {
this.detailLoading = false;
this.detailList = response.data.orderDetailEntities || [];
if (response.data.finishAccept) {
this.$confirm("核对结果正确,是否立即完成核对？", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.postAccept();
})
.catch(() => {
});
} else {
this.$message.success("匹配成功！");
}
} else {
this.$message.error(response.message);
}
})
.catch(() => {
this.detailLoading = false;
});
},
getInputFocus(event) {
event.currentTarget.select();
},
checkFinish() {
let query = {
orderId: this.orderQuery.billNo,
};
getAcceptStatus(query)
.then((response) => {
if (response.code == 20000) {
let tip = "核对结果正确,是否立即完成核对？";
this.finishAccept(tip);
} else {
let tip = "核对未完成,是否强制完成核对此单据？";
this.finishAccept(tip);
}
})
.catch(() => {
});
},
finishAccept(tip) {
this.$confirm(tip, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.postAccept();
}).catch(() => {
});
},
postAccept() {
let query = {
orderId: this.orderQuery.billNo,
};
thirdUpdateStatus(query)
.then((response) => {
if (response.code == 20000) {
this.$message.success("核对成功！");
this.closeDialog();
this.$emit('childByValue', 1)
} else {
this.$message.error(response.message);
}
})
.catch(() => {
});
},
renewAccept() {
let query = {
billNo: this.orderQuery.billNo,
}
acceptClear(query)
.then((response) => {
this.detailLoading = false;
this.detailList = response.data.orderDetailEntities || [];
})
.catch(() => {
this.detailLoading = false;
this.detailList = [];
});
},
getOrderDetail() {
this.detailLoading = true;
let query = {
billNo: this.orderQuery.billNo,
}
getAcceptOrder(query)
.then((response) => {
this.detailLoading = false;
this.detailList = response.data.orderDetailEntities || [];
if (response.data.exitAccept) {
this.$confirm("检测到上一次验收操作未完成, 是否继续上一次验收?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
})
.catch(() => {
this.renewAccept();
});
}
})
.catch(() => {
this.detailLoading = false;
this.detailList = [];
});
}
},
mounted() {
document.body.ondrop = function (event) {
event.preventDefault();
event.stopPropagation();
};
var that = this;
var inputer = document.getElementById("inputer");
window.sc = new A.KeyScaner(inputer);//传入要监听的DOM节点
sc.onInput = function (text) {
if (text.includes("delete")) {
that.vailQuery.code = "";
return;
}
if (that.sitcomScan) {
let tempTxt = text;
let str = tempTxt.replace(/[\r]/g, "");
that.sictomText = that.sictomText + str;
that.vailQuery.code = that.sictomText;
} else {
that.vailQuery.code = text;
}
};
inputer.focus();
},
created() {
this.formData = this.orderQuery;
this.getOrderDetail()
},
}
</script>
<style scoped>
#inputer {
width: 100%;
min-height: 30px;
background-color: white;
border: #d0d0d0;
border-style: solid;
border-width: 0.1px;
color: #4a4a4a;
}
#inputer:focus {
width: 100%;
min-height: 30px;
background-color: white;
border: #0080FF;
border-style: solid;
border-width: 0.1px;
color: #4a4a4a;
}
</style>

19
src/views/inout/IoAuditedOrder.vue
Unescape Escape View File

@ -87,7 +87,7 @@
</el-button-group> </el-button-group>
</div> </div>
<el-divider style="margin: 15px"></el-divider> <el-divider style="margin: 15px"></el-divider>
<el-table v-loading="loading" :data="list" style="width: 100%;" highlight-current-row class="table-fixed" <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
border border
@current-change="handleSelectionChange"> @current-change="handleSelectionChange">
<el-table-column type="selection" width="55"></el-table-column> <el-table-column type="selection" width="55"></el-table-column>
@ -122,7 +122,7 @@
<!-- </el-tag>--> <!-- </el-tag>-->
<!-- </template>--> <!-- </template>-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<el-table-column label="操作" width="200" fixed="right"> <el-table-column label="操作" width="150" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
type="text" type="text"
@ -194,7 +194,7 @@
> >
<el-table-column label="序号" type="index"></el-table-column> <el-table-column label="序号" type="index"></el-table-column>
<el-table-column <el-table-column
label="产品通用名称" label="物资名称"
prop="coName" prop="coName"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
@ -225,12 +225,12 @@
prop="price" prop="price"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="生产厂家" label="生产企业"
prop="manufacturer" prop="manufacturer"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="注册/备案凭证号" label="注册/备案号"
prop="certCode" prop="certCode"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
@ -340,7 +340,7 @@ import {selectSysParamByKey} from "@/api/param/systemParamConfig";
import {getResultDetailList} from "@/api/inout/orderDetailResult"; import {getResultDetailList} from "@/api/inout/orderDetailResult";
import {getCodeDetailList} from "@/api/inout/orderDetailCode"; import {getCodeDetailList} from "@/api/inout/orderDetailCode";
import {getCodeList} from "@/api/inout/code"; import {getCodeList} from "@/api/inout/code";
import {inspectionOrderPDFFromTemplateFile, orderPDFFromTemplateFile} from "@/api/itextpdf/orderPrint" import {inspectionOrderPDFFromTemplateFile,orderPDFFromTemplateFile} from "@/api/itextpdf/orderPrint"
const formJson = { const formJson = {
@ -374,7 +374,7 @@ export default {
4: "处理异常", 4: "处理异常",
5: "校验成功", 5: "校验成功",
6: "校验异常", 6: "校验异常",
7: "审核通过", 7: "已审核",
8: "审核拒绝" 8: "审核拒绝"
}, },
invList: [], invList: [],
@ -389,7 +389,7 @@ export default {
"3": "pda即时校验", "3": "pda即时校验",
"4": "pda未校验", "4": "pda未校验",
"5": "pc端扫码精灵", "5": "pc端扫码精灵",
"6": "缺量补录单据", "6": "流转自动补单",
"7": "UDI供应商平台", "7": "UDI供应商平台",
"8": "平衡补录单据", "8": "平衡补录单据",
"10": "手动补单", "10": "手动补单",
@ -815,6 +815,5 @@ export default {
}; };
</script> </script>
<style lang="scss" scoped> <style type="text/scss" lang="scss">
</style> </style>

90
src/views/inout/IoCheckErrorOrder.vue
Unescape Escape View File

@ -3,14 +3,14 @@
<el-card class="el-card"> <el-card class="el-card">
<el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch"> <el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
<el-row> <el-row>
<el-col :span="6"> <el-col :span="8">
<el-form-item class="query-form-item" label="单号:"> <el-form-item class="query-form-item" label="单号:">
<el-input v-model="filterQuery.billNo" placeholder="请输入单号" <el-input v-model="filterQuery.billNo" placeholder="单号"
style="width: 90%" style="width: 90%"
clearable="true"></el-input> clearable="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="8">
<el-form-item class="query-form-item" label="出入库类型:"> <el-form-item class="query-form-item" label="出入库类型:">
<el-select v-model="filterQuery.mainAction" placeholder="请选择出入库类型" style="width: 90%"> <el-select v-model="filterQuery.mainAction" placeholder="请选择出入库类型" style="width: 90%">
<el-option label="全部" value=""></el-option> <el-option label="全部" value=""></el-option>
@ -19,7 +19,23 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6">
<!-- <el-col :span="8">-->
<!-- <el-form-item class="query-form-item" label="采购部门:">-->
<!-- <el-select v-model="filterQuery.deptCode" placeholder="请选择采购部门" clearable="true"-->
<!-- style="width: 90%"-->
<!-- >-->
<!-- <el-option-->
<!-- v-for="item in deptList"-->
<!-- :key="item.name"-->
<!-- :label="item.name"-->
<!-- :value="item.code">-->
<!-- <span style="float: left">{{ item.name }}</span>-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="8">
<el-form-item class="query-form-item" label="单据类型:"> <el-form-item class="query-form-item" label="单据类型:">
<el-select v-model="filterQuery.action" placeholder="请选择单据类型" <el-select v-model="filterQuery.action" placeholder="请选择单据类型"
style="width: 90%" style="width: 90%"
@ -34,11 +50,15 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> </el-row>
<el-row>
<el-col :span="8">
<el-form-item class="query-form-item" label="所属仓库:"> <el-form-item class="query-form-item" label="所属仓库:">
<el-select v-model="filterQuery.invCode" placeholder="请选择所属仓库" clearable="true" <el-select v-model="filterQuery.invCode" placeholder="请选择所属仓库" clearable="true"
style="width: 90%" style="width: 90%"
@change="subInvChange" @change="invChange"
> >
<el-option <el-option
v-for="item in subInvList" v-for="item in subInvList"
@ -50,10 +70,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> <el-col :span="8">
<el-row>
<el-col :span="6">
<el-form-item class="query-form-item" label="创建时间:"> <el-form-item class="query-form-item" label="创建时间:">
<el-date-picker <el-date-picker
:picker-options="pickerOptions" :picker-options="pickerOptions"
@ -69,6 +86,8 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<div class="top-right-btn"> <div class="top-right-btn">
@ -90,31 +109,30 @@
<el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
border border
@cell-click="handleSelectionChange"> @cell-click="handleSelectionChange">
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column label="序号" type="index"></el-table-column> <el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="扫码单据类型" prop="billTypeName"></el-table-column> <el-table-column label="送货单号" prop="billNo" show-overflow-tooltip width="180"></el-table-column>
<el-table-column label="订单号" prop="billNo" show-overflow-tooltip></el-table-column> <el-table-column label="单据类型" prop="billTypeName" width="150">
<el-table-column label="来源订单号" prop="corpOrderId" show-overflow-tooltip></el-table-column> </el-table-column>
<el-table-column label="来源" prop="fromType"> <el-table-column label="创建时间" prop="createTime" width="150" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ fromTypeMap[scope.row.fromType] }}</span> <i class="el-icon-time"></i>
<span>{{ scope.row.createTime }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="往来单位" prop="fromCorpName" width="220"> <el-table-column label="送货单位" prop="fromName" width="220">
</el-table-column>
<el-table-column label="当前部门" prop="deptName" width="120">
</el-table-column> </el-table-column>
<el-table-column label="当前仓库" prop="invName" width="120"> <el-table-column label="所属部门" prop="deptName" width="120" v-if="enableDept">
</el-table-column> </el-table-column>
<el-table-column label="所属科室" prop="deptName" width="120" v-if="enableDept"> <el-table-column label="所属仓库" prop="invName" width="120">
</el-table-column> </el-table-column>
<el-table-column label="创建时间" prop="createTime" show-overflow-tooltip> <el-table-column label="来源单号" prop="corpOrderId" show-overflow-tooltip width="180"></el-table-column>
<el-table-column label="来源" prop="fromType" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<i class="el-icon-time"></i> <span>{{ fromTypeMap[scope.row.fromType] }}</span>
<span>{{ scope.row.createTime }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="校验状态" prop="status" width="100">
<el-table-column label="单据状态" prop="status" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag :type="statusFilterType(scope.row.status)">{{ <el-tag :type="statusFilterType(scope.row.status)">{{
checkStatus[scope.row.status] checkStatus[scope.row.status]
@ -185,7 +203,7 @@
> >
<el-table-column label="序号" type="index"></el-table-column> <el-table-column label="序号" type="index"></el-table-column>
<el-table-column <el-table-column
label="产品通用名称" label="物资名称"
prop="coName" prop="coName"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
@ -219,12 +237,12 @@
prop="price" prop="price"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="生产厂家" label="生产企业"
prop="manufacturer" prop="manufacturer"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="注册/备案凭证号" label="注册/备案号"
prop="certCode" prop="certCode"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
@ -270,7 +288,7 @@
> >
<el-table-column label="序号" type="index"></el-table-column> <el-table-column label="序号" type="index"></el-table-column>
<el-table-column <el-table-column
label="产品通用名" label="物资名称"
prop="coName" prop="coName"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
@ -306,12 +324,12 @@
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="生产厂家" label="生产企业"
prop="manufacturer" prop="manufacturer"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="注册/备案凭证号" label="注册/备案号"
prop="certCode" prop="certCode"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
@ -430,7 +448,7 @@ import {
} from "../../api/inout/order"; } from "../../api/inout/order";
import {filterAllByUser} from "@/api/system/invWarehouse"; import {filterAllByUser} from "@/api/system/invWarehouse";
import {getLocalJoinByUser} from "@/api/basic/busType"; import {getLocalJoinByUser} from "@/api/basic/busType";
import {filterSubByInv} from "@/api/system/invSubWarehouse"; import {filterSubAll} from "@/api/system/invSubWarehouse";
import {isBlank} from "@/utils/strUtil"; import {isBlank} from "@/utils/strUtil";
import {selectSysParamByKey} from "@/api/param/systemParamConfig"; import {selectSysParamByKey} from "@/api/param/systemParamConfig";
import {getBizDetailList} from "@/api/inout/orderDetailBiz"; import {getBizDetailList} from "@/api/inout/orderDetailBiz";
@ -470,7 +488,7 @@ export default {
4: "处理异常", 4: "处理异常",
5: "校验成功", 5: "校验成功",
6: "校验异常", 6: "校验异常",
7: "审核通过", 7: "已审核",
8: "审核拒绝" 8: "审核拒绝"
}, },
storageList: [], storageList: [],
@ -486,7 +504,7 @@ export default {
"3": "pda即时校验", "3": "pda即时校验",
"4": "pda未校验", "4": "pda未校验",
"5": "pc端扫码精灵", "5": "pc端扫码精灵",
"6": "缺量补录单据", "6": "流转自动补单",
"7": "UDI供应商平台", "7": "UDI供应商平台",
"8": "平衡补录单据", "8": "平衡补录单据",
"10": "手动补单", "10": "手动补单",
@ -732,7 +750,7 @@ export default {
let query = { let query = {
pcode: this.filterQuery.locStorageCode pcode: this.filterQuery.locStorageCode
}; };
filterSubByInv(query) filterSubAll(query)
.then((response) => { .then((response) => {
this.subInvList = response.data || []; this.subInvList = response.data || [];
}) })
@ -743,7 +761,7 @@ export default {
let query = { let query = {
filter: 3, filter: 3,
}; };
filterSubByInv(query) filterSubAll(query)
.then((response) => { .then((response) => {
this.subInvList = response.data || []; this.subInvList = response.data || [];
this.getList(); this.getList();

38
src/views/inout/IoCheckSuccessOrder.vue
Unescape Escape View File

@ -92,7 +92,7 @@
@current-change="handleSelectionChange"> @current-change="handleSelectionChange">
<el-table-column type="selection" width="55"></el-table-column> <el-table-column type="selection" width="55"></el-table-column>
<el-table-column label="序号" type="index"></el-table-column> <el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="扫码单据类型" prop="billTypeName"></el-table-column> <el-table-column label="单据类型" prop="billTypeName"></el-table-column>
<el-table-column label="订单号" prop="billNo" show-overflow-tooltip></el-table-column> <el-table-column label="订单号" prop="billNo" show-overflow-tooltip></el-table-column>
<el-table-column label="来源订单号" prop="corpOrderId" show-overflow-tooltip></el-table-column> <el-table-column label="来源订单号" prop="corpOrderId" show-overflow-tooltip></el-table-column>
<el-table-column label="来源" prop="fromType"> <el-table-column label="来源" prop="fromType">
@ -202,7 +202,7 @@
> >
<el-table-column label="序号" type="index"></el-table-column> <el-table-column label="序号" type="index"></el-table-column>
<el-table-column <el-table-column
label="产品通用名称" label="物资名称"
prop="coName" prop="coName"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
@ -210,21 +210,10 @@
label="规格型号" label="规格型号"
prop="spec" prop="spec"
></el-table-column> ></el-table-column>
<el-table-column
label="批次号"
<el-table-column label="批次号" header-align="center">
<el-table-column header-align="center"
label="手录"
prop="batchNo"
show-overflow-tooltip
></el-table-column>
<el-table-column header-align="center"
label="扫码"
prop="batchNo" prop="batchNo"
show-overflow-tooltip
></el-table-column> ></el-table-column>
</el-table-column>
<el-table-column <el-table-column
label="生产日期" label="生产日期"
prop="productDate" prop="productDate"
@ -246,12 +235,12 @@
prop="price" prop="price"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="生产厂家" label="生产企业"
prop="manufacturer" prop="manufacturer"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="注册/备案凭证号" label="注册/备案号"
prop="certCode" prop="certCode"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
@ -297,7 +286,7 @@
> >
<el-table-column label="序号" type="index"></el-table-column> <el-table-column label="序号" type="index"></el-table-column>
<el-table-column <el-table-column
label="产品通用名" label="物资名称"
prop="coName" prop="coName"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
@ -333,12 +322,12 @@
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="生产厂家" label="生产企业"
prop="manufacturer" prop="manufacturer"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="注册/备案凭证号" label="注册/备案号"
prop="certCode" prop="certCode"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
@ -489,16 +478,17 @@ export default {
endTime: null, endTime: null,
invCode: this.$store.getters.locInvCode, invCode: this.$store.getters.locInvCode,
}, },
customerId: this.$store.getters.customerId,
checkStatus: { checkStatus: {
1: "草稿", 1: "草稿",
2: "等待处理", 2: "等待处理",
3: "等待校验", 3: "等待校验",
4: "处理异常", 4: "处理异常",
5: "待验收", 5: "待核对",
6: "校验异常", 6: "校验异常",
7: "审核通过", 7: "已审核",
8: "审核拒绝", 8: "审核拒绝",
9: "正在处理" 9: "正在处理", 10: "待审核",
}, },
storageList: [], storageList: [],
invList: [], invList: [],
@ -513,7 +503,7 @@ export default {
"3": "pda即时校验", "3": "pda即时校验",
"4": "pda未校验", "4": "pda未校验",
"5": "pc端扫码精灵", "5": "pc端扫码精灵",
"6": "缺量补录单据", "6": "流转自动补单",
"7": "UDI供应商平台", "7": "UDI供应商平台",
"8": "平衡补录单据", "8": "平衡补录单据",
"10": "手动补单", "10": "手动补单",

89
src/views/inout/IoCreateBusOrder.vue
Unescape Escape View File

@ -6,15 +6,15 @@
ref="form" ref="form"
class="query-form" size="mini" label-width="100px" v-show="showSearch"> class="query-form" size="mini" label-width="100px" v-show="showSearch">
<el-row> <el-row>
<el-col :span="6"> <el-col :span="8">
<el-form-item class="query-form-item" label="单号:" prop="billNo"> <el-form-item class="query-form-item" label="单号:">
<el-input v-model="filterQuery.billNo" placeholder="单号" <el-input v-model="filterQuery.billNo" placeholder="单号"
style="width: 90%" style="width: 90%"
prop="noticeTitle"
clearable="true"></el-input> clearable="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6">
<el-col :span="8">
<el-form-item class="query-form-item" label="出入库类型:" prop="mainAction"> <el-form-item class="query-form-item" label="出入库类型:" prop="mainAction">
<el-select v-model="filterQuery.mainAction" placeholder="请选择出入库类型" style="width: 90%"> <el-select v-model="filterQuery.mainAction" placeholder="请选择出入库类型" style="width: 90%">
<el-option label="全部" value=""></el-option> <el-option label="全部" value=""></el-option>
@ -23,8 +23,9 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6">
<el-form-item class="query-form-item" label="单据类型:" prop="action"> <el-col :span="8">
<el-form-item class="query-form-item" label="单据类型:">
<el-select v-model="filterQuery.action" placeholder="请选择单据类型" <el-select v-model="filterQuery.action" placeholder="请选择单据类型"
style="width: 90%" style="width: 90%"
clearable> clearable>
@ -38,11 +39,29 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <el-col :span="8">-->
<!-- <el-form-item class="query-form-item" label="采购部门:">-->
<!-- <el-select v-model="filterQuery.deptCode" placeholder="请选择采购部门" clearable="true"-->
<!-- style="width: 90%"-->
<!-- >-->
<!-- <el-option-->
<!-- v-for="item in deptList"-->
<!-- :key="item.name"-->
<!-- :label="item.name"-->
<!-- :value="item.code">-->
<!-- <span style="float: left">{{ item.name }}</span>-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="6"> <el-col :span="8">
<el-form-item class="query-form-item" label="所属仓库:" prop="invCode"> <el-form-item class="query-form-item" label="收货仓库:">
<el-select v-model="filterQuery.invCode" placeholder="请选择所属仓库" clearable="true" <el-select v-model="filterQuery.invCode" placeholder="请选择收货仓库" clearable="true"
style="width: 90%" style="width: 90%"
@change="invChange" @change="invChange"
> >
@ -56,7 +75,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="8">
<el-form-item class="query-form-item" label="创建时间:"> <el-form-item class="query-form-item" label="创建时间:">
<el-date-picker <el-date-picker
:picker-options="pickerOptions" :picker-options="pickerOptions"
@ -72,6 +91,8 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<div class="top-right-btn"> <div class="top-right-btn">
@ -89,11 +110,11 @@
> >
<el-button type="primary" icon="el-icon-plus" @click="addOrders">新增单据</el-button> <el-button type="primary" icon="el-icon-plus" @click="addOrders">新增单据</el-button>
<el-button type="primary" icon="el-icon-bottom-left" @click="selectThrOrderFunction()" <!-- <el-button type="primary" icon="el-icon-bottom-left" @click="selectThrOrderFunction()"-->
:loading="loading">选入第三方单据 <!-- :loading="loading">选入第三方单据-->
</el-button> <!-- </el-button>-->
<el-button type="primary" icon="el-icon-bottom-left" @click="selectReceive()" <el-button type="primary" icon="el-icon-bottom-left" @click="selectReceive()"
:loading="loading">选入领用单据 :loading="loading">选入单据
</el-button> </el-button>
</el-button-group> </el-button-group>
</div> </div>
@ -101,30 +122,24 @@
<el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
border border
> >
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column label="序号" type="index"></el-table-column> <el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="扫码单据类型" prop="billTypeName"> <el-table-column label="单据号" prop="billNo" show-overflow-tooltip width="140"></el-table-column>
<el-table-column label="单据类型" prop="billTypeName" width="140"></el-table-column>
<el-table-column label="创建时间" prop="createTime" width="140" show-overflow-tooltip>
</el-table-column> </el-table-column>
<el-table-column label="订单号" prop="billNo" show-overflow-tooltip></el-table-column> <!-- <el-table-column label="送货单位" prop="fromName" width="220">-->
<el-table-column label="来源订单号" prop="corpOrderId" show-overflow-tooltip></el-table-column> <!-- </el-table-column>-->
<el-table-column label="来源" prop="fromType"> <el-table-column label="采购部门" prop="deptName" width="120">
<template slot-scope="scope">
<span>{{ fromTypeMap[scope.row.fromType] }}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column label="往来单位" prop="fromName" width="220"> <el-table-column label=收货仓库 prop="invName" width="120">
</el-table-column> </el-table-column>
<el-table-column label="当前仓库" prop="invName" width="120"> <el-table-column label="来源单据号" prop="corpOrderId" show-overflow-tooltip width="140"></el-table-column>
</el-table-column> <el-table-column label="来源" prop="fromType">
<el-table-column label="所属科室" prop="deptName" width="120" v-if="enableDept">
</el-table-column>
<el-table-column label="创建时间" prop="createTime" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<i class="el-icon-time"></i> <span>{{ fromTypeMap[scope.row.fromType] }}</span>
<span>{{ scope.row.createTime }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="校验状态" prop="status" width="100"> <el-table-column label="审核状态" prop="status" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag :type="statusFilterType(scope.row.status)">{{ <el-tag :type="statusFilterType(scope.row.status)">{{
checkStatus[scope.row.status] checkStatus[scope.row.status]
@ -132,7 +147,7 @@
</el-tag> </el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" width="150"> <el-table-column label="操作" width="150" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
type="text" type="text"
@ -153,7 +168,7 @@
size="small" size="small"
v-if="scope.row.status == 1" v-if="scope.row.status == 1"
@click.native.stop="onUpload(scope.row.billNo)" @click.native.stop="onUpload(scope.row.billNo)"
>立即提交 >提交校验
</el-button </el-button
> >
</template> </template>
@ -257,9 +272,9 @@ export default {
4: "处理异常", 4: "处理异常",
5: "校验成功", 5: "校验成功",
6: "校验异常", 6: "校验异常",
7: "审核通过", 7: "已审核",
8: "审核拒绝", 8: "审核拒绝",
9: "正在处理" 9: "正在处理", 10: "待审核",
}, },
curIndex: "", curIndex: "",
idQuery: {}, idQuery: {},
@ -283,7 +298,7 @@ export default {
"3": "pda即时校验", "3": "pda即时校验",
"4": "pda未校验", "4": "pda未校验",
"5": "pc端扫码精灵", "5": "pc端扫码精灵",
"6": "缺量补录单据", "6": "流转自动补单",
"7": "UDI供应商平台", "7": "UDI供应商平台",
"8": "平衡补录单据", "8": "平衡补录单据",
"10": "手动补单", "10": "手动补单",
@ -377,6 +392,7 @@ export default {
let query = { let query = {
code: this.filterQuery.invCode, code: this.filterQuery.invCode,
enabled: true, enabled: true,
vueType: "supDelivery",
}; };
getLocalJoinByUser(query) getLocalJoinByUser(query)
.then((response) => { .then((response) => {
@ -409,6 +425,7 @@ export default {
//获取订单列表 //获取订单列表
getList() { getList() {
this.loading = true; this.loading = true;
this.filterQuery.vueType = "supDelivery";
getOrderList(this.filterQuery) getOrderList(this.filterQuery)
.then((response) => { .then((response) => {
this.loading = false; this.loading = false;

36
src/views/inout/IoCreateErrorOrder.vue
Unescape Escape View File

@ -3,14 +3,14 @@
<el-card class="el-card"> <el-card class="el-card">
<el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch"> <el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
<el-row> <el-row>
<el-col :span="6"> <el-col :span="8">
<el-form-item class="query-form-item" label="单号:"> <el-form-item class="query-form-item" label="单号:">
<el-input v-model="filterQuery.billNo" placeholder="单号" <el-input v-model="filterQuery.billNo" placeholder="单号"
style="width: 90%" style="width: 90%"
clearable="true"></el-input> clearable="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="8">
<el-form-item class="query-form-item" label="出入库类型:"> <el-form-item class="query-form-item" label="出入库类型:">
<el-select v-model="filterQuery.mainAction" placeholder="请选择出入库类型" style="width: 90%"> <el-select v-model="filterQuery.mainAction" placeholder="请选择出入库类型" style="width: 90%">
<el-option label="全部" value=""></el-option> <el-option label="全部" value=""></el-option>
@ -19,7 +19,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="8">
<el-form-item class="query-form-item" label="单据类型:"> <el-form-item class="query-form-item" label="单据类型:">
<el-select v-model="filterQuery.action" placeholder="请选择单据类型" <el-select v-model="filterQuery.action" placeholder="请选择单据类型"
style="width: 90%" style="width: 90%"
@ -34,9 +34,10 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="6"> <el-col :span="8">
<el-form-item class="query-form-item" label="所属仓库:"> <el-form-item class="query-form-item" label="所属仓库:">
<el-select v-model="filterQuery.invCode" placeholder="请选择所属仓库" clearable="true" <el-select v-model="filterQuery.invCode" placeholder="请选择所属仓库" clearable="true"
style="width: 90%" style="width: 90%"
@ -52,7 +53,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="8">
<el-form-item class="query-form-item" label="创建时间:"> <el-form-item class="query-form-item" label="创建时间:">
<el-date-picker <el-date-picker
:picker-options="pickerOptions" :picker-options="pickerOptions"
@ -68,6 +69,23 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <el-col :span="8">-->
<!-- <el-form-item class="query-form-item" label="审核时间:">-->
<!-- <el-date-picker-->
<!-- :picker-options="pickerOptions"-->
<!-- v-model="auditDateRange"-->
<!-- type="daterange"-->
<!-- format="yyyy 年 MM 月 dd 日"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- range-separator="至"-->
<!-- start-placeholder="开始日期"-->
<!-- end-placeholder="结束日期"-->
<!-- style="width: 90%"-->
<!-- >-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
</el-row> </el-row>
</el-form> </el-form>
<div class="top-right-btn"> <div class="top-right-btn">
@ -141,7 +159,7 @@
size="small" size="small"
v-if="scope.row.status == 1" v-if="scope.row.status == 1"
@click.native.stop="onUpload(scope.row.billNo)" @click.native.stop="onUpload(scope.row.billNo)"
>立即提交 >校验提交
</el-button </el-button
> >
</template> </template>
@ -215,9 +233,9 @@ export default {
4: "处理异常", 4: "处理异常",
5: "校验成功", 5: "校验成功",
6: "校验异常", 6: "校验异常",
7: "审核通过", 7: "已审核",
8: "审核拒绝", 8: "审核拒绝",
9: "正在处理" 9: "正在处理", 10: "待审核",
}, },
curIndex: "", curIndex: "",
idQuery: {}, idQuery: {},
@ -241,7 +259,7 @@ export default {
"3": "pda即时校验", "3": "pda即时校验",
"4": "pda未校验", "4": "pda未校验",
"5": "pc端扫码精灵", "5": "pc端扫码精灵",
"6": "缺量补录单据", "6": "流转自动补单",
"7": "UDI供应商平台", "7": "UDI供应商平台",
"8": "平衡补录单据", "8": "平衡补录单据",
"10": "手动补单", "10": "手动补单",

133
src/views/inout/IoCreateOrder.vue
Unescape Escape View File

@ -3,14 +3,57 @@
<el-card class="el-card"> <el-card class="el-card">
<el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch"> <el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
<el-row> <el-row>
<el-col :span="6"> <el-col :span="8">
<el-form-item class="query-form-item" label="单号:"> <el-form-item class="query-form-item" label="单号:">
<el-input v-model="filterQuery.billNo" placeholder="单号" <el-input v-model="filterQuery.billNo" placeholder="单号"
style="width: 90%" style="width: 90%"
clearable="true"></el-input> clearable="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <!-- <el-col :span="8">-->
<!-- <el-form-item class="query-form-item" label="采购部门:">-->
<!-- <el-select v-model="filterQuery.deptCode" placeholder="请选择采购部门" clearable="true"-->
<!-- style="width: 90%"-->
<!-- >-->
<!-- <el-option-->
<!-- v-for="item in deptList"-->
<!-- :key="item.name"-->
<!-- :label="item.name"-->
<!-- :value="item.code">-->
<!-- <span style="float: left">{{ item.name }}</span>-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="8">-->
<!-- <el-form-item class="query-form-item" label="送货单位:">-->
<!-- <el-select-->
<!-- v-model="filterQuery.fromCorp"-->
<!-- filterable-->
<!-- remote-->
<!-- clearable="true"-->
<!-- reserve-keyword-->
<!-- placeholder="供应商名称"-->
<!-- :remote-method="findMethod"-->
<!-- size="mini"-->
<!-- :loading="corpLoading"-->
<!-- style="width: 90%"-->
<!-- >-->
<!-- <el-option-->
<!-- v-for="item in fromOptions"-->
<!-- :key="item.name"-->
<!-- :label="item.name"-->
<!-- :value="item.erpId"-->
<!-- >-->
<!-- <span style="float: left">{{ item.name }}</span>-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="8">
<el-form-item class="query-form-item" label="出入库类型:"> <el-form-item class="query-form-item" label="出入库类型:">
<el-select v-model="filterQuery.mainAction" placeholder="请选择出入库类型" style="width: 90%"> <el-select v-model="filterQuery.mainAction" placeholder="请选择出入库类型" style="width: 90%">
<el-option label="全部" value=""></el-option> <el-option label="全部" value=""></el-option>
@ -19,7 +62,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="8">
<el-form-item class="query-form-item" label="单据类型:"> <el-form-item class="query-form-item" label="单据类型:">
<el-select v-model="filterQuery.action" placeholder="请选择单据类型" <el-select v-model="filterQuery.action" placeholder="请选择单据类型"
style="width: 90%" style="width: 90%"
@ -36,9 +79,9 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="6"> <el-col :span="8">
<el-form-item class="query-form-item" label="所属仓库:"> <el-form-item class="query-form-item" label="收货仓库:">
<el-select v-model="filterQuery.invCode" placeholder="请选择所属仓库" clearable="true" <el-select v-model="filterQuery.invCode" placeholder="请选择收货仓库" clearable="true"
style="width: 90%" style="width: 90%"
@change="invChange" @change="invChange"
> >
@ -52,7 +95,8 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6">
<el-col :span="8">
<el-form-item class="query-form-item" label="创建时间:"> <el-form-item class="query-form-item" label="创建时间:">
<el-date-picker <el-date-picker
:picker-options="pickerOptions" :picker-options="pickerOptions"
@ -68,6 +112,8 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<div class="top-right-btn"> <div class="top-right-btn">
@ -90,30 +136,32 @@
<el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
border border
> >
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column label="序号" type="index"></el-table-column> <el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="扫码单据类型" prop="billTypeName"> <el-table-column label="单据号" prop="billNo" show-overflow-tooltip width="180"></el-table-column>
<el-table-column label="单据类型" prop="billTypeName" width="150">
</el-table-column> </el-table-column>
<el-table-column label="订单号" prop="billNo" show-overflow-tooltip></el-table-column> <el-table-column label="创建时间" prop="createTime" width="150" show-overflow-tooltip>
<el-table-column label="来源订单号" prop="corpOrderId" show-overflow-tooltip></el-table-column>
<el-table-column label="来源" prop="fromType">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ fromTypeMap[scope.row.fromType] }}</span> <i class="el-icon-time"></i>
<span>{{ scope.row.createTime }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="往来单位" prop="fromName" width="220">
</el-table-column>
<el-table-column label="当前仓库" prop="invName" width="120"> <!-- <el-table-column label="送货单位" prop="fromName" width="220">-->
<!-- </el-table-column>-->
<el-table-column label="所属部门" prop="deptName" width="120" v-if="enableDept">
</el-table-column> </el-table-column>
<el-table-column label="所属科室" prop="deptName" width="120" v-if="enableDept"> <el-table-column label="所属仓库" prop="invName" width="120">
</el-table-column> </el-table-column>
<el-table-column label="创建时间" prop="createTime" show-overflow-tooltip> <el-table-column label="来源单号" prop="corpOrderId" show-overflow-tooltip width="180"></el-table-column>
<el-table-column label="来源" prop="fromType" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<i class="el-icon-time"></i> <span>{{ fromTypeMap[scope.row.fromType] }}</span>
<span>{{ scope.row.createTime }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="校验状态" prop="status" width="100">
<el-table-column label="单据状态" prop="status" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag :type="statusFilterType(scope.row.status)">{{ <el-tag :type="statusFilterType(scope.row.status)">{{
checkStatus[scope.row.status] checkStatus[scope.row.status]
@ -121,7 +169,7 @@
</el-tag> </el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" width="150"> <el-table-column label="操作" width="150" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
type="text" type="text"
@ -142,7 +190,7 @@
size="small" size="small"
v-if="scope.row.status == 1" v-if="scope.row.status == 1"
@click.native.stop="onUpload(scope.row.billNo)" @click.native.stop="onUpload(scope.row.billNo)"
>立即提交 >校验提交
</el-button </el-button
> >
</template> </template>
@ -203,6 +251,7 @@ import store from "../../store";
import {getInvListByUser} from "@/api/system/invWarehouse"; import {getInvListByUser} from "@/api/system/invWarehouse";
import {getLocalJoinByUser} from "@/api/basic/busType"; import {getLocalJoinByUser} from "@/api/basic/busType";
import {selectSysParamByKey} from "@/api/param/systemParamConfig"; import {selectSysParamByKey} from "@/api/param/systemParamConfig";
import {getDeptListByUser} from "@/api/auth/authDept";
export default { export default {
@ -216,14 +265,17 @@ export default {
mainAction: null, mainAction: null,
action: null, action: null,
statusType: "newOrder", statusType: "newOrder",
busType: 2,
page: 1, page: 1,
limit: 10, limit: 10,
startTime: null, startTime: null,
endTime: null, endTime: null,
// deptCode: this.$store.getters.locDeptCode,
invCode: this.$store.getters.locInvCode, invCode: this.$store.getters.locInvCode,
}, },
viewType: 3, corpLoading: false,
fromOptions: [],
checkStatus: { checkStatus: {
1: "草稿", 1: "草稿",
2: "等待处理", 2: "等待处理",
@ -231,14 +283,15 @@ export default {
4: "处理异常", 4: "处理异常",
5: "校验成功", 5: "校验成功",
6: "校验异常", 6: "校验异常",
7: "审核通过", 7: "已审核",
8: "审核拒绝", 8: "审核拒绝",
9: "正在处理" 9: "正在处理", 10: "待审核",
}, },
curIndex: "", curIndex: "",
idQuery: {}, idQuery: {},
storageList: [], storageList: [],
invList: [], invList: [],
deptList: [],
list: [], list: [],
codeDetailVisible: false, codeDetailVisible: false,
addOrderVisible: false, addOrderVisible: false,
@ -258,7 +311,7 @@ export default {
"3": "pda即时校验", "3": "pda即时校验",
"4": "pda未校验", "4": "pda未校验",
"5": "pc端扫码精灵", "5": "pc端扫码精灵",
"6": "缺量补录单据", "6": "流转自动补单",
"7": "UDI供应商平台", "7": "UDI供应商平台",
"8": "平衡补录单据", "8": "平衡补录单据",
"10": "手动补单", "10": "手动补单",
@ -347,7 +400,22 @@ export default {
hideSearch() { hideSearch() {
this.showSearch = !this.showSearch; this.showSearch = !this.showSearch;
}, },
findMethod(key) {
this.corpLoading = true;
this.fromOptions = [];
let params = {
key: key,
corpType: 2,
page: 1,
limit: 20
};
getBasicUnitMaintains(params).then((res) => {
this.corpLoading = false;
this.fromOptions = res.data.list || [];
}).catch(() => {
this.corpLoading = false;
})
},
handleSizeChange(val) { handleSizeChange(val) {
this.filterQuery.limit = val; this.filterQuery.limit = val;
this.getList(); this.getList();
@ -451,6 +519,7 @@ export default {
this.loading = false; this.loading = false;
if (response.code === 20000) { if (response.code === 20000) {
this.$message.success("提交成功"); this.$message.success("提交成功");
this.getList();
} else { } else {
this.$message.error(response.message); this.$message.error(response.message);
} }
@ -465,6 +534,13 @@ export default {
.catch(() => { .catch(() => {
}); });
}, },
getDeptList() {
getDeptListByUser().then((res) => {
this.deptList = res.data || [];
});
},
invChange() { invChange() {
this.filterQuery.action = null; this.filterQuery.action = null;
this.getBusType(); this.getBusType();
@ -498,6 +574,7 @@ export default {
} }
}); });
this.getList(); this.getList();
this.getDeptList();
}, },
}; };

70
src/views/inout/IoCreateScanOrder.vue
Unescape Escape View File

@ -3,14 +3,14 @@
<el-card class="el-card"> <el-card class="el-card">
<el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch"> <el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
<el-row> <el-row>
<el-col :span="6"> <el-col :span="8">
<el-form-item class="query-form-item" label="单号:"> <el-form-item class="query-form-item" label="单号:">
<el-input v-model="filterQuery.billNo" placeholder="单号" <el-input v-model="filterQuery.billNo" placeholder="单号"
style="width: 90%" style="width: 90%"
clearable="true"></el-input> clearable="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="8">
<el-form-item class="query-form-item" label="出入库类型:"> <el-form-item class="query-form-item" label="出入库类型:">
<el-select v-model="filterQuery.mainAction" placeholder="请选择出入库类型" style="width: 90%"> <el-select v-model="filterQuery.mainAction" placeholder="请选择出入库类型" style="width: 90%">
<el-option label="全部" value=""></el-option> <el-option label="全部" value=""></el-option>
@ -19,7 +19,8 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6">
<el-col :span="8">
<el-form-item class="query-form-item" label="单据类型:"> <el-form-item class="query-form-item" label="单据类型:">
<el-select v-model="filterQuery.action" placeholder="请选择单据类型" <el-select v-model="filterQuery.action" placeholder="请选择单据类型"
style="width: 90%" style="width: 90%"
@ -34,11 +35,28 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <el-col :span="8">-->
<!-- <el-form-item class="query-form-item" label="采购部门:">-->
<!-- <el-select v-model="filterQuery.deptCode" placeholder="请选择采购部门" clearable="true"-->
<!-- style="width: 90%"-->
<!-- >-->
<!-- <el-option-->
<!-- v-for="item in deptList"-->
<!-- :key="item.name"-->
<!-- :label="item.name"-->
<!-- :value="item.code">-->
<!-- <span style="float: left">{{ item.name }}</span>-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="6"> <el-col :span="8">
<el-form-item class="query-form-item" label="所属仓库:"> <el-form-item class="query-form-item" label="收货仓库:">
<el-select v-model="filterQuery.invCode" placeholder="请选择所属仓库" clearable="true" <el-select v-model="filterQuery.invCode" placeholder="请选择收货仓库" clearable="true"
style="width: 90%" style="width: 90%"
@change="invChange" @change="invChange"
> >
@ -52,7 +70,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="8">
<el-form-item class="query-form-item" label="创建时间:"> <el-form-item class="query-form-item" label="创建时间:">
<el-date-picker <el-date-picker
:picker-options="pickerOptions" :picker-options="pickerOptions"
@ -68,6 +86,8 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<div class="top-right-btn"> <div class="top-right-btn">
@ -90,30 +110,25 @@
<el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
border border
> >
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column label="序号" type="index"></el-table-column> <el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="扫码单据类型" prop="billTypeName"> <el-table-column label="单据号" prop="billNo" show-overflow-tooltip width="140"></el-table-column>
</el-table-column>
<el-table-column label="订单号" prop="billNo" show-overflow-tooltip></el-table-column> <el-table-column label="单据类型" prop="billTypeName" width="140"></el-table-column>
<el-table-column label="来源订单号" prop="corpOrderId" show-overflow-tooltip></el-table-column> <el-table-column label="创建时间" prop="createTime" width="140" show-overflow-tooltip>
<el-table-column label="来源" prop="fromType">
<template slot-scope="scope">
<span>{{ fromTypeMap[scope.row.fromType] }}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column label="往来单位" prop="fromName" width="220"> <el-table-column label="往来单位" prop="fromName" width="220">
</el-table-column> </el-table-column>
<el-table-column label="当前仓库" prop="invName" width="120"> <el-table-column label="所属部门" prop="deptName" width="120">
</el-table-column> </el-table-column>
<el-table-column label="所属科室" prop="deptName" width="120" v-if="enableDept"> <el-table-column label=所属仓库 prop="invName" width="120">
</el-table-column> </el-table-column>
<el-table-column label="创建时间" prop="createTime" show-overflow-tooltip> <el-table-column label="来源单据号" prop="corpOrderId" show-overflow-tooltip width="140"></el-table-column>
<el-table-column label="来源" prop="fromType">
<template slot-scope="scope"> <template slot-scope="scope">
<i class="el-icon-time"></i> <span>{{ fromTypeMap[scope.row.fromType] }}</span>
<span>{{ scope.row.createTime }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="校验状态" prop="status" width="100"> <el-table-column label="审核状态" prop="status" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag :type="statusFilterType(scope.row.status)">{{ <el-tag :type="statusFilterType(scope.row.status)">{{
checkStatus[scope.row.status] checkStatus[scope.row.status]
@ -121,7 +136,8 @@
</el-tag> </el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" width="150"> <el-table-column label="操作" width="150" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
type="text" type="text"
@ -142,7 +158,7 @@
size="small" size="small"
v-if="scope.row.status == 1" v-if="scope.row.status == 1"
@click.native.stop="onUpload(scope.row.billNo)" @click.native.stop="onUpload(scope.row.billNo)"
>立即提交 >提交校验
</el-button </el-button
> >
</template> </template>
@ -215,9 +231,9 @@ export default {
4: "处理异常", 4: "处理异常",
5: "校验成功", 5: "校验成功",
6: "校验异常", 6: "校验异常",
7: "审核通过", 7: "已审核",
8: "审核拒绝", 8: "审核拒绝",
9: "正在处理" 9: "正在处理", 10: "待审核",
}, },
curIndex: "", curIndex: "",
idQuery: {}, idQuery: {},
@ -241,7 +257,7 @@ export default {
"3": "pda即时校验", "3": "pda即时校验",
"4": "pda未校验", "4": "pda未校验",
"5": "pc端扫码精灵", "5": "pc端扫码精灵",
"6": "缺量补录单据", "6": "流转自动补单",
"7": "UDI供应商平台", "7": "UDI供应商平台",
"8": "平衡补录单据", "8": "平衡补录单据",
"10": "手动补单", "10": "手动补单",

109
src/views/inout/IoDealOrder.vue
Unescape Escape View File

@ -3,14 +3,15 @@
<el-card class="el-card"> <el-card class="el-card">
<el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch"> <el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
<el-row> <el-row>
<el-col :span="6"> <el-col :span="8">
<el-form-item class="query-form-item" label="单号:"> <el-form-item class="query-form-item" label="单号:">
<el-input v-model="filterQuery.billNo" placeholder="单号" <el-input v-model="filterQuery.billNo" placeholder="单号"
style="width: 90%" style="width: 90%"
clearable="true"></el-input> clearable="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6">
<el-col :span="8">
<el-form-item class="query-form-item" label="出入库类型:"> <el-form-item class="query-form-item" label="出入库类型:">
<el-select v-model="filterQuery.mainAction" placeholder="请选择出入库类型" style="width: 90%"> <el-select v-model="filterQuery.mainAction" placeholder="请选择出入库类型" style="width: 90%">
<el-option label="全部" value=""></el-option> <el-option label="全部" value=""></el-option>
@ -19,7 +20,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="8">
<el-form-item class="query-form-item" label="单据类型:"> <el-form-item class="query-form-item" label="单据类型:">
<el-select v-model="filterQuery.action" placeholder="请选择单据类型" <el-select v-model="filterQuery.action" placeholder="请选择单据类型"
style="width: 90%" style="width: 90%"
@ -34,11 +35,27 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <el-col :span="8">-->
<!-- <el-form-item class="query-form-item" label="采购部门:">-->
<!-- <el-select v-model="filterQuery.deptCode" placeholder="请选择采购部门" clearable="true"-->
<!-- style="width: 90%"-->
<!-- >-->
<!-- <el-option-->
<!-- v-for="item in deptList"-->
<!-- :key="item.name"-->
<!-- :label="item.name"-->
<!-- :value="item.code">-->
<!-- <span style="float: left">{{ item.name }}</span>-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="6"> <el-col :span="8">
<el-form-item class="query-form-item" label="所属仓库:"> <el-form-item class="query-form-item" label="收货仓库:">
<el-select v-model="filterQuery.invCode" placeholder="请选择所属仓库" clearable="true" <el-select v-model="filterQuery.invCode" placeholder="请选择收货仓库" clearable="true"
style="width: 90%" style="width: 90%"
@change="invChange" @change="invChange"
> >
@ -52,7 +69,11 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6">
<el-col :span="8">
<el-form-item class="query-form-item" label="创建时间:"> <el-form-item class="query-form-item" label="创建时间:">
<el-date-picker <el-date-picker
:picker-options="pickerOptions" :picker-options="pickerOptions"
@ -68,6 +89,8 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<div class="top-right-btn"> <div class="top-right-btn">
@ -91,30 +114,30 @@
@current-change="handleSelectionChange" @current-change="handleSelectionChange"
border border
> >
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column label="序号" type="index"></el-table-column> <el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="扫码单据类型" prop="billTypeName"> <el-table-column label="单据号" prop="billNo" show-overflow-tooltip width="180"></el-table-column>
<el-table-column label="单据类型" prop="billTypeName" width="150">
</el-table-column> </el-table-column>
<el-table-column label="订单号" prop="billNo" show-overflow-tooltip></el-table-column> <el-table-column label="创建时间" prop="createTime" width="150" show-overflow-tooltip>
<el-table-column label="来源订单号" prop="corpOrderId" show-overflow-tooltip></el-table-column>
<el-table-column label="来源" prop="fromType">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ fromTypeMap[scope.row.fromType] }}</span> <i class="el-icon-time"></i>
<span>{{ scope.row.createTime }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="往来单位" prop="fromName" width="220"> <el-table-column label="往来单位" prop="fromName" width="220">
</el-table-column> </el-table-column>
<el-table-column label="当前仓库" prop="invName" width="120"> <el-table-column label="所属部门" prop="deptName" width="120" v-if="enableDept">
</el-table-column> </el-table-column>
<el-table-column label="所属科室" prop="deptName" width="120" v-if="enableDept"> <el-table-column label="所属仓库" prop="invName" width="120">
</el-table-column> </el-table-column>
<el-table-column label="创建时间" prop="createTime" show-overflow-tooltip> <el-table-column label="来源单号" prop="corpOrderId" show-overflow-tooltip width="180"></el-table-column>
<el-table-column label="来源" prop="fromType" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<i class="el-icon-time"></i> <span>{{ fromTypeMap[scope.row.fromType] }}</span>
<span>{{ scope.row.createTime }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="校验状态" prop="status" width="100">
<el-table-column label="单据状态" prop="status" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag :type="statusFilterType(scope.row.status)">{{ <el-tag :type="statusFilterType(scope.row.status)">{{
checkStatus[scope.row.status] checkStatus[scope.row.status]
@ -122,7 +145,7 @@
</el-tag> </el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" width="150"> <el-table-column label="操作" width="150" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
type="text" type="text"
@ -141,9 +164,8 @@
<el-button <el-button
type="text" type="text"
size="small" size="small"
v-if="scope.row.status == 1"
@click.native.stop="onUpload(scope.row.billNo)" @click.native.stop="onUpload(scope.row.billNo)"
>立即提交 >校验提交
</el-button </el-button
> >
</template> </template>
@ -191,7 +213,7 @@
<el-tabs type="border-card" style="margin: 15px"> <el-tabs type="border-card" style="margin: 15px">
<!--单据业务详情--> <!--单据业务详情-->
<el-tab-pane> <el-tab-pane>
<span slot="label">单据 {{ currentRow.billNo }}-业务详情</span> <span slot="label">单据 {{ currentRow == null ? '' : currentRow.billNo }}-业务扫码校验结果</span>
<el-form :inline="true" :model="bizQuery" class="query-form" size="mini"> <el-form :inline="true" :model="bizQuery" class="query-form" size="mini">
<el-form-item class="query-form-item" label="产品名称:"> <el-form-item class="query-form-item" label="产品名称:">
<el-input <el-input
@ -222,35 +244,35 @@
> >
<el-table-column label="序号" type="index"></el-table-column> <el-table-column label="序号" type="index"></el-table-column>
<el-table-column <el-table-column
label="产品通用名称" label="物资名称" width="150"
prop="coName" prop="coName"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="规格型号" label="规格型号" width="150"
prop="spec" prop="spec"
></el-table-column> ></el-table-column>
<el-table-column label="批次号" header-align="center"> <el-table-column label="批次号" header-align="center">
<el-table-column header-align="center" <el-table-column header-align="center"
label="手录" label="手录" width="100"
prop="bbatchNo" prop="bbatchNo"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
<el-table-column header-align="center" <el-table-column header-align="center"
label="扫码" label="扫码"
prop="sbatchNo" prop="sbatchNo" width="100"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
</el-table-column> </el-table-column>
<el-table-column label="生产日期" header-align="center"> <el-table-column label="生产日期" header-align="center">
<el-table-column header-align="center" <el-table-column header-align="center"
label="手录" label="手录" width="100"
prop="bproductDate" prop="bproductDate"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
<el-table-column header-align="center" <el-table-column header-align="center"
label="扫码" label="扫码" width="100"
prop="sproductDate" prop="sproductDate"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
@ -258,12 +280,12 @@
<el-table-column label="失效日期" header-align="center"> <el-table-column label="失效日期" header-align="center">
<el-table-column header-align="center" <el-table-column header-align="center"
label="手录" label="手录" width="100"
prop="bexpireDate" prop="bexpireDate"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
<el-table-column header-align="center" <el-table-column header-align="center"
label="扫码" label="扫码" width="100"
prop="sexpireDate" prop="sexpireDate"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
@ -271,27 +293,29 @@
<el-table-column label="数量" header-align="center"> <el-table-column label="数量" header-align="center">
<el-table-column <el-table-column
header-align="center" header-align="center"
label="单据数量" label="单据数量" width="100"
prop="count" prop="count"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
header-align="center" header-align="center"
label="扫码数量" label="扫码数量" width="100"
prop="scanCount" prop="scanCount"
></el-table-column> ></el-table-column>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="价格" label="价格"
prop="price" prop="price" width="100"
></el-table-column> ></el-table-column>
<el-table-column width="100" label="计量单位" prop="measname">
</el-table-column>
<el-table-column <el-table-column
label="生产厂家" label="生产企业"
prop="manufacturer" prop="manufacturer" width="160"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="注册/备案凭证号" label="注册/备案号" width="160"
prop="certCode" prop="certCode"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
@ -348,7 +372,7 @@ export default {
6: "校验异常", 6: "校验异常",
7: "审核通过", 7: "审核通过",
8: "审核拒绝", 8: "审核拒绝",
9: "正在处理" 9: "正在处理", 10: "待审核",
}, },
curIndex: "", curIndex: "",
idQuery: {}, idQuery: {},
@ -373,7 +397,7 @@ export default {
"3": "pda即时校验", "3": "pda即时校验",
"4": "pda未校验", "4": "pda未校验",
"5": "pc端扫码精灵", "5": "pc端扫码精灵",
"6": "缺量补录单据", "6": "流转自动补单",
"7": "UDI供应商平台", "7": "UDI供应商平台",
"8": "平衡补录单据", "8": "平衡补录单据",
"10": "手动补单", "10": "手动补单",
@ -521,6 +545,9 @@ export default {
if (response.code === 20000) { if (response.code === 20000) {
this.list = response.data.list || []; this.list = response.data.list || [];
this.total = response.data.total || 0; this.total = response.data.total || 0;
if (this.list.length == 0) {
this.bizDetailList = [];
}
} else { } else {
this.$message.error(response.message); this.$message.error(response.message);
} }
@ -576,6 +603,8 @@ export default {
this.loading = false; this.loading = false;
if (response.code === 20000) { if (response.code === 20000) {
this.$message.success("提交成功"); this.$message.success("提交成功");
this.getList();
this.bizDetailList = [];
} else { } else {
this.$message.error(response.message); this.$message.error(response.message);
} }
@ -637,7 +666,7 @@ export default {
this.getBizDetailList(); this.getBizDetailList();
}, },
getBizDetailList() { getBizDetailList() {
if (isBlank(this.currentRow.billNo)) { if (this.currentRow == null || isBlank(this.currentRow.billNo)) {
this.$message.error("请先选择需要查询的单据！") this.$message.error("请先选择需要查询的单据！")
return; return;
} }

2
src/views/inout/IoEditOrder.vue
Unescape Escape View File

@ -21,7 +21,7 @@
border border
@current-change="handleSelectionChange"> @current-change="handleSelectionChange">
<el-table-column label="序号" type="index"></el-table-column> <el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="扫码单据类型" prop="billTypeName"></el-table-column> <el-table-column label="单据类型" prop="billTypeName"></el-table-column>
<el-table-column label="订单号" prop="billNo" show-overflow-tooltip></el-table-column> <el-table-column label="订单号" prop="billNo" show-overflow-tooltip></el-table-column>
<el-table-column label="来源订单号" prop="corpOrderId" show-overflow-tooltip></el-table-column> <el-table-column label="来源订单号" prop="corpOrderId" show-overflow-tooltip></el-table-column>
<el-table-column label="来源" prop="fromType"> <el-table-column label="来源" prop="fromType">

28
src/views/inout/PanelCreateOrderBizDetail.vue
Unescape Escape View File

@ -8,7 +8,7 @@
ref="mainTable" ref="mainTable"
@click.native.stop="selectProductFunction()" @click.native.stop="selectProductFunction()"
:loading="loading" :loading="loading"
>产品录入 >物资录入
</el-button </el-button
> >
</el-button-group> </el-button-group>
@ -23,7 +23,7 @@
max-height="350" height="350" ref="multipleTable"> max-height="350" height="350" ref="multipleTable">
<el-table-column label="序号" type="index" width="50"></el-table-column> <el-table-column label="序号" type="index" width="50"></el-table-column>
<el-table-column width="150" <el-table-column width="150"
label="产品通用名" label="物资名称"
prop="coName" prop="coName"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
@ -32,7 +32,7 @@
prop="spec" prop="spec"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
<el-table-column width="150" label="批次号"> <el-table-column width="120" label="批次号">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.batchNo" <el-input v-model="scope.row.batchNo"
:disabled="scope.row.index !== selectedIndex" :disabled="scope.row.index !== selectedIndex"
@ -41,7 +41,7 @@
placeholder="请输入批次号"></el-input> placeholder="请输入批次号"></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="180" label="生产日期(yyMMdd)"> <el-table-column width="120" label="生产日期">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.productDate" auto-complete="off" <el-input v-model="scope.row.productDate" auto-complete="off"
@ -51,7 +51,7 @@
></el-input> ></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="180" label="失效日期(yyMMdd)"> <el-table-column width="120" label="失效日期">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.expireDate" auto-complete="off" <el-input v-model="scope.row.expireDate" auto-complete="off"
@ -61,7 +61,7 @@
></el-input> ></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="120" label="单据数量"> <el-table-column width="100" label="单据数量">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.count" <el-input v-model="scope.row.count"
type='number' type='number'
@ -70,13 +70,14 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="80" <el-table-column width="100"
label="扫码数量" label="扫码数量"
prop="scanCount" prop="scanCount"
v-if="viewType!=2" v-if="viewType!=2"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
<el-table-column width="150" label="价格">
<el-table-column width="120" label="价格">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.price" <el-input v-model="scope.row.price"
type='number' type='number'
@ -85,15 +86,18 @@
></el-input> ></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="100" label="计量单位" prop="measname">
</el-table-column>
<el-table-column width="160" <el-table-column width="160"
label="注册/备案凭证号" label="注册/备案号"
prop="certCode" prop="certCode"
show-overflow-tooltip show-overflow-tooltip
> >
</el-table-column> </el-table-column>
<el-table-column width="150" <el-table-column width="150"
label="生产厂家" label="生产企业"
prop="manufacturer" prop="manufacturer"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
@ -158,7 +162,7 @@
</el-table> </el-table>
<el-dialog <el-dialog
title="业务详情-产品录入" title="业务详情-物资录入"
:visible.sync="selectProductVisible" :visible.sync="selectProductVisible"
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false" :close-on-press-escape="false"
@ -172,7 +176,7 @@
></stockOrderNewSelectProduct> ></stockOrderNewSelectProduct>
</el-dialog> </el-dialog>
<el-dialog <el-dialog
title="库存产品录入" title="库存物资录入"
:visible.sync="selectInvProductVisible" :visible.sync="selectInvProductVisible"
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false" :close-on-press-escape="false"

8
src/views/inout/PanelCreateOrderCodeDetail.vue
Unescape Escape View File

@ -5,7 +5,7 @@
:row-style="rowStyle" :row-style="rowStyle"
ref="multipleTable"> ref="multipleTable">
<el-table-column type="index" label="序号" width="50"></el-table-column> <el-table-column type="index" label="序号" width="50"></el-table-column>
<el-table-column label="产品通用名" width="150" prop="coName" show-overflow-tooltip></el-table-column> <el-table-column label="物资名称" width="150" prop="coName" show-overflow-tooltip></el-table-column>
<el-table-column label="规格型号" width="150" prop="spec" show-overflow-tooltip></el-table-column> <el-table-column label="规格型号" width="150" prop="spec" show-overflow-tooltip></el-table-column>
<el-table-column label="批次号" width="150" prop="batchNo" show-overflow-tooltip></el-table-column> <el-table-column label="批次号" width="150" prop="batchNo" show-overflow-tooltip></el-table-column>
<el-table-column label="生产日期" width="120" prop="productDate" show-overflow-tooltip> <el-table-column label="生产日期" width="120" prop="productDate" show-overflow-tooltip>
@ -21,8 +21,10 @@
<el-table-column label="扫码数量" width="80" prop="count" show-overflow-tooltip></el-table-column> <el-table-column label="扫码数量" width="80" prop="count" show-overflow-tooltip></el-table-column>
<el-table-column label="实际数量" width="80" prop="reCount" show-overflow-tooltip></el-table-column> <el-table-column label="实际数量" width="80" prop="reCount" show-overflow-tooltip></el-table-column>
<el-table-column label="价格" width="150" prop="price" show-overflow-tooltip></el-table-column> <el-table-column label="价格" width="150" prop="price" show-overflow-tooltip></el-table-column>
<el-table-column label="生产厂家" width="150" prop="manufacturer" show-overflow-tooltip></el-table-column> <el-table-column width="100" label="计量单位" prop="measname">
<el-table-column label="注册/备案凭证号" width="150" prop="certCode" show-overflow-tooltip></el-table-column> </el-table-column>
<el-table-column label="生产企业" width="150" prop="manufacturer" show-overflow-tooltip></el-table-column>
<el-table-column label="注册/备案号" width="150" prop="certCode" show-overflow-tooltip></el-table-column>
</el-table> </el-table>
</div> </div>
</template> </template>

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

@ -16,47 +16,49 @@
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="生产日期" label="批次号"
prop="produceDate" prop="batchNo"
width="120" width="120"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="失效日期" label="扫码数量"
prop="expireDate" prop="count"
width="120" width="80"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="批次号" label="实际数量"
prop="batchNo" prop="reCount"
width="120" width="80"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="序列号" label="生产日期"
prop="serialNo" prop="produceDate"
width="120" width="120"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="供应商" label="失效日期"
prop="supName" prop="expireDate"
width="180" width="120"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="扫码数量"
prop="count"
width="80"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="实际数量" label="序列号"
prop="reCount" prop="serialNo"
width="80" width="120"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
<!-- <el-table-column-->
<!-- label="供应商"-->
<!-- prop="supName"-->
<!-- width="180"-->
<!-- show-overflow-tooltip-->
<!-- ></el-table-column>-->
<el-table-column label="操作" width="220" fixed="right"> <el-table-column label="操作" width="220" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@ -272,7 +274,7 @@ export default {
rowStyle({row, rowIndex}) { rowStyle({row, rowIndex}) {
let rowBackground = {}; let rowBackground = {};
if (!this.$isNotBlank(row.supId) || !this.$isNotBlank(row.relId) ) { if (!this.$isNotBlank(row.supId) || !this.$isNotBlank(row.relId)) {
rowBackground.color = '#f60303'; rowBackground.color = '#f60303';
} }
return rowBackground; return rowBackground;
@ -288,6 +290,7 @@ export default {
if (response.code == 20000) { if (response.code == 20000) {
this.$message.success("绑定成功"); this.$message.success("绑定成功");
this.orderFormData.id = this.curRow.orderId; this.orderFormData.id = this.curRow.orderId;
this.closeBindDialog();
this.getCodeList(); this.getCodeList();
} else { } else {
if (response.code == 503) { if (response.code == 503) {

36
src/views/system/param/busTypeChange.vue
Unescape Escape View File

@ -25,9 +25,28 @@
<el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row> <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row>
<el-table-column label="序号" type="index" width="60"></el-table-column> <el-table-column label="序号" type="index" width="60"></el-table-column>
<el-table-column label="补单类型名称" prop="originName"></el-table-column> <el-table-column label="业务单" prop="originName"></el-table-column>
<el-table-column label="补单类型代码" prop="originAction"></el-table-column>
<el-table-column label="目标单据类型" prop="targetBusName"></el-table-column> <el-table-column label="出入库单" header-align="center">
<el-table-column label="目标出入库单" prop="targetName"></el-table-column>
<el-table-column label="时间间隔(h)" prop="beforeTime"></el-table-column>
<el-table-column label="单据状态" prop="auditStatus">
<template slot-scope="scope">
<span>{{ orderStatus[scope.row.auditStatus] }}</span>
</template>
</el-table-column>
</el-table-column>
<el-table-column label="业务单" header-align="center">
<el-table-column label="目标业务单" prop="targetBusName"></el-table-column>
<el-table-column label="时间间隔(h)" prop="busBeforeTime"></el-table-column>
<el-table-column label="单据状态" prop="busAuditStatus">
<template slot-scope="scope">
<span>{{ orderStatus[scope.row.busAuditStatus] }}</span>
</template>
</el-table-column>
</el-table-column>
<el-table-column label="类型" prop="type"> <el-table-column label="类型" prop="type">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ typeMap[scope.row.type] }}</span> <span>{{ typeMap[scope.row.type] }}</span>
@ -134,6 +153,13 @@ export default {
3: "采购计划", 3: "采购计划",
4: "盘点转单" 4: "盘点转单"
}, },
orderStatus: {
1: "草稿",
2: "待审核",
3: "已审核"
},
formMap: { formMap: {
add: "新增单据生成设置", add: "新增单据生成设置",
edit: "编辑单据生成设置", edit: "编辑单据生成设置",
@ -253,7 +279,9 @@ export default {
targetAction: null, targetAction: null,
name: null, name: null,
enable: null, enable: null,
remark: null remark: null,
auditStatus: null,
busAuditStatus: null,
}; };
this.modifyDialogVisible = true; this.modifyDialogVisible = true;
}, },

130
src/views/system/param/busTypeChangeModify.vue
Unescape Escape View File

@ -4,34 +4,19 @@
<el-row type="flex"> <el-row type="flex">
<el-col :span="11"> <el-col :span="11">
<el-form-item label="单据类型名称" prop="originName"> <el-form-item label="单据类型名称" prop="originName">
<el-input v-model="inputQuery.originName" :disabled="!isAdd" size="small" placeholder="请输入内容" style="width: 90%"></el-input> <el-input v-model="inputQuery.originName" :disabled="!isAdd" size="small" placeholder="请输入内容"
style="width: 90%"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="11"> <el-col :span="11">
<el-form-item label="单据类型代码" prop="originAction"> <el-form-item label="单据类型代码" prop="originAction">
<el-input v-model="inputQuery.originAction" :disabled="!isAdd" size="small" placeholder="请输入内容" style="width: 90%"></el-input> <el-input v-model="inputQuery.originAction" :disabled="!isAdd" size="small" placeholder="请输入内容"
style="width: 90%"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row type="flex" style="margin-bottom: 20px">
<el-row type="flex">
<el-col :span="11">
<el-form-item label="目标单据类型" prop="targetAction">
<el-select v-model="inputQuery.targetAction" placeholder="请选择" clearable size="small" style="width: 90%">
<el-option
v-for="item in busTypes"
:key="item.action"
:label="item.name"
:value="item.action">
<span style="float: left"> {{item.name}}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{item.action}}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="11"> <el-col :span="11">
<el-form-item label="启用状态" prop="enable"> <el-form-item label="启用状态" prop="enable">
<el-select v-model="inputQuery.enable" <el-select v-model="inputQuery.enable"
@ -45,9 +30,6 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row type="flex">
<el-col :span="11"> <el-col :span="11">
<el-form-item label="类型"> <el-form-item label="类型">
<el-select v-model="inputQuery.type" <el-select v-model="inputQuery.type"
@ -59,12 +41,93 @@
<el-option label="耗材领用" :value="1"></el-option> <el-option label="耗材领用" :value="1"></el-option>
<el-option label="产品申购" :value="2"></el-option> <el-option label="产品申购" :value="2"></el-option>
<el-option label="采购计划" :value="3"></el-option> <el-option label="采购计划" :value="3"></el-option>
<el-option label="采购订单" :value="5"></el-option>
<el-option label="盘点转单" :value="4"></el-option> <el-option label="盘点转单" :value="4"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-divider content-position="center">生成出入库单</el-divider>
<el-row style="margin-top: 20px">
<el-col :span="11">
<el-form-item label="目标出入库单" prop="targetIoAction">
<el-select v-model="inputQuery.targetAction" placeholder="请选择" clearable size="small" style="width: 90%">
<el-option
v-for="item in targetTypes"
:key="item.action"
:label="item.name"
:value="item.action">
<span style="float: left"> {{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="11">
<el-form-item label="时间间隔(h)" prop="beforeTime">
<el-input style="width: 90%"
size="small"
type="number"
placeholder="请输入出入库单时间间隔"
v-model="inputQuery.beforeTime"
onkeyup="this.value=this.value.replace(/\D/g,'')"
onafterpaste="this.value=this.value.replace(/\D/g,'')"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row style="margin-bottom: 20px">
<el-col :span="11">
<el-form-item label="出入库单审核状态" prop="auditStatus" class="query-form-item">
<el-radio-group v-model="inputQuery.auditStatus">
<el-radio :label="1">草稿</el-radio>
<el-radio :label="2">待审核</el-radio>
<el-radio :label="3">已审核</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-divider content-position="center">生成业务单</el-divider>
<el-row type="flex" style="margin-top: 20px">
<el-col :span="11">
<el-form-item label="目标业务单" prop="targetBusAction">
<el-select v-model="inputQuery.targetBusAction" placeholder="请选择" clearable size="small" style="width: 90%">
<el-option
v-for="item in targetBusTypes"
:key="item.originAction"
:label="item.originName"
:value="item.originAction">
<span style="float: left"> {{ item.originName }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="11">
<el-form-item label="时间间隔（h）" prop="busBeforeTime">
<el-input style="width: 90%"
size="small"
type="number"
placeholder="请输入业务单时间间隔"
v-model="inputQuery.busBeforeTime"
onkeyup="this.value=this.value.replace(/\D/g,'')"
onafterpaste="this.value=this.value.replace(/\D/g,'')"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item label="审核状态" prop="busAuditStatus" class="query-form-item">
<el-radio-group v-model="inputQuery.busAuditStatus">
<el-radio :label="1">草稿</el-radio>
<el-radio :label="2">待审核</el-radio>
<el-radio :label="3">已审核</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex"> <el-row type="flex">
<el-col :span="23" type="flex"> <el-col :span="23" type="flex">
<el-form-item prop="comments"> <el-form-item prop="comments">
@ -81,7 +144,8 @@
<script> <script>
import {getBusTypeList} from "@/api/basic/busType"; import {getBusTypeList, getBusTypeListByUser} from "@/api/basic/busType";
import {getBusTypeChangeList} from "@/api/basic/busTypeChange";
export default { export default {
name: "BusTypePreModify", name: "BusTypePreModify",
@ -98,7 +162,8 @@ export default {
enabled: true, enabled: true,
isBuType: true, isBuType: true,
}, },
busTypes: [], targetTypes: [],
targetBusTypes: [],
isAdd: false, isAdd: false,
formRules: { formRules: {
originName: [ originName: [
@ -152,17 +217,30 @@ export default {
}; };
getBusTypeList(params).then((res) => { getBusTypeList(params).then((res) => {
if (res.code === 20000) { if (res.code === 20000) {
this.busTypes = res.data.list || []; this.targetTypes = res.data.list || [];
} }
}) })
},
getTargetBusType() {
let query = {
enable: true
};
getBusTypeChangeList(query).then((res) => {
if (res.code === 20000) {
this.targetBusTypes = res.data.list || [];
} }
})
},
}, },
created() { created() {
if (this.inputQuery.originAction == null) { if (this.inputQuery.originAction == null) {
this.isAdd = true; this.isAdd = true;
this.inputQuery.auditStatus = 2;
this.inputQuery.busAuditStatus = 2;
} }
this.getBusType(); this.getBusType();
this.getTargetBusType();
} }
} }
</script> </script>

76
src/views/system/param/busTypePre.vue
Unescape Escape View File

@ -27,11 +27,29 @@
<el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row> <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row>
<el-table-column label="序号" type="index" width="60"></el-table-column> <el-table-column label="序号" type="index" width="60"></el-table-column>
<el-table-column label="原单据类型" prop="originName"></el-table-column> <el-table-column label="出入库单" prop="originName"></el-table-column>
<el-table-column label="目标单据类型" prop="targetName"></el-table-column> <el-table-column label="出入库单" header-align="center">
<el-table-column label="目标当前仓库" prop="invName"></el-table-column> <el-table-column label="目标出入库单" prop="targetName"></el-table-column>
<el-table-column label="目标往来仓库" prop="defaultInvName"></el-table-column> <el-table-column label="时间间隔(h)" prop="beforeTime"></el-table-column>
<el-table-column label="时间推移（小时）" prop="beforeTime"></el-table-column> <el-table-column label="单据状态" prop="auditStatus">
<template slot-scope="scope">
<span>{{ orderStatus[scope.row.auditStatus] }}</span>
</template>
</el-table-column>
</el-table-column>
<el-table-column label="业务单" header-align="center">
<el-table-column label="目标业务单" prop="targetBusName"></el-table-column>
<el-table-column label="时间间隔(h)" prop="busBeforeTime"></el-table-column>
<el-table-column label="单据状态" prop="busAuditStatus">
<template slot-scope="scope">
<span>{{ orderStatus[scope.row.busAuditStatus] }}</span>
</template>
</el-table-column>
</el-table-column>
<!-- <el-table-column label="目标当前仓库" prop="invName"></el-table-column>-->
<!-- <el-table-column label="目标往来仓库" prop="defaultInvName"></el-table-column>-->
<el-table-column label="补单方式" prop="supplementAll"> <el-table-column label="补单方式" prop="supplementAll">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ enableMap[scope.row.supplementAll] }}</span> <span>{{ enableMap[scope.row.supplementAll] }}</span>
@ -117,20 +135,29 @@ export default {
action: null, action: null,
invCode: null, invCode: null,
defaultInvCode: null, defaultInvCode: null,
beforeTime: null, beforeTime: 0,
busBeforeTime: 0,
supplementAll: null, supplementAll: null,
intro: null, intro: null,
remark: null remark: null,
auditStatus: null,
busAuditStatus: null,
}, },
enableMap: { enableMap: {
true: "全量补单", true: "全量补单",
false: "自动补单", false: "缺量补单",
},
orderStatus: {
1: "草稿",
2: "待审核",
3: "已审核"
}, },
total: 0, total: 0,
loading: false, loading: false,
formMap: { formMap: {
add: "新增单据流转设置", add: "新增出入库单据流转设置",
edit: "编辑单据流转设置", edit: "编辑出入库单据流转设置",
}, },
formName: null, formName: null,
}; };
@ -184,18 +211,18 @@ export default {
this.$message.error("原单据类型不能为空！"); this.$message.error("原单据类型不能为空！");
return; return;
} }
if (isBlank(this.inputQuery.action)) { if (isBlank(this.inputQuery.action) && isBlank(this.inputQuery.targetBusAction)) {
this.$message.error("目标单据类型不能为空！") this.$message.error("目标出入库单与目标业务单不能同时为空！")
return;
}
if (isBlank(this.inputQuery.invCode)) {
this.$message.error("目标所在仓库不能为空！")
return;
}
if (!isBlank(this.inputQuery.beforeTime) && this.inputQuery.beforeTime < 0) {
this.$message.error("推移时间不能小于0！");
return; return;
} }
// if (isBlank(this.inputQuery.invCode)) {
// this.$message.error("目标所在仓库不能为空！")
// return;
// }
// if (!isBlank(this.inputQuery.beforeTime) && this.inputQuery.beforeTime < 0) {
// this.$message.error("推移时间不能小于0！");
// return;
// }
if (this.formName === "add") { if (this.formName === "add") {
let numRegExp = '^[0-9]*$'; let numRegExp = '^[0-9]*$';
@ -210,7 +237,7 @@ export default {
this.loading = false; this.loading = false;
this.cancelDialog(); this.cancelDialog();
this.getList(); this.getList();
}else{ } else {
this.$message.error(res.message); this.$message.error(res.message);
} }
}).catch(() => { }).catch(() => {
@ -240,10 +267,13 @@ export default {
action: null, action: null,
invCode: null, invCode: null,
defaultInvCode: null, defaultInvCode: null,
beforeTime: null, beforeTime: 0,
busBeforeTime: 0,
supplementAll: null, supplementAll: null,
intro: null, intro: null,
remark: null remark: null,
auditStatus: null,
busAuditStatus: null,
}; };
this.modifyDialogVisible = true; this.modifyDialogVisible = true;
}, },

178
src/views/system/param/busTypePreModify.vue
Unescape Escape View File

@ -1,9 +1,9 @@
<template> <template>
<div> <div>
<el-form :model="inputQuery" :rules="formRules" ref="dataForm" label-width="120px" border> <el-form :model="inputQuery" :rules="formRules" ref="dataForm" label-width="120px" border>
<el-row type="flex"> <el-row type="flex" style="margin-bottom: 20px">
<el-col :span="11"> <el-col :span="11">
<el-form-item label="原单据类型" prop="originAction"> <el-form-item label="出入库单" prop="originAction">
<el-select v-model="inputQuery.originAction" placeholder="原单据类型" clearable size="small" <el-select v-model="inputQuery.originAction" placeholder="原单据类型" clearable size="small"
style="width: 90%"> style="width: 90%">
<el-option <el-option
@ -12,88 +12,139 @@
:label="item.name" :label="item.name"
:value="item.action"> :value="item.action">
<span style="float: left"> {{ item.name }}</span> <span style="float: left"> {{ item.name }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.action }}</span>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="11">
<el-form-item label="补单方式" prop="supplementAll">
<el-select v-model="inputQuery.supplementAll" placeholder="补单方式" clearable size="small"
style="width: 90%">
<el-option label="全量补单" :value="true"></el-option>
<el-option label="缺量补单" :value="false"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<!-- <el-row type="flex" style="margin-bottom: 20px">-->
<!-- <el-col :span="11">-->
<!-- <el-form-item label="目标所在仓库" prop="invCode">-->
<!-- <el-select v-model="inputQuery.invCode" placeholder="目标所在仓库" clearable size="small"-->
<!-- @change="invChange"-->
<!-- style="width: 90%">-->
<!-- <el-option-->
<!-- v-for="item in locInvs"-->
<!-- :key="item.name"-->
<!-- :label="item.name"-->
<!-- :value="item.code">-->
<!-- <span style="float: left"> {{ item.name }}</span>-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<!-- <el-col :span="11">-->
<!-- <el-form-item label="目标往来仓库" prop="defaultInvCode">-->
<!-- <el-select v-model="inputQuery.defaultInvCode" placeholder="目标往来仓库" clearable size="small"-->
<!-- @change="invChange"-->
<!-- style="width: 90%">-->
<!-- <el-option-->
<!-- v-for="item in fromInvs"-->
<!-- :key="item.name"-->
<!-- :label="item.name"-->
<!-- :value="item.code">-->
<!-- <span style="float: left"> {{ item.name }}</span>-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<el-divider content-position="left">生成出入库单</el-divider>
<el-row style="margin-top: 20px">
<el-col :span="11"> <el-col :span="11">
<el-form-item label="目标单据类型" prop="action"> <el-form-item label="目标出入库单" prop="action">
<el-select v-model="inputQuery.action" placeholder="目标单据类型" clearable size="small" style="width: 90%"> <el-select v-model="inputQuery.action" placeholder="目标出入库单" clearable size="small" style="width: 90%">
<el-option <el-option
v-for="item in targetBusTypes" v-for="item in targetTypes"
:key="item.action" :key="item.action"
:label="item.name" :label="item.name"
:value="item.action"> :value="item.action">
<span style="float: left"> {{ item.name }}</span> <span> {{ item.name }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.action }}</span>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row type="flex">
<el-col :span="11"> <el-col :span="11">
<el-form-item label="目标所在仓库" prop="invCode"> <el-form-item label="时间间隔（h）" prop="beforeTime">
<el-select v-model="inputQuery.invCode" placeholder="目标所在仓库" clearable size="small" <el-input style="width: 90%"
@change="invChange" size="small"
style="width: 90%"> type="number"
<el-option placeholder="请输入内容"
v-for="item in locInvs" v-model="inputQuery.beforeTime"
:key="item.name" onkeyup="this.value=this.value.replace(/\D/g,'')"
:label="item.name" onafterpaste="this.value=this.value.replace(/\D/g,'')"
:value="item.code"> ></el-input>
<span style="float: left"> {{ item.name }}</span>
</el-option>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row style="margin-bottom: 20px">
<el-col :span="11">
<el-form-item label="审核状态" prop="auditStatus" class="query-form-item">
<el-radio-group v-model="inputQuery.auditStatus">
<el-radio :label="1">草稿</el-radio>
<el-radio :label="2">待核对</el-radio>
</el-radio-group>
<!-- <el-select v-model="inputQuery.auditStatus" placeholder="请选择出入库类型" style="width: 90%">-->
<!-- <el-radio :label="1">草稿</el-radio>-->
<!-- <el-radio :label="2">待核对</el-radio>-->
<!-- <el-radio :label="3">待审核</el-radio>-->
<!-- </el-select>-->
</el-form-item>
</el-col>
</el-row>
<el-divider content-position="left">生成业务单</el-divider>
<el-row>
<el-col :span="11"> <el-col :span="11">
<el-form-item label="目标往来仓库" prop="defaultInvCode"> <el-form-item label="目标业务单" prop="action">
<el-select v-model="inputQuery.defaultInvCode" placeholder="目标往来仓库" clearable size="small" <el-select v-model="inputQuery.targetBusAction" placeholder="目标业务单" clearable size="small"
@change="invChange"
style="width: 90%"> style="width: 90%">
<el-option <el-option
v-for="item in fromInvs" v-for="item in targetBusTypes"
:key="item.name" :key="item.originAction"
:label="item.name" :label="item.originName"
:value="item.code"> :value="item.originAction">
<span style="float: left"> {{ item.name }}</span> <span> {{ item.originName }}</span>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row type="flex">
<el-col :span="11"> <el-col :span="11">
<el-form-item label="推移时间（小时）" prop="beforeTime"> <el-form-item label="时间间隔（h）" prop="beforeTime">
<el-input style="width: 90%" <el-input style="width: 90%"
size="small" size="small"
type="number" type="number"
placeholder="请输入内容" placeholder="请输入内容"
v-model="inputQuery.beforeTime" v-model="inputQuery.busBeforeTime"
onkeyup="this.value=this.value.replace(/\D/g,'')" onkeyup="this.value=this.value.replace(/\D/g,'')"
onafterpaste="this.value=this.value.replace(/\D/g,'')" onafterpaste="this.value=this.value.replace(/\D/g,'')"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row>
<el-col :span="11"> <el-col :span="11">
<el-form-item label="流转方式" prop="supplementAll"> <el-form-item label="审核状态" prop="busAuditStatus" class="query-form-item">
<el-select v-model="inputQuery.supplementAll" placeholder="流转方式" clearable size="small" <el-radio-group v-model="inputQuery.busAuditStatus">
style="width: 90%"> <el-radio :label="1">草稿</el-radio>
<el-option label="全量补单" :value="true"></el-option> <el-radio :label="2">待审核</el-radio>
<el-option label="自动补单" :value="false"></el-option> </el-radio-group>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row type="flex"> <el-row type="flex">
<el-col :span="23" type="flex"> <el-col :span="23" type="flex">
<el-form-item prop="intro"> <el-form-item prop="intro">
@ -113,6 +164,7 @@
import {getBusTypeList, getBusTypeListByUser} from "@/api/basic/busType"; import {getBusTypeList, getBusTypeListByUser} from "@/api/basic/busType";
import {filterSubAll, findByFrom} from "@/api/system/invSubWarehouse"; import {filterSubAll, findByFrom} from "@/api/system/invSubWarehouse";
import {isBlank} from "@/utils/strUtil"; import {isBlank} from "@/utils/strUtil";
import {getBusTypeChangeList} from "@/api/basic/busTypeChange";
export default { export default {
name: "BusTypePreModify", name: "BusTypePreModify",
@ -130,6 +182,7 @@ export default {
isBuType: true, isBuType: true,
}, },
originBusTypes: [], originBusTypes: [],
targetTypes: [],
targetBusTypes: [], targetBusTypes: [],
locInvs: [], locInvs: [],
fromInvs: [], fromInvs: [],
@ -149,13 +202,13 @@ export default {
trigger: "blur" trigger: "blur"
} }
], ],
invCode: [ // invCode: [
{ // {
required: true, // required: true,
message: "目标所在仓库不能为空", // message: "目标所在仓库不能为空",
trigger: "blur" // trigger: "blur"
} // }
], // ],
// defaultInvCode: [ // defaultInvCode: [
// { // {
// required: true, // required: true,
@ -193,7 +246,19 @@ export default {
let query = { let query = {
enable: true enable: true
}; };
getBusTypeListByUser(query).then((res) => { getBusTypeList(query).then((res) => {
if (res.code === 20000) {
this.targetTypes = res.data.list || [];
}
})
},
getTargetChangeType() {
let query = {
enable: true
};
getBusTypeChangeList(query).then((res) => {
if (res.code === 20000) { if (res.code === 20000) {
this.targetBusTypes = res.data.list || []; this.targetBusTypes = res.data.list || [];
} }
@ -224,10 +289,10 @@ export default {
invChange() { invChange() {
if (!isBlank(this.inputQuery.invCode)) { if (!isBlank(this.inputQuery.invCode)) {
this.getFromInv(); this.getFromInv();
this.getTargetBusType();
} else { } else {
this.inputQuery.action = null; this.inputQuery.action = null;
this.targetBusTypes = []; this.targetTypes = [];
} }
}, },
}, },
@ -235,9 +300,14 @@ export default {
created() { created() {
if (this.inputQuery.originAction == null) { if (this.inputQuery.originAction == null) {
this.isAdd = true; this.isAdd = true;
// this.inputQuery.auditStatus = 2;
// this.inputQuery.busAuditStatus = 2;
} else { } else {
this.getTargetBusType(); this.getTargetBusType();
} }
this.getTargetBusType();
this.getTargetChangeType();
this.getOriginBusType(); this.getOriginBusType();
this.getLocInv(); this.getLocInv();
this.getFromInv(); this.getFromInv();

2
vue.config.js
Unescape Escape View File

@ -35,7 +35,7 @@ module.exports = {
proxy: { proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy // detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: { [process.env.VUE_APP_BASE_API]: {
target: `http://127.0.0.1:9991`, target: `http://192.168.0.166:9991`,
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: '' ['^' + process.env.VUE_APP_BASE_API]: ''

Write Preview
Loading…
Cancel
Save