1.修改部分字段文字显示

2.调整关联客户平台操作逻辑和错误提示
master
x_z 3 years ago
parent 401a9a493b
commit f9c16c5401

@ -14,18 +14,21 @@
<el-row> <el-row>
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-input <el-input
clearable
v-model="filterQuery.cpmctymc" v-model="filterQuery.cpmctymc"
placeholder="产品通用名" placeholder="产品通用名"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-input <el-input
clearable
v-model="filterQuery.ggxh" v-model="filterQuery.ggxh"
placeholder="规格型号" placeholder="规格型号"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-input <el-input
clearable
v-model="filterQuery.cpms" v-model="filterQuery.cpms"
placeholder="产品描述" placeholder="产品描述"
></el-input> ></el-input>
@ -33,7 +36,7 @@
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-input <el-input
v-model="filterQuery.zczbhhzbapzbh" v-model="filterQuery.zczbhhzbapzbh"
placeholder="注册/备案号" placeholder="注册/备案凭证号"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-row> </el-row>
@ -41,18 +44,21 @@
<el-row> <el-row>
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-input <el-input
clearable
v-model="filterQuery.ylqxzcrbarmc" v-model="filterQuery.ylqxzcrbarmc"
placeholder="注册/备案人" placeholder="医疗器械注册人"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-input <el-input
clearable
v-model="filterQuery.manufactory" v-model="filterQuery.manufactory"
placeholder="生产企业" placeholder="生产企业"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-input <el-input
clearable
v-model="filterQuery.thirdId" v-model="filterQuery.thirdId"
placeholder="第三方产品编码" placeholder="第三方产品编码"
></el-input> ></el-input>

@ -5,14 +5,6 @@
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-input v-model="query.key" style="width: 300px;" placeholder="搜索"></el-input> <el-input v-model="query.key" style="width: 300px;" placeholder="搜索"></el-input>
</el-form-item> </el-form-item>
<el-form-item class="query-form-item">
<el-select v-model="query.corpType" 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="4"></el-option>
</el-select>
</el-form-item>
<el-form-item> <el-form-item>
<el-button-group> <el-button-group>
<el-button <el-button
@ -42,11 +34,6 @@
<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="unitId" fixed></el-table-column> <el-table-column label="往来单位编码" prop="unitId" fixed></el-table-column>
<el-table-column label="往来单位名称" prop="corpName" fixed></el-table-column> <el-table-column label="往来单位名称" prop="corpName" fixed></el-table-column>
<el-table-column label="往来单位类型" prop="coryType" fixed>
<template slot-scope="scope">
<span>{{ coryTypeArr[scope.row.corpType] }}</span>
</template>
</el-table-column>
<el-table-column label="拼音码" prop="pinyinCode" fixed></el-table-column> <el-table-column label="拼音码" prop="pinyinCode" fixed></el-table-column>
<el-table-column label="医院客户名称" prop="platformName" fixed></el-table-column> <el-table-column label="医院客户名称" prop="platformName" fixed></el-table-column>
<el-table-column label="操作" fixed="right"> <el-table-column label="操作" fixed="right">
@ -218,22 +205,22 @@
</template> </template>
<script> <script>
import { import {
getUnbindUnitMaintain, getUnbindUnitMaintain,
getUnitMaintain, getUnitMaintain,
addUnit, addUnit,
modifyUnit modifyUnit
} from "../../api/receipts/unitMaintain"; } from "../../api/receipts/unitMaintain";
import { import {
getPlatform, getPlatform,
linkPlatform, linkPlatform,
getLinkPlatformList, getLinkPlatformList,
unbindPlatform, unbindPlatform,
getTargetActions getTargetActions
} from "../../api/auth/platform"; } from "../../api/auth/platform";
import {getBusTypeByUser} from "@/api/warehouse/BusRole"; import {getBusTypeByUser} from "@/api/warehouse/BusRole";
export default { export default {
data() { data() {
return { return {
query: { query: {
@ -307,12 +294,7 @@ export default {
value: 4, value: 4,
label: "特殊往来" label: "特殊往来"
} }
], ]
coryTypeArr: {
1: "客户",
2: "供应商",
4: "特殊往来"
}
}; };
}, },
@ -394,6 +376,7 @@ export default {
getUnitMaintain() { getUnitMaintain() {
let unitQuery = { let unitQuery = {
customerId: this.$store.getters.customerId, customerId: this.$store.getters.customerId,
corpType: 1,
page: 1, page: 1,
limit: 20 limit: 20
}; };
@ -503,9 +486,46 @@ export default {
}); });
}, },
linkSubmit() { linkSubmit() {
//
let corpId = this.editLogin.corpName;
if (!this.editDialogVisible) {
let corpNameTemp = null;
this.corpNamesList.forEach(item => {
if (item.id == this.editLogin.corpName) {
corpNameTemp = item.name;
corpId = item.id;
return;
}
});
let flag = false;
//
this.list.forEach(item => {
if (item.corpName == corpNameTemp) {
flag = true;
return;
}
});
if (flag) {
this.$message.error('“' + corpNameTemp + '”' + " 已经关联");
return;
}
} else {
let corpNameTemp = null;
this.corpNamesList.forEach(item => {
if (item.name == this.editLogin.corpName) {
corpNameTemp = item.name;
corpId = item.id;
return;
}
});
}
this.$refs["editLogin"].validate((valid) => { this.$refs["editLogin"].validate((valid) => {
if (valid) { if (valid) {
this.editLogin.id = this.editLogin.corpName; this.editLogin.id = corpId;
linkPlatform(this.editLogin) linkPlatform(this.editLogin)
.then((response) => { .then((response) => {
if (response.code == 20000) { if (response.code == 20000) {
@ -540,7 +560,7 @@ export default {
this.getList(); this.getList();
this.getPlatformList(); this.getPlatformList();
} }
}; };
</script> </script>
<style> <style>

@ -1,7 +1,8 @@
<template> <template>
<div> <div>
<el-form :inline="true" :model="filterQuery" class="query-form" size="mini"> <el-card>
<el-row> <el-form :inline="true" :model="filterQuery" size="mini">
<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="最小销售产品标识" :clearable="true"></el-input> <el-input v-model="filterQuery.nameCode" placeholder="最小销售产品标识" :clearable="true"></el-input>
</el-form-item> </el-form-item>
@ -15,7 +16,7 @@
<el-input v-model="filterQuery.batchNo" placeholder="批次号" :clearable="true"></el-input> <el-input v-model="filterQuery.batchNo" placeholder="批次号" :clearable="true"></el-input>
</el-form-item> </el-form-item>
</el-row> </el-row>
<el-row> <el-row style="width: 100%;">
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-input v-model="filterQuery.manufactory" placeholder="生产厂家" :clearable="true"></el-input> <el-input v-model="filterQuery.manufactory" placeholder="生产厂家" :clearable="true"></el-input>
</el-form-item> </el-form-item>
@ -63,7 +64,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</el-card>
<el-dialog <el-dialog
title="库存详情" title="库存详情"

@ -147,7 +147,7 @@
<el-table-column label="生产日期" width="120" prop="produceDate"></el-table-column> <el-table-column label="生产日期" width="120" prop="produceDate"></el-table-column>
<el-table-column label="失效日期" width="120" prop="expireDate"></el-table-column> <el-table-column label="失效日期" width="120" prop="expireDate"></el-table-column>
<el-table-column label="数量" width="100" prop="count"></el-table-column> <el-table-column label="数量" width="100" prop="count"></el-table-column>
<el-table-column label="" width="120" prop="price"> <el-table-column label="价" width="120" prop="price">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input :disabled="scope.$index !== currentCheckIndex" v-model="scope.row.price" <el-input :disabled="scope.$index !== currentCheckIndex" v-model="scope.row.price"
placeholder="请输入"></el-input> placeholder="请输入"></el-input>
@ -271,24 +271,24 @@
</template> </template>
<script> <script>
import { import {
stockOrderList, stockOrderDetail, stockOrderList, stockOrderDetail,
deleteStockOrderById, deleteStockOrderDetailById, deleteStockOrderById, deleteStockOrderDetailById,
copyStockOrderDetail, uploadStockOrderDetail, copyStockOrderDetail, uploadStockOrderDetail,
supplementOrder, updateStockOrderDetail supplementOrder, updateStockOrderDetail
} from "../../api/warehouse/stockOrder"; } from "../../api/warehouse/stockOrder";
import stockOrderDistribution from "./stockOrderDistribution"; import stockOrderDistribution from "./stockOrderDistribution";
import stockOrderQRCodeDetail from "./stockOrderQRCodeDetail"; import stockOrderQRCodeDetail from "./stockOrderQRCodeDetail";
import stockQRCodeExport from "./stockQRCodeExport"; import stockQRCodeExport from "./stockQRCodeExport";
import draggable from "vuedraggable"; import draggable from "vuedraggable";
import { inspectionStockOrderPDFFromTemplateFile, stockOrderPDFFromTemplateFile } from "../../api/itextpdf/itextpdf"; import {inspectionStockOrderPDFFromTemplateFile, stockOrderPDFFromTemplateFile} from "../../api/itextpdf/itextpdf";
import store from "../../store"; import store from "../../store";
import {getBusTypeByUser} from "../../api/warehouse/BusRole" import {getBusTypeByUser} from "../../api/warehouse/BusRole"
import { filterAllByUser } from "@/api/basic/invWarehouse"; import {filterAllByUser} from "@/api/basic/invWarehouse";
import StockOrderEdit from "@/views/warehouse/stockOrderEdit"; import StockOrderEdit from "@/views/warehouse/stockOrderEdit";
import {updateSpms} from "@/api/warehouse/order"; import {updateSpms} from "@/api/warehouse/order";
export default { export default {
name: "stockOrderDelSearch", name: "stockOrderDelSearch",
data() { data() {
return { return {
@ -335,16 +335,16 @@ 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"}
] ]
}, },
sourceMap: { sourceMap: {
@ -561,12 +561,16 @@ export default {
} }
}, },
printOrder(row) { printOrder(row) {
let tQuery = { queryId: row.orderId }; let tQuery = {
queryId: row.orderId,
moduleId: 4
};
this.loading = true; this.loading = true;
inspectionStockOrderPDFFromTemplateFile(tQuery).then((response) => { inspectionStockOrderPDFFromTemplateFile(tQuery).then((response) => {
if (response.code === 20000) { if (response.code === 20000) {
tQuery = { tQuery = {
orderId: row.orderId orderId: row.orderId,
moduleId: 4
}; };
stockOrderPDFFromTemplateFile(tQuery).then((response) => { stockOrderPDFFromTemplateFile(tQuery).then((response) => {
//pdfurl //pdfurl
@ -574,7 +578,7 @@ export default {
binaryData.push(response); binaryData.push(response);
//blob //blob
let url = window.URL.createObjectURL( let url = window.URL.createObjectURL(
new Blob(binaryData, { type: "application/pdf" }) new Blob(binaryData, {type: "application/pdf"})
); );
this.loading = false; this.loading = false;
window.open(url);//pdf window.open(url);//pdf
@ -627,7 +631,7 @@ export default {
type: "warning" type: "warning"
}).then(() => { }).then(() => {
this.loading = true; this.loading = true;
deleteStockOrderById({ id: row.id }) deleteStockOrderById({id: row.id})
.then(response => { .then(response => {
this.loading = false; this.loading = false;
if (response.code === 20000) { if (response.code === 20000) {
@ -675,7 +679,7 @@ export default {
type: "warning" type: "warning"
}).then(() => { }).then(() => {
this.detailLoading = true; this.detailLoading = true;
deleteStockOrderDetailById({ id: row.id }) deleteStockOrderDetailById({id: row.id})
.then(response => { .then(response => {
this.detailLoading = false; this.detailLoading = false;
if (response.code === 20000) { if (response.code === 20000) {
@ -842,12 +846,12 @@ export default {
this.actDateRange = [start, end]; this.actDateRange = [start, end];
this.getList(); this.getList();
} }
}; };
</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;
@ -855,12 +859,12 @@ export default {
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;
} }
</style> </style>

Loading…
Cancel
Save