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

Merge branch 'fencang' into busUser

Browse Source 
# Conflicts:
#	src/views/warehouse/IOErrorOrder.vue
featFunction
anthonywj 3 years ago
parent 1e7cd1f93e ca7a6beaa0
commit 625727248d
12 changed files with 162 additions and 131 deletions
Show Stats Download Patch File Download Diff File

101
src/views/basic/UdiInfoRelevance.vue
Unescape Escape View File

@ -15,55 +15,58 @@
<el-card class="el-card" v-if="checked">
<div>
<el-form :inline="true" :model="erpQuery" style="display: flex" size="mini">
<el-form-item class="query-form-item">
<el-input
v-model="erpQuery.code"
placeholder="产品编码/商品条码/医保编码"
clearable="true"
@keyup.enter.native="keyupErp_submit($event)"
></el-input>
</el-form-item>
<el-form-item class="query-form-item">
<el-input v-model="erpQuery.name"
clearable="true"
placeholder="产品名称"></el-input>
</el-form-item>
<el-form-item class="query-form-item">
<el-input v-model="erpQuery.registerNo"
clearable="true"
placeholder="注册/备案凭证号"></el-input>
</el-form-item>
<el-form-item class="query-form-item">
<el-input v-model="erpQuery.manufactory"
clearable="true"
placeholder="生产厂家"></el-input>
</el-form-item>
<el-form-item class="query-form-item">
<el-input
v-model="erpQuery.spec"
clearable="true"
placeholder="规格型号"
></el-input>
</el-form-item>
<el-form-item class="query-form-item">
<el-select v-model="thirdSysFk" placeholder="请选择第三方系统" disabled="true">
<el-option
v-for="item in thirdSys"
:key="item.value"
:label="item.thirdName"
:value="item.thirdId">
<span style="float: left">{{ item.thirdName }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.thirdId }}</span>
</el-option>
</el-select>
</el-form-item>
<el-form-item style="display: flex">
<el-button type="primary" icon="search" @click="searchErpList">查询</el-button>
</el-form-item>
<el-form :inline="true" :model="erpQuery" size="mini">
<el-row>
<el-form-item class="query-form-item">
<el-input
v-model="erpQuery.code"
placeholder="产品编码/商品条码/医保编码"
clearable="true"
@keyup.enter.native="keyupErp_submit($event)"
></el-input>
</el-form-item>
<el-form-item class="query-form-item">
<el-input v-model="erpQuery.name"
clearable="true"
placeholder="产品名称"></el-input>
</el-form-item>
<el-form-item class="query-form-item">
<el-input v-model="erpQuery.registerNo"
clearable="true"
placeholder="注册/备案凭证号"></el-input>
</el-form-item>
<el-form-item class="query-form-item">
<el-input v-model="erpQuery.manufactory"
clearable="true"
placeholder="生产厂家"></el-input>
</el-form-item>
</el-row>
<el-row>
<el-form-item class="query-form-item">
<el-input
v-model="erpQuery.spec"
clearable="true"
placeholder="规格型号"
></el-input>
</el-form-item>
<el-form-item class="query-form-item">
<el-select v-model="thirdSysFk" placeholder="请选择第三方系统" disabled="true">
<el-option
v-for="item in thirdSys"
:key="item.value"
:label="item.thirdName"
:value="item.thirdId">
<span style="float: left">{{ item.thirdName }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.thirdId }}</span>
</el-option>
</el-select>
</el-form-item>
<el-form-item style="display: flex">
<el-button type="primary" icon="search" @click="searchErpList">查询</el-button>
</el-form-item>
</el-row>
</el-form>
<el-table

32
src/views/basic/invWarehouse.vue
Unescape Escape View File

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

10
src/views/inventory/invUdiTraceOrder.vue
Unescape Escape View File

@ -142,6 +142,7 @@
:page-size="filterQuery.limit"
@current-change="handleCurrentChange"
layout="prev, pager, next"
:current-page="filterQuery.page"
:total="total"
></el-pagination>
</el-card>
@ -505,7 +506,6 @@ export default {
this.getList();
},
handleSelectionChange(val) {
console.log(val);
this.multipleSelection = val;
},
@ -515,7 +515,6 @@ export default {
this.errDialogVisible = true;
},
findMethod(query) {
console.log(query);
this.fromOptions = [];
let cQuery = {
key: query,
@ -584,7 +583,6 @@ export default {
this.loading = true;
this.filterQuery.customerId = store.getters.customerId;
if (!this.$isBlank(this.filterQuery.code)) {
console.log(this.filterQuery.code)
let code = this.filterQuery.code;
this.filterQuery.code = code.replace("\r","")
}
@ -597,6 +595,9 @@ export default {
this.total = response.data.total || 0;
} else {
this.loading = false;
this.list = [];
this.detailList = [];
this.total = 0;
this.$message.error(response.message);
}
@ -685,7 +686,6 @@ export default {
this.successOrderExportPDFSettingVisible = true;
},
successOrderExportPDF(row) {
console.log(row)
let tQuery = {
orderId: row.id,
customerId: store.getters.customerId
@ -720,7 +720,6 @@ export default {
},
selectUnit(row) {
console.log(row.id);
this.unitUpdateQuery.id = this.curIndex;
this.unitUpdateQuery.fromCorp = row.name;
this.unitUpdateQuery.fromCorpId = row.unitid;
@ -892,7 +891,6 @@ export default {
},
uploadOrderDialog(value) {
console.log(value.id + "---" + value.orderid);
this.uploadQuery = {
orderId: value.id,
};

4
src/views/warehouse/DialogSelectErpOrder.vue
Unescape Escape View File

@ -56,10 +56,6 @@
>导入比对
</el-button
>
<!-- <el-button type="primary" icon="search" @click="combineErps"
>合并下载</el-button
> -->
</el-button-group>
</el-form-item>
</el-row>

11
src/views/warehouse/DialogcChangeNewOrder.vue
Unescape Escape View File

@ -226,6 +226,7 @@ import {getLocalJoinByUser} from "@/api/basic/busLocalType";
import {submitOrderWeb} from "@/api/warehouse/order";
import {stockOrderChange, stockOrderDetail} from "@/api/warehouse/stockOrder";
import {filterSubByInv} from "@/api/basic/invSubWarehouse";
import {isBlank} from "@/utils/strUtil";
export default {
name: "DialogcChangeNewOrder",
@ -432,7 +433,12 @@ export default {
storageChange(row) {
this.formData.fromCorpId = row.code;
this.formData.fromCorp = row.name;
this.findSubStorageMethod();
if (isBlank(this.formData.fromCorp)) {
this.fromSubStorageOptions = [];
this.formData.fromSubInvCode = null;
} else {
this.findSubStorageMethod();
}
},
unitChange(row) {
@ -441,7 +447,8 @@ export default {
},
actionChange(item) {
this.curAction = this.getActionItem(item);
// this.formData.locStorageCode = this.curAction.storageCode;
this.formData.fromCorp = null;
this.formData.fromSubInvCode = null;
this.findMethod();
},
getActionItem(action) {

1
src/views/warehouse/IOWaitOrder.vue
Unescape Escape View File

@ -947,7 +947,6 @@ export default {
.then((response) => {
this.storageList = response.data || [];
if (this.storageList.length > 0) {
this.getSubInvList();
this.getList();
}
})

18
src/views/warehouse/addHosOrder.vue
Unescape Escape View File

@ -821,12 +821,22 @@ export default {
});
} else if (response.code == 507) {
this.editTitle = response.message;
this.editOriginCodeVisible = true;
this.editTitle = response.message;
this.formData.produceDate = response.data.produceDate;
this.formData.expireDate = response.data.expireDate;
this.formData.batchNo = response.data.batchNo;
this.formData.serialNo = response.data.serialNo;
this.$message({
type: 'error',
message: "提交失败！" + this.editTitle,
customClass: 'messageIndex'
});
// this.$message.error("提交失败！" + this.editTitle);
} else {
this.$alert(response.message, '提示', {
confirmButtonText: '确定',
@ -1051,6 +1061,7 @@ export default {
filterSubByInv(query)
.then((response) => {
this.subInvList = response.data || [];
this.fromSubStorageOptions = response.data || [];
if (this.subInvList != null && this.subInvList.length == 1) {
this.formData.invWarehouseCode = this.subInvList[0].code;
this.getBusType();
@ -1246,7 +1257,7 @@ export default {
}
}
this.findSubInvByInv(this.formData.locStorageCode);
this.findSubStorageMethod();
// this.findSubStorageMethod();
this.getBusType();
@ -1256,6 +1267,9 @@ export default {
<style>
.messageIndex {
z-index: 9999 !important;
}
.ao-text {
width: 100%;

9
src/views/warehouse/addOrder.vue
Unescape Escape View File

@ -547,7 +547,7 @@ export default {
} else if (response.code == 508) {
this.originCode = "";
this.formData.code = "01" + response.data.nameCode;
this.originCode =this.formData.code ;
this.originCode = this.formData.code;
// this.$confirm("当前商品条码对应产品信息：\n" +
// "DI标识:" + response.data.nameCode + "\n" +
// "产品名称：" + response.data.cpmctymc + "\n" +
@ -685,6 +685,13 @@ export default {
this.formData.expireDate = response.data.expireDate;
this.formData.batchNo = response.data.batchNo;
this.formData.serialNo = response.data.serialNo;
this.$message({
type: 'error',
message: "提交失败！" + this.editTitle,
customClass: 'messageIndex'
});
} else {
this.$alert(response.message, '提示', {
confirmButtonText: '确定',

2
src/views/warehouse/errorCode.vue
Unescape Escape View File

@ -52,7 +52,7 @@
></el-table-column>
<el-table-column
label="供应商"
prop="supId"
prop="supName"
show-overflow-tooltip
></el-table-column>
<el-table-column

51
src/views/warehouse/stockOrderDelete.vue
Unescape Escape View File

@ -76,24 +76,24 @@
<span>{{ scope.row.actDate }}</span>
</template>
</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="审核时间"-->
<!-- 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">
<template slot-scope="scope">
<el-button
@ -113,15 +113,6 @@
</template>
</el-table-column>
</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 class="el-card" v-if="true">
@ -302,9 +293,9 @@
"8": "平衡补录单据",
},
erpCheckStatus: {
1: "已完成",
0: "已完成",
2: "已完成",
0: "未校验",
1: "失败",
2: "成功",
},
isSp: store.getters.customerId,
detailFormData: {},

24
src/views/warehouse/stockOrderEditor.vue
Unescape Escape View File

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

30
src/views/warehouse/stockOrderSearch.vue
Unescape Escape View File

@ -469,10 +469,11 @@ import stockQRCodeExport from "./stockQRCodeExport";
import draggable from "vuedraggable";
import {inspectionStockOrderPDFFromTemplateFile, stockOrderPDFFromTemplateFile} from "../../api/itextpdf/itextpdf";
import store from "../../store";
import {getLocalJoinBusType, getLocalJoinByUser} from "../../api/basic/busLocalType";
import {filterAll, filterAllByUser} from "@/api/basic/invWarehouse";
import {getLocalJoinByUser} from "../../api/basic/busLocalType";
import {filterAllByUser} from "@/api/basic/invWarehouse";
import StockOrderEdit from "@/views/warehouse/stockOrderEdit";
import {filterSubByInv} from "@/api/basic/invSubWarehouse";
import {isBlank} from "@/utils/strUtil";
export default {
name: "stockOrderSearch",
@ -950,7 +951,7 @@ export default {
.then((response) => {
this.storageList = response.data || [];
if (this.storageList.length > 0) {
this.getSubInvList();
// this.getSubInvList();
this.getList();
}
})
@ -960,15 +961,20 @@ export default {
invChange() {
this.query.invWarehouseCode = "";
this.subInvList = [];
let query = {
pcode: this.query.locStorageCode
};
filterSubByInv(query)
.then((response) => {
this.subInvList = response.data || [];
})
.catch(() => {
});
if (!isBlank(this.query.locStorageCode)) {
let query = {
pcode: this.query.locStorageCode
};
filterSubByInv(query)
.then((response) => {
this.subInvList = response.data || [];
})
.catch(() => {
});
} else {
this.subInvList = [];
}
},
getSubInvList() {

Write Preview
Loading…
Cancel
Save