diff --git a/.env.production b/.env.production
index 85178235..15436a12 100644
--- a/.env.production
+++ b/.env.production
@@ -1,5 +1,6 @@
# 页面标题
-VUE_APP_TITLE = UDI管理系统
+VUE_APP_TITLE = UDI管理系统VUE_APP_BASE_API = 'http://r.jiyuudims.cloud:5004/UDI_WMS_MC/'
+
# 生产环境配置
ENV = 'production'
@@ -9,12 +10,13 @@ ENV = 'production'
#林纪裕cd
# VUE_APP_BASE_API = 'http://101.43.77.55:9150/UDI_WMS_MC/'
# VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_WMS_MC/'
-VUE_APP_BASE_API = 'http://r.jiyuudims.cloud:5004/UDI_WMS_MC/'
# 测试服务器
# VUE_APP_BASE_API = 'http://192.168.0.66:9150/UDI_WMS_MC/'
+# 文明东
+# VUE_APP_BASE_API = 'http://192.168.0.62:9150/UDI_WMS_MC/'
# 吴总测试服务器
# VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_WMS_MC/'
diff --git a/src/api/inout/order.js b/src/api/inout/order.js
index 85622592..452696e5 100644
--- a/src/api/inout/order.js
+++ b/src/api/inout/order.js
@@ -49,6 +49,14 @@ export function submitBiz(query) {
});
}
+export function submitAllocateBiz(query) {
+ return axios({
+ url: "/warehouse/inout/waitAllocate/submitOrderWeb",
+ method: "post",
+ data: query
+ });
+}
+
export function saveOrderWeb(query) {
return axios({
@@ -421,6 +429,7 @@ export function getOrderList(params) {
params: params
});
}
+
export function getOrderFilter(params) {
return axios({
url: "udiwms/inout/preInorder/filter",
@@ -428,6 +437,7 @@ export function getOrderFilter(params) {
params: params
});
}
+
export function updateStatus(query) {
return axios({
url: "/spms/inout/order/web/updateStatus",
@@ -518,6 +528,7 @@ export function orderDetailAdd(params) {
data: params
});
}
+
export function orderChange(query) {
return axios({
url: "/udiwms/stock/order/change",
diff --git a/src/api/inout/orderDetailBiz.js b/src/api/inout/orderDetailBiz.js
index 7b8795b5..b4aa8c90 100644
--- a/src/api/inout/orderDetailBiz.js
+++ b/src/api/inout/orderDetailBiz.js
@@ -41,7 +41,6 @@ export function insertInvoice(params) {
}
-
export function getCheckDetailList(params) {
return axios({
url: "/udiwms/inout/wditCheck/filterList",
@@ -51,5 +50,14 @@ export function getCheckDetailList(params) {
}
+export function getWaitAllocateList(params) {
+ return axios({
+ url: "/udiwms/inout/waitAllocate/filterList",
+ method: "get",
+ params: params
+ });
+}
+
+
diff --git a/src/views/basic/busType/bussinessTypeModify.vue b/src/views/basic/busType/bussinessTypeModify.vue
index c5fdc783..91087b05 100644
--- a/src/views/basic/busType/bussinessTypeModify.vue
+++ b/src/views/basic/busType/bussinessTypeModify.vue
@@ -115,7 +115,7 @@
<el-col :span="11">
<el-form-item label="供应商使用权限" prop="prefix">
<el-select v-model="inputQuery.spUse"
- style="width: 90%" placeholder="是否允许" >
+ style="width: 90%" placeholder="是否允许">
<el-option label="无" :value="0"></el-option>
<el-option label="可查看" :value="1"></el-option>
<el-option label="增删改查" :value="2"></el-option>
@@ -125,7 +125,7 @@
<el-col :span="11">
<el-form-item label="物资近效期处理方式" prop="prefix">
<el-select v-model="inputQuery.checkVailDate"
- style="width: 90%" placeholder="" >
+ style="width: 90%" placeholder="">
<el-option label="不处理" :value=0></el-option>
<el-option label="弹框提醒" :value=1></el-option>
<el-option label="禁止录入" :value=2></el-option>
@@ -153,7 +153,7 @@
<el-col :span="11">
<el-form-item label="物资过期处理方式" prop="prefix">
<el-select v-model="inputQuery.checkExpire"
- style="width: 90%" placeholder="" >
+ style="width: 90%" placeholder="">
<el-option label="不处理" :value=0></el-option>
<el-option label="弹框提醒" :value=1></el-option>
<el-option label="禁止录入" :value=2></el-option>
@@ -163,7 +163,7 @@
<el-col :span="11">
<el-form-item label="资质过期处理方式" prop="prefix">
<el-select v-model="inputQuery.checkCertExpire"
- style="width: 90%" placeholder="" >
+ style="width: 90%" placeholder="">
<el-option label="不处理" :value=0></el-option>
<el-option label="弹框提醒" :value=1></el-option>
<el-option label="禁止录入" :value=2></el-option>
@@ -192,7 +192,7 @@
<el-row type="flex">
<el-col :span="11">
<el-form-item label="禁用单据类型" prop="prefix">
- <el-select v-model="inputQuery.enable" style="width: 90%" placeholder="状态" >
+ <el-select v-model="inputQuery.enable" style="width: 90%" placeholder="状态">
<el-option label="否" :value="true"></el-option>
<el-option label="是" :value="false"></el-option>
</el-select>
@@ -239,7 +239,7 @@
<el-col span="5">
<el-select v-model="inputQuery.codeFillCheck" style="width: 65%"
:disabled="inputQuery.corpType!=2 || inputQuery.mainAction!= 'WareHouseIn'"
- placeholder="是否启用" >
+ placeholder="是否启用">
<el-option label="启用" :value="true"></el-option>
<el-option label="不启用" :value="false"></el-option>
</el-select>
@@ -295,7 +295,7 @@
</el-col>
<el-divider direction="vertical"></el-divider>
<el-col span="5">
- <el-select v-model="inputQuery.vailGroupBuy" style="width: 65%" placeholder="是否启用" >
+ <el-select v-model="inputQuery.vailGroupBuy" style="width: 65%" placeholder="是否启用">
<el-option label="无需校验" :value=0></el-option>
<el-option label="只采集集采产品" :value=1></el-option>
<el-option label="只采集非集采产品" :value=2></el-option>
@@ -335,7 +335,7 @@
<el-col span="5">
<el-select v-model="inputQuery.scanPreIn" style="width: 65%"
:disabled=" inputQuery.mainAction == 'WareHouseIn' || inputQuery.corpType !== 1 || inputQuery.advancePreIn==1 || inputQuery.vailInv==1"
- placeholder="是否启用" >
+ placeholder="是否启用">
<el-option label="是" :value="true"></el-option>
<el-option label="否" :value="false"></el-option>
</el-select>
@@ -355,7 +355,7 @@
<el-col span="5">
<el-select v-model="inputQuery.advancePreIn" style="width: 65%"
:disabled=" inputQuery.mainAction == 'WareHouseIn' || inputQuery.corpType !== 1 || inputQuery.scanPreIn==1 || inputQuery.vailInv==1"
- placeholder="是否启用" >
+ placeholder="是否启用">
<el-option label="是" :value="true"></el-option>
<el-option label="否" :value="false"></el-option>
</el-select>
@@ -436,7 +436,7 @@
</el-col>
<el-divider direction="vertical"></el-divider>
<el-col span="5">
- <el-select v-model="inputQuery.backPreinType" style="width: 65%" >
+ <el-select v-model="inputQuery.backPreinType" style="width: 65%">
<el-option label="按单使用和退库" :value="1"></el-option>
<el-option label="按货位（仓库）使用和退库" :value="2"></el-option>
</el-select>
@@ -454,7 +454,7 @@
</el-col>
<el-divider direction="vertical"></el-divider>
<el-col span="5">
- <el-select v-model="inputQuery.preInBackAction" style="width: 65%" >
+ <el-select v-model="inputQuery.preInBackAction" style="width: 65%">
<el-option
v-for="item in preInBackList"
:key="item.name"
@@ -526,11 +526,13 @@
</el-col>
<el-divider direction="vertical"></el-divider>
<el-col span="5">
- <el-select v-model="inputQuery.checkWebNew" style="width: 65%" :disabled="!inputQuery.checkEnable"
+ <el-select v-model="inputQuery.checkWebNew" style="width: 75%" :disabled="!inputQuery.checkEnable"
placeholder="是否启用"
>
- <el-option label="启用" :value="true"></el-option>
- <el-option label="不启用" :value="false"></el-option>
+ <el-option label="无业业务单扫码拣货" :value="0"></el-option>
+ <el-option label="有业务单有三期拣货" :value="1"></el-option>
+ <el-option label="有业务单无三期拣货" :value="2"></el-option>
+ <el-option label="有业务单操货(有无三期)" :value="3"></el-option>
</el-select>
</el-col>
<el-divider direction="vertical"></el-divider>
@@ -546,11 +548,13 @@
</el-col>
<el-divider direction="vertical"></el-divider>
<el-col span="5">
- <el-select v-model="inputQuery.checkPdaUn" style="width: 65%" :disabled="!inputQuery.checkEnable"
+ <el-select v-model="inputQuery.checkPdaUn" style="width: 75%" :disabled="!inputQuery.checkEnable"
placeholder="是否启用"
>
- <el-option label="启用" :value="true"></el-option>
- <el-option label="不启用" :value="false"></el-option>
+ <el-option label="无业业务单扫码拣货" :value="0"></el-option>
+ <el-option label="有业务单有三期拣货" :value="1"></el-option>
+ <el-option label="有业务单无三期拣货" :value="2"></el-option>
+ <el-option label="有业务单操货(有无三期)" :value="3"></el-option>
</el-select>
</el-col>
<el-divider direction="vertical"></el-divider>
@@ -566,11 +570,13 @@
</el-col>
<el-divider direction="vertical"></el-divider>
<el-col span="5">
- <el-select v-model="inputQuery.checkPdaEd" style="width: 65%" :disabled="!inputQuery.checkEnable"
+ <el-select v-model="inputQuery.checkPdaEd" style="width: 75%" :disabled="!inputQuery.checkEnable"
placeholder="是否启用"
>
- <el-option label="启用" :value="true"></el-option>
- <el-option label="不启用" :value="false"></el-option>
+ <el-option label="无业业务单扫码拣货" :value="0"></el-option>
+ <el-option label="有业务单有三期拣货" :value="1"></el-option>
+ <el-option label="有业务单无三期拣货" :value="2"></el-option>
+ <el-option label="有业务单操货(有无三期)" :value="3"></el-option>
</el-select>
</el-col>
<el-divider direction="vertical"></el-divider>
@@ -586,11 +592,13 @@
</el-col>
<el-divider direction="vertical"></el-divider>
<el-col span="5">
- <el-select v-model="inputQuery.checkUdims" style="width: 65%" :disabled="!inputQuery.checkEnable"
+ <el-select v-model="inputQuery.checkUdims" style="width: 75%" :disabled="!inputQuery.checkEnable"
placeholder="是否启用"
>
- <el-option label="启用" :value="true"></el-option>
- <el-option label="不启用" :value="false"></el-option>
+ <el-option label="无业业务单扫码拣货" :value="0"></el-option>
+ <el-option label="有业务单有三期拣货" :value="1"></el-option>
+ <el-option label="有业务单无三期拣货" :value="2"></el-option>
+ <el-option label="有业务单操货(有无三期)" :value="3"></el-option>
</el-select>
</el-col>
<el-divider direction="vertical"></el-divider>
@@ -606,11 +614,13 @@
</el-col>
<el-divider direction="vertical"></el-divider>
<el-col span="5">
- <el-select v-model="inputQuery.checkPc" style="width: 65%" :disabled="!inputQuery.checkEnable"
+ <el-select v-model="inputQuery.checkPc" style="width: 75%" :disabled="!inputQuery.checkEnable"
placeholder="是否启用"
>
- <el-option label="启用" :value="true"></el-option>
- <el-option label="不启用" :value="false"></el-option>
+ <el-option label="无业业务单扫码拣货" :value="0"></el-option>
+ <el-option label="有业务单有三期拣货" :value="1"></el-option>
+ <el-option label="有业务单无三期拣货" :value="2"></el-option>
+ <el-option label="有业务单操货(有无三期)" :value="3"></el-option>
</el-select>
</el-col>
<el-divider direction="vertical"></el-divider>
@@ -626,11 +636,13 @@
</el-col>
<el-divider direction="vertical"></el-divider>
<el-col span="5">
- <el-select v-model="inputQuery.checkSp" style="width: 65%" :disabled="!inputQuery.checkEnable"
+ <el-select v-model="inputQuery.checkSp" style="width: 75%" :disabled="!inputQuery.checkEnable"
placeholder="是否启用"
>
- <el-option label="启用" :value="true"></el-option>
- <el-option label="不启用" :value="false"></el-option>
+ <el-option label="无业业务单扫码拣货" :value="0"></el-option>
+ <el-option label="有业务单有三期拣货" :value="1"></el-option>
+ <el-option label="有业务单无三期拣货" :value="2"></el-option>
+ <el-option label="有业务单操货(有无三期)" :value="3"></el-option>
</el-select>
</el-col>
<el-divider direction="vertical"></el-divider>
@@ -645,11 +657,13 @@
</el-col>
<el-divider direction="vertical"></el-divider>
<el-col span="5">
- <el-select v-model="inputQuery.checkChange" style="width: 65%" :disabled="!inputQuery.checkEnable"
+ <el-select v-model="inputQuery.checkChange" style="width: 75%" :disabled="!inputQuery.checkEnable"
placeholder="是否启用"
>
- <el-option label="启用" :value="true"></el-option>
- <el-option label="不启用" :value="false"></el-option>
+ <el-option label="无业业务单扫码拣货" :value="0"></el-option>
+ <el-option label="有业务单有三期拣货" :value="1"></el-option>
+ <el-option label="有业务单无三期拣货" :value="2"></el-option>
+ <el-option label="有业务单操货(有无三期)" :value="3"></el-option>
</el-select>
</el-col>
<el-divider direction="vertical"></el-divider>
@@ -665,11 +679,13 @@
</el-col>
<el-divider direction="vertical"></el-divider>
<el-col span="5">
- <el-select v-model="inputQuery.checkBalance" :disabled="!inputQuery.checkEnable" style="width: 65%"
+ <el-select v-model="inputQuery.checkBalance" :disabled="!inputQuery.checkEnable" style="width: 75%"
placeholder="是否启用"
>
- <el-option label="启用" :value="true"></el-option>
- <el-option label="不启用" :value="false"></el-option>
+ <el-option label="无业业务单扫码拣货" :value="0"></el-option>
+ <el-option label="有业务单有三期拣货" :value="1"></el-option>
+ <el-option label="有业务单无三期拣货" :value="2"></el-option>
+ <el-option label="有业务单操货(有无三期)" :value="3"></el-option>
</el-select>
</el-col>
<el-divider direction="vertical"></el-divider>
@@ -684,11 +700,13 @@
</el-col>
<el-divider direction="vertical"></el-divider>
<el-col span="5">
- <el-select v-model="inputQuery.checkCopy" style="width: 65%" :disabled="!inputQuery.checkEnable"
+ <el-select v-model="inputQuery.checkCopy" style="width: 75%" :disabled="!inputQuery.checkEnable"
placeholder="是否启用"
>
- <el-option label="启用" :value="true"></el-option>
- <el-option label="不启用" :value="false"></el-option>
+ <el-option label="无业业务单扫码拣货" :value="0"></el-option>
+ <el-option label="有业务单有三期拣货" :value="1"></el-option>
+ <el-option label="有业务单无三期拣货" :value="2"></el-option>
+ <el-option label="有业务单操货(有无三期)" :value="3"></el-option>
</el-select>
</el-col>
<el-divider direction="vertical"></el-divider>
@@ -1125,7 +1143,7 @@
import {candidateBusType} from '@/api/basic/busType'
import busTypeAdvancedSettings from '@/views/basic/busType/busTypeAdvancedSettings.vue'
import {isBlank} from '@/utils/strUtil'
-import {getOriginBusType,selectList} from '@/api/basic/busOriginType'
+import {getOriginBusType, selectList} from '@/api/basic/busOriginType'
import {getBasicUnitMaintains2} from '@/api/basic/basicUnitMaintain'
export default {
@@ -1259,17 +1277,17 @@ export default {
},
- selectBussinessList(){
+ selectBussinessList() {
selectList().then((res) => {
- this.preInBackList=res.data;
+ this.preInBackList = res.data;
})
},
- getPreInBack(){
- if(this.inputQuery.preInBack==false){
- this.inputQuery.preInBackAction=null;
- this.inputQuery.backPreinType='';
- }else{
- this.inputQuery.backPreinType=1;
+ getPreInBack() {
+ if (this.inputQuery.preInBack == false) {
+ this.inputQuery.preInBackAction = null;
+ this.inputQuery.backPreinType = '';
+ } else {
+ this.inputQuery.backPreinType = 1;
}
},
//获取单据类型
@@ -1296,10 +1314,10 @@ export default {
// this.inputQuery.actionType = null
// }
- // 联动修改允许手动输入客户信息值
- if (this.inputQuery.corpType != 1 || this.inputQuery.mainAction != "WarehouseOut") {
- this.inputQuery.genUnit = false;
- }
+ // // 联动修改允许手动输入客户信息 有bug允许手动输入一直为false
+ // if (this.inputQuery.corpType != 1 || this.inputQuery.mainAction != "WarehouseOut") {
+ // this.inputQuery.genUnit = false;
+ // }
},
// 单据类型高级设置弹窗
@@ -1354,9 +1372,9 @@ export default {
this.findSpecialMethod()
this.selectBussinessList()
this.oldData = Object.assign({}, this.inputQuery)
- if(this.inputQuery.id==null || this.inputQuery.id==''){
- this.inputQuery.codeFillCheck=false;
- this.inputQuery.preInBack=false;
+ if (this.inputQuery.id == null || this.inputQuery.id == '') {
+ this.inputQuery.codeFillCheck = false;
+ this.inputQuery.preInBack = false;
}
}
diff --git a/src/views/basic/business/stockOrder.vue b/src/views/basic/business/stockOrder.vue
index 7fc3c662..82be430d 100644
--- a/src/views/basic/business/stockOrder.vue
+++ b/src/views/basic/business/stockOrder.vue
@@ -100,9 +100,9 @@
<span>{{ enableMap[scope.row.inCodeStatus] }}</span>
</template>
</el-table-column>
- <el-table-column label="采购部门" prop="deptName" width="120">
+ <el-table-column label="所属部门" prop="deptName" width="120">
</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 label="单据来源" prop="fromType" width="120">
<template slot-scope="scope">
diff --git a/src/views/basic/business/stockOrderPrint.vue b/src/views/basic/business/stockOrderPrint.vue
index 268cf10d..2c61b724 100644
--- a/src/views/basic/business/stockOrderPrint.vue
+++ b/src/views/basic/business/stockOrderPrint.vue
@@ -99,9 +99,9 @@
<span>{{ enableMap[scope.row.inCodeStatus] }}</span>
</template>
</el-table-column>
- <el-table-column label="采购部门" prop="deptName" width="120">
+ <el-table-column label="所属部门" prop="deptName" width="120">
</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 label="单据来源" prop="fromType" width="120">
<template slot-scope="scope">
diff --git a/src/views/basic/product/productUdiType.vue b/src/views/basic/product/productUdiType.vue
index 7ab642de..37f54eda 100644
--- a/src/views/basic/product/productUdiType.vue
+++ b/src/views/basic/product/productUdiType.vue
@@ -309,7 +309,6 @@ export default {
});
}else {
//查询全部
- debugger
menuAllList(data).then(response => {
this.fromDeptOptions = [];
menu.children = this.handleTree(response.data,"code", "parentCode");
diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue
index e6785d82..d1d9b649 100644
--- a/src/views/inout/DialogCreateOrder.vue
+++ b/src/views/inout/DialogCreateOrder.vue
@@ -16,14 +16,20 @@
type="primary"
v-if="documentShow"
@click.native="OptionalDocument()"
- >选入预验收库单
+ >选入预验收库单
</el-button>
<el-button size="mini" type="primary" @click.native="saveOrder()"
- >草稿保存
+ >草稿保存
</el-button>
<el-button size="mini" type="primary" @click.native="submit()"
- >立即提交
+ >立即提交
</el-button>
+
+ <el-button size="mini" type="primary" @click.native="submit(1)"
+ v-if="curAction.checkWebNew == 3"
+ >未配货提交
+ </el-button>
+
</el-button-group>
<el-row>
<el-col :span="11">
@@ -92,8 +98,8 @@
>
<span style="float: left">{{ item.name }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{
- item.warehouseName
- }}</span>
+ item.warehouseName
+ }}</span>
</el-option>
</el-select>
</el-form-item>
@@ -153,8 +159,8 @@
>
<span style="float: left">{{ item.name }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{
- item.code
- }}</span>
+ item.code
+ }}</span>
</el-option>
</el-select>
</el-form-item>
@@ -190,12 +196,12 @@
<el-form-item prop="acceptance" label="预验收单据:">
<el-select
style="width: 90%"
- v-model="orderFormData.checkPreInOrders"
+ v-model="checkPreInArray"
multiple
placeholder="请选入单据"
>
<el-option
- v-for="(item, index) in orderFormData.checkPreInOrders"
+ v-for="(item, index) in checkPreInArray"
:key="item.index"
:label="item"
:value="item"
@@ -232,7 +238,7 @@
size="mini"
@click.native.stop="addCode()"
style="margin-left: 15px"
- >添加
+ >添加
</el-button>
</el-col>
</el-row>
@@ -301,7 +307,7 @@
<dialog-create-order-select
@giveselectbox="giveselectbox"
:closeDialogtwo="closeDialogtwo"
- :checkPreInOrders="orderFormData.checkPreInOrders"
+ :checkPreInOrders="checkPreInArray"
>
</dialog-create-order-select>
</el-dialog>
@@ -316,11 +322,11 @@ import {
submitOrderWeb,
saveOrderWeb,
updateCodeBindSup,
- enterCodeWeb,
+ enterCodeWeb, submitAllocateBiz,
} from "../../api/inout/order";
-import { findByFrom, findInvByUser } from "../../api/system/invSubWarehouse";
-import { parseTime } from "../../utils/coTools";
-import { getBasicUnitMaintains } from "../../api/basic/basicUnitMaintain";
+import {findByFrom, findInvByUser} from "../../api/system/invSubWarehouse";
+import {parseTime} from "../../utils/coTools";
+import {getBasicUnitMaintains} from "../../api/basic/basicUnitMaintain";
import editCodeDialog from "./DialogEditCode";
import DialogCreateOrderSelect from "./DialogCreateOrderSelect";
@@ -328,7 +334,7 @@ import codesPanel from "./PanelCreateOrderCodes";
import codeDetailPanel from "./PanelCreateOrderCodeDetail";
import bizDetailPanel from "./PanelCreateOrderBizDetail";
import A from "../../plugins/KeyScaner";
-import { findByInvUser } from "@/api/basic/busType";
+import {findByInvUser} from "@/api/basic/busType";
export default {
name: "ioCreateOrder",
@@ -346,7 +352,7 @@ export default {
required: true,
},
viewType: {
- //1、新增业务单据页面，2.新增扫码单据页面，3、正常单据处理页面
+ //1、新增业务单据页面，2.新增扫码单据页面，3、正常单据处理页面,4.带配货页面
type: Object,
required: true,
},
@@ -366,6 +372,7 @@ export default {
errMsg: null,
checkPreInOrders: null,
},
+ checkPreInArray: [],
errView: 0,
//选入相关
selectorder: false,
@@ -398,19 +405,19 @@ export default {
formRules: {
corpOrderId: [
- { required: true, message: "请输入单据号", trigger: "blur" },
+ {required: true, message: "请输入单据号", trigger: "blur"},
],
createTime: [
- { required: true, message: "请选择创建时间", trigger: "blur" },
+ {required: true, message: "请选择创建时间", trigger: "blur"},
],
invCode: [
- { required: true, message: "请选择当前仓库", trigger: "change" },
+ {required: true, message: "请选择当前仓库", trigger: "change"},
],
action: [
- { required: true, message: "请选择单据类型", trigger: "change" },
+ {required: true, message: "请选择单据类型", trigger: "change"},
],
acceptance: [
- { required: true, message: "请选入预验收单据", trigger: "blur" },
+ {required: true, message: "请选入预验收单据", trigger: "blur"},
],
},
isScan: true,
@@ -466,17 +473,24 @@ export default {
this.getBusTypeByInv();
}
})
- .catch(() => {});
+ .catch(() => {
+ });
},
//接收预验单传值
giveselectbox(val) {
- this.orderFormData.checkPreInOrders = JSON.parse(JSON.stringify(val));
+
+ this.checkPreInArray = JSON.parse(JSON.stringify(val));
+ if (this.checkPreInArray != null) {
+ this.orderFormData.checkPreInOrders = this.checkPreInArray.join(",");
+ }
+ // this.orderFormData.checkPreInOrders = JSON.parse(JSON.stringify(val));
},
//仓库改变
changeInv() {
this.orderFormData.action = null;
this.orderFormData.checkPreInOrders = null;
- if ((this.documentShow = true)) {
+ this.checkPreInArray = [];
+ if (this.documentShow) {
this.documentShow = false;
}
this.getBusTypeByInv();
@@ -491,7 +505,8 @@ export default {
.then((response) => {
this.busTypeOptions = response.data || [];
})
- .catch(() => {});
+ .catch(() => {
+ });
},
//关闭预选单弹框
closeDialogtwo() {
@@ -523,7 +538,8 @@ export default {
this.bizShow = true;
} else this.bizShow = false;
})
- .catch(() => {});
+ .catch(() => {
+ });
},
//获取往来单位候选列表
@@ -559,11 +575,9 @@ export default {
actionChange(item) {
this.orderFormData.checkPreInOption = null;
this.orderFormData.checkPreInOrders = null;
+ this.checkPreInArray = [];
this.curAction = this.getActionItem(item);
- if (
- (this.curAction.checkEnable && this.curAction.checkWebNew) ||
- this.viewType == 1
- ) {
+ if ((this.curAction.checkEnable && this.curAction.checkWebNew!=0) || this.viewType == 1) {
//单据类型需要一次校验 或 单据类型为1，显示业务单据页面
this.bizShow = true;
} else this.bizShow = false;
@@ -580,9 +594,7 @@ export default {
this.orderFormData.fromInvCode = null;
this.findFromInvList();
}
- if (
- (this.curAction.scanPreIn = true && this.curAction.backPreinType == 1)
- ) {
+ if (this.curAction.scanPreIn && this.curAction.backPreinType == 1 && this.curAction.preInBack) {
this.documentShow = true;
} else {
this.documentShow = false;
@@ -601,7 +613,8 @@ export default {
this.orderFormData.fromInvCode = this.fromInvOptions[0].code;
}
})
- .catch(() => {});
+ .catch(() => {
+ });
},
//获取当前单据类型
@@ -674,7 +687,8 @@ export default {
confirmButtonText: "确定",
type: "warning",
closeOnClickModal: true,
- callback: (action) => {},
+ callback: (action) => {
+ },
});
}
this.corpOrderIdDisabled = true;
@@ -704,7 +718,8 @@ export default {
tQuery.ignoreExpire = true;
this.addCodeSubmit(tQuery);
})
- .catch(() => {});
+ .catch(() => {
+ });
} else if (response.code == 505) {
this.$confirm(response.message, "提示", {
confirmButtonText: "确定",
@@ -715,15 +730,18 @@ export default {
tQuery.ignoreRecentExpire = true;
this.addCodeSubmit(tQuery);
})
- .catch(() => {});
+ .catch(() => {
+ });
} else if (response.code == 605) {
this.$confirm(response.message, "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
- .then(() => {})
- .catch(() => {});
+ .then(() => {
+ })
+ .catch(() => {
+ });
return;
} else if (response.code == 604) {
this.$confirm(response.message, "提示", {
@@ -731,8 +749,10 @@ export default {
cancelButtonText: "取消",
type: "warning",
})
- .then(() => {})
- .catch(() => {});
+ .then(() => {
+ })
+ .catch(() => {
+ });
return;
} else if (response.code == 507) {
this.editOriginCodeVisible = true;
@@ -778,12 +798,13 @@ export default {
this.orderFormData = orderQuery;
},
- submit() {
+ submit(val) {
+ debugger
let tQuery = Object.assign(
JSON.parse(JSON.stringify(this.orderFormData))
);
tQuery.orderId = this.orderFormData.billNo;
- if (this.viewType == 2) {
+ if (this.viewType == 2) { //扫码单据立即提交
submitCodes(tQuery).then((response) => {
if (response.code === 20000) {
this.$message.success("提交成功,等待处理，请刷新后查看！");
@@ -792,7 +813,11 @@ export default {
this.$message.error(response.message);
}
});
- } else if (this.viewType == 1) {
+ } else if (this.viewType == 1) { //业务单据提交提交
+ if (val == 1 || this.curAction.checkWebNew == 2)
+ tQuery.fromVailPi = 2;
+ else
+ tQuery.fromVailPi = 1;
submitBiz(tQuery).then((response) => {
if (response.code === 20000) {
this.$message.success("提交成功");
@@ -801,7 +826,16 @@ export default {
this.$message.error(response.message);
}
});
- } else
+ } else if (this.viewType == 4) {
+ submitAllocateBiz(tQuery).then((response) => {
+ if (response.code === 20000) {
+ this.$message.success("提交成功");
+ this.closeDialog();
+ } else {
+ this.$message.error(response.message);
+ }
+ });
+ } else { //校验后提交
submitOrderWeb(tQuery).then((response) => {
if (response.code === 20000) {
this.$message.success("提交成功");
@@ -810,6 +844,8 @@ export default {
this.$message.error(response.message);
}
});
+ }
+
},
saveOrder() {
let tQuery = Object.assign(
@@ -926,7 +962,8 @@ export default {
this.$message.error(response.message);
}
})
- .catch(() => {});
+ .catch(() => {
+ });
},
closeCodeDialog() {
this.editOriginCodeVisible = false;
@@ -985,6 +1022,10 @@ export default {
this.corpOrderIdDisabled = true;
this.orderFormData = this.orderQuery;
this.actionEnable = true;
+ if (this.$isNotBlank(this.orderFormData.checkPreInOrders)) {
+ this.checkPreInArray = this.orderFormData.split(",");
+ }
+
this.refreshCodesPanel();
//加载选择框候选数据
this.findInvListByUser();
diff --git a/src/views/inout/DialogCreateOrderSelect.vue b/src/views/inout/DialogCreateOrderSelect.vue
index f108ef9c..3dbbba2f 100644
--- a/src/views/inout/DialogCreateOrderSelect.vue
+++ b/src/views/inout/DialogCreateOrderSelect.vue
@@ -220,10 +220,11 @@ export default {
2: "等待处理",
3: "等待校验",
4: "处理异常",
- 5: "校验成功",
+ 5: "待核对",
6: "校验异常",
7: "已审核",
8: "审核拒绝",
+ 9: "正在处理", 10: "待审核", 11: "待配货",
},
invList: [],
list: [],
@@ -404,7 +405,7 @@ export default {
handleAll(selection) {
if(selection.length==0){
this.$refs.multipleTable.clearSelection()
- }
+ }
},
// 获取单据 业务详情、扫码详情、扫码明细
getOrderDetails() {
diff --git a/src/views/inout/InvoiceRegistration.vue b/src/views/inout/InvoiceRegistration.vue
index 55cf7fca..7856271f 100644
--- a/src/views/inout/InvoiceRegistration.vue
+++ b/src/views/inout/InvoiceRegistration.vue
@@ -11,8 +11,8 @@
</el-form-item>
</el-col>
<!-- <el-col :span="8">-->
- <!-- <el-form-item class="query-form-item" label="采购部门:">-->
- <!-- <el-select v-model="filterQuery.deptCode" placeholder="请选择采购部门" clearable="true"-->
+ <!-- <el-form-item class="query-form-item" label="采购仓库:">-->
+ <!-- <el-select v-model="filterQuery.deptCode" placeholder="请选择采购仓库" clearable="true"-->
<!-- style="width: 90%"-->
<!-- >-->
<!-- <el-option-->
@@ -152,7 +152,7 @@
<el-table-column label="审核时间" prop="auditTime" width="150" show-overflow-tooltip>
</el-table-column>
- <el-table-column label="采购部门" prop="deptName" width="120" v-if="enableDept">
+ <el-table-column label="采购仓库" prop="deptName" width="120" v-if="enableDept">
</el-table-column>
<el-table-column label="收货仓库" prop="invName" width="120">
</el-table-column>
@@ -476,7 +476,7 @@ export default {
6: "校验异常",
7: "已审核",
8: "审核拒绝",
- 9: "正在处理", 10: "待审核",
+ 9: "正在处理", 10: "待审核", 11: "待配货",
},
storageList: [],
invList: [],
diff --git a/src/views/inout/IoAuditedOrder.vue b/src/views/inout/IoAuditedOrder.vue
index 3e392a93..a8af54f9 100644
--- a/src/views/inout/IoAuditedOrder.vue
+++ b/src/views/inout/IoAuditedOrder.vue
@@ -3,14 +3,14 @@
<el-card class="el-card">
<el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
<el-row>
- <el-col :span="6">
+ <el-col :span="8">
<el-form-item class="query-form-item" label="单号:">
<el-input v-model="filterQuery.billNo" placeholder="请输入单号"
style="width: 90%"
clearable="true"></el-input>
</el-form-item>
</el-col>
- <el-col :span="6">
+ <el-col :span="8">
<el-form-item class="query-form-item" label="出入库类型:">
<el-select v-model="filterQuery.mainAction" placeholder="请选择出入库类型" style="width: 90%">
<el-option label="全部" value=""></el-option>
@@ -19,7 +19,7 @@
</el-select>
</el-form-item>
</el-col>
- <el-col :span="6">
+ <el-col :span="8">
<el-form-item class="query-form-item" label="单据类型:">
<el-select v-model="filterQuery.action" placeholder="请选择单据类型"
style="width: 90%"
@@ -34,7 +34,9 @@
</el-select>
</el-form-item>
</el-col>
- <el-col :span="6">
+ </el-row>
+ <el-row>
+ <el-col :span="8">
<el-form-item class="query-form-item" label="所属仓库:">
<el-select v-model="filterQuery.invCode" placeholder="请选择所属仓库" clearable="true"
style="width: 90%"
@@ -50,10 +52,7 @@
</el-select>
</el-form-item>
</el-col>
- </el-row>
-
- <el-row>
- <el-col :span="6">
+ <el-col :span="8">
<el-form-item class="query-form-item" label="创建时间:">
<el-date-picker
:picker-options="pickerOptions"
@@ -69,6 +68,24 @@
</el-date-picker>
</el-form-item>
</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-form>
<div class="top-right-btn">
@@ -90,39 +107,47 @@
<el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
border
@row-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="扫码单据类型" prop="billTypeName"></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="fromType">
+ <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 label="往来单位" prop="fromName" width="220">
+ </el-table-column>
+ <el-table-column label="创建时间" prop="createTime" show-overflow-tooltip width="150">
<template slot-scope="scope">
- <span>{{ fromTypeMap[scope.row.fromType] }}</span>
+ <i class="el-icon-time"></i>
+ <span>{{ scope.row.createTime }}</span>
</template>
</el-table-column>
- <el-table-column label="往来单位" prop="fromName" width="220">
+
+ <el-table-column label="审核时间" prop="checkTime" show-overflow-tooltip width="150">
+ <template slot-scope="scope">
+ <i class="el-icon-time"></i>
+ <span>{{ scope.row.checkTime }}</span>
+ </template>
</el-table-column>
- <el-table-column label="当前部门" prop="deptName" width="120">
+
+
+ <el-table-column label="采购仓库" prop="deptName" width="120">
</el-table-column>
- <el-table-column label="当前仓库" prop="invName" width="120">
+ <el-table-column label="审核人" prop="reviewUserName" width="120">
</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 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">
- <i class="el-icon-time"></i>
- <span>{{ scope.row.createTime }}</span>
+ <span>{{ fromTypeMap[scope.row.fromType] }}</span>
</template>
</el-table-column>
- <!-- <el-table-column label="校验状态" prop="status" width="100">-->
- <!-- <template slot-scope="scope">-->
- <!-- <el-tag :type="(scope.row.status ===-1 ) | statusFilterType">{{-->
- <!-- checkStatus[scope.row.status]-->
- <!-- }}-->
- <!-- </el-tag>-->
- <!-- </template>-->
- <!-- </el-table-column>-->
- <el-table-column label="操作" width="150" fixed="right">
+ <el-table-column label="审核状态" prop="status" width="100">
+ <template slot-scope="scope">
+ <el-tag :type="statusFilterType(scope.row.status)">{{
+ checkStatus[scope.row.status]
+ }}
+ </el-tag>
+ </template>
+ </el-table-column>
+ <el-table-column label="操作" width="120" fixed="right">
<template slot-scope="scope">
<el-button
type="text"
@@ -139,14 +164,13 @@
>撤回
</el-button
>
-
- <el-button
- type="text"
- size="small"
- @click.native.stop="deleteDialog(scope.row)"
- >删除
- </el-button
- >
+<!-- <el-button-->
+ <!-- type="text"-->
+ <!-- size="small"-->
+ <!-- @click.native.stop="deleteDialog(scope.row)"-->
+ <!-- >删除-->
+ <!-- </el-button-->
+ <!-- >-->
</template>
</el-table-column>
</el-table>
@@ -195,43 +219,45 @@
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column
label="物资名称"
- prop="coName"
+ prop="coName" width="160"
show-overflow-tooltip
></el-table-column>
<el-table-column
- label="规格型号"
+ label="规格型号" width="160"
prop="spec"
- show-overflow-tooltip
></el-table-column>
<el-table-column
- label="批次号"
+ label="批次号" width="120"
prop="batchNo"
- show-overflow-tooltip
></el-table-column>
<el-table-column
- label="生产日期"
+ label="生产日期" width="120"
prop="productDate"
></el-table-column>
<el-table-column
label="失效日期"
- prop="expireDate"
+ prop="expireDate" width="120"
></el-table-column>
<el-table-column
- label="单据数量"
- prop="reCount"
+ label="单据数量" width="100"
+ prop="count"
></el-table-column>
<el-table-column
- label="价格"
+ label="扫码数量"
+ prop="scanCount" width="100"
+ ></el-table-column>
+ <el-table-column
+ label="价格" width="100"
prop="price"
></el-table-column>
<el-table-column
- label="生产企业"
+ label="生产企业" width="180"
prop="manufacturer"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="注册/备案号"
- prop="certCode"
+ prop="certCode" width="180"
show-overflow-tooltip
></el-table-column>
</el-table>
@@ -340,7 +366,7 @@ import {selectSysParamByKey} from "@/api/param/systemParamConfig";
import {getResultDetailList} from "@/api/inout/orderDetailResult";
import {getCodeDetailList} from "@/api/inout/orderDetailCode";
import {getCodeList} from "@/api/inout/code";
-import {inspectionOrderPDFFromTemplateFile,orderPDFFromTemplateFile} from "@/api/itextpdf/orderPrint"
+import {inspectionOrderPDFFromTemplateFile, orderPDFFromTemplateFile} from "@/api/itextpdf/orderPrint"
const formJson = {
@@ -372,10 +398,11 @@ export default {
2: "等待处理",
3: "等待校验",
4: "处理异常",
- 5: "校验成功",
+ 5: "待核对",
6: "校验异常",
7: "已审核",
- 8: "审核拒绝"
+ 8: "审核拒绝",
+ 9: "正在处理", 10: "待审核", 11: "待配货",
},
invList: [],
list: [],
@@ -410,6 +437,7 @@ export default {
busTypes: [],
currentRow: {},
actDateRange: [],
+ auditDateRange: [],
pickerOptions: {
shortcuts: [
{
@@ -487,6 +515,8 @@ export default {
endTime: null,
invCode: this.$store.getters.locInvCode,
};
+ this.actDateRange = [];
+ this.auditDateRange = [];
this.getList();
},
onSubmit() {
@@ -498,6 +528,15 @@ export default {
this.filterQuery.startTime = null;
this.filterQuery.endTime = null;
}
+
+ if (this.auditDateRange !== null) {
+ this.filterQuery.startAduditTime = this.auditDateRange[0];
+ this.filterQuery.endAduditTime = this.auditDateRange[1];
+ } else {
+ this.filterQuery.startAduditTime = null;
+ this.filterQuery.endAduditTime = null;
+ }
+
this.filterQuery.page = 1;
this.getList();
},
@@ -784,16 +823,18 @@ export default {
// this.$message.info('回退失败');
});
},
- },
- filters: {
statusFilterType(status) {
const statusMap = {
- false: "success",
- true: "warning",
+ 5: "warning",
+ 1: "warning",
+ 6: "danger",
+ 7: "success",
};
return statusMap[status];
},
},
+ filters: {
+ },
mounted() {
document.body.ondrop = function (event) {
event.preventDefault();
diff --git a/src/views/inout/IoCheckAuditOrder.vue b/src/views/inout/IoCheckAuditOrder.vue
index ab22e94b..414a4269 100644
--- a/src/views/inout/IoCheckAuditOrder.vue
+++ b/src/views/inout/IoCheckAuditOrder.vue
@@ -95,7 +95,7 @@
border
@row-click="handleSelectionChange">
<el-table-column label="序号" type="index"></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 width="180"></el-table-column>
<el-table-column label="单据类型" prop="billTypeName" width="150"></el-table-column>
<el-table-column label="往来单位" prop="fromName" width="220">
</el-table-column>
@@ -112,9 +112,9 @@
<!--</template>-->
</el-table-column>
- <el-table-column label="当前部门" prop="deptName" width="120">
+ <el-table-column label="所属部门" prop="deptName" width="120">
</el-table-column>
- <el-table-column label="当前仓库" prop="invName" width="120">
+ <el-table-column label="所属仓库" prop="invName" width="120">
</el-table-column>
<el-table-column label="核对人" prop="checkUserName" width="120">
</el-table-column>
@@ -124,8 +124,6 @@
<span>{{ fromTypeMap[scope.row.fromType] }}</span>
</template>
</el-table-column>
-
-
<el-table-column label="审核状态" prop="status" width="100">
<template slot-scope="scope">
<el-tag :type="statusFilterType(scope.row.status)">{{
@@ -134,7 +132,7 @@
</el-tag>
</template>
</el-table-column>
- <el-table-column label="操作" width="160" fixed="right">
+ <el-table-column label="操作" width="200" fixed="right">
<template slot-scope="scope">
<el-button
@@ -151,8 +149,6 @@
>撤回
</el-button
>
-
-
<el-button
type="text"
size="small"
@@ -547,7 +543,7 @@ export default {
6: "校验异常",
7: "已审核",
8: "审核拒绝",
- 9: "正在处理", 10: "待审核",
+ 9: "正在处理", 10: "待审核", 11: "待配货",
},
reviceStatus: {
1: "未验收",
diff --git a/src/views/inout/IoCheckErrorOrder.vue b/src/views/inout/IoCheckErrorOrder.vue
index ab79dc48..0a53cdf4 100644
--- a/src/views/inout/IoCheckErrorOrder.vue
+++ b/src/views/inout/IoCheckErrorOrder.vue
@@ -21,8 +21,8 @@
</el-col>
<!-- <el-col :span="8">-->
- <!-- <el-form-item class="query-form-item" label="采购部门:">-->
- <!-- <el-select v-model="filterQuery.deptCode" placeholder="请选择采购部门" clearable="true"-->
+ <!-- <el-form-item class="query-form-item" label="采购仓库:">-->
+ <!-- <el-select v-model="filterQuery.deptCode" placeholder="请选择采购仓库" clearable="true"-->
<!-- style="width: 90%"-->
<!-- >-->
<!-- <el-option-->
@@ -113,28 +113,22 @@
border
@cell-click="handleSelectionChange">
<el-table-column label="序号" type="index"></el-table-column>
- <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 label="单据号" prop="billNo" show-overflow-tooltip width="140"></el-table-column>
+ <el-table-column label="单据类型" prop="billTypeName" width="160"></el-table-column>
+ <el-table-column label="创建时间" prop="createTime" width="140" show-overflow-tooltip>
</el-table-column>
- <el-table-column label="创建时间" prop="createTime" width="150" show-overflow-tooltip>
- <template slot-scope="scope">
- <i class="el-icon-time"></i>
- <span>{{ scope.row.createTime }}</span>
- </template>
- </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 label="所属部门" prop="deptName" width="120" v-if="enableDept">
+ <el-table-column label="所属部门" prop="deptName" width="120">
</el-table-column>
- <el-table-column label="所属仓库" prop="invName" width="120">
+ <el-table-column label=所属仓库 prop="invName" width="120">
</el-table-column>
- <el-table-column label="来源单号" prop="corpOrderId" show-overflow-tooltip width="180"></el-table-column>
- <el-table-column label="来源" prop="fromType" width="120">
+ <el-table-column label="来源单据号" prop="corpOrderId" show-overflow-tooltip width="140"></el-table-column>
+ <el-table-column label="来源" prop="fromType" width="140">
<template slot-scope="scope">
<span>{{ fromTypeMap[scope.row.fromType] }}</span>
</template>
</el-table-column>
-
<el-table-column label="单据状态" prop="status" width="100">
<template slot-scope="scope">
<el-tag :type="statusFilterType(scope.row.status)">{{
@@ -207,46 +201,45 @@
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column
label="物资名称"
- prop="coName"
+ prop="coName" width="160"
show-overflow-tooltip
></el-table-column>
<el-table-column
- label="规格型号"
+ label="规格型号" width="160"
prop="spec"
></el-table-column>
<el-table-column
- label="批次号"
+ label="批次号" width="120"
prop="batchNo"
- show-overflow-tooltip
></el-table-column>
<el-table-column
- label="生产日期"
+ label="生产日期" width="120"
prop="productDate"
></el-table-column>
<el-table-column
label="失效日期"
- prop="expireDate"
+ prop="expireDate" width="120"
></el-table-column>
<el-table-column
- label="单据数量"
+ label="单据数量" width="100"
prop="count"
></el-table-column>
<el-table-column
label="扫码数量"
- prop="scanCount"
+ prop="scanCount" width="100"
></el-table-column>
<el-table-column
- label="价格"
+ label="价格" width="100"
prop="price"
></el-table-column>
<el-table-column
- label="生产企业"
+ label="生产企业" width="180"
prop="manufacturer"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="注册/备案号"
- prop="certCode"
+ prop="certCode" width="180"
show-overflow-tooltip
></el-table-column>
</el-table>
@@ -291,48 +284,48 @@
>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column
- label="物资名称"
+ label="物资名称" width="160"
prop="coName"
show-overflow-tooltip
></el-table-column>
<el-table-column
- label="规格型号"
+ label="规格型号" width="160"
prop="spec"
show-overflow-tooltip
></el-table-column>
<el-table-column
- label="批次号"
+ label="批次号" width="120"
prop="batchNo"
show-overflow-tooltip
></el-table-column>
<el-table-column
- label="生产日期"
+ label="生产日期" width="120"
prop="productDate"
></el-table-column>
<el-table-column
- label="失效日期"
+ label="失效日期" width="120"
prop="expireDate"
></el-table-column>
<el-table-column
- label="单据数量"
+ label="单据数量" width="100"
prop="orderCount"
></el-table-column>
<el-table-column
label="扫码数量"
- prop="reCount"
+ prop="reCount" width="100"
></el-table-column>
<el-table-column
label="供应商"
- prop="supName"
+ prop="supName" width="180"
show-overflow-tooltip
></el-table-column>
<el-table-column
- label="生产企业"
+ label="生产企业" width="180"
prop="manufacturer"
show-overflow-tooltip
></el-table-column>
<el-table-column
- label="注册/备案号"
+ label="注册/备案号" width="180"
prop="certCode"
show-overflow-tooltip
></el-table-column>
@@ -489,10 +482,11 @@ export default {
2: "等待处理",
3: "等待校验",
4: "处理异常",
- 5: "校验成功",
+ 5: "待核对",
6: "校验异常",
7: "已审核",
- 8: "审核拒绝"
+ 8: "审核拒绝",
+ 9: "正在处理", 10: "待审核", 11: "待配货",
},
storageList: [],
subInvList: [],
diff --git a/src/views/inout/IoCheckSuccessOrder.vue b/src/views/inout/IoCheckSuccessOrder.vue
index 6074c6ae..f62f92f6 100644
--- a/src/views/inout/IoCheckSuccessOrder.vue
+++ b/src/views/inout/IoCheckSuccessOrder.vue
@@ -98,9 +98,9 @@
</el-table-column>
<el-table-column label="往来单位" prop="fromName" width="220">
</el-table-column>
- <el-table-column label="当前部门" prop="deptName" width="120">
+ <el-table-column label="所属部门" prop="deptName" width="120">
</el-table-column>
- <el-table-column label=当前仓库 prop="invName" width="120">
+ <el-table-column label=所属仓库 prop="invName" width="120">
</el-table-column>
<el-table-column label="来源单据号" prop="corpOrderId" show-overflow-tooltip width="140"></el-table-column>
<el-table-column label="来源" prop="fromType">
@@ -161,7 +161,7 @@
></pagination>
</el-card>
- <el-tabs type="border-card" style="margin: 15px" >
+ <el-tabs type="border-card" style="margin: 15px">
<!--单据业务详情-->
<el-tab-pane>
<span slot="label">单据 {{ currentRow.billNo }}-单据详情</span>
@@ -191,63 +191,51 @@
</el-form-item>
</el-form>
- <el-table v-loading="bizDetailLoading" :data="bizDetailList" style="width: 100%" border class="table-fixed"
+ <el-table v-loading="bizDetailLoading" :data="bizDetailList" style="width: 100%" border class="table-fixed"
row-key="id"
>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column
label="物资名称"
- prop="coName"
- width="150"
+ prop="coName" width="160"
show-overflow-tooltip
></el-table-column>
<el-table-column
- label="规格型号"
- width="150"
+ label="规格型号" width="160"
prop="spec"
></el-table-column>
<el-table-column
- label="批次号"
- width="100"
+ label="批次号" width="120"
prop="batchNo"
></el-table-column>
<el-table-column
- label="送货数量"
- prop="count"
- width="100"
+ label="生产日期" width="120"
+ prop="productDate"
></el-table-column>
<el-table-column
- label="扫码数量"
- prop="scanCount"
- width="100"
+ label="失效日期"
+ prop="expireDate" width="120"
></el-table-column>
<el-table-column
- label="价格"
- prop="price"
- width="100"
+ label="单据数量" width="100"
+ prop="count"
></el-table-column>
<el-table-column
- label="生产日期"
- prop="productDate"
- width="100"
+ label="扫码数量"
+ prop="scanCount" width="100"
></el-table-column>
<el-table-column
- label="失效日期"
- prop="expireDate"
- width="100"
+ label="价格" width="100"
+ prop="price"
></el-table-column>
- <el-table-column width="100" label="计量单位" prop="measname">
- </el-table-column>
<el-table-column
- label="生产企业"
+ label="生产企业" width="180"
prop="manufacturer"
- width="160"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="注册/备案号"
- width="160"
- prop="certCode"
+ prop="certCode" width="180"
show-overflow-tooltip
></el-table-column>
@@ -318,6 +306,7 @@
<el-table-column
label="UDI码"
prop="code"
+ width="220"
show-overflow-tooltip
></el-table-column>
<el-table-column
@@ -332,25 +321,23 @@
></el-table-column>
<el-table-column
label="批次号"
- prop="batchNo"
- show-overflow-tooltip
+ prop="batchNo" width="120"
></el-table-column>
<el-table-column
label="序列号"
- prop="serialNo"
+ prop="serialNo" width="120"
></el-table-column>
<el-table-column
label="供应商"
- prop="supName"
- show-overflow-tooltip
+ prop="supName" width="180"
></el-table-column>
<el-table-column
label="扫码数量"
- prop="reCount"
+ prop="count" width="100"
></el-table-column>
<el-table-column
label="实际数量"
- prop="reCount"
+ prop="reCount" width="100"
></el-table-column>
</el-table>
<pagination
@@ -381,7 +368,7 @@
</el-dialog>
<el-dialog
- title="送货单核对"
+ title="单据核对"
:visible.sync="acceptOrderVisible"
width="80%"
:close-on-click-modal="false"
@@ -413,8 +400,8 @@ import {inspectionOrderPDFFromTemplateFile, orderPDFFromTemplateFile} from "@/ap
import AcceptOrder from "@/views/inout/DialogThrReviewOrder";
import {getDeptListByUser} from "@/api/auth/authDept";
import DialogCheck from "@/views/inout/DialogCheck";
-import { getBizDetailList } from '@/api/inout/orderDetailBiz'
-import { previewImage } from '@/api/purchase/supCompany'
+import {getBizDetailList} from '@/api/inout/orderDetailBiz'
+import {previewImage} from '@/api/purchase/supCompany'
import ElImageViewer from "element-ui/packages/image/src/image-viewer";
@@ -430,11 +417,11 @@ export default {
data() {
return {
BASE_URL: process.env.VUE_APP_BASE_API,
- imgList:[],
- imgViewerVisible:false,
+ imgList: [],
+ imgViewerVisible: false,
showSearch: true,
- Upinvoice:false,
- currentManufacturer:{},
+ Upinvoice: false,
+ currentManufacturer: {},
filterQuery: {
id: "",
billNo: null,
@@ -458,7 +445,7 @@ export default {
7: "已审核",
8: "审核拒绝",
9: "正在处理",
- 10: "待审核",
+ 10: "待审核", 11: "待配货",
},
invList: [],
deptList: [],
@@ -557,7 +544,7 @@ export default {
acceptOrderVisible: false,
};
},
- components: {AcceptOrder,DialogCheck,ElImageViewer},
+ components: {AcceptOrder, DialogCheck, ElImageViewer},
methods: {
onReset() {
this.$router.push({
@@ -606,41 +593,44 @@ export default {
});
},
- showImgViewer(row){
+ showImgViewer(row) {
this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
- console.log(this.certFileUrl+"========");
- this.imgList=[];
- previewImage({imageUrl:row.filePath,certFileUrl:this.certFileUrl}).then(response => {
+ console.log(this.certFileUrl + "========");
+ this.imgList = [];
+ previewImage({imageUrl: row.filePath, certFileUrl: this.certFileUrl}).then(response => {
if (response.code === 20000) {
- this.imgList=response.data;
+ this.imgList = response.data;
}
console.log(this.imgList)
this.imgViewerVisible = true;
});
- const m = (e) => { e.preventDefault() };
+ const m = (e) => {
+ e.preventDefault()
+ };
document.body.style.overflow = 'hidden';
document.addEventListener("touchmove", m, false); // 禁止页面滑动
},
- closeImgViewer(){
+ closeImgViewer() {
this.imgViewerVisible = false;
- const m = (e) => { e.preventDefault() };
+ const m = (e) => {
+ e.preventDefault()
+ };
document.body.style.overflow = 'auto';
document.removeEventListener("touchmove", m, true);
},
-
- upload(row){
+ upload(row) {
this.currentManufacturer = row;
this.Upinvoice = true;
},
- closeCheckDialog(){
+ closeCheckDialog() {
this.Upinvoice = false;
this.getOrderDetails();
},
handleSelectionChange(val) {
- this.currentRow.billNo=val.billNo;
+ this.currentRow.billNo = val.billNo;
this.getOrderDetails();
},
// 获取单据 业务详情、扫码详情、扫码明细
@@ -857,7 +847,7 @@ export default {
this.loading = false;
});
},
- freshen(){
+ freshen() {
this.Upinvoice = false;
this.getOrderDetails();
},
diff --git a/src/views/inout/IoCreateBusOrder.vue b/src/views/inout/IoCreateBusOrder.vue
index 5a088769..efa4089a 100644
--- a/src/views/inout/IoCreateBusOrder.vue
+++ b/src/views/inout/IoCreateBusOrder.vue
@@ -42,8 +42,8 @@
<!-- <el-col :span="8">-->
- <!-- <el-form-item class="query-form-item" label="采购部门:">-->
- <!-- <el-select v-model="filterQuery.deptCode" placeholder="请选择采购部门" clearable="true"-->
+ <!-- <el-form-item class="query-form-item" label="采购仓库:">-->
+ <!-- <el-select v-model="filterQuery.deptCode" placeholder="请选择采购仓库" clearable="true"-->
<!-- style="width: 90%"-->
<!-- >-->
<!-- <el-option-->
@@ -60,8 +60,8 @@
</el-row>
<el-row>
<el-col :span="8">
- <el-form-item class="query-form-item" label="收货仓库:">
- <el-select v-model="filterQuery.invCode" placeholder="请选择收货仓库" clearable="true"
+ <el-form-item class="query-form-item" label="所属仓库:">
+ <el-select v-model="filterQuery.invCode" placeholder="请选择所属仓库" clearable="true"
style="width: 90%"
@change="invChange"
>
@@ -124,22 +124,22 @@
>
<el-table-column label="序号" type="index"></el-table-column>
<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="billTypeName" width="160"></el-table-column>
<el-table-column label="创建时间" prop="createTime" width="140" show-overflow-tooltip>
</el-table-column>
- <!-- <el-table-column label="送货单位" prop="fromName" width="220">-->
- <!-- </el-table-column>-->
- <el-table-column label="采购部门" prop="deptName" width="120">
+ <el-table-column label="往来单位" prop="fromName" width="220">
</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 label=所属仓库 prop="invName" width="120">
</el-table-column>
<el-table-column label="来源单据号" prop="corpOrderId" show-overflow-tooltip width="140"></el-table-column>
- <el-table-column label="来源" prop="fromType">
+ <el-table-column label="来源" prop="fromType" width="140">
<template slot-scope="scope">
<span>{{ fromTypeMap[scope.row.fromType] }}</span>
</template>
</el-table-column>
- <el-table-column label="审核状态" prop="status" width="100">
+ <el-table-column label="单据状态" prop="status" width="100">
<template slot-scope="scope">
<el-tag :type="statusFilterType(scope.row.status)">{{
checkStatus[scope.row.status]
@@ -274,7 +274,7 @@ export default {
6: "校验异常",
7: "已审核",
8: "审核拒绝",
- 9: "正在处理", 10: "待审核",
+ 9: "正在处理", 10: "待审核", 11: "待配货",
},
curIndex: "",
idQuery: {},
diff --git a/src/views/inout/IoCreateErrorOrder.vue b/src/views/inout/IoCreateErrorOrder.vue
index b60ad64a..712fa88a 100644
--- a/src/views/inout/IoCreateErrorOrder.vue
+++ b/src/views/inout/IoCreateErrorOrder.vue
@@ -107,27 +107,21 @@
<el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
border
>
- <el-table-column type="selection" width="55"></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></el-table-column>
- <el-table-column label="来源订单号" prop="corpOrderId" show-overflow-tooltip></el-table-column>
- <el-table-column label="来源" prop="fromType">
- <template slot-scope="scope">
- <span>{{ fromTypeMap[scope.row.fromType] }}</span>
- </template>
+ <el-table-column label="单据号" prop="billNo" show-overflow-tooltip width="140"></el-table-column>
+ <el-table-column label="单据类型" prop="billTypeName" width="160"></el-table-column>
+ <el-table-column label="创建时间" prop="createTime" width="140" show-overflow-tooltip>
</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="deptName" width="120">
</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 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" width="140">
<template slot-scope="scope">
- <i class="el-icon-time"></i>
- <span>{{ scope.row.createTime }}</span>
+ <span>{{ fromTypeMap[scope.row.fromType] }}</span>
</template>
</el-table-column>
<el-table-column label="校验状态" prop="status" width="100">
@@ -138,7 +132,7 @@
</el-tag>
</template>
</el-table-column>
- <el-table-column label="操作" width="150">
+ <el-table-column label="操作" width="150" fixed="right">
<template slot-scope="scope">
<el-button
type="text"
@@ -235,7 +229,7 @@ export default {
6: "校验异常",
7: "已审核",
8: "审核拒绝",
- 9: "正在处理",10: "待审核",
+ 9: "正在处理",10: "待审核", 11: "待配货",
},
curIndex: "",
idQuery: {},
diff --git a/src/views/inout/IoCreateOrder.vue b/src/views/inout/IoCreateOrder.vue
index 0f2464da..4623d7e2 100644
--- a/src/views/inout/IoCreateOrder.vue
+++ b/src/views/inout/IoCreateOrder.vue
@@ -11,8 +11,8 @@
</el-form-item>
</el-col>
<!-- <el-col :span="8">-->
- <!-- <el-form-item class="query-form-item" label="采购部门:">-->
- <!-- <el-select v-model="filterQuery.deptCode" placeholder="请选择采购部门" clearable="true"-->
+ <!-- <el-form-item class="query-form-item" label="采购仓库:">-->
+ <!-- <el-select v-model="filterQuery.deptCode" placeholder="请选择采购仓库" clearable="true"-->
<!-- style="width: 90%"-->
<!-- >-->
<!-- <el-option-->
@@ -80,8 +80,8 @@
</el-row>
<el-row>
<el-col :span="8">
- <el-form-item class="query-form-item" label="收货仓库:">
- <el-select v-model="filterQuery.invCode" placeholder="请选择收货仓库" clearable="true"
+ <el-form-item class="query-form-item" label="所属仓库:">
+ <el-select v-model="filterQuery.invCode" placeholder="请选择所属仓库" clearable="true"
style="width: 90%"
@change="invChange"
>
@@ -283,7 +283,7 @@ export default {
6: "校验异常",
7: "已审核",
8: "审核拒绝",
- 9: "正在处理", 10: "待审核",
+ 9: "正在处理", 10: "待审核", 11: "待配货",
},
curIndex: "",
idQuery: {},
diff --git a/src/views/inout/IoCreateScanOrder.vue b/src/views/inout/IoCreateScanOrder.vue
index 53fc8abb..5601f701 100644
--- a/src/views/inout/IoCreateScanOrder.vue
+++ b/src/views/inout/IoCreateScanOrder.vue
@@ -37,8 +37,8 @@
</el-col>
<!-- <el-col :span="8">-->
- <!-- <el-form-item class="query-form-item" label="采购部门:">-->
- <!-- <el-select v-model="filterQuery.deptCode" placeholder="请选择采购部门" clearable="true"-->
+ <!-- <el-form-item class="query-form-item" label="采购仓库:">-->
+ <!-- <el-select v-model="filterQuery.deptCode" placeholder="请选择采购仓库" clearable="true"-->
<!-- style="width: 90%"-->
<!-- >-->
<!-- <el-option-->
@@ -112,8 +112,7 @@
>
<el-table-column label="序号" type="index"></el-table-column>
<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="billTypeName" width="160"></el-table-column>
<el-table-column label="创建时间" prop="createTime" width="140" show-overflow-tooltip>
</el-table-column>
<el-table-column label="往来单位" prop="fromName" width="220">
@@ -123,12 +122,12 @@
<el-table-column label=所属仓库 prop="invName" width="120">
</el-table-column>
<el-table-column label="来源单据号" prop="corpOrderId" show-overflow-tooltip width="140"></el-table-column>
- <el-table-column label="来源" prop="fromType">
+ <el-table-column label="来源" prop="fromType" width="140">
<template slot-scope="scope">
<span>{{ fromTypeMap[scope.row.fromType] }}</span>
</template>
</el-table-column>
- <el-table-column label="审核状态" prop="status" width="100">
+ <el-table-column label="单据状态" prop="status" width="100">
<template slot-scope="scope">
<el-tag :type="statusFilterType(scope.row.status)">{{
checkStatus[scope.row.status]
@@ -233,7 +232,7 @@ export default {
6: "校验异常",
7: "已审核",
8: "审核拒绝",
- 9: "正在处理", 10: "待审核",
+ 9: "正在处理", 10: "待审核", 11: "待配货",
},
curIndex: "",
idQuery: {},
diff --git a/src/views/inout/IoDealOrder.vue b/src/views/inout/IoDealOrder.vue
index 904a44f1..eb730af7 100644
--- a/src/views/inout/IoDealOrder.vue
+++ b/src/views/inout/IoDealOrder.vue
@@ -36,8 +36,8 @@
</el-form-item>
</el-col>
<!-- <el-col :span="8">-->
- <!-- <el-form-item class="query-form-item" label="采购部门:">-->
- <!-- <el-select v-model="filterQuery.deptCode" placeholder="请选择采购部门" clearable="true"-->
+ <!-- <el-form-item class="query-form-item" label="采购仓库:">-->
+ <!-- <el-select v-model="filterQuery.deptCode" placeholder="请选择采购仓库" clearable="true"-->
<!-- style="width: 90%"-->
<!-- >-->
<!-- <el-option-->
@@ -54,8 +54,8 @@
</el-row>
<el-row>
<el-col :span="8">
- <el-form-item class="query-form-item" label="收货仓库:">
- <el-select v-model="filterQuery.invCode" placeholder="请选择收货仓库" clearable="true"
+ <el-form-item class="query-form-item" label="所属仓库:">
+ <el-select v-model="filterQuery.invCode" placeholder="请选择所属仓库" clearable="true"
style="width: 90%"
@change="invChange"
>
@@ -126,12 +126,12 @@
</el-table-column>
<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 label="所属部门" prop="deptName" width="120">
</el-table-column>
<el-table-column label="所属仓库" prop="invName" width="120">
</el-table-column>
<el-table-column label="来源单号" prop="corpOrderId" show-overflow-tooltip width="180"></el-table-column>
- <el-table-column label="来源" prop="fromType" width="120">
+ <el-table-column label="来源" prop="fromType" width="140">
<template slot-scope="scope">
<span>{{ fromTypeMap[scope.row.fromType] }}</span>
</template>
@@ -372,7 +372,7 @@ export default {
6: "校验异常",
7: "审核通过",
8: "审核拒绝",
- 9: "正在处理", 10: "待审核",
+ 9: "正在处理", 10: "待审核", 11: "待配货",
},
curIndex: "",
idQuery: {},
diff --git a/src/views/inout/IoEditOrder.vue b/src/views/inout/IoEditOrder.vue
index 79f71949..43e9e1a6 100644
--- a/src/views/inout/IoEditOrder.vue
+++ b/src/views/inout/IoEditOrder.vue
@@ -21,26 +21,28 @@
border
@current-change="handleSelectionChange">
<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></el-table-column>
- <el-table-column label="来源订单号" prop="corpOrderId" show-overflow-tooltip></el-table-column>
- <el-table-column label="来源" prop="fromType">
- <template slot-scope="scope">
- <span>{{ fromTypeMap[scope.row.fromType] }}</span>
- </template>
+ <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 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 label="所属部门" prop="deptName" width="120">
</el-table-column>
- <el-table-column label="当前仓库" prop="invName" width="120">
+ <el-table-column label=所属仓库 prop="invName" width="120">
</el-table-column>
- <el-table-column label="所属科室" prop="deptName" width="120" v-if="enableDept">
+ <el-table-column label="来源单据号" prop="corpOrderId" show-overflow-tooltip width="140"></el-table-column>
+ <el-table-column label="来源" prop="fromType">
+ <template slot-scope="scope">
+ <span>{{ fromTypeMap[scope.row.fromType] }}</span>
+ </template>
</el-table-column>
- <el-table-column label="创建时间" prop="createTime" show-overflow-tooltip>
+ <el-table-column label="核对状态" prop="status" width="100">
<template slot-scope="scope">
- <i class="el-icon-time"></i>
- <span>{{ scope.row.createTime }}</span>
+ <el-tag :type="statusFilterType(scope.row.status)">{{
+ checkStatus[scope.row.status]
+ }}
+ </el-tag>
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" width="150">
@@ -106,43 +108,45 @@
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column
label="物资名称"
- prop="coName"
+ prop="coName" width="160"
show-overflow-tooltip
></el-table-column>
<el-table-column
- label="规格型号"
+ label="规格型号" width="160"
prop="spec"
- show-overflow-tooltip
></el-table-column>
<el-table-column
- label="批次号"
+ label="批次号" width="120"
prop="batchNo"
- show-overflow-tooltip
></el-table-column>
<el-table-column
- label="生产日期"
+ label="生产日期" width="120"
prop="productDate"
></el-table-column>
<el-table-column
label="失效日期"
- prop="expireDate"
+ prop="expireDate" width="120"
></el-table-column>
<el-table-column
- label="单据数量"
+ label="单据数量" width="100"
prop="count"
></el-table-column>
<el-table-column
- label="价格"
+ label="扫码数量"
+ prop="scanCount" width="100"
+ ></el-table-column>
+ <el-table-column
+ label="价格" width="100"
prop="price"
></el-table-column>
<el-table-column
- label="生产企业"
+ label="生产企业" width="180"
prop="manufacturer"
show-overflow-tooltip
></el-table-column>
<el-table-column
- label="注册/备案凭证号"
- prop="certCode"
+ label="注册/备案号"
+ prop="certCode" width="180"
show-overflow-tooltip
></el-table-column>
</el-table>
@@ -444,10 +448,11 @@ export default {
2: "等待处理",
3: "等待校验",
4: "处理异常",
- 5: "校验成功",
+ 5: "待核对",
6: "校验异常",
- 7: "审核通过",
- 8: "审核拒绝"
+ 7: "已审核",
+ 8: "审核拒绝",
+ 9: "正在处理", 10: "待审核", 11: "待配货",
},
invList: [],
list: [],
@@ -805,15 +810,19 @@ export default {
this.order.billNo = row.billNo;
this.codeDialogVisible = true;
},
- },
- filters: {
+
statusFilterType(status) {
const statusMap = {
- false: "success",
- true: "warning",
+ 5: "warning",
+ 1: "warning",
+ 6: "danger",
+ 7: "success",
};
return statusMap[status];
},
+
+ },
+ filters: {
},
mounted() {
document.body.ondrop = function (event) {
diff --git a/src/views/inout/IoWaitAllocateOrder.vue b/src/views/inout/IoWaitAllocateOrder.vue
new file mode 100644
index 00000000..4e9b6f71
--- /dev/null
+++ b/src/views/inout/IoWaitAllocateOrder.vue
@@ -0,0 +1,677 @@
+<template>
+ <div>
+ <el-card class="el-card">
+ <el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
+ <el-row>
+ <el-col :span="8">
+ <el-form-item class="query-form-item" label="单号:">
+ <el-input v-model="filterQuery.billNo" placeholder="单号"
+ style="width: 90%"
+ clearable="true"></el-input>
+ </el-form-item>
+ </el-col>
+
+ <el-col :span="8">
+ <el-form-item class="query-form-item" label="出入库类型:">
+ <el-select v-model="filterQuery.mainAction" placeholder="请选择出入库类型" style="width: 90%">
+ <el-option label="全部" value=""></el-option>
+ <el-option label="入库" value="WareHouseIn"></el-option>
+ <el-option label="出库" value="WareHouseOut"></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.action" placeholder="请选择单据类型"
+ style="width: 90%"
+ clearable>
+ <el-option
+ v-for="item in busTypes"
+ :key="item.name"
+ :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="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-col :span="8">
+ <el-form-item class="query-form-item" label="所属仓库:">
+ <el-select v-model="filterQuery.invCode" placeholder="请选择所属仓库" clearable="true"
+ style="width: 90%"
+ @change="invChange"
+ >
+ <el-option
+ v-for="item in invList"
+ :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-date-picker
+ :picker-options="pickerOptions"
+ v-model="actDateRange"
+ 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-form>
+ <div class="top-right-btn">
+ <el-button-group>
+ <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+ <el-button
+ type="primary"
+ icon="el-icon-refresh"
+ @click="onReset"
+ >重置
+ </el-button>
+ <el-button type="primary" icon="el-icon-search" @click="onSubmit"
+ >查询
+ </el-button
+ >
+ </el-button-group>
+ </div>
+ <el-divider style="margin: 15px"></el-divider>
+ <el-table v-loading="loading" :data="list" style="width: 100%"
+ highlight-current-row
+ @row-click="handleSelectionChange"
+ border
+ >
+ <el-table-column label="序号" type="index"></el-table-column>
+ <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 label="创建时间" prop="createTime" width="150" show-overflow-tooltip>
+ <template slot-scope="scope">
+ <i class="el-icon-time"></i>
+ <span>{{ scope.row.createTime }}</span>
+ </template>
+ </el-table-column>
+ <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 label="所属仓库" prop="invName" width="120">
+ </el-table-column>
+ <el-table-column label="来源单号" prop="corpOrderId" show-overflow-tooltip width="180"></el-table-column>
+ <el-table-column label="来源" prop="fromType" width="140">
+ <template slot-scope="scope">
+ <span>{{ fromTypeMap[scope.row.fromType] }}</span>
+ </template>
+ </el-table-column>
+
+ <el-table-column label="单据状态" prop="status" width="100">
+ <template slot-scope="scope">
+ <el-tag :type="statusFilterType(scope.row.status)">{{
+ checkStatus[scope.row.status]
+ }}
+ </el-tag>
+ </template>
+ </el-table-column>
+ <el-table-column label="操作" width="150" fixed="right">
+ <template slot-scope="scope">
+ <el-button
+ type="text"
+ size="small"
+ @click.native.stop="addOrders(scope.row)"
+ >编辑
+ </el-button
+ >
+ <el-button
+ type="text"
+ size="small"
+ @click.native.stop="deleteDialog(scope.row.billNo)"
+ >删除
+ </el-button
+ >
+ <el-button
+ type="text"
+ size="small"
+ @click.native.stop="onUpload(scope.row.billNo)"
+ >校验提交
+ </el-button
+ >
+ </template>
+ </el-table-column>
+ </el-table>
+ <el-dialog
+ title="编辑单据"
+ :visible.sync="addOrderVisible"
+ width="85%"
+ append-to-body
+ :close-on-click-modal="false"
+ :close-on-press-escape="false"
+ v-if="addOrderVisible"
+ @close='closeDialog'
+ >
+ <addOrder
+ :closeDialog="closeDialog"
+ :orderQuery="idQuery"
+ :viewType="viewType"
+ ></addOrder>
+ </el-dialog>
+ <el-dialog
+ title="单号详情"
+ :visible.sync="codeDetailVisible"
+ :close-on-click-modal="false"
+ :close-on-press-escape="false"
+ width="80%"
+ v-if="codeDetailVisible"
+ >
+ <codeDetail
+ :idQuery="idQuery"
+ v-on:closeDetailDialog="closeDetailDialog"
+ ></codeDetail>
+ </el-dialog>
+ <pagination
+ v-show="total>0"
+ :total="total"
+ :page.sync="filterQuery.page"
+ :limit.sync="filterQuery.limit"
+ @pagination="getList"
+ />
+ </el-card>
+
+
+ <el-tabs type="border-card" style="margin: 15px">
+ <!--单据业务详情-->
+ <el-tab-pane>
+ <span slot="label">单据 {{ currentRow == null ? '' : currentRow.billNo }}-业务扫码校验结果</span>
+ <!--<el-form :inline="true" :model="bizQuery" class="query-form" size="mini">-->
+ <!-- <el-form-item class="query-form-item" label="物资名称:">-->
+ <!-- <el-input-->
+ <!-- v-model="bizQuery.productName"-->
+ <!-- placeholder="请输入物资名称"-->
+ <!-- clearable-->
+ <!-- >-->
+ <!-- </el-input>-->
+ <!-- </el-form-item>-->
+ <!-- <el-form-item>-->
+ <!-- <el-button-group>-->
+ <!-- <el-button-->
+ <!-- type="primary"-->
+ <!-- icon="el-icon-refresh"-->
+ <!-- @click="onBizReset"-->
+ <!-- >重置-->
+ <!-- </el-button>-->
+ <!-- <el-button type="primary" @click="onBizSubmit"-->
+ <!-- icon="el-icon-search"-->
+ <!-- >查询-->
+ <!-- </el-button>-->
+ <!-- </el-button-group>-->
+ <!-- </el-form-item>-->
+ <!--</el-form>-->
+ <el-table v-loading="bizDetailLoading" :data="bizDetailList" style="width: 100%" border
+ :row-style="rowStyle"
+ row-key="id"
+ >
+ <el-table-column label="序号" type="index"></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"
+ ></el-table-column>
+ <el-table-column
+ header-align="center"
+ label="单据数量" width="100"
+ prop="count"
+ ></el-table-column>
+ <el-table-column
+ header-align="center"
+ label="扫码数量" width="100"
+ prop="scanCount"
+ ></el-table-column>
+
+ <el-table-column
+ label="价格"
+ prop="price" width="100"
+ ></el-table-column>
+ <el-table-column width="100" label="计量单位" prop="measname">
+ </el-table-column>
+ <el-table-column
+ label="生产企业"
+ prop="manufacturer" width="160"
+ show-overflow-tooltip
+ ></el-table-column>
+ <el-table-column
+ label="注册/备案号" width="160"
+ prop="certCode"
+ show-overflow-tooltip
+ ></el-table-column>
+ </el-table>
+ </el-tab-pane>
+ </el-tabs>
+
+
+ </div>
+</template>
+
+<script>
+import {
+ deleteByOrderId,
+ submitOrderWeb,
+ updateUnit, mergeOrder,
+ getOrderList, submitAllocateBiz
+} from "../../api/inout/order";
+import {getBasicUnitMaintains} from "../../api/basic/basicUnitMaintain"
+import draggable from "vuedraggable";
+import addOrder from "./DialogCreateOrder";
+import store from "../../store";
+import {getInvListByUser} from "@/api/system/invWarehouse";
+import {getLocalJoinByUser} from "@/api/basic/busType";
+import {selectSysParamByKey} from "@/api/param/systemParamConfig";
+import {isBlank} from "@/utils/strUtil";
+import {getBizDetailList, getWaitAllocateList} from "@/api/inout/orderDetailBiz";
+
+
+export default {
+ name: "IoWaitAllocateOrder",
+ data() {
+ return {
+ showSearch: true,
+ filterQuery: {
+ id: "",
+ billNo: null,
+ mainAction: null,
+ action: null,
+ statusType: "unAllocate",
+ page: 1,
+ limit: 10,
+ startTime: null,
+ endTime: null,
+ invCode: this.$store.getters.locInvCode,
+ },
+ viewType: 4,
+ checkStatus: {
+ 1: "草稿",
+ 2: "等待处理",
+ 3: "等待校验",
+ 4: "处理异常",
+ 5: "校验成功",
+ 6: "校验异常",
+ 7: "审核通过",
+ 8: "审核拒绝",
+ 9: "正在处理", 10: "待审核",
+ 11: "待配货",
+ },
+ curIndex: "",
+ idQuery: {},
+ storageList: [],
+ invList: [],
+ list: [],
+ codeDetailVisible: false,
+ addOrderVisible: false,
+ total: 0,
+ loading: false,
+ index: null,
+ formName: null,
+ errorDetail: "",
+ formMap: {
+ add: "新增",
+ edit: "编辑",
+ },
+ enableDept: false,
+ fromTypeMap: {
+ "1": "UDIMS平台",
+ "2": "网页新增",
+ "3": "pda即时校验",
+ "4": "pda未校验",
+ "5": "pc端扫码精灵",
+ "6": "流转自动补单",
+ "7": "UDI供应商平台",
+ "8": "平衡补录单据",
+ "10": "手动补单",
+ "11": "仓库盘点",
+ "12": "采购计划",
+ "13": "领用单据",
+ "14": "第三方系统单据",
+ },
+ deleteData: {
+ billNo: "",
+ status: 10,
+ },
+ dialogTableVisible: false,
+ formLoading: false,
+ deleteLoading: false,
+ busTypes: [],
+ actDateRange: [],
+ pickerOptions: {
+ shortcuts: [
+ {
+ text: "最近一周",
+ onClick(picker) {
+ const end = new Date();
+ const start = new Date();
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+ picker.$emit("pick", [start, end]);
+ },
+ },
+ {
+ text: "最近一个月",
+ onClick(picker) {
+ const end = new Date();
+ const start = new Date();
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+ picker.$emit("pick", [start, end]);
+ },
+ },
+ {
+ text: "最近三个月",
+ onClick(picker) {
+ const end = new Date();
+ const start = new Date();
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+ picker.$emit("pick", [start, end]);
+ },
+ },
+ ],
+ },
+ currentRow: {
+ billNo: ""
+ },
+ bizQuery: {
+ productName: null,
+ orderIdFk: null,
+ page: 1,
+ limit: 10
+ },
+ bizTotal: 0,
+ bizDetailLoading: false,
+ bizDetailList: [],
+
+ };
+ },
+ components: {
+ addOrder,
+ },
+ methods: {
+ onReset() {
+ this.$router.push({
+ path: "",
+ });
+ this.filterQuery = {
+ id: "",
+ billNo: null,
+ mainAction: null,
+ action: null,
+ statusType: "unAllocate",
+ page: 1,
+ limit: 10,
+ startTime: null,
+ endTime: null,
+ invCode: this.$store.getters.locInvCode,
+ };
+ this.actDateRange = [];
+ this.getList();
+ },
+ onSubmit() {
+ if (this.actDateRange !== null) {
+ this.filterQuery.startTime = this.actDateRange[0];
+ this.filterQuery.endTime = this.actDateRange[1];
+ } else {
+ this.filterQuery.startTime = null;
+ this.filterQuery.endTime = null;
+ }
+ this.filterQuery.page = 1;
+ this.getList();
+ },
+ hideSearch() {
+ this.showSearch = !this.showSearch;
+ },
+
+ handleSizeChange(val) {
+ this.filterQuery.limit = val;
+ this.getList();
+ },
+ handleCurrentChange(val) {
+ this.filterQuery.page = val;
+ this.getList();
+ },
+ closeDetailDialog(val) {
+ this.codeDetailVisible = false;
+ },
+ getBusType() {
+ let query = {
+ code: this.filterQuery.invCode,
+ enabled: true,
+ vueType: "supDelivery",
+ };
+ getLocalJoinByUser(query)
+ .then((response) => {
+ this.busTypes = response.data.list || [];
+ this.getList();
+ })
+ .catch(() => {
+ });
+ },
+ addOrders(row) {
+ this.currentRow = row;
+ this.idQuery = {};
+ this.idQuery = row;
+
+ this.addOrderVisible = true;
+ },
+ closeDialog() {
+ this.addOrderVisible = false;
+ this.addHosOrderVisible = false;
+ this.getList();
+ },
+
+ //获取订单列表
+ getList() {
+ this.loading = true;
+ getOrderList(this.filterQuery)
+ .then((response) => {
+ this.loading = false;
+ if (response.code === 20000) {
+ this.list = response.data.list || [];
+ this.total = response.data.total || 0;
+ if (this.list.length == 0) {
+ this.bizDetailList = [];
+ }
+ } else {
+ this.$message.error(response.message);
+ }
+ })
+ .catch((error) => {
+ this.$message.error(error.message)
+ this.loading = false;
+ this.list = [];
+ this.total = 0;
+ });
+ },
+ deleteOrders(data) {
+ this.loading = true;
+ this.deleteData.billNo = data;
+ deleteByOrderId(this.deleteData)
+ .then((response) => {
+ if (response.code == 20000) {
+ this.getList();
+ this.$message({
+ type: "success",
+ message: "删除成功！",
+ });
+ } else if (response.code == 520) {
+ this.$message.error("新增扫码单据列表已不存在该扫码单据！");
+ this.getList();
+ }
+
+ })
+ .catch(() => {
+ });
+ },
+ deleteDialog(rowId) {
+ this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ })
+ .then(() => {
+ this.deleteOrders(rowId);
+ })
+ .catch(() => {
+ });
+ },
+ onUpload(data) {
+ this.loading = true;
+ var idQuery = {
+ billNo: "",
+ };
+ idQuery.billNo = data;
+ submitAllocateBiz(idQuery)
+ .then((response) => {
+ this.loading = false;
+ if (response.code === 20000) {
+ this.$message.success("提交成功");
+ this.getList();
+ this.bizDetailList = [];
+ } else {
+ this.$message.error(response.message);
+ }
+ this.loading = false;
+ });
+ },
+ getInvList() {
+ getInvListByUser()
+ .then((response) => {
+ this.invList = response.data || [];
+ })
+ .catch(() => {
+ });
+ },
+ invChange() {
+ this.filterQuery.action = null;
+ this.getBusType();
+ },
+
+ statusFilterType(status) {
+ const statusMap = {
+ 2: "warning",
+ 1: "warning",
+ 4: "danger",
+ 3: "success",
+ };
+ return statusMap[status];
+ },
+
+ rowStyle({row, rowIndex}) {
+ let rowBackground = {};
+ if (!this.$isNotBlank(row.supId) || !this.$isNotBlank(row.bindRlFk)) {
+ rowBackground.color = '#f60303';
+ return rowBackground;
+ }
+ if (!row.checkSuccess) {
+ rowBackground.color = '#f60303';
+ }
+ return rowBackground;
+ },
+
+
+ onBizReset() {
+ this.bizQuery = {
+ productName: null,
+ orderIdFk: null,
+ page: 1,
+ limit: 10
+ };
+ this.getBizDetailList();
+ },
+ onBizSubmit() {
+ this.bizQuery.page = 1;
+ this.getBizDetailList();
+ },
+
+ handleSelectionChange(val) {
+ this.currentRow = val;
+ this.getBizDetailList();
+ },
+ getBizDetailList() {
+ if (this.currentRow == null || isBlank(this.currentRow.billNo)) {
+ this.$message.error("请先选择需要查询的单据！")
+ return;
+ }
+ this.bizDetailLoading = true;
+ this.bizQuery.orderIdFk = this.currentRow.billNo;
+ getWaitAllocateList(this.bizQuery).then((res) => {
+ this.bizDetailLoading = false;
+ if (res.code === 20000) {
+ this.bizDetailList = res.data || [];
+ } else {
+ this.$message.error(res.message);
+ this.bizDetailList = [];
+ }
+ }).catch((error) => {
+ this.bizDetailLoading = false;
+ this.$message.error(error.message);
+ this.bizDetailList = [];
+ this.bizTotal = 0;
+ })
+ },
+
+ },
+ mounted() {
+ document.body.ondrop = function (event) {
+ event.preventDefault();
+ event.stopPropagation();
+ };
+ },
+ created() {
+ this.getInvList();
+ this.getBusType();
+ selectSysParamByKey({paramKey: "muti_inv_mode"}).then((res) => {
+ if (res.code === 20000) {
+ if (res.data.paramValue === "0") {
+ this.enableDept = true;
+ }
+ }
+ });
+ this.getList();
+
+ },
+};
+</script>
+
+<style type="text/scss" lang="scss">
+</style>
+
diff --git a/src/views/inventory/InvProducts.vue b/src/views/inventory/InvProducts.vue
index 153938b8..490312e3 100644
--- a/src/views/inventory/InvProducts.vue
+++ b/src/views/inventory/InvProducts.vue
@@ -222,7 +222,7 @@ export default {
supId: null,
zczbhhzbapzbh: null,
ylqxzcrbarmc: null,
- invCode: this.$store.getters.locInvCode,
+ invCode: null,
page: 1,
limit: 10,
udiCode: null,
@@ -268,7 +268,7 @@ export default {
supId: null,
zczbhhzbapzbh: null,
ylqxzcrbarmc: null,
- invCode: this.$store.getters.locInvCode,
+ invCode: null,
page: 1,
limit: 10,
};
diff --git a/src/views/inventory/trace/sickerUdiTraceOrder.vue b/src/views/inventory/trace/sickerUdiTraceOrder.vue
index fd5ea8b6..d4640557 100644
--- a/src/views/inventory/trace/sickerUdiTraceOrder.vue
+++ b/src/views/inventory/trace/sickerUdiTraceOrder.vue
@@ -193,7 +193,11 @@ export default {
"6": "缺量补录单据",
"7": "UDI供应商平台",
"8": "平衡补录单据",
- "10": "手动补单"
+ "10": "手动补单",
+ "11": "仓库盘点",
+ "12": "采购计划",
+ "13": "领用单据",
+ "14": "第三方系统单据",
},
//往来单位
list: [],
diff --git a/src/views/system/dept/invWarehouse.vue b/src/views/system/dept/invWarehouse.vue
index 0842c8a8..3029dc7e 100644
--- a/src/views/system/dept/invWarehouse.vue
+++ b/src/views/system/dept/invWarehouse.vue
@@ -505,7 +505,6 @@ export default {
};
},
onResetintent(){
- debugger
this.$router.push({
path: "",
});
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index 49cf40e8..3bf7ec6e 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -279,6 +279,7 @@ import {listMenu, getMenu, delMenu, addMenu, updateMenu} from "@/api/system/menu
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
import IconSelect from "@/components/IconSelect";
+import {delInnerOrder} from "@/api/inventory/innerOrder";
export default {
name: "Menu",
@@ -451,14 +452,27 @@ export default {
},
/** 删除按钮操作 */
handleDelete(row) {
- this.$modal.confirm('是否确认删除名称为"' + row.menuName + '"的数据项？').then(function () {
- return delMenu(row.menuId);
- }).then(() => {
- this.getList();
- this.$modal.msgSuccess("删除成功");
- }).catch(() => {
- });
- }
+
+ this.$confirm('是否确认删除名称为"' + row.menuName + '"的数据项？', "提示", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ })
+ .then(() => {
+ delMenu(row.menuId).then(response => {
+ if (response.code == 20000) {
+ this.getList();
+ this.$modal.msgSuccess("删除成功");
+ } else {
+ this.$modal.msgError(response.message);
+ }
+ })
+ .catch(() => {
+ });
+
+ }
+ );
+ },
}
-};
+}
</script>