Merge branch 'fengcang' into busUser

# Conflicts:
#	public/config.json
#	src/views/basic/BasicEntrutsRece.vue
#	src/views/business/stockOrder.vue
#	src/views/business/stockOrderDelSearch.vue
#	src/views/business/stockOrderEditor.vue
#	src/views/business/stockOrderNew.vue
#	src/views/business/stockOrderNewDistribution.vue
#	src/views/business/stockOrderSearch.vue
#	src/views/business/stockOrderWaitCheck.vue
#	src/views/inout/IOAddOrder.vue
#	src/views/inout/IOCheckWaitOrder.vue
#	src/views/inout/IOFinishOrder.vue
purchase
anthonyywj2 3 years ago
commit ea7d03a753

@ -5,4 +5,3 @@
"WEBSOCKET_URL": "ws://192.168.0.109:9991/UDI_WMS_MC/api/websocket/", "WEBSOCKET_URL": "ws://192.168.0.109:9991/UDI_WMS_MC/api/websocket/",
"hosp_name": "平和县医院" "hosp_name": "平和县医院"
} }

@ -353,8 +353,6 @@ export default {
created() { created() {
this.getList(); this.getList();
this.getSyncConfig(); this.getSyncConfig();
}, },
}; };
</script> </script>

@ -19,9 +19,8 @@
<el-card class="el-card" v-if="checked"> <el-card class="el-card" v-if="checked">
<div> <div>
<el-form :inline="true" :model="erpQuery" style="display: flex" size="mini"> <el-form :inline="true" :model="erpQuery" size="mini">
<el-row>
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-input <el-input
v-model="erpQuery.code" v-model="erpQuery.code"
@ -45,6 +44,9 @@
clearable="true" clearable="true"
placeholder="生产厂家"></el-input> placeholder="生产厂家"></el-input>
</el-form-item> </el-form-item>
</el-row>
<el-row>
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-input <el-input
v-model="erpQuery.spec" v-model="erpQuery.spec"
@ -69,6 +71,7 @@
<el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button> <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
<el-button type="primary" icon="search" @click="searchErpList"></el-button> <el-button type="primary" icon="search" @click="searchErpList"></el-button>
</el-form-item> </el-form-item>
</el-row>
</el-form> </el-form>
<el-table <el-table

@ -833,10 +833,10 @@ export default {
pidData: {}, pidData: {},
deleteLoading: false, deleteLoading: false,
uploadFileUrl: null, uploadFileUrl: null,
userData: null, userData: [],
bussinessTypeData: null, bussinessTypeData: [],
userList: null, userList: [],
bussinessTypeList: null, bussinessTypeList: [],
userFormVisible: false, userFormVisible: false,
relBusUserVisile: false, relBusUserVisile: false,
currentCode: null, currentCode: null,
@ -1409,13 +1409,18 @@ export default {
if (res.code === 20000) { if (res.code === 20000) {
this.userFormVisible = false; this.userFormVisible = false;
this.$message.success("添加成功"); this.$message.success("添加成功");
let loadParam = { this.userQuery = {
code: this.currentCode code: this.currentCode,
}; page: 1,
limit: 10
}
// //
warehouseUserList(loadParam).then((res) => { warehouseUserList(this.userQuery).then((res) => {
this.userData = res.data; this.userData = res.data.list;
this.userTotal = res.data.total;
}).catch((error) => { }).catch((error) => {
this.userData = [];
this.userTotal = 0;
}); });
} else { } else {
this.$message.error(res.message); this.$message.error(res.message);
@ -1464,12 +1469,17 @@ export default {
saveWarehouseBussinessType(query).then((res) => { saveWarehouseBussinessType(query).then((res) => {
this.$message.success("添加成功"); this.$message.success("添加成功");
// //
let loadParam = { this.busQuery = {
code: this.currentCode code: this.currentCode,
page: 1,
limit: 10
} }
warehouseBussinessTypeList(loadParam).then((res) => { warehouseBussinessTypeList(this.busQuery).then((res) => {
this.bussinessTypeData = res.data; this.bussinessTypeData = res.data.list;
this.busTotal = res.data.total;
}).catch((error) => { }).catch((error) => {
this.bussinessTypeData = [];
this.busTotal = 0;
}); });
}).catch((error) => { }).catch((error) => {
}); });

@ -425,6 +425,7 @@ export default {
storageChange(row) { storageChange(row) {
this.formData.fromCorpId = row.code; this.formData.fromCorpId = row.code;
this.formData.fromCorp = row.name; this.formData.fromCorp = row.name;
this.formData.fromSubInvCode = null;
this.findSubStorageMethod(); this.findSubStorageMethod();
}, },
@ -435,6 +436,10 @@ export default {
actionChange(item) { actionChange(item) {
this.curAction = this.getActionItem(item); this.curAction = this.getActionItem(item);
// this.formData.locStorageCode = this.curAction.storageCode; // this.formData.locStorageCode = this.curAction.storageCode;
//
this.formData.locStorageCode = null;
this.formData.invWarehouseCode = null;
this.formData.fromCorp = null;
this.findMethod(); this.findMethod();
}, },
getActionItem(action) { getActionItem(action) {

@ -61,6 +61,9 @@
<span>{{ getStorageName(scope.row.locStorageCode) }}</span> <span>{{ getStorageName(scope.row.locStorageCode) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="创建时间" label="创建时间"
prop="actDate" prop="actDate"
@ -72,24 +75,6 @@
<span>{{ scope.row.actDate }}</span> <span>{{ scope.row.actDate }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column
label="审核时间"
prop="actDate"
width="150"
show-overflow-tooltip="true"
>
<template slot-scope="scope">
<i class="el-icon-time"></i>
<span>{{ scope.row.auditTime }}</span>
</template>
</el-table-column>
<el-table-column label="校验状态" prop="contrastStatus" width="120">
<template slot-scope="scope">
<el-tag :type="(scope.row.contrastStatus === 1) | statusFilterType">
{{ erpCheckStatus[scope.row.contrastStatus] }}
</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" width="150"> <el-table-column label="操作" fixed="right" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@ -109,15 +94,6 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-pagination
:page-size="query.limit"
@current-change="handleCurrentChange"
layout="prev, pager, next"
:total="total"
:current-page="query.page"
>
</el-pagination>
</el-card> </el-card>
<el-card class="el-card" v-if="true"> <el-card class="el-card" v-if="true">
@ -246,13 +222,13 @@
</template> </template>
<script> <script>
import {filterOrderForDelete, orderDetail, deleteByOrderId, updateOrderInfo} from "../../api/inout/order"; import {filterOrderForDelete, orderDetail, deleteByOrderId, updateOrderInfo} from "../../api/inout/order";
import store from "../../store"; import store from "../../store";
import {getBussinessType} from "../../api/basic/bussinessType"; import {getBussinessType} from "../../api/basic/bussinessType";
import {filterAllByUser} from "../../api/basic/invWarehouse"; import {filterAllByUser} from "../../api/basic/invWarehouse";
import codeReplace from "./codeReplace"; import codeReplace from "./codeReplace";
export default { export default {
name: "stockOrderDelete", name: "stockOrderDelete",
data() { data() {
return { return {
@ -296,9 +272,12 @@
"8": "平衡补录单据", "8": "平衡补录单据",
}, },
erpCheckStatus: { erpCheckStatus: {
1: "已完成", // error: "",
0: "已完成", // null: "",
2: "已完成", // success: "",
1: "校验异常",
0: "未校验",
2: "校验成功",
}, },
isSp: store.getters.customerId, isSp: store.getters.customerId,
detailFormData: {}, detailFormData: {},
@ -581,12 +560,12 @@
this.getBusType(); this.getBusType();
this.getStorage(); this.getStorage();
} }
} }
</script> </script>
<style scoped> <style scoped>
.el-dialog { .el-dialog {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
margin: 0 !important; margin: 0 !important;
@ -594,17 +573,17 @@
top: 50%; top: 50%;
left: 50%; left: 50%;
transform: translate(-50%, -50%); transform: translate(-50%, -50%);
} }
.el-dialog .el-dialog__body { .el-dialog .el-dialog__body {
flex: 1; flex: 1;
overflow: auto; overflow: auto;
} }
.el-table /deep/ .highlight-row { .el-table /deep/ .highlight-row {
background: #cae3f9; background: #cae3f9;
} }
</style> </style>

@ -564,18 +564,18 @@ export default {
}, },
distributionVisible: false, distributionVisible: false,
detailFormRules: { detailFormRules: {
// batchNo: [ batchNo: [
// {required: true, message: "", trigger: "blur"} {required: true, message: "请输入批次号", trigger: "blur"}
// ], ],
// productDate: [ productDate: [
// {required: true, message: "", trigger: "blur"} {required: true, message: "请输入生产日期", trigger: "blur"}
// ], ],
// expireDate: [ expireDate: [
// {required: true, message: "", trigger: "blur"} {required: true, message: "请输入失效日期", trigger: "blur"}
// ], ],
// sweepCount: [ sweepCount: [
// {required: true, message: "", trigger: "blur"} {required: true, message: "请输入扫码数量", trigger: "blur"}
// ] ]
}, },
detailFormVisible: false, detailFormVisible: false,
detailFormData: {}, detailFormData: {},

@ -62,7 +62,7 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="20" style="margin-top: -10px"> <el-row :gutter="20" style="margin-top: -5px">
<el-col :span="3"> <el-col :span="3">
<div class="ao-text"> <div class="ao-text">
<span>业务类型</span> <span>业务类型</span>
@ -164,7 +164,6 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="20" style="margin-top: -10px"> <el-row :gutter="20" style="margin-top: -10px">
<el-col :span="3"> <el-col :span="3">
<div class="ao-text"> <div class="ao-text">
@ -457,7 +456,6 @@ import {filterAll, filterAllByLoc, filterAllByUser} from "@/api/basic/invWarehou
import dialogInvProduct from "../inventory/DialogInvProduct" import dialogInvProduct from "../inventory/DialogInvProduct"
import {filterSubByInv} from "@/api/basic/invSubWarehouse"; import {filterSubByInv} from "@/api/basic/invSubWarehouse";
import {isBlank} from "@/utils/strUtil"; import {isBlank} from "@/utils/strUtil";
import {filterDepts} from "@/api/auth/authDept";
export default { export default {
name: "idQuery", name: "idQuery",
@ -495,7 +493,6 @@ export default {
type: null, type: null,
corpName: "", corpName: "",
corpId: "", corpId: "",
deptCode: null,
}, },
formRules: { formRules: {
corpName: [ corpName: [
@ -828,6 +825,9 @@ export default {
locStorageCode: this.formData.locStorageCode, locStorageCode: this.formData.locStorageCode,
invWarehouseCode: this.formData.invWarehouseCode, invWarehouseCode: this.formData.invWarehouseCode,
}; };
if (!isBlank(this.formData.unitIdFk) && this.formData.unitIdFk === this.formData.corpId) {
this.invQueryData.corpId = this.formData.corpId;
}
this.selectInvProductVisible = true; this.selectInvProductVisible = true;
} else if (item.mainAction == "WareHouseIn" && this.curAction.corpType == 1 && this.formData.noInvOut != true) { } else if (item.mainAction == "WareHouseIn" && this.curAction.corpType == 1 && this.formData.noInvOut != true) {

@ -165,8 +165,7 @@ export default {
keys: [], keys: [],
}, },
dataList: [], dataList: [],
pageTotal: 1, pageTotal: 0,
total: 1,
currentRow: null, currentRow: null,
loading: false, loading: false,
udiRlDetailVisible: false, udiRlDetailVisible: false,
@ -224,7 +223,7 @@ export default {
nameCode: "", nameCode: "",
ggxh: null, ggxh: null,
page: 1, page: 1,
limit: 20, limit: 10,
addType: 1, addType: 1,
billType: this.data.formData.billType, billType: this.data.formData.billType,
corpId: this.data.formData.corpId, corpId: this.data.formData.corpId,

@ -469,7 +469,7 @@ import selectRlDialog from "./DialogSelectRl";
import editCodeDialog from "./editCode"; import editCodeDialog from "./editCode";
import A from "../../plugin/KeyScaner" import A from "../../plugin/KeyScaner"
import {deleteLog} from "@/api/basic/udiinfolog"; import {deleteLog} from "@/api/basic/udiinfolog";
import {filterDepts} from "@/api/auth/authDept";
export default { export default {
name: "idQuery", name: "idQuery",
@ -559,7 +559,6 @@ export default {
checkSuccess: false, checkSuccess: false,
codeDetail: null, codeDetail: null,
editTitle: "编辑条码", editTitle: "编辑条码",
fromDeptOptions: [],
}; };
}, },
components: { components: {
@ -583,7 +582,6 @@ export default {
fromCorpId: this.formData.fromCorpId, fromCorpId: this.formData.fromCorpId,
outChangeEnable: this.formData.outChangeEnable, outChangeEnable: this.formData.outChangeEnable,
preCheck: this.formData.preCheck, preCheck: this.formData.preCheck,
deptCode: this.formData.deptCode,
} }
submitOrderWeb(tQuery) submitOrderWeb(tQuery)
.then((response) => { .then((response) => {
@ -922,6 +920,9 @@ export default {
code: this.formData.invWarehouseCode, code: this.formData.invWarehouseCode,
enabled: true, enabled: true,
}; };
if (isBlank(query.code)) {
query.code = this.$store.getters.locSubInvCode;
}
getLocalJoinByUser(query) getLocalJoinByUser(query)
.then((response) => { .then((response) => {
this.busTypes = response.data.list || []; this.busTypes = response.data.list || [];
@ -1258,15 +1259,9 @@ export default {
this.findStorageMethod(); this.findStorageMethod();
} }
} }
this.findSubInvByInv(this.formData.locStorageCode); this.findSubInvByInv(this.formData.locStorageCode);
} }
, };
}
;
</script> </script>

@ -262,19 +262,18 @@
import { import {
orderListError, orderListError,
deleteByOrderId, deleteByOrderId,
commitOrder, addCommitOrder, addCommitOrder,
updateUnit, updateUnit,
} from "../../api/inout/order"; } from "../../api/inout/order";
import draggable from "vuedraggable"; import draggable from "vuedraggable";
import codeDetail from "./IONewCode"; import codeDetail from "./IONewCode";
import addOrder from "./IOAddOrder"; import addOrder from "./IOAddOrder";
import store from "../../store"; import store from "../../store";
import {getBussinessType} from "../../api/basic/bussinessType";
import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain"; import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
import {filterAllByUser} from "@/api/basic/invWarehouse"; import {filterAllByUser} from "@/api/basic/invWarehouse";
import {getLocalJoinByUser} from "@/api/basic/busLocalType"; import {getLocalJoinByUser} from "@/api/basic/busLocalType";
import {filterSubByInv} from "@/api/basic/invSubWarehouse"; import {filterSubByInv} from "@/api/basic/invSubWarehouse";
import {isBlank} from "@/utils/strUtil";
const formJson = { const formJson = {
site_id: "", site_id: "",
@ -412,7 +411,6 @@ export default {
}, },
selectUnit(row) { selectUnit(row) {
console.log(row.id);
this.unitUpdateQuery.id = this.curIndex; this.unitUpdateQuery.id = this.curIndex;
this.unitUpdateQuery.fromCorp = row.name; this.unitUpdateQuery.fromCorp = row.name;
this.unitUpdateQuery.fromCorpId = row.erpId; this.unitUpdateQuery.fromCorpId = row.erpId;
@ -432,7 +430,6 @@ export default {
this.filterQuery.customerId = store.getters.customerId; this.filterQuery.customerId = store.getters.customerId;
orderListError(this.filterQuery) orderListError(this.filterQuery)
.then((response) => { .then((response) => {
console.log(response)
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;
@ -449,7 +446,6 @@ export default {
this.deleteData.id = data; this.deleteData.id = data;
deleteByOrderId(this.deleteData) deleteByOrderId(this.deleteData)
.then((response) => { .then((response) => {
if (response.code == 20000) { if (response.code == 20000) {
this.getList(); this.getList();
this.$message({ this.$message({
@ -460,13 +456,16 @@ export default {
this.$message.error("补录单据列表已不存在该扫码单据!"); this.$message.error("补录单据列表已不存在该扫码单据!");
this.getList(); this.getList();
} }
}) })
.catch(() => { .catch(() => {
}); });
}, },
deleteDialog(rowId) { deleteDialog(rowId) {
if (isBlank(rowId)) {
this.$message.error("请选择需要删除的数据!");
return;
}
this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", { this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
@ -503,7 +502,6 @@ export default {
var corpOrderId = mOrder.remark; var corpOrderId = mOrder.remark;
this.errorDetail = mOrder.remark; this.errorDetail = mOrder.remark;
console.log(corpOrderId + " " + mOrder + " " + mOrder.remark);
this.dialogVisible = true; this.dialogVisible = true;
}, },

@ -106,6 +106,7 @@
<el-table-column label="所属部门" prop="deptName" width="120"> <el-table-column label="所属部门" prop="deptName" width="120">
</el-table-column> </el-table-column>
<el-table-column label="创建时间" prop="actDate" show-overflow-tooltip> <el-table-column label="创建时间" prop="actDate" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<i class="el-icon-time"></i> <i class="el-icon-time"></i>
@ -263,8 +264,6 @@
<script> <script>
import { import {
orderListError,
codeList,
filterOrder, filterOrder,
deleteByOrderId, deleteByOrderId,
commitOrder, commitOrder,
@ -273,14 +272,13 @@ import {
import {getBasicUnitMaintains} from "../../api/basic/basicUnitMaintain" import {getBasicUnitMaintains} from "../../api/basic/basicUnitMaintain"
import draggable from "vuedraggable"; import draggable from "vuedraggable";
import codeDetail from "./errorCode"; import codeDetail from "./errorCode";
import ioErrorOrder from "./IOErrorOrder"; import ioErrorOrder from "./IOErrorOrder";
import addOrder from "./IOAddOrder"; import addOrder from "./IOAddOrder";
import store from "../../store"; import store from "../../store";
import {getBussinessType} from "../../api/basic/bussinessType";
import {filterAllByUser} from "@/api/basic/invWarehouse"; import {filterAllByUser} from "@/api/basic/invWarehouse";
import {getLocalJoinByUser} from "@/api/basic/busLocalType"; import {getLocalJoinByUser} from "@/api/basic/busLocalType";
import {filterSubByInv} from "@/api/basic/invSubWarehouse"; import {filterSubByInv} from "@/api/basic/invSubWarehouse";
import {isBlank} from "@/utils/strUtil";
const formJson = { const formJson = {
site_id: "", site_id: "",
@ -515,6 +513,12 @@ export default {
this.filterQuery.customerId = store.getters.customerId; this.filterQuery.customerId = store.getters.customerId;
// this.filterQuery.status = 1; // this.filterQuery.status = 1;
// this.filterQuery.statusOrOne = -1; // this.filterQuery.statusOrOne = -1;
if (isBlank(this.filterQuery.locStorageCode)) {
this.filterQuery.locStorageCode = this.$store.getters.locInvCode;
this.filterQuery.invWarehouseCode = this.$store.getters.locSubInvCode;
}
filterOrder(this.filterQuery) filterOrder(this.filterQuery)
.then((response) => { .then((response) => {
this.loading = false; this.loading = false;

@ -83,6 +83,7 @@ import store from "../../store";
import {getBussinessType} from "../../api/basic/bussinessType"; import {getBussinessType} from "../../api/basic/bussinessType";
import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain"; import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
import {getStockOrderDetailInstrumentById} from "@/api/inout/stockOrder"; import {getStockOrderDetailInstrumentById} from "@/api/inout/stockOrder";
import {isBlank} from "@/utils/strUtil";
export default { export default {
@ -115,12 +116,6 @@ export default {
unitFk: null, unitFk: null,
invStorageCode: null, invStorageCode: null,
}, },
detailQuery: {
code: null,
productIdFk: null,
page: 1,
limit: 20,
},
list: [], list: [],
codeDetailVisible: false, codeDetailVisible: false,
total: 0, total: 0,
@ -327,6 +322,9 @@ export default {
this.filterQuery.invStorageCode = this.invQueryData.locStorageCode; this.filterQuery.invStorageCode = this.invQueryData.locStorageCode;
this.filterQuery = Object.assign(this.filterQuery, query); this.filterQuery = Object.assign(this.filterQuery, query);
this.filterQuery.limit = parseInt(this.filterQuery.limit); this.filterQuery.limit = parseInt(this.filterQuery.limit);
if (!isBlank(this.invQueryData.corpId)) {
this.filterQuery.supId = this.invQueryData.corpId;
}
// //
this.getList(); this.getList();
}, },

@ -77,7 +77,7 @@
<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="条码查询" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>

@ -146,7 +146,7 @@ import codeDetail from "./InvProductsDetail";
import store from "../../store"; import store from "../../store";
import {getBussinessType} from "../../api/basic/bussinessType"; import {getBussinessType} from "../../api/basic/bussinessType";
import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain"; import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
import {filterAllByUser, filterUplLocInv} from "@/api/basic/invWarehouse"; import {filterUplLocInv} from "@/api/basic/invWarehouse";
import {filterSubByInv} from "@/api/basic/invSubWarehouse"; import {filterSubByInv} from "@/api/basic/invSubWarehouse";
@ -377,6 +377,7 @@ export default {
this.getList(); this.getList();
this.findStorageCode(); this.findStorageCode();
this.getStorage(); this.getStorage();
this.findMethod();
}, },
}; };
</script> </script>

@ -26,11 +26,11 @@
> >
<el-option <el-option
v-for="item in fromOptions" v-for="item in fromOptions"
:key="item.companyName" :key="item.name"
:label="item.companyName" :label="item.name"
:value="item.customerId" :value="item.erpId"
> >
<span style="float: left">{{ item.companyName }}</span> <span style="float: left">{{ item.name }}</span>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -307,12 +307,10 @@ export default {
}); });
}, },
findMethod(query) { findMethod(query) {
console.log(query);
this.fromOptions = []; this.fromOptions = [];
let cQuery = { let cQuery = {
key: query, key: query,
customerName: query, customerName: query,
}; };
getBasicUnitMaintains(cQuery) getBasicUnitMaintains(cQuery)
.then((response) => { .then((response) => {

Loading…
Cancel
Save