中继服务同步设置

master
anthonywj 3 years ago
parent 80700bc193
commit bb82c73b78

@ -1,5 +1,5 @@
{ {
"BASE_URL": "http://192.168.0.109:9996", "BASE_URL": "http://139.9.178.73:8080/SPMS_SERVER",
"SERVER_IP": "http://192.168.0.109:9996", "SERVER_IP": "http://139.9.178.73:8080/SPMS_SERVER",
"hosp_name": "诏安县总医院(测试)" "hosp_name": "诏安县总医院(测试)"
} }

@ -0,0 +1,36 @@
import axios from "../../utils/axios";
export function filterProducts(query) {
return axios({
url: "/spms/prein/inv/products/filter",
method: "get",
params: query
});
}
export function filterDetailProducts(query) {
return axios({
url: "/spms/prein/inv/products/filterDetail",
method: "get",
params: query
});
}
export function deleteProducts(query) {
return axios(
{
url: "/spms/prein/inv/products/delete",
method: "post",
data: query
}
)
}
export function statDetailProducts(query) {
return axios({
url: "/spms/prein/inv/products/stat",
method: "get",
params: query
});
}

@ -25,3 +25,21 @@ export function createSchedule(query) {
data: query data: query
}); });
} }
export function findConfig(query) {
return axios({
url: "/system/param/syncData/config",
method: "get",
params: query
});
}
export function updateConfig(query) {
return axios({
url: "/system/param/syncData/save",
method: "post",
data: query
});
}

@ -88,10 +88,13 @@ import thrCorpsImport from "../views/thrsys/ThrCorpsImport.vue";
import receiveOrderNew from "../views/thrsys/ThrOrdedrReceiveAdd.vue"; import receiveOrderNew from "../views/thrsys/ThrOrdedrReceiveAdd.vue";
import receiveOrderSearch from "../views/thrsys/ThrOrdedrReceiveSearch.vue"; import receiveOrderSearch from "../views/thrsys/ThrOrdedrReceiveSearch.vue";
import spsSyncData from "../views/thrsys/SysUdimsData.vue"; import spsSyncData from "../views/thrsys/SysUdimsData.vue";
import syncConfig from "../views/thrsys/SysUdimsConfig.vue";
//库存 //库存
import invProducts from "../views/inventory/InvProducts.vue"; import invProducts from "../views/inventory/InvProducts.vue";
import invPreProducts from "../views/inventory/invPreProducts" import invPreProducts from "../views/inventory/invPreProducts"
import invPreInProducts from "../views/inventory/invPreInProducts"
import supInvProducts from "../views/inventory/supInvProducts.vue"; import supInvProducts from "../views/inventory/supInvProducts.vue";
import supInvPreProducts from "../views/inventory/supInvPreProducts" import supInvPreProducts from "../views/inventory/supInvPreProducts"
import invUdiTrace from "@/views/inventory/invUdiTrace"; import invUdiTrace from "@/views/inventory/invUdiTrace";
@ -300,6 +303,14 @@ export const asyncRouterMap = [
authRule: ["admin/systemParamConfig"] authRule: ["admin/systemParamConfig"]
}, },
}, },
{
path: "syncConfig",
name: "同步设置",
component: syncConfig,
meta: {
authRule: ["systemConfig/syncConfig"]
}
},
{ {
path: "bussinessType", path: "bussinessType",
name: "扫码单据类型", name: "扫码单据类型",
@ -324,6 +335,7 @@ export const asyncRouterMap = [
authRule: ["thrsys/thirdSys"] authRule: ["thrsys/thirdSys"]
} }
}, },
] ]
}, },
{ {
@ -801,6 +813,15 @@ export const asyncRouterMap = [
authRule: ["inv/invPreProducts"] authRule: ["inv/invPreProducts"]
} }
}, },
{
path: "invPreInProducts",
component: invPreInProducts,
name: "预验收库存查询",
icon: "",
meta: {
authRule: ["inv/invPreInProducts"]
}
},
{ {
path: "udiTrace", path: "udiTrace",
component: invUdiTraceOrder, component: invUdiTraceOrder,

@ -9,13 +9,6 @@
style="width: 400px" style="width: 400px"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<!-- <el-form-item class="query-form-item">-->
<!-- <el-select v-model="filterQuery.enabled" placeholder="状态">-->
<!-- <el-option label="全部" value=""></el-option>-->
<!-- <el-option label="已关联" value=1></el-option>-->
<!-- <el-option label="未关联" value=0></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item> <el-form-item>
<el-button-group> <el-button-group>
<el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button> <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
@ -34,16 +27,16 @@
<el-table-column label="业务单据类型名称" prop="name" fixed></el-table-column> <el-table-column label="业务单据类型名称" prop="name" fixed></el-table-column>
<el-table-column label="业务单据类型代码" prop="action" fixed></el-table-column> <el-table-column label="业务单据类型代码" prop="action" fixed></el-table-column>
<el-table-column label="第三方单据类型" prop="originAction" fixed></el-table-column> <el-table-column label="第三方单据类型" prop="originAction" fixed></el-table-column>
<!-- <el-table-column label="单据是否启用" prop="enable" fixed>-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ enableMap[scope.row.enable] }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="是否寄售" prop="advanceType" fixed> <el-table-column label="是否寄售" prop="advanceType" fixed>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ enableMap[scope.row.advanceType] }}</span> <span>{{ enableMap[scope.row.advanceType] }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="预验收" prop="preIn" fixed>
<template slot-scope="scope">
<span>{{ enableMap[scope.row.preIn] }}</span>
</template>
</el-table-column>
<el-table-column label="缺量自动补单" prop="advanceType" fixed> <el-table-column label="缺量自动补单" prop="advanceType" fixed>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ enableMap[scope.row.changeEnable] }}</span> <span>{{ enableMap[scope.row.changeEnable] }}</span>
@ -56,6 +49,8 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" fixed="right"> <el-table-column label="操作" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@ -152,6 +147,7 @@ export default {
changeEnable: null, changeEnable: null,
spUse: null, spUse: null,
prefix: null, prefix: null,
preIn:null,
}, },
enableMap: { enableMap: {
true: "是", true: "是",
@ -243,6 +239,7 @@ export default {
changeEnable: row.changeEnable, changeEnable: row.changeEnable,
spUse: row.spUse, spUse: row.spUse,
prefix: row.prefix, prefix: row.prefix,
preIn:row.preIn,
}; };
}, },

@ -85,20 +85,19 @@
</el-row> </el-row>
<el-row :gutter="20" class="el-row" type="flex"> <el-row :gutter="20" class="el-row" type="flex">
<!-- <el-col :span="4" class="el-col">-->
<!-- <div class="text item">-->
<!-- <el-checkbox v-model="inputQuery.enable"></el-checkbox>-->
<!-- </div>-->
<!-- </el-col>-->
<el-col :span="4" class="el-col"> <el-col :span="4" class="el-col">
<div class="text item"> <div class="text item">
<el-checkbox v-model="inputQuery.advanceType"></el-checkbox> <el-checkbox v-model="inputQuery.advanceType"
:disabled="inputQuery.preIn"
>寄售类型单据
</el-checkbox>
</div> </div>
</el-col> </el-col>
<el-col :span="4" class="el-col"> <el-col :span="4" class="el-col">
<div class="text item"> <div class="text item">
<el-checkbox v-model="inputQuery.changeEnable" @change="isChangeOrder" <el-checkbox v-model="inputQuery.changeEnable" @change="isChangeOrder"
:disabled="!changeEnable || inputQuery.mainAction=='WareHouseIn' || inputQuery.id == null || inputQuery.mainAction==null"> :disabled="!changeEnable || inputQuery.mainAction=='WareHouseIn'
|| inputQuery.id == null || inputQuery.mainAction==null ||inputQuery.preIn">
缺量自动补单 缺量自动补单
</el-checkbox> </el-checkbox>
</div> </div>
@ -108,6 +107,13 @@
<el-checkbox v-model="inputQuery.spUse">使</el-checkbox> <el-checkbox v-model="inputQuery.spUse">使</el-checkbox>
</div> </div>
</el-col> </el-col>
<el-col :span="4" class="el-col">
<div class="text item">
<el-checkbox v-model="inputQuery.preIn" @change="preInChange"
:disabled="inputQuery.mainAction=='WareHouseOut' || inputQuery.mainAction==null">预验收</el-checkbox>
</div>
</el-col>
</el-row> </el-row>
<div v-if="visibleChange"> <div v-if="visibleChange">
@ -383,7 +389,12 @@ export default {
} }
, ,
preInChange() {
if (this.inputQuery.preIn) {
this.inputQuery.changeEnable = false;
this.inputQuery.advanceType = false;
}
},
isChangeOrder() { isChangeOrder() {
console.log("this.inputQuery.changeEnable = " + this.inputQuery.changeEnable); console.log("this.inputQuery.changeEnable = " + this.inputQuery.changeEnable);
if (this.inputQuery.changeEnable) { if (this.inputQuery.changeEnable) {

@ -213,6 +213,18 @@
prop="zczbhhzbapzbh" prop="zczbhhzbapzbh"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
<el-table-column label="操作" fixed="right">
<template slot-scope="scope">
<el-button
type="text"
size="small"
@click="diDetail(scope.row)"
>详情
</el-button
>
</template>
</el-table-column>
</el-table> </el-table>
<el-pagination <el-pagination
:page-size="unionQuery.limit" :page-size="unionQuery.limit"
@ -222,6 +234,18 @@
></el-pagination> ></el-pagination>
</div> </div>
</el-card> </el-card>
<el-dialog
title="器械信息详情"
:close-on-click-modal="false"
:close-on-press-escape="false"
:visible.sync="selectDialog"
width="65%"
append-to-body
v-if="selectDialog"
>
<selectDiDetail :editQuery="diDetails"
></selectDiDetail>
</el-dialog>-
</div> </div>
</template> </template>
@ -230,7 +254,7 @@ import {getUdiInfos, filterCompany} from "../../api/basic/udiInfo";
import {combineUdi} from "../../api/basic/udiRelevance"; import {combineUdi} from "../../api/basic/udiRelevance";
import {getBasicThirdSys} from "../../api/basic/basicThirdSys"; import {getBasicThirdSys} from "../../api/basic/basicThirdSys";
import {getInvbasdoc} from "../../api/basic/getErps"; import {getInvbasdoc} from "../../api/basic/getErps";
import selectDiDetail from "@/views/basic/SelectDIDetailDialog";
export default { export default {
name: "closeDialog", name: "closeDialog",
props: { props: {
@ -279,6 +303,8 @@ export default {
multipleUdiSelection: [], multipleUdiSelection: [],
thirdSys: [], thirdSys: [],
thirdSysFk: null, thirdSysFk: null,
diDetails: null,
selectDialog: false,
}; };
}, },
methods: { methods: {
@ -333,7 +359,10 @@ export default {
// this.unionQuery.zczbhhzbapzbh = this.currentRow.registerNo; // this.unionQuery.zczbhhzbapzbh = this.currentRow.registerNo;
// this.unionQuery.ggxh = this.currentRow.spec; // this.unionQuery.ggxh = this.currentRow.spec;
}, },
diDetail(row) {
this.diDetails = row;
this.selectDialog = true;
},
searchErpList() { searchErpList() {
this.erpQuery.page = 1; this.erpQuery.page = 1;
this.getErpList(); this.getErpList();
@ -483,6 +512,9 @@ export default {
created() { created() {
this.getBasicThirdSys(); this.getBasicThirdSys();
}, },
components: {
selectDiDetail,
},
}; };
</script> </script>

@ -0,0 +1,259 @@
<template>
<div>
<el-descriptions class="margin-top" title="产品信息" :column="3" :size="size" border>
<el-descriptions-item>
<template slot="label">
产品名称
</template>
{{ idQuery.cpmctymc }}
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">
产品标识
</template>
{{ idQuery.nameCode }}
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">
批次号
</template>
{{ idQuery.batchNo }}
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">
规格型号
</template>
{{ idQuery.ggxh }}
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">
生产日期
</template>
{{ idQuery.productionDate }}
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">
失效日期
</template>
{{ idQuery.expireDate }}
</el-descriptions-item>
</el-descriptions>
<el-form :inline="true" :model="query" class="query-form" size="mini">
<el-form-item class="query-form-item">
<el-input v-model="query.code" placeholder="条码查询"></el-input>
</el-form-item>
<el-form-item>
<el-button-group>
<el-button type="primary" icon="search" @click="getCodeList"
>查询
</el-button
>
</el-button-group>
</el-form-item>
</el-form>
<el-table v-loading="loading" :data="codeArry" style="width: 100%">
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column
label="条码"
prop="originCode"
show-overflow-tooltip
></el-table-column>
<el-table-column label="单据类型" prop="action" width="150">
<template slot-scope="scope">
<span>{{ getActionName(scope.row.action) }}</span>
</template>
</el-table-column>
<el-table-column
label="出入库类型"
prop="mainActionStr"
width="150"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="入库数量"
prop="inCount"
width="150"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="出库数量"
prop="outCount"
width="150"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="订单日期"
prop="updateTime"
width="150"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="所属订单"
prop="orderIdFk"
width="200"
show-overflow-tooltip
></el-table-column>
</el-table>
<el-pagination
:page-size="query.limit"
@current-change="handleCurrentChange"
layout="prev, pager, next,total"
:total="total"
>
</el-pagination>
</div>
</template>
<script>
import {
filterDetailProducts, statDetailProducts
} from "../../api/inventory/InvPreInProducts";
import store from "../../store";
import draggable from "vuedraggable";
import {getBussinessType} from "../../api/basic/bussinessType";
export default {
name: "idQuery",
props: {
idQuery: {
type: Object,
required: true,
},
},
data() {
return {
query: {
batchNo: null,
productIdFk: null,
customerId: null,
page: 1,
limit: 20,
},
codeArry: [],
total: 0,
loading: true,
index: null,
formLoading: false,
formVisible: false,
deleteLoading: false,
orderNo: null,
busTypes: [],
statData: {},
};
},
components: {
draggable,
},
methods: {
onReset() {
this.$router.push({
path: "",
});
this.query = {
productIdFk: null,
customerId: null,
page: 1,
limit: 20,
};
this.getCodeList();
},
onSubmit() {
this.$router.push({
path: "",
query: this.query,
});
this.getCodeList();
},
handleSizeChange(val) {
this.query.limit = val;
this.getCodeList();
},
handleCurrentChange(val) {
this.query.page = val;
this.getCodeList();
},
getCodeList() {
this.loading = true;
this.query.productIdFk = this.idQuery.relIdFk;
this.query.batchNo = this.idQuery.batchNo;
this.query.supId = this.idQuery.supId;
this.query.invStorageCode = this.idQuery.invStorageCode;
filterDetailProducts(this.query) //
.then((response) => {
this.loading = false;
this.codeArry = response.data.list || [];
this.total = response.data.total || 0;
})
.catch(() => {
this.loading = false;
this.list = [];
this.total = 0;
});
},
getStat() {
this.query.productIdFk = this.idQuery.relIdFk;
this.query.batchNo = this.idQuery.batchNo;
this.query.customerId = store.getters.customerId;
this.query.invStorageCode = this.idQuery.invStorageCode;
statDetailProducts(this.query) //
.then((response) => {
this.loading = false;
this.statData = response.data;
})
.catch(() => {
this.loading = false;
});
},
intentBack() {
// this.$router.push({path:'../readme/detail',query:{id:row.corpOrderId}});
this.$router.go(-1);
},
getActionName(action) {
for (let i = 0; i < this.busTypes.length; i++) {
if (this.busTypes[i].action === action) {
return this.busTypes[i].name;
}
}
},
getBusType() {
let query = {
enabled: true,
};
getBussinessType(query)
.then((response) => {
this.busTypes = response.data.list || [];
this.filterQuery.billAction = this.busTypes[0].action;
// this.getList();
})
.catch(() => {
});
},
},
filters: {},
mounted() {
document.body.ondrop = function (event) {
event.preventDefault();
event.stopPropagation();
};
},
created() {
this.getBusType();
this.getCodeList();
this.getStat();
},
};
</script>

@ -41,40 +41,6 @@
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
<!-- <el-descriptions style="margin-top: 15px" class="margin-top" title="库存统计" :column="3" :size="size" border>-->
<!-- <el-descriptions-item>-->
<!-- <template slot="label">-->
<!-- 入库数量-->
<!-- </template>-->
<!-- {{ statData.inCount }}-->
<!-- </el-descriptions-item>-->
<!-- <el-descriptions-item>-->
<!-- <template slot="label">-->
<!-- 出库数量-->
<!-- </template>-->
<!-- {{ statData.outCount }}-->
<!-- </el-descriptions-item>-->
<!-- <el-descriptions-item>-->
<!-- <template slot="label">-->
<!-- 结余数量-->
<!-- </template>-->
<!-- {{ (statData.inCount - statData.outCount) }}-->
<!-- </el-descriptions-item>-->
<!-- <el-descriptions-item>-->
<!-- <template slot="label">-->
<!-- 普通采购数量-->
<!-- </template>-->
<!-- {{ statData.commonCount }}-->
<!-- </el-descriptions-item>-->
<!-- <el-descriptions-item>-->
<!-- <template slot="label">-->
<!-- 预入库数量-->
<!-- </template>-->
<!-- {{ statData.advanceCount }}-->
<!-- </el-descriptions-item>-->
<!-- </el-descriptions>-->
<el-form :inline="true" :model="query" class="query-form" size="mini"> <el-form :inline="true" :model="query" class="query-form" size="mini">
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-input v-model="query.code" placeholder="条码查询"></el-input> <el-input v-model="query.code" placeholder="条码查询"></el-input>
@ -121,12 +87,6 @@
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
<!-- <el-table-column-->
<!-- label="数量"-->
<!-- prop="count"-->
<!-- width="150"-->
<!-- show-overflow-tooltip-->
<!-- ></el-table-column>-->
<el-table-column <el-table-column
label="订单日期" label="订单日期"
prop="updateTime" prop="updateTime"

@ -4,13 +4,13 @@
<el-form :inline="true" :model="filterQuery" size="mini"> <el-form :inline="true" :model="filterQuery" size="mini">
<el-row style="width: 100%"> <el-row style="width: 100%">
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-input v-model="filterQuery.nameCode" placeholder="产品标识DI"></el-input> <el-input v-model="filterQuery.nameCode" placeholder="产品标识DI" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-input v-model="filterQuery.productsName" placeholder="产品名称"></el-input> <el-input v-model="filterQuery.productsName" placeholder="产品名称" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-input v-model="filterQuery.batchNo" placeholder="批次号"></el-input> <el-input v-model="filterQuery.batchNo" placeholder="批次号" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-select <el-select
@ -40,13 +40,13 @@
<el-row style="width: 100%"> <el-row style="width: 100%">
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-input v-model="filterQuery.ggxh" placeholder="规格型号"></el-input> <el-input v-model="filterQuery.ggxh" placeholder="规格型号" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-input v-model="filterQuery.zczbhhzbapzbh" placeholder="批准文号"></el-input> <el-input v-model="filterQuery.zczbhhzbapzbh" placeholder="批准文号" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="生产厂家"></el-input> <el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="生产厂家" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-select v-model="filterQuery.invStorageCode" placeholder="请选择当前仓库" clearable="true" <el-select v-model="filterQuery.invStorageCode" placeholder="请选择当前仓库" clearable="true"

@ -1,129 +1,129 @@
<template> <template>
<div> <div>
<el-card> <el-card>
<el-form :inline="true" :model="filterQuery" size="mini"> <el-form :inline="true" :model="filterQuery" size="mini">
<el-row style="width: 100%"> <el-row style="width: 100%">
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-input v-model="filterQuery.nameCode" placeholder="产品标识DI"></el-input> <el-input v-model="filterQuery.nameCode" placeholder="产品标识DI" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-input v-model="filterQuery.productsName" placeholder="产品名称"></el-input> <el-input v-model="filterQuery.productsName" placeholder="产品名称" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-input v-model="filterQuery.batchNo" placeholder="批次号"></el-input> <el-input v-model="filterQuery.batchNo" placeholder="批次号" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-select <el-select
v-model="filterQuery.supId" v-model="filterQuery.supId"
filterable filterable
remote remote
clearable="true" clearable="true"
reserve-keyword reserve-keyword
placeholder="请输入供应商名称" placeholder="请输入供应商名称"
:remote-method="findMethod" :remote-method="findMethod"
size="mini" size="mini"
:loading="loading" :loading="loading"
> >
<el-option <el-option
v-for="item in fromOptions" v-for="item in fromOptions"
:key="item.companyName" :key="item.companyName"
:label="item.companyName" :label="item.companyName"
:value="item.customerId" :value="item.customerId"
> >
<span style="float: left">{{ item.companyName }}</span> <span style="float: left">{{ item.companyName }}</span>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-row> </el-row>
<el-row style="width: 100%"> <el-row style="width: 100%">
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-input v-model="filterQuery.ggxh" placeholder="规格型号"></el-input> <el-input v-model="filterQuery.ggxh" placeholder="规格型号" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-input v-model="filterQuery.zczbhhzbapzbh" placeholder="批准文号"></el-input> <el-input v-model="filterQuery.zczbhhzbapzbh" placeholder="批准文号" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="生产厂家"></el-input> <el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="生产厂家" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-select v-model="filterQuery.invStorageCode" placeholder="请选择当前仓库" clearable="true" <el-select v-model="filterQuery.invStorageCode" placeholder="请选择当前仓库" clearable="true"
size="mini"> size="mini">
<el-option <el-option
v-for="item in storageList" v-for="item in storageList"
:key="item.name" :key="item.name"
:label="item.name" :label="item.name"
:value="item.code"> :value="item.code">
<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-form-item> <el-form-item>
<el-button-group> <el-button-group>
<el-button <el-button
type="primary" type="primary"
icon="el-icon-refresh" icon="el-icon-refresh"
@click="onReset" @click="onReset"
></el-button> ></el-button>
<el-button type="primary" icon="search" @click="onSubmit" <el-button type="primary" icon="search" @click="onSubmit"
>统计 >统计
</el-button </el-button
> >
</el-button-group> </el-button-group>
</el-form-item> </el-form-item>
</el-row> </el-row>
</el-form> </el-form>
<el-table v-loading="loading" :data="list" style="width: 100%"> <el-table v-loading="loading" :data="list" style="width: 100%">
<el-table-column label="序号" type="index" fixed></el-table-column> <el-table-column label="序号" type="index" fixed></el-table-column>
<el-table-column label="产品标识" prop="nameCode" width="120"></el-table-column> <el-table-column label="产品标识" prop="nameCode" width="120"></el-table-column>
<el-table-column label="产品名称" prop="cpmctymc" width="180"> <el-table-column label="产品名称" prop="cpmctymc" width="180">
</el-table-column> </el-table-column>
<el-table-column label="规格型号" prop="ggxh" width="180"></el-table-column> <el-table-column label="规格型号" prop="ggxh" width="180"></el-table-column>
<el-table-column label="批次号" prop="batchNo" width="120"></el-table-column> <el-table-column label="批次号" prop="batchNo" width="120"></el-table-column>
<el-table-column label="生产日期" prop="productionDate" width="120"></el-table-column> <el-table-column label="生产日期" prop="productionDate" width="120"></el-table-column>
<el-table-column label="失效日期" prop="expireDate" width="120"></el-table-column> <el-table-column label="失效日期" prop="expireDate" width="120"></el-table-column>
<el-table-column label="入库数量" prop="inCount" width="120"></el-table-column> <el-table-column label="入库数量" prop="inCount" width="120"></el-table-column>
<el-table-column label="出库数量" prop="outCount" width="120"></el-table-column> <el-table-column label="出库数量" prop="outCount" width="120"></el-table-column>
<el-table-column label="结余数量" prop="reCount" width="120"> <el-table-column label="结余数量" prop="reCount" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
{{ (scope.row.inCount - scope.row.outCount) }} {{ (scope.row.inCount - scope.row.outCount) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="生产厂家" prop="ylqxzcrbarmc" v-if="showSup" show-overflow-tooltip <el-table-column label="生产厂家" prop="ylqxzcrbarmc" v-if="showSup" show-overflow-tooltip
width="120"></el-table-column> width="120"></el-table-column>
<el-table-column label="供应商" prop="companyName" v-if="showSup" show-overflow-tooltip <el-table-column label="供应商" prop="companyName" v-if="showSup" show-overflow-tooltip
width="120"></el-table-column> width="120"></el-table-column>
<!-- <el-table-column label="仓库" prop="invStorageName" v-if="showSup"--> <!-- <el-table-column label="仓库" prop="invStorageName" v-if="showSup"-->
<!-- show-overflow-tooltip width="120"></el-table-column>--> <!-- show-overflow-tooltip width="120"></el-table-column>-->
</el-table> </el-table>
</el-card> </el-card>
<el-dialog <el-dialog
title="库存详情" title="库存详情"
:visible.sync="codeDetailVisible" :visible.sync="codeDetailVisible"
width="85%" width="85%"
v-if="codeDetailVisible" v-if="codeDetailVisible"
> >
<codeDetail <codeDetail
:idQuery="idQuery" :idQuery="idQuery"
v-on:closeDetailDialog="closeDetailDialog" v-on:closeDetailDialog="closeDetailDialog"
></codeDetail> ></codeDetail>
</el-dialog> </el-dialog>
<el-pagination <el-pagination
:page-size="filterQuery.limit" :page-size="filterQuery.limit"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
layout="prev, pager, next" layout="prev, pager, next"
:total="total" :total="total"
></el-pagination> ></el-pagination>
</div> </div>
</template> </template>
<script> <script>
@ -137,207 +137,207 @@ import {filterAllByUser, filterUplLocInv} from "@/api/basic/invWarehouse";
export default { export default {
data() { data() {
return { return {
filterQuery: { filterQuery: {
cpmctymc: null, cpmctymc: null,
nameCode: null, nameCode: null,
relIdFk: null, relIdFk: null,
batchNo: null, batchNo: null,
page: 1, page: 1,
limit: 20, limit: 20,
customerId: null, customerId: null,
invStorageCode: null, invStorageCode: null,
supId: null, supId: null,
ggxh: null, ggxh: null,
zczbhhzbapzbh: null, zczbhhzbapzbh: null,
ylqxzcrbarmc: null, ylqxzcrbarmc: null,
}, },
detailQuery: { detailQuery: {
code: null, code: null,
productIdFk: null, productIdFk: null,
page: 1, page: 1,
limit: 20, limit: 20,
}, },
list: [], list: [],
codeDetailVisible: false, codeDetailVisible: false,
total: 0, total: 0,
loading: false, loading: false,
index: null, index: null,
dialogTableVisible: false, dialogTableVisible: false,
formLoading: false, formLoading: false,
dialogVisible: false, dialogVisible: false,
deleteLoading: false, deleteLoading: false,
busTypes: [], busTypes: [],
idQuery: null, idQuery: null,
showSup: false, showSup: false,
fromOptions: [], fromOptions: [],
storageOptions: [], storageOptions: [],
storageList: [], storageList: [],
}; };
},
components: {
draggable,
codeDetail,
},
methods: {
onReset() {
this.$router.push({
path: "",
});
this.filterQuery = {
invStorageCode: null,
nameCode: null,
relIdFk: null,
batchNo: null,
customerId: null,
unitFk: null,
page: 1,
limit: 20,
};
this.getList();
}, },
components: { onSubmit() {
draggable, //
codeDetail, var param = this.filterQuery;
if (param.cpmctymc == null && param.ggxh == null && param.zczbhhzbapzbh == null && param.ylqxzcrbarmc == null
&& param.invStorageCode == null && param.nameCode == null && param.batchNo == null && param.supId == null) {
this.$message({
message: '统计条件不可为空',
type: 'warning'
});
} else {
this.loading = true;
this.getList();
}
},
handleSizeChange(val) {
this.filterQuery.limit = val;
this.getList();
},
handleCurrentChange(val) {
this.filterQuery.page = val;
this.getList();
},
handleUnitClick(row) {
this.curIndex = row.id;
this.dialogTableVisible = true;
},
closeDetailDialog(val) {
this.codeDetailVisible = false;
}, },
methods: {
onReset() {
this.$router.push({
path: "",
});
this.filterQuery = {
invStorageCode: null,
nameCode: null,
relIdFk: null,
batchNo: null,
customerId: null,
unitFk: null,
page: 1,
limit: 20,
};
this.getList();
},
onSubmit() {
//
var param = this.filterQuery;
if (param.cpmctymc == null && param.ggxh == null && param.zczbhhzbapzbh == null && param.ylqxzcrbarmc == null
&& param.invStorageCode == null && param.nameCode == null && param.batchNo == null && param.supId == null) {
this.$message({
message: '统计条件不可为空',
type: 'warning'
});
} else {
this.loading = true;
this.getList();
}
},
handleSizeChange(val) {
this.filterQuery.limit = val;
this.getList();
},
handleCurrentChange(val) {
this.filterQuery.page = val;
this.getList();
},
handleUnitClick(row) {
this.curIndex = row.id;
this.dialogTableVisible = true;
},
closeDetailDialog(val) {
this.codeDetailVisible = false;
},
closeDialog() { closeDialog() {
this.getList(); this.getList();
}, },
getList() { getList() {
this.loading = true; this.loading = true;
this.filterQuery.customerId = store.getters.customerId; this.filterQuery.customerId = store.getters.customerId;
stockStatistics(this.filterQuery) stockStatistics(this.filterQuery)
.then((response) => { .then((response) => {
console.log(response) console.log(response)
this.showSup = response.data.showSup; this.showSup = response.data.showSup;
this.loading = false; this.loading = false;
this.list = response.data.list || []; this.list = response.data.list || [];
this.total = response.data.total || 0; this.total = response.data.total || 0;
}) })
.catch(() => { .catch(() => {
this.loading = false; this.loading = false;
this.list = []; this.list = [];
this.total = 0; this.total = 0;
}); });
}, },
// //
findMethod(query) { findMethod(query) {
this.fromOptions = []; this.fromOptions = [];
let cQuery = { let cQuery = {
key: query, key: query,
}; };
getBasicUnitMaintains(cQuery) getBasicUnitMaintains(cQuery)
.then((response) => { .then((response) => {
this.loading = false; this.loading = false;
this.fromOptions = response.data.page.list || []; this.fromOptions = response.data.page.list || [];
}) })
.catch(() => { .catch(() => {
this.loading = false; this.loading = false;
}); });
}, },
//ID //ID
findStorageCode(query) { findStorageCode(query) {
this.storageOptions = []; this.storageOptions = [];
let cQuery = { let cQuery = {
key: query, key: query,
}; };
getStorageCode(cQuery).then((response) => { getStorageCode(cQuery).then((response) => {
this.storageOptions = response.data.list; this.storageOptions = response.data.list;
}).catch(() => { }).catch(() => {
}) })
}, },
intentDetail(row) { intentDetail(row) {
this.idQuery = row; this.idQuery = row;
// this.idQuery.supId = null; // this.idQuery.supId = null;
this.idQuery.customerId = null; this.idQuery.customerId = null;
this.codeDetailVisible = true; this.codeDetailVisible = true;
},
getBusType() {
let query = {
enabled: true,
};
getBussinessType(query)
.then((response) => {
this.busTypes = response.data.list || [];
this.filterQuery.billAction = this.busTypes[0].action;
// this.getList();
})
.catch(() => {
});
},
getActionName(action) {
for (let i = 0; i < this.busTypes.length; i++) {
if (this.busTypes[i].action === action) {
return this.busTypes[i].name;
}
}
},
getStorage() {
this.storageList = [];
filterUplLocInv()
.then((response) => {
this.storageList = response.data || [];
})
.catch(() => {
});
},
}, },
filters: { getBusType() {
statusFilterType(status) { let query = {
const statusMap = { enabled: true,
false: "success", };
true: "danger", getBussinessType(query)
}; .then((response) => {
return statusMap[status]; this.busTypes = response.data.list || [];
}, this.filterQuery.billAction = this.busTypes[0].action;
// this.getList();
})
.catch(() => {
});
}, },
mounted() { getActionName(action) {
document.body.ondrop = function (event) { for (let i = 0; i < this.busTypes.length; i++) {
event.preventDefault(); if (this.busTypes[i].action === action) {
event.stopPropagation(); return this.busTypes[i].name;
}; }
}
}, },
created() { getStorage() {
this.getBusType(); this.storageList = [];
let query = this.$route.query; filterUplLocInv()
this.filterQuery = Object.assign(this.filterQuery, query); .then((response) => {
this.filterQuery.limit = parseInt(this.filterQuery.limit); this.storageList = response.data || [];
this.loading = true; })
this.getList(); .catch(() => {
this.findStorageCode(); });
this.getStorage(); },
},
filters: {
statusFilterType(status) {
const statusMap = {
false: "success",
true: "danger",
};
return statusMap[status];
}, },
},
mounted() {
document.body.ondrop = function (event) {
event.preventDefault();
event.stopPropagation();
};
},
created() {
this.getBusType();
let query = this.$route.query;
this.filterQuery = Object.assign(this.filterQuery, query);
this.filterQuery.limit = parseInt(this.filterQuery.limit);
this.loading = true;
this.getList();
this.findStorageCode();
this.getStorage();
},
}; };
</script> </script>

@ -0,0 +1,355 @@
<template>
<div>
<el-card>
<el-form :inline="true" :model="filterQuery" size="mini">
<el-row style="width: 100%">
<el-form-item class="query-form-item">
<el-input v-model="filterQuery.nameCode" placeholder="产品标识DI"></el-input>
</el-form-item>
<el-form-item class="query-form-item">
<el-input v-model="filterQuery.productsName" placeholder="产品名称"></el-input>
</el-form-item>
<el-form-item class="query-form-item">
<el-input v-model="filterQuery.batchNo" placeholder="批次号"></el-input>
</el-form-item>
<el-form-item class="query-form-item">
<el-select
v-model="filterQuery.supId"
filterable
remote
clearable="true"
reserve-keyword
placeholder="请输入供应商名称"
:remote-method="findMethod"
size="mini"
:loading="loading"
>
<el-option
v-for="item in fromOptions"
:key="item.companyName"
:label="item.companyName"
:value="item.customerId"
>
<span style="float: left">{{ item.companyName }}</span>
</el-option>
</el-select>
</el-form-item>
</el-row>
<el-row style="width: 100%">
<el-form-item class="query-form-item">
<el-input v-model="filterQuery.ggxh" placeholder="规格型号"></el-input>
</el-form-item>
<el-form-item class="query-form-item">
<el-input v-model="filterQuery.zczbhhzbapzbh" placeholder="批准文号"></el-input>
</el-form-item>
<el-form-item class="query-form-item">
<el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="生产厂家"></el-input>
</el-form-item>
<el-form-item>
<el-button-group>
<el-button
type="primary"
icon="el-icon-refresh"
@click="onReset"
></el-button>
<el-button type="primary" icon="search" @click="onSubmit"
>查询
</el-button
>
</el-button-group>
</el-form-item>
</el-row>
</el-form>
<el-table v-loading="loading" :data="list" style="width: 100%">
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="产品标识" prop="nameCode" width="120"></el-table-column>
<el-table-column label="产品名称" prop="cpmctymc" width="180">
</el-table-column>
<el-table-column label="规格型号" prop="ggxh" width="180"></el-table-column>
<el-table-column label="批次号" prop="batchNo" width="120"></el-table-column>
<el-table-column label="生产日期" prop="productionDate" width="120"></el-table-column>
<el-table-column label="失效日期" prop="expireDate" width="120"></el-table-column>
<el-table-column label="入库数量" prop="inCount" width="120"></el-table-column>
<el-table-column label="出库数量" prop="outCount" width="120"></el-table-column>
<el-table-column label="结余数量" prop="reCount" width="120">
<template slot-scope="scope">
{{ (scope.row.inCount - scope.row.outCount) }}
</template>
</el-table-column>
<el-table-column label="生产厂家" prop="ylqxzcrbarmc" v-if="showSup" show-overflow-tooltip
width="120"></el-table-column>
<el-table-column label="供应商" prop="companyName" v-if="showSup" show-overflow-tooltip
width="120"></el-table-column>
<el-table-column label="仓库" prop="invStorageName" v-if="showSup"
show-overflow-tooltip width="120"></el-table-column>
<el-table-column label="操作" width="120" fixed="right">
<template slot-scope="scope">
<el-button
type="text"
size="small"
@click.native.stop="intentDetail(scope.row)"
>详情
</el-button
>
<el-button
type="text"
size="small"
@click.native.stop="deleteDialog(scope.row.id)"
>删除
</el-button
>
</template>
</el-table-column>
</el-table>
</el-card>
<el-dialog
title="库存详情"
:visible.sync="codeDetailVisible"
width="85%"
v-if="codeDetailVisible"
>
<codeDetail
:idQuery="idQuery"
v-on:closeDetailDialog="closeDetailDialog"
></codeDetail>
</el-dialog>
<el-pagination
:page-size="filterQuery.limit"
@current-change="handleCurrentChange"
layout="prev, pager, next"
:total="total"
></el-pagination>
</div>
</template>
<script>
import {
filterProducts,
deleteProducts,
} from "../../api/inventory/InvPreInProducts";
import draggable from "vuedraggable";
import codeDetail from "./InvPreInProductsDetail";
import store from "../../store";
import {getBussinessType} from "../../api/basic/bussinessType";
import {filterCustomers} from "@/api/auth/customer";
export default {
data() {
return {
filterQuery: {
cpmctymc: null,
nameCode: null,
relIdFk: null,
batchNo: null,
page: 1,
limit: 20,
customerId: null,
unitFk: null,
},
detailQuery: {
code: null,
productIdFk: null,
page: 1,
limit: 20,
},
list: [],
fromOptions: [],
codeDetailVisible: false,
total: 0,
loading: true,
index: null,
dialogTableVisible: false,
formLoading: false,
dialogVisible: false,
deleteLoading: false,
busTypes: [],
idQuery: null,
showSup: false,
};
},
components: {
draggable,
codeDetail,
},
methods: {
onReset() {
this.$router.push({
path: "",
});
this.filterQuery = {
cpmctymc: null,
nameCode: null,
relIdFk: null,
batchNo: null,
customerId: null,
page: 1, unitFk: null,
limit: 20,
};
this.getList();
},
onSubmit() {
this.loading = true;
this.getList();
},
handleSizeChange(val) {
this.filterQuery.limit = val;
this.getList();
},
handleCurrentChange(val) {
this.filterQuery.page = val;
this.getList();
},
handleUnitClick(row) {
this.curIndex = row.id;
this.dialogTableVisible = true;
},
closeDetailDialog(val) {
this.codeDetailVisible = false;
},
closeDialog() {
this.getList();
},
getList() {
this.loading = true;
this.filterQuery.customerId = store.getters.customerId;
filterProducts(this.filterQuery)
.then((response) => {
console.log(response)
this.loading = false;
this.showSup = response.data.showSup;
this.list = response.data.list || [];
this.total = response.data.total || 0;
})
.catch(() => {
this.loading = false;
this.list = [];
this.total = 0;
});
},
deleteOrders(data) {
this.loading = true;
let query = {
id: data,
}
deleteProducts(query)
.then((response) => {
if (response.code == 20000) {
this.getList();
this.$message({
type: "success",
message: "删除成功!",
});
} else {
this.$message.error(response.message);
}
})
.catch(() => {
});
},
deleteDialog(rowId) {
this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.deleteOrders(rowId);
})
.catch(() => {
});
},
findMethod(query) {
console.log(query);
this.fromOptions = [];
let cQuery = {
key: query,
customerName: query,
};
// getBasicUnitMaintains(cQuery)
// .then((response) => {
// this.loading = false;
// this.fromOptions = response.data.page.list || [];
// })
// .catch(() => {
// this.loading = false;
// });
filterCustomers(cQuery)
.then((response) => {
this.fromOptions = response.data.list || [];
})
.catch(() => {
this.fromOptions = [];
});
},
intentDetail(row) {
this.idQuery = row;
// this.idQuery.supId = null;
this.idQuery.customerId = null;
this.codeDetailVisible = true;
},
getBusType() {
let query = {
enabled: true,
};
getBussinessType(query)
.then((response) => {
this.busTypes = response.data.list || [];
this.filterQuery.billAction = this.busTypes[0].action;
// this.getList();
})
.catch(() => {
});
},
getActionName(action) {
for (let i = 0; i < this.busTypes.length; i++) {
if (this.busTypes[i].action === action) {
return this.busTypes[i].name;
}
}
},
},
filters: {
statusFilterType(status) {
const statusMap = {
false: "success",
true: "danger",
};
return statusMap[status];
},
},
mounted() {
document.body.ondrop = function (event) {
event.preventDefault();
event.stopPropagation();
};
},
created() {
this.findMethod();
this.getBusType();
let query = this.$route.query;
this.filterQuery = Object.assign(this.filterQuery, query);
this.filterQuery.limit = parseInt(this.filterQuery.limit);
//
this.getList();
},
};
</script>
<style type="text/scss" lang="scss">
</style>

@ -13,6 +13,7 @@
<el-input <el-input
v-model="query.code" v-model="query.code"
placeholder="UDI码" placeholder="UDI码"
clearable
style="width: 500px" style="width: 500px"
@keyup.enter.native="keyup_submit($event)" @keyup.enter.native="keyup_submit($event)"
></el-input> ></el-input>

@ -15,6 +15,7 @@
id="inputer" id="inputer"
v-model="filterQuery.code" v-model="filterQuery.code"
placeholder="UDI码" placeholder="UDI码"
clearable
ref='inputRef' ref='inputRef'
style="width: 500px" style="width: 500px"
@keypress.enter.native="enterKey($event)" @keypress.enter.native="enterKey($event)"

@ -4,13 +4,13 @@
<el-form :inline="true" :model="filterQuery" class="query-form" size="mini"> <el-form :inline="true" :model="filterQuery" class="query-form" size="mini">
<el-row> <el-row>
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-input v-model="filterQuery.nameCode" placeholder="产品标识DI"></el-input> <el-input v-model="filterQuery.nameCode" placeholder="产品标识DI" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-input v-model="filterQuery.cpmctymc" placeholder="产品名称"></el-input> <el-input v-model="filterQuery.cpmctymc" placeholder="产品名称" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-input v-model="filterQuery.batchNo" placeholder="批次号"></el-input> <el-input v-model="filterQuery.batchNo" placeholder="批次号" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button-group> <el-button-group>
@ -45,25 +45,6 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="供应商" prop="companyName" v-if="showSup" show-overflow-tooltip></el-table-column> <el-table-column label="供应商" prop="companyName" v-if="showSup" show-overflow-tooltip></el-table-column>
<!-- <el-table-column label="操作" width="120" fixed="right">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
<!-- type="text"-->
<!-- size="small"-->
<!-- @click.native.stop="intentDetail(scope.row)"-->
<!-- >详情-->
<!-- </el-button-->
<!-- >-->
<!-- <el-button-->
<!-- type="text"-->
<!-- size="small"-->
<!-- @click.native.stop="deleteDialog(scope.row.id)"-->
<!-- >删除-->
<!-- </el-button-->
<!-- >-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table> </el-table>
</el-card> </el-card>

@ -4,13 +4,13 @@
<el-form :inline="true" :model="filterQuery" class="query-form" size="mini"> <el-form :inline="true" :model="filterQuery" class="query-form" size="mini">
<el-row> <el-row>
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-input v-model="filterQuery.nameCode" placeholder="产品标识DI"></el-input> <el-input v-model="filterQuery.nameCode" placeholder="产品标识DI" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-input v-model="filterQuery.cpmctymc" placeholder="产品名称"></el-input> <el-input v-model="filterQuery.cpmctymc" placeholder="产品名称" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-input v-model="filterQuery.batchNo" placeholder="批次号"></el-input> <el-input v-model="filterQuery.batchNo" placeholder="批次号" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button-group> <el-button-group>

@ -0,0 +1,209 @@
<template>
<el-card>
<el-descriptions class="margin-top" title="数据同步设置" :column="1" :size="100" border>
<template slot="extra">
<el-button type="primary" size="small" @click="saveConfig()"></el-button>
</template>
<el-descriptions-item>
<template slot="label">
参数设置
</template>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="4" class="el-col" style="margin-top: 6px">
<el-checkbox v-model="configQuery.downstreamEnable"></el-checkbox>
</el-col>
<el-col :span="20" class="el-col">
<div>
<span>数据同步轮询时间(单位:分钟):&nbsp;</span>
<el-input
style="width: 100px"
size="small"
type="number"
v-model="configQuery.syncTime"
splaceholder="请输入内容"
></el-input>
</div>
</el-col>
</el-row>
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">
单据类型
</template>
<el-checkbox v-model="configQuery.typeBus"></el-checkbox>
<el-checkbox v-model="configQuery.typeScan"></el-checkbox>
<el-checkbox v-model="configQuery.typeThird"></el-checkbox>
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">
基础信息
</template>
<el-checkbox v-model="configQuery.basicProducts"></el-checkbox>
<el-checkbox v-model="configQuery.basicCorp"></el-checkbox>
<el-checkbox v-model="configQuery.basicInv"></el-checkbox>
<el-checkbox v-model="configQuery.basicThirdProducts"></el-checkbox>
<el-checkbox v-model="configQuery.basicThirdCorp"></el-checkbox>
<el-checkbox v-model="configQuery.basicThirdInv"></el-checkbox>
<el-checkbox v-model="configQuery.basicThirdBusOrder"></el-checkbox>
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">
国家库DI数据
</template>
<el-checkbox v-model="configQuery.dbDiProducts">DI</el-checkbox>
</el-descriptions-item>
</el-descriptions>
<el-descriptions class="margin-top" title="" :column="1" :size="100" style="margin-top: 30px" border>
<el-descriptions-item label="单据(单据类型)" label-style="width: 150px">
<el-checkbox-group v-model="checkedBusTypes" @change="handleCheckedChange" >
<el-checkbox
style="padding-top: 10px"
v-for="busType in busTypes" :label="busType" :key="busType.action"
:value="busType.action">{{ busType.name }}
</el-checkbox>
</el-checkbox-group>
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">
单据(单据状态)
</template>
<el-checkbox v-model="configQuery.orderUnCheck"></el-checkbox>
<el-checkbox v-model="configQuery.orderUnReceive"></el-checkbox>
<el-checkbox v-model="configQuery.orderScanFinish"></el-checkbox>
</el-descriptions-item>
</el-descriptions>
</el-card>
</template>
<script>
import {findConfig, updateConfig} from "@/api/thrsys/spsSyncStatus";
import store from "@/store";
import {getBussinessType} from "@/api/basic/bussinessType";
export default {
name: "SysUdimsConfig",
data() {
return {
configQuery: {
id: null,
typeBus: null,
typeScan: null,
typeThird: null,
basicProducts: null,
basicCorp: null,
basicInv: null,
basicThirdProducts: null,
basicThirdCorp: null,
basicThirdInv: null,
basicThirdBusOrder: null,
orderScanFinish: null,
dbDiProducts: null,
downstreamEnable: null,
syncTime: null,
orderUnCheck: null,
orderUnReceive: null,
busTypes: [],
},
checkedBusTypes: [],
busTypes: [],
}
},
methods: {
getConfig() {
findConfig()
.then((response) => {
if (response.code == 20000) {
// debugger
this.configQuery = response.data;
if (this.configQuery.busTypes != null) {
for (let i = 0; i < this.configQuery.busTypes.length; i++) {
for (let k = 0; k < this.busTypes.length; k++) {
if (this.busTypes[k].action == this.configQuery.busTypes[i]) {
this.checkedBusTypes.push(this.busTypes[k]);
}
}
}
}
console.log(this.checkedBusTypes);
} else {
this.$message.error(response.message);
}
})
.catch(() => {
this.loading = false;
this.list = [];
this.total = 0;
});
},
saveConfig() {
if (this.checkedBusTypes != null) {
this.configQuery.busTypes = [];
for (let i = 0; i < this.checkedBusTypes.length; i++) {
this.configQuery.busTypes.push(this.checkedBusTypes[i].action);
}
}
updateConfig(this.configQuery)
.then((response) => {
this.loading = false;
if (response.code == 20000) {
this.$message.success("更新成功!");
this.getConfig();
}
})
.catch(() => {
this.loading = false;
});
},
handleCheckedChange() {
},
getBusType() {
let query = {
enabled: true,
};
getBussinessType(query)
.then((response) => {
this.busTypes = response.data.list || [];
this.getConfig();
})
.catch(() => {
});
},
},
created() {
this.headers = {
ADMIN_ID: store.getters.adminId,
ADMIN_TOKEN: store.getters.token,
};
this.getBusType();
},
}
</script>
<style scoped>
</style>

@ -1,103 +1,108 @@
<template> <template>
<div> <div>
<el-form :inline="true" :model="query" class="query-form" size="mini">
<el-row>
<el-form-item class="query-form-item">
<el-input v-model="filterQuery.genKey" placeholder="记录ID"></el-input>
</el-form-item>
<el-form-item class="query-form-item">
<el-select v-model="filterQuery.status" placeholder="处理状态">
<el-option label="全部" value=""></el-option>
<el-option label="等待处理" value="0"></el-option>
<el-option label="已处理" value="1"></el-option>
<el-option label="异常" value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item> <el-card>
<el-button-group style="display:flex;"> <el-form :inline="true" :model="query" class="query-form" size="mini">
<el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button> <el-row>
<el-button type="primary" icon="search" @click="getList"></el-button> <el-form-item class="query-form-item">
<el-button type="primary" icon="search" @click="createSchedule(1)"></el-button> <el-input v-model="filterQuery.genKey" placeholder="记录ID"></el-input>
<el-button type="primary" icon="search" @click="createSchedule(2)"></el-button> </el-form-item>
<el-button type="primary" icon="search" @click="createSchedule(3)"></el-button>
<el-button type="primary" icon="search" @click="createSchedule(4)">DI</el-button>
</el-button-group>
</el-form-item>
</el-row>
</el-form>
<el-table <el-form-item class="query-form-item">
v-loading="loading" <el-select v-model="filterQuery.status" placeholder="处理状态">
:data="list" <el-option label="全部" value=""></el-option>
style="width: 100%" <el-option label="等待处理" value="0"></el-option>
> <el-option label="已处理" value="1"></el-option>
<el-table-column label="序号" type="index"></el-table-column> <el-option label="异常" value="2"></el-option>
<el-table-column </el-select>
label="任务ID" </el-form-item>
prop="id"
show-overflow-tooltip
></el-table-column>
<el-table-column <el-form-item>
label="任务类型" <el-button-group style="display:flex;">
prop="idDatas" <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
show-overflow-tooltip <el-button type="primary" icon="search" @click="getList"></el-button>
> <el-button type="primary" icon="search" @click="createSchedule(1)"></el-button>
<el-button type="primary" icon="search" @click="createSchedule(2)"></el-button>
<el-button type="primary" icon="search" @click="createSchedule(3)"></el-button>
<el-button type="primary" icon="search" @click="createSchedule(4)">DI</el-button>
</el-button-group>
</el-form-item>
</el-row>
</el-form>
<template slot-scope="scope"> <el-table
<span>{{ type[scope.row.idDatas] }}</span> v-loading="loading"
</template> :data="list"
</el-table-column> style="width: 100%"
<el-table-column
label="状态"
prop="status"
show-overflow-tooltip
> >
<template slot-scope="scope"> <el-table-column label="序号" type="index"></el-table-column>
<el-tag <el-table-column
:type="statusFilterType(scope.row.status)" label="任务ID"
>{{ status[scope.row.status] }} prop="id"
</el-tag show-overflow-tooltip
> ></el-table-column>
</template>
</el-table-column> <el-table-column
<el-table-column label="任务类型"
label="开始时间" prop="idDatas"
prop="startTime" show-overflow-tooltip
show-overflow-tooltip >
></el-table-column>
<el-table-column <template slot-scope="scope">
label="结束时间" <span>{{ type[scope.row.idDatas] }}</span>
prop="endTime" </template>
show-overflow-tooltip </el-table-column>
:formatter="formatterThirdSys" <el-table-column
></el-table-column> label="状态"
prop="status"
show-overflow-tooltip
>
<template slot-scope="scope">
<el-tag
:type="statusFilterType(scope.row.status)"
>{{ status[scope.row.status] }}
</el-tag
>
</template>
</el-table-column>
<el-table-column
label="开始时间"
prop="startTime"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="结束时间"
prop="endTime"
show-overflow-tooltip
:formatter="formatterThirdSys"
></el-table-column>
<el-table-column label="操作" fixed="right" width="160">
<template slot-scope="scope">
<el-button
type="text"
size="small"
@click.native.stop="deleteDialog(scope.row.id)"
>删除
</el-button
>
</template>
</el-table-column>
</el-table>
<el-pagination
:page-size="filterQuery.limit"
@current-change="handleCurrentChange"
layout="prev, pager, next"
:total="total"
></el-pagination>
</el-card>
<el-table-column label="操作" fixed="right" width="160">
<template slot-scope="scope">
<el-button
type="text"
size="small"
@click.native.stop="deleteDialog(scope.row.id)"
>删除
</el-button
>
</template>
</el-table-column>
</el-table>
<el-pagination
:page-size="filterQuery.limit"
@current-change="handleCurrentChange"
layout="prev, pager, next"
:total="total"
></el-pagination>
</div> </div>
</template> </template>
<script> <script>
import {filterLog, deleteLog, createSchedule} from "../../api/thrsys/spsSyncStatus"; import {filterLog, deleteLog, createSchedule, findConfig, updateConfig} from "../../api/thrsys/spsSyncStatus";
import store from "@/store"; import store from "@/store";
export default { export default {
@ -107,7 +112,7 @@ export default {
id: null, id: null,
status: "1", status: "1",
page: 1, page: 1,
limit: 20, limit: 10,
}, },
list: [], list: [],
headers: {}, headers: {},
@ -128,11 +133,30 @@ export default {
1: "处理完成", 1: "处理完成",
2: "处理异常", 2: "处理异常",
}, },
configQuery: {
id: null,
typeBus: null,
typeScan: null,
typeThird: null,
basicProducts: null,
basicCorp: null,
basicInv: null,
basicThirdProducts: null,
basicThirdCorp: null,
basicThirdInv: null,
basicThirdBusOrder: null,
orderScanFinish: null,
dbDiProducts: null,
downstreamEnable: null,
syncTime: null,
},
uploadFileUrl: null, uploadFileUrl: null,
uploadData: { uploadData: {
thirdSys: "thirdId", thirdSys: "thirdId",
}, },
templateDlUrl: null, templateDlUrl: null,
checked: false,
}; };
}, },
@ -168,6 +192,35 @@ export default {
}); });
}, },
getConfig() {
findConfig()
.then((response) => {
if (response.code == 20000) {
this.configQuery = response.data;
} else {
this.$message.error(response.message);
}
})
.catch(() => {
this.loading = false;
this.list = [];
this.total = 0;
});
},
saveConfig() {
updateConfig(this.configQuery)
.then((response) => {
this.loading = false;
if (response.code == 20000) {
this.$message.success("更新成功!");
this.getConfig();
}
})
.catch(() => {
this.loading = false;
});
},
cancelDialog(val) { cancelDialog(val) {
this.udiImportDetailVisible = false; this.udiImportDetailVisible = false;
@ -264,6 +317,7 @@ export default {
ADMIN_TOKEN: store.getters.token, ADMIN_TOKEN: store.getters.token,
}; };
this.getList(); this.getList();
this.getConfig();
}, },
}; };
</script> </script>

@ -131,7 +131,7 @@
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="单位" label="规格型号"
prop="spec" prop="spec"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
></el-table-column> ></el-table-column>

@ -566,6 +566,7 @@ export default {
selectErpDialogVisible: false, //ERP selectErpDialogVisible: false, //ERP
selectLocalVisible: false, //UDI selectLocalVisible: false, //UDI
isUseDyCheck: false, isUseDyCheck: false,
loading:false,
}; };
}, },
@ -585,7 +586,6 @@ export default {
getList() { getList() {
this.loading = true; this.loading = true;
this.filterQuery.nameCode = this.curRow.nameCode; this.filterQuery.nameCode = this.curRow.nameCode;
console.log(this.curAction.corpType);
if (this.curAction != null && this.curAction.corpType == 0) { if (this.curAction != null && this.curAction.corpType == 0) {
this.filterQuery.unitFk = this.curRow.fromCorpId; this.filterQuery.unitFk = this.curRow.fromCorpId;
} }

@ -69,8 +69,6 @@
</el-table-column> </el-table-column>
<el-table-column label="往来单位" prop="fromCorp" width="220"> <el-table-column label="往来单位" prop="fromCorp" width="220">
<template slot-scope="scope"> <template slot-scope="scope">
<!-- {{ scope.row.fromCorp }}-->
<p v-if="scope.row.fromCorp == null"> <p v-if="scope.row.fromCorp == null">
<el-button <el-button
type="primary" type="primary"

@ -80,24 +80,6 @@
<el-table-column label="往来单位" prop="fromCorp" width="220"> <el-table-column label="往来单位" prop="fromCorp" width="220">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.fromCorp }} {{ scope.row.fromCorp }}
<!-- <p v-if="scope.row.fromCorp == null">-->
<!-- <el-button-->
<!-- type="primary"-->
<!-- size="mini"-->
<!-- @click.native.stop="handleUnitClick(scope.row)"-->
<!-- >选择往来单位-->
<!-- </el-button-->
<!-- >-->
<!-- </p>-->
<!-- <p v-if="scope.row.fromCorp !== null">-->
<!-- <el-button-->
<!-- type="primary"-->
<!-- size="mini"-->
<!-- @click.native.stop="handleUnitClick(scope.row)"-->
<!-- >{{ scope.row.fromCorp }}-->
<!-- </el-button-->
<!-- >-->
<!-- </p>-->
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="当前仓库" prop="locStorageCode" width="150"> <el-table-column label="当前仓库" prop="locStorageCode" width="150">
@ -124,29 +106,10 @@
<el-button <el-button
type="text" type="text"
size="small" size="small"
@click.native.stop="addOrders(scope.row)" @click.native.stop="addOrders(scope.row)"
>编辑 >编辑
</el-button </el-button
> >
<!-- v-if="scope.row.status === -1"-->
<!-- <el-button-->
<!-- type="text"-->
<!-- size="small"-->
<!-- v-if="scope.row.status !== -1"-->
<!-- @click.native.stop="intentDetail(scope.row)"-->
<!-- >详情-->
<!-- </el-button-->
<!-- >-->
<!-- <el-button-->
<!-- type="text"-->
<!-- size="small"-->
<!-- v-if="scope.row.status !== -1"-->
<!-- @click.native.stop="handleErrorDetail(scope.$index)"-->
<!-- >错误详情-->
<!-- </el-button-->
<!-- >-->
<el-button <el-button
type="text" type="text"
size="small" size="small"
@ -477,6 +440,7 @@ export default {
this.idQuery.id = ''; this.idQuery.id = '';
this.idQuery.actDate = ''; this.idQuery.actDate = '';
this.idQuery.corpOrderId = ''; this.idQuery.corpOrderId = '';
this.idQuery.outChangeEnable = row.outChangeEnable; this.idQuery.outChangeEnable = row.outChangeEnable;
if (row.id !== null && row.id !== undefined && row.id !== '') { if (row.id !== null && row.id !== undefined && row.id !== '') {
this.idQuery.id = row.id; this.idQuery.id = row.id;
@ -484,6 +448,7 @@ export default {
this.idQuery.corpOrderId = row.corpOrderId; this.idQuery.corpOrderId = row.corpOrderId;
this.idQuery.billType = row.action; this.idQuery.billType = row.action;
this.idQuery.locStorageCode = row.locStorageCode; this.idQuery.locStorageCode = row.locStorageCode;
this.idQuery.preCheck = row.preCheck;
} }
if (store.getters.customerId == 110) { if (store.getters.customerId == 110) {
@ -491,6 +456,7 @@ export default {
this.idQuery.action = row.action; this.idQuery.action = row.action;
this.idQuery.fromCorp = row.fromCorp; this.idQuery.fromCorp = row.fromCorp;
this.idQuery.fromCorpId = row.fromCorpId; this.idQuery.fromCorpId = row.fromCorpId;
this.idQuery.preCheck = row.preCheck;
} else } else
this.addOrderVisible = true; this.addOrderVisible = true;

@ -13,6 +13,7 @@
<el-input <el-input
v-model="query.code" v-model="query.code"
placeholder="UDI码" placeholder="UDI码"
clearable
style="width: 500px" style="width: 500px"
@keyup.enter.native="keyup_submit($event)" @keyup.enter.native="keyup_submit($event)"
></el-input> ></el-input>

@ -63,7 +63,6 @@
<el-option <el-option
v-for="item in busTypes" v-for="item in busTypes"
:key="item.name" :key="item.name"
: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>
@ -80,9 +79,6 @@
<el-col :span="8"> <el-col :span="8">
<el-form-item prop="locStorageCode"> <el-form-item prop="locStorageCode">
<!--<el-select v-model="formData.billType" style="width: 100%" placeholder="业务类型" :disabled="true">-->
<!--<el-option label="送货单" value="deliveryNote"></el-option>-->
<!--</el-select>-->
<el-select v-model="formData.locStorageCode" placeholder="当前仓库信息" @change="locCHange" <el-select v-model="formData.locStorageCode" placeholder="当前仓库信息" @change="locCHange"
:disabled="corpOrderIdDisabled"> :disabled="corpOrderIdDisabled">
<el-option <el-option
@ -175,6 +171,11 @@
<el-checkbox v-model="formData.outChangeEnable" <el-checkbox v-model="formData.outChangeEnable"
:disabled="!curAction.changeEnable">允许出库自动缺量补单 :disabled="!curAction.changeEnable">允许出库自动缺量补单
</el-checkbox> </el-checkbox>
<el-checkbox v-model="formData.preCheck"
:disabled="corpOrderIdDisabled"
>是否预验收
</el-checkbox>
</div> </div>
</el-col> </el-col>
@ -214,11 +215,6 @@
</el-row> </el-row>
<!-- <div>-->
<!-- <input type="text" id="inputer" ime-mode="disabled" tabindex="0" >-->
<!-- </div>-->
<!-- <div id="inputer" tabindex="0"></div>-->
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="14" style="margin-left: 40px"> <el-col :span="14" style="margin-left: 40px">
@ -384,6 +380,7 @@ export default {
action: null, action: null,
locStorageCode: null, locStorageCode: null,
outChangeEnable: false, outChangeEnable: false,
preCheck: false,
}, },
curId: null, curId: null,
storageList: [], storageList: [],
@ -436,6 +433,7 @@ export default {
fromCorp: this.formData.fromCorp, fromCorp: this.formData.fromCorp,
fromCorpId: this.formData.fromCorpId, fromCorpId: this.formData.fromCorpId,
outChangeEnable: this.formData.outChangeEnable, outChangeEnable: this.formData.outChangeEnable,
preCheck: this.formData.preCheck,
} }
submitOrderWeb(tQuery) submitOrderWeb(tQuery)
.then((response) => { .then((response) => {
@ -527,14 +525,6 @@ export default {
addCodeSubmit(tQuery) { addCodeSubmit(tQuery) {
addOrderWeb(tQuery).then((response) => { addOrderWeb(tQuery).then((response) => {
// let teQuery = {code: this.formData.code};
// expireTimeCheck(teQuery).then((response) => {
// if (response.code === 20000) {
// } else {
// this.$message.warning(response.message);
// }
// this.loading = false;
// });
if (response.code === 20000) { if (response.code === 20000) {
this.idQuery.id = response.data.orderId; this.idQuery.id = response.data.orderId;
@ -557,28 +547,12 @@ export default {
this.getCodeList(); this.getCodeList();
this.selectRlTitle = response.message; this.selectRlTitle = response.message;
this.bindRl(response.data); this.bindRl(response.data);
// this.$alert(response.message, '', {
// confirmButtonText: '',
// type: 'warning',
// closeOnClickModal: true,
// callback: action => {
// this.bindRl(response.data);
// }
// });
} else if (response.code == 503) { } else if (response.code == 503) {
this.curRow = response.data; this.curRow = response.data;
this.idQuery.id = this.curRow.orderId; this.idQuery.id = this.curRow.orderId;
this.getCodeList(); this.getCodeList();
this.selectUnitTitle = response.message; this.selectUnitTitle = response.message;
this.handleUnitClick(response.data); this.handleUnitClick(response.data);
// this.$alert(response.message, '', {
// confirmButtonText: '',
// type: 'warning',
// closeOnClickModal: true,
// callback: action => {
// this.handleUnitClick(response.data);
// }
// });
} else if (response.code == 504) { } else if (response.code == 504) {
this.$confirm(response.message, "提示", { this.$confirm(response.message, "提示", {
@ -615,8 +589,6 @@ export default {
} }
}); });
} }
} }
this.loading = false; this.loading = false;
}); });
@ -920,11 +892,13 @@ export default {
//onInput500ms //onInput500ms
if (text.includes("delete")) { if (text.includes("delete")) {
that.formData.code = ""; that.formData.code = "";
that.sitcomScan = ""; that.sictomText = "";
return; return;
} }
if (that.sitcomScan) { if (that.sitcomScan) {
that.sictomText = that.sictomText + text; let tempTxt = text;
let str = tempTxt.replace(/[\r]/g, "");
that.sictomText = that.sictomText + str;
that.formData.code = that.sictomText; that.formData.code = that.sictomText;
} else { } else {
that.formData.code = text; that.formData.code = text;
@ -950,6 +924,7 @@ export default {
this.formData.fromCorpId = this.idQuery.fromCorpId; this.formData.fromCorpId = this.idQuery.fromCorpId;
this.formData.locStorageCode = this.idQuery.locStorageCode; this.formData.locStorageCode = this.idQuery.locStorageCode;
this.formData.outChangeEnable = this.idQuery.outChangeEnable; this.formData.outChangeEnable = this.idQuery.outChangeEnable;
this.formData.preCheck = this.idQuery.preCheck;
this.actionEnable = true; this.actionEnable = true;
this.getCodeList(); this.getCodeList();
} else { } else {

@ -352,6 +352,7 @@ export default {
orderId: this.idQuery.id, orderId: this.idQuery.id,
action: this.formData.billType, action: this.formData.billType,
locStorageCode: this.formData.locStorageCode, locStorageCode: this.formData.locStorageCode,
preCheck:this.formData.preCheck,
} }
submitOrderWeb(tQuery) submitOrderWeb(tQuery)
@ -704,10 +705,6 @@ export default {
}, },
filters: {}, filters: {},
mounted() { mounted() {
document.body.ondrop = function (event) {
event.preventDefault();
event.stopPropagation();
};
document.body.ondrop = function (event) { document.body.ondrop = function (event) {
event.preventDefault(); event.preventDefault();
event.stopPropagation(); event.stopPropagation();
@ -725,7 +722,9 @@ export default {
return; return;
} }
if (that.sitcomScan) { if (that.sitcomScan) {
that.sictomText = that.sictomText + text; let tempTxt = text;
let str= tempTxt.replace(/[\r]/g, "");
that.sictomText = that.sictomText + str;
that.formData.code = that.sictomText; that.formData.code = that.sictomText;
} else { } else {
that.formData.code = text; that.formData.code = text;
@ -750,7 +749,7 @@ export default {
this.formData.billType = this.idQuery.billType; this.formData.billType = this.idQuery.billType;
this.formData.locStorageCode = this.idQuery.locStorageCode; this.formData.locStorageCode = this.idQuery.locStorageCode;
this.corpOrderIdDisabled = true; this.corpOrderIdDisabled = true;
this.formData.preCheck = this.idQuery.preCheck;
if (this.addType == "edit") { if (this.addType == "edit") {
this.visiblV = 1; this.visiblV = 1;
} }

@ -482,6 +482,14 @@ export default {
this.actDateRange = []; this.actDateRange = [];
}, },
onSubmit() { 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.getList(); this.getList();
if (this.query.status === "202" || this.query.status === "502") { if (this.query.status === "202" || this.query.status === "502") {
this.haveDistributionVisible = true; this.haveDistributionVisible = true;

@ -12,15 +12,6 @@
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-input v-model="query.billNo" placeholder="单据号"></el-input> <el-input v-model="query.billNo" placeholder="单据号"></el-input>
</el-form-item> </el-form-item>
<!-- <el-form-item class="query-form-item">-->
<!-- <el-select v-model="query.status" placeholder="单据状态">-->
<!-- <el-option label="全部" value=""></el-option>-->
<!-- <el-option label="草稿" value="1"></el-option>-->
<!-- <el-option label="未配货" value="2"></el-option>-->
<!-- <el-option label="待校验" value="3"></el-option>-->
<!-- <el-option label="已校验" value="4"></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-select v-model="query.billType" placeholder="请选择业务类型" clearable="true" size="mini"> <el-select v-model="query.billType" placeholder="请选择业务类型" clearable="true" size="mini">
<el-option <el-option

@ -104,8 +104,8 @@
v-for="item in busTypes" v-for="item in busTypes"
:key="item.name" :key="item.name"
:label="item.name" :label="item.name"
:value="item.action"> :value="item.localAction">
<span style="float: left">{{ item.name }}</span> <span style="float: left">{{ item.localName }}</span>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>

@ -871,7 +871,14 @@ export default {
return; return;
} }
} }
if (this.$isBlank(tQuery.batchNo)) {
if (!tQuery.allowNoBatch) {
return this.$message.error('批次号不能为空');
}
}
if (this.$isBlank(tQuery.productDate) && this.$isBlank(tQuery.expireDate)) {
return this.$message.error('生产日期与失效日期不能全部为空');
}
uploadStockOrderDetail(tQuery).then((response) => { uploadStockOrderDetail(tQuery).then((response) => {
this.detailLoading = false; this.detailLoading = false;
if (response.code === 20000) { if (response.code === 20000) {

@ -10,7 +10,7 @@
> >
<el-row style="width: 100%"> <el-row style="width: 100%">
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-input v-model="query.billNo" placeholder="单据号"></el-input> <el-input v-model="query.billNo" placeholder="单据号" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-select v-model="query.billType" placeholder="请选择业务类型" clearable="true" size="mini"> <el-select v-model="query.billType" placeholder="请选择业务类型" clearable="true" size="mini">
@ -454,6 +454,14 @@ export default {
this.actDateRange = []; this.actDateRange = [];
}, },
onSubmit() { 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.getList(); this.getList();
if (this.query.status === "202" || this.query.status === "502") { if (this.query.status === "202" || this.query.status === "502") {
this.haveDistributionVisible = true; this.haveDistributionVisible = true;

Loading…
Cancel
Save