1.修复bug

fengcang
x_z 3 years ago
parent 4297055a9f
commit e1b2b276ac

@ -325,7 +325,6 @@ export default {
}, },
entrustSubInvChange() { entrustSubInvChange() {
let query = { let query = {
code: this.inputQuery.entrustSubInv, code: this.inputQuery.entrustSubInv,
} }

@ -147,7 +147,7 @@
>提交 >提交
</el-button </el-button
> >
<el-button type="primary" size="small" icon="search" @click="cancelDialog" <el-button type="primary" size="small" icon="search" @click="cancelInterfaceDialog"
>取消 >取消
</el-button </el-button
> >
@ -496,9 +496,13 @@ export default {
cancelDialog() { cancelDialog() {
this.getList(); this.getList();
this.modifyDialogVisible = false; this.modifyDialogVisible = false;
this.modifyDetailDialogVisible = false;
this.modifyBusYypeDialogVisible = false; this.modifyBusYypeDialogVisible = false;
}, },
//
cancelInterfaceDialog() {
this.modifyDetailDialogVisible = false;
this.getDetailList();
},
handleCurrentChange(row) { handleCurrentChange(row) {
if (row != null) { if (row != null) {
this.thirdSysFk = row.thirdId; this.thirdSysFk = row.thirdId;

@ -449,6 +449,7 @@ export default {
hideForm() { hideForm() {
// //
this.formVisible = !this.formVisible; this.formVisible = !this.formVisible;
this.getList();
return true; return true;
}, },
// //

@ -1173,6 +1173,7 @@ export default {
cancelDialog() { cancelDialog() {
this.editDialogVisible = false; this.editDialogVisible = false;
this.getList();
}, },
handleCurrentChange(val) { handleCurrentChange(val) {
this.filterQuery.page = val; this.filterQuery.page = val;

@ -15,7 +15,7 @@
</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.filterType" placeholder="请选择过滤对照条件"> <el-select v-model="filterQuery.filterType" placeholder="请选择过滤对照条件">
<el-option <el-option
v-for="item in filterList" v-for="item in filterList"
@ -25,15 +25,17 @@
<span style="float: left">{{ item.sysName }}</span> <span style="float: left">{{ item.sysName }}</span>
</el-option> </el-option>
</el-select> </el-select>
</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 v-model="filterQuery.ylqxzcrbarmc" placeholder="生产企业/注册备案人" clearable="true"></el-input> <el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="生产企业/注册备案人" clearable="true"></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 v-model="filterQuery.supName" placeholder="配送企业" clearable="true"></el-input> <el-input v-model="filterQuery.supName" placeholder="配送企业" clearable="true"></el-input>
</el-form-item> </el-form-item>

@ -1,351 +1,356 @@
<template> <template>
<div> <div>
<el-card class="el-card"> <el-card class="el-card">
<div> <div>
<el-form :inline="true" :model="listQuery" size="mini"> <el-form :inline="true" :model="listQuery" size="mini">
<el-row style="margin-top: 15px;width: 1000px"> <el-row style="margin-top: 15px;width: 1000px">
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-input v-model="listQuery.udiCode" <el-input v-model="listQuery.udiCode"
style="width: 600px" style="width: 600px"
placeholder="请扫描或输入UDI码" placeholder="请扫描或输入UDI码"
clearable="true" clearable="true"
@keyup.enter.native="keyup_submit($event)"></el-input> @keyup.enter.native="keyup_submit($event)"></el-input>
</el-form-item> </el-form-item>
</el-row> </el-row>
<el-row> <el-row>
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-input v-model="listQuery.unionCode" placeholder="DI/医保编码/商品条码" <el-input v-model="listQuery.unionCode" placeholder="DI/医保编码/商品条码"
clearable="true"></el-input> clearable="true"></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="listQuery.cpmctymc" placeholder="产品通用名" clearable="true"></el-input> <el-input v-model="listQuery.cpmctymc" placeholder="产品通用名" clearable="true"></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="listQuery.ggxh" placeholder="规格型号" clearable="true"></el-input> <el-input v-model="listQuery.ggxh" placeholder="规格型号" clearable="true"></el-input>
</el-form-item> </el-form-item>
</el-row> </el-row>
<el-row> <el-row>
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-input v-model="listQuery.ylqxzcrbarmc" placeholder="生产企业/注册备案人" <el-input v-model="listQuery.ylqxzcrbarmc" placeholder="生产企业/注册备案人"
clearable="true"></el-input> clearable="true"></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="listQuery.thrPiId" placeholder="第三方产品编码" clearable="true"></el-input> <el-input v-model="listQuery.thrPiId" placeholder="第三方产品编码" clearable="true"></el-input>
</el-form-item> </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>
<el-button type="primary" icon="search" @click="getList"></el-button> <el-button type="primary" icon="search" @click="search"></el-button>
<el-button type="primary" icon="search" @click="combine"></el-button> <el-button type="primary" icon="search" @click="combine"></el-button>
</el-button-group> </el-button-group>
</el-form-item> </el-form-item>
</el-row> </el-row>
</el-form> </el-form>
<el-table <el-table
:data="dataList" :data="dataList"
style="width: 100%" style="width: 100%"
highlight-current-row="false" highlight-current-row="false"
v-loading="loading" v-loading="loading"
:row-class-name="tableRowClassName" :row-class-name="tableRowClassName"
@current-change="handleChange" @current-change="handleChange"
ref="multipleTable" ref="multipleTable"
>
<el-table-column
type="selection"
width="55">
</el-table-column>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column
label="最小销售产品标识"
prop="nameCode"
width="140"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="产品编码"
prop="thirdId"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="生产企业"
prop="ylqxzcrbarmc"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="产品通用名"
prop="cpmctymc"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="规格型号"
prop="ggxh"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="注册/备案凭证"
prop="zczbhhzbapzbh"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="器械类别"
prop="qxlb"
show-overflow-tooltip
></el-table-column>
<el-table-column label="操作" fixed="right" width="160">
<template slot-scope="scope">
<el-button
type="text"
size="small"
@click.native.stop="handleDetailClick(scope.row)"
>详情
</el-button
>
</template>
</el-table-column>
</el-table>
<el-pagination
:page-size="listQuery.limit"
@current-change="handleErpPageChange"
layout="prev, pager, next"
:total="pageTotal"
:current-page="listQuery.page"
></el-pagination>
</div>
</el-card>
<el-dialog
title="耗材字典详情"
:visible.sync="udiRlDetailVisible"
width="85%"
:close-on-click-modal="false"
:close-on-press-escape="false"
append-to-body
v-if="udiRlDetailVisible"
> >
<el-table-column <udiRlDetailDialog :editQuery="currentRow"></udiRlDetailDialog>
type="selection" </el-dialog>
width="55"> </div>
</el-table-column>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column
label="最小销售产品标识"
prop="nameCode"
width="140"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="产品编码"
prop="thirdId"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="生产企业"
prop="ylqxzcrbarmc"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="产品通用名"
prop="cpmctymc"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="规格型号"
prop="ggxh"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="注册/备案凭证"
prop="zczbhhzbapzbh"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="器械类别"
prop="qxlb"
show-overflow-tooltip
></el-table-column>
<el-table-column label="操作" fixed="right" width="160">
<template slot-scope="scope">
<el-button
type="text"
size="small"
@click.native.stop="handleDetailClick(scope.row)"
>详情
</el-button
>
</template>
</el-table-column>
</el-table>
<el-pagination
:page-size="listQuery.limit"
@current-change="handleErpPageChange"
layout="prev, pager, next"
:total="pageTotal"
:current-page="listQuery.page"
></el-pagination>
</div>
</el-card>
<el-dialog
title="耗材字典详情"
:visible.sync="udiRlDetailVisible"
width="85%"
:close-on-click-modal="false"
:close-on-press-escape="false"
append-to-body
v-if="udiRlDetailVisible"
>
<udiRlDetailDialog :editQuery="currentRow" ></udiRlDetailDialog>
</el-dialog>
</div>
</template> </template>
<script> <script>
import { import {
getStockOrderDetailInstrumentById, getStockOrderDetailInstrumentById,
stockOrderDetailFilterProduct stockOrderDetailFilterProduct
} from "../../api/inout/stockOrder"; } from "../../api/inout/stockOrder";
import store from "../../store"; import store from "../../store";
import udiRlDetailDialog from "./../basic/UdiRlDetailDialog"; import udiRlDetailDialog from "./../basic/UdiRlDetailDialog";
export default { export default {
name: "closeDialog", name: "closeDialog",
props: { props: {
data: { data: {
type: Object, type: Object,
required: true, required: true,
}, },
closeDialog: { closeDialog: {
type: Function, type: Function,
required: true, required: true,
},
}, },
},
data() { data() {
return { return {
listQuery: { listQuery: {
billNo: "", billNo: "",
page: 1, page: 1,
limit: 10, limit: 10,
},
combineQuery: {
thirdId: "",
relId: "",
erpName: "",
keys: [],
},
dataList: [],
pageTotal: 1,
total: 1,
currentRow: null,
loading: false,
udiRlDetailVisible:false,
multipleUdiSelection: [],
thirdSys: [],
thirdSysFk: null,
busTypes: [],
actDateRange: [],
pickerOptions: {
shortcuts: [
{
text: "最近一周",
onClick(picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
picker.$emit("pick", [start, end]);
}, },
}, combineQuery: {
{ thirdId: "",
text: "最近一个月", relId: "",
onClick(picker) { erpName: "",
const end = new Date(); keys: [],
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
picker.$emit("pick", [start, end]);
}, },
}, dataList: [],
{ pageTotal: 1,
text: "最近三个月", total: 1,
onClick(picker) { currentRow: null,
const end = new Date(); loading: false,
const start = new Date(); udiRlDetailVisible: false,
start.setTime(start.getTime() - 3600 * 1000 * 24 * 90); multipleUdiSelection: [],
picker.$emit("pick", [start, end]); thirdSys: [],
thirdSysFk: null,
busTypes: [],
actDateRange: [],
pickerOptions: {
shortcuts: [
{
text: "最近一周",
onClick(picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
picker.$emit("pick", [start, end]);
},
},
{
text: "最近一个月",
onClick(picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
picker.$emit("pick", [start, end]);
},
},
{
text: "最近三个月",
onClick(picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
picker.$emit("pick", [start, end]);
},
},
],
}, },
}, orderEditor: false,
], orderId: "",
}, };
orderEditor: false,
orderId: "",
};
},
methods: {
onReset() {
this.$router.push({
path: "",
});
this.listQuery = {
unionCode: null,
udiCode: null,
ylqxzcrbarmc: "",
cpmctymc: "",
thrPiId: null,
nameCode: "",
ggxh: null,
page: 1,
limit: 20,
addType: 1,
billType: this.data.formData.billType,
corpId: this.data.formData.corpId,
};
this.getList();
},
tableRowClassName({row}) {
if (row.checked) return "warning-row";
return "";
},
checkSelectable(row) {
return !row.check;
}, },
handleCurrentChange(val) { methods: {
this.unionQuery.page = val; onReset() {
this.getList(); this.$router.push({
}, path: "",
handleChange(val) { });
this.currentRow = val; this.listQuery = {
}, unionCode: null,
handleDetailClick(row) { udiCode: null,
this.currentRow = row; ylqxzcrbarmc: "",
this.udiRlDetailVisible = true; cpmctymc: "",
thrPiId: null,
nameCode: "",
ggxh: null,
page: 1,
limit: 20,
addType: 1,
billType: this.data.formData.billType,
corpId: this.data.formData.corpId,
};
this.getList();
},
tableRowClassName({row}) {
if (row.checked) return "warning-row";
return "";
},
checkSelectable(row) {
return !row.check;
},
handleCurrentChange(val) {
this.unionQuery.page = val;
this.getList();
},
handleChange(val) {
this.currentRow = val;
},
handleDetailClick(row) {
this.currentRow = row;
this.udiRlDetailVisible = true;
}, },
handleErpPageChange(val) { handleErpPageChange(val) {
this.listQuery.page = val; this.listQuery.page = val;
this.getList(); this.getList();
}, },
keyup_submit(event) { keyup_submit(event) {
this.listQuery.page = 1; this.listQuery.page = 1;
this.getList(); this.getList();
event.target.select(); event.target.select();
}, },
getList() { search() {
this.loading = true; this.listQuery.page = 1;
this.listQuery.customerId = store.getters.customerId; this.getList();
stockOrderDetailFilterProduct(this.listQuery) },
.then((response) => { getList() {
this.loading = false; this.loading = true;
if (response.code === 20000) { this.listQuery.customerId = store.getters.customerId;
this.dataList = response.data.list || []; stockOrderDetailFilterProduct(this.listQuery)
this.pageTotal = response.data.total || 0; .then((response) => {
} else { this.loading = false;
this.$message.error(response.message); if (response.code === 20000) {
this.dataList = []; this.dataList = response.data.list || [];
this.pageTotal = 0; this.pageTotal = response.data.total || 0;
} else {
this.$message.error(response.message);
this.dataList = [];
this.pageTotal = 0;
}
})
.catch(() => {
this.loading = false;
this.dataList = [];
this.pageTotal = 0;
});
},
intentBack() {
this.closeDialog();
},
combine() {
let selection = this.$refs.multipleTable.selection;
if (selection.length < 1) {
this.$message.error('未选择产品');
return;
} }
}) let ids = [];
.catch(() => {
this.loading = false;
this.dataList = [];
this.pageTotal = 0;
});
},
intentBack() {
this.closeDialog();
},
combine() {
let selection = this.$refs.multipleTable.selection;
if (selection.length < 1) {
this.$message.error('未选择产品');
return;
}
let ids = [];
selection.forEach((obj, index) => { selection.forEach((obj, index) => {
let data = { let data = {
relId: obj.rlId, relId: obj.rlId,
} }
ids.push(data); ids.push(data);
}); });
this.loading = true; this.loading = true;
let tQuery = { let tQuery = {
datas: ids, datas: ids,
stockOrderLists: this.data.stockOrderLists, stockOrderLists: this.data.stockOrderLists,
}; };
getStockOrderDetailInstrumentById(tQuery).then((response) => { getStockOrderDetailInstrumentById(tQuery).then((response) => {
this.loading = false; this.loading = false;
if (response.code === 20000) { if (response.code === 20000) {
this.closeDialog(response.data); this.closeDialog(response.data);
} else { } else {
this.$message.error(response.message); this.$message.error(response.message);
} }
}).catch(() => { }).catch(() => {
this.loading = false; this.loading = false;
}); });
},
handleSelectionUdiChange(val) {
this.multipleUdiSelection = val;
},
}, },
handleSelectionUdiChange(val) { created() {
this.multipleUdiSelection = val; if (this.$isNotBlank(this.data)) {
this.listQuery.nameCode = this.data.udi;
if (this.data.billType != null) {
this.listQuery.billType = this.data.billType;
} else
this.listQuery.billType = this.data.formData.billType;
this.listQuery.corpId = this.data.formData.corpId;
this.orderEditor = this.data.orderEditor;
this.orderId = this.data.orderId;
this.getList();
}
}, },
}, components: {udiRlDetailDialog},
created() {
if (this.$isNotBlank(this.data)) {
this.listQuery.nameCode = this.data.udi;
if (this.data.billType != null) {
this.listQuery.billType = this.data.billType;
} else
this.listQuery.billType = this.data.formData.billType;
this.listQuery.corpId = this.data.formData.corpId;
this.orderEditor = this.data.orderEditor;
this.orderId = this.data.orderId;
this.getList();
}
},
components: {udiRlDetailDialog},
}; };
</script> </script>
<style scoped> <style scoped>
.query-form-item { .query-form-item {
display: block !important; display: block !important;
margin-right: 10px; margin-right: 10px;
margin-bottom: 5px; margin-bottom: 5px;
} }
div /deep/ .el-table .warning-row { div /deep/ .el-table .warning-row {
background: #bebebe; background: #bebebe;
} }
div /deep/ .el-table .success-row { div /deep/ .el-table .success-row {
background: #ffffff; background: #ffffff;
} }
</style> </style>

@ -30,7 +30,7 @@
<el-form-item> <el-form-item>
<el-button-group style="display:flex;"> <el-button-group style="display:flex;">
<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="getList"></el-button> <el-button type="primary" icon="search" @click="search"></el-button>
</el-button-group> </el-button-group>
</el-form-item> </el-form-item>
</el-row> </el-row>
@ -175,6 +175,10 @@ export default {
}; };
this.getList(); this.getList();
}, },
search() {
this.filterQuery.page = 1;
this.getList();
},
getList() { getList() {
this.loading = true; this.loading = true;
stockOrderUploadLogList(this.filterQuery).then((res) => { stockOrderUploadLogList(this.filterQuery).then((res) => {

@ -721,11 +721,15 @@ export default {
this.filterQuery.customerId = store.getters.customerId; this.filterQuery.customerId = store.getters.customerId;
filterOrder(this.filterQuery) filterOrder(this.filterQuery)
.then((response) => { .then((response) => {
console.log(response)
this.loading = false; this.loading = false;
this.list = response.data.list || []; if (response.code === 20000) {
this.detailList = []; this.list = response.data.list || [];
this.total = response.data.total || 0; this.detailList = [];
this.total = response.data.total || 0;
} else {
this.list = [];
this.$message.error(response.message);
}
}) })
.catch(() => { .catch(() => {
this.loading = false; this.loading = false;

@ -126,7 +126,7 @@
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="parentId" prop="parentName"
label="所属仓库" label="所属仓库"
> >
</el-table-column> </el-table-column>

Loading…
Cancel
Save