bug修复

fencang
anthonywj 3 years ago
parent 43cf7aec0f
commit 1e57be77e1

@ -0,0 +1,437 @@
<template>
<div>
<el-table :data="sysList" style="width: 100%" border>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column
label="第三方系统名称"
prop="sysName"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="第三方产品名称"
prop="thirdName"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="第三方产品ID"
prop="thirdId"
show-overflow-tooltip
></el-table-column>
</el-table>
<el-table
v-loading="loading"
:data="detailList"
style="width: 100%; margin-top: 20px"
border
@current-change="handleDetail"
>
<el-table-column
label="产品标识"
prop="nameCode"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="产品通用名"
prop="cpmctymc"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="包装级别"
prop="packLevel"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="包装层级"
prop="bzcj"
show-overflow-tooltip
></el-table-column>
</el-table>
<el-form
:model="editQuery"
ref="editQuery"
label-width="100px"
style="margin-top: 20px"
>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="12" class="el-col">
<div class="text item">
<div class="itemTag">
<span>产品名称:&nbsp;</span>
</div>
<el-input
style="width: 65%"
size="small"
splaceholder="请输入内容"
:disabled="true"
v-model="editQuery.cpmctymc"
></el-input>
</div>
</el-col>
<el-col :span="12" class="el-col">
<div class="text item">
<div class="itemTag">
<span>产品标识:&nbsp;</span>
</div>
<el-input
style="width: 65%"
:disabled="true"
size="small"
splaceholder="请输入内容"
v-model="editQuery.nameCode"
></el-input>
</div>
</el-col>
</el-row>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="12" class="el-col">
<div class="text item">
<div class="itemTag">
<span>规格型号:&nbsp;</span>
</div>
<el-input
style="width: 65%"
:disabled="true"
size="small"
splaceholder="请输入内容"
v-model="editQuery.ggxh"
></el-input>
</div>
</el-col>
<el-col :span="12" class="el-col">
<div class="text item">
<div class="itemTag">
<span>器械类别:&nbsp;</span>
</div>
<el-input
style="width: 65%"
:disabled="true"
size="small"
splaceholder="请输入内容"
v-model="editQuery.qxlb"
></el-input>
</div>
</el-col>
</el-row>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="12" class="el-col">
<div class="text item">
<div class="itemTag">
<span>产品类别:&nbsp;</span>
</div>
<el-input
style="width: 65%"
:disabled="true"
size="small"
splaceholder="请输入内容"
v-model="editQuery.cplb"
></el-input>
</div>
</el-col>
<el-col :span="12" class="el-col">
<div class="text item">
<div class="itemTag">
<span>分类编码:&nbsp;</span>
</div>
<el-input
style="width: 65%"
:disabled="true"
size="small"
splaceholder="请输入内容"
v-model="editQuery.flbm"
></el-input>
</div>
</el-col>
</el-row>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="12" class="el-col">
<div class="text item">
<div class="itemTag">
<span>商品条码:&nbsp;</span>
</div>
<el-input
style="width: 65%"
:disabled="true"
size="small"
splaceholder="请输入内容"
v-model="editQuery.sptm"
></el-input>
</div>
</el-col>
<el-col :span="12" class="el-col">
<div class="text item">
<div class="itemTag">
<span>医保编码:&nbsp;</span>
</div>
<el-input
style="width: 65%"
:disabled="true"
size="small"
splaceholder="请输入内容"
v-model="editQuery.ybbm"
></el-input>
</div>
</el-col>
</el-row>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="12" class="el-col">
<div class="text item">
<div class="itemTag">
<span>医疗器械注册人:&nbsp;</span>
</div>
<el-input
style="width: 65%"
:disabled="true"
size="small"
splaceholder="ylqxzcrbarmc"
v-model="editQuery.ylqxzcrbarmc"
></el-input>
</div>
</el-col>
<el-col :span="12" class="el-col">
<div class="text item">
<div class="itemTag">
<span>注册人英文名称:&nbsp;</span>
</div>
<el-input
style="width: 65%"
:disabled="true"
size="small"
splaceholder="请输入内容"
v-model="editQuery.ylqxzcrbarywmc"
></el-input>
</div>
</el-col>
</el-row>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="12" class="el-col">
<div class="text item">
<div class="itemTag">
<span>统一社会信用号:&nbsp;</span>
</div>
<el-input
style="width: 65%"
:disabled="true"
size="small"
splaceholder="请输入内容"
v-model="editQuery.tyshxydm"
></el-input>
</div>
</el-col>
<el-col :span="12" class="el-col">
<div class="text item">
<div class="itemTag">
<span>注册证/备案号:&nbsp;</span>
</div>
<el-input
style="width: 65%"
:disabled="true"
size="small"
splaceholder="请输入内容"
v-model="editQuery.zczbhhzbapzbh"
></el-input>
</div>
</el-col>
</el-row>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="12" class="el-col">
<div class="text item">
<div class="itemTag">
<span>上级产品编码:&nbsp;</span>
</div>
<el-input
style="width: 65%"
:disabled="true"
size="small"
splaceholder="请输入内容"
v-model="editQuery.sjcpbm"
></el-input>
</div>
</el-col>
<el-col :span="12" class="el-col">
<div class="text item">
<div class="itemTag">
<span>包装级别:&nbsp;</span>
</div>
<el-input
style="width: 65%"
size="small"
splaceholder="请输入内容"
:disabled="true"
v-model="editQuery.packLevel"
></el-input>
</div>
</el-col>
</el-row>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="12" class="el-col">
<div class="text item">
<div class="itemTag">
<span>计量单位/包装级别:&nbsp;</span>
</div>
<el-input
style="width: 65%"
size="small"
splaceholder="请输入内容"
v-model="editQuery.bzcj"
:disabled="true"
></el-input>
</div>
</el-col>
<el-col :span="12" class="el-col">
<div class="text item">
<div class="itemTag">
<span>包含下级包装数量:&nbsp;</span>
</div>
<el-input
style="width: 65%"
size="small"
splaceholder="请输入内容"
:disabled="true"
v-model="editQuery.bhxjsl"
></el-input>
</div>
</el-col>
</el-row>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="12" class="el-col">
<div class="text item">
<div class="itemTag">
<span>包含下级产品编码:&nbsp;</span>
</div>
<el-input
style="width: 65%"
size="small"
:disabled="true"
splaceholder="请输入内容"
v-model="editQuery.bhxjcpbm"
></el-input>
</div>
</el-col>
<el-col :span="12" class="el-col">
<div class="text item">
<div class="itemTag">
<span>包含最小销售包装数量:&nbsp;</span>
</div>
<el-input
style="width: 65%"
size="small"
:disabled="true"
splaceholder="请输入内容"
v-model="editQuery.bhzxxsbzsl"
></el-input>
</div>
</el-col>
</el-row>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="12" class="el-col">
<div class="text item">
<div class="itemTag">
<span>最小包装单元内包含使用单元数量:&nbsp;</span>
</div>
<el-input
style="width: 65%"
:disabled="!checked"
size="small"
splaceholder="请输入内容"
v-model="editQuery.zxxsbzbhsydysl"
></el-input>
</div>
</el-col>
<el-col :span="12" class="el-col">
<el-form-item prop="name">
<el-checkbox v-model="checked" class="text item itemTag"
disabled
>以使用单元数量入库
</el-checkbox>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
</template>
<script>
import {thirdSysDetail} from "@/api/basic/udiRelevance";
import {filterByUuid} from "@/api/basic/udiInfo";
export default {
name: "UdiRlDetail",
props: {
editQuery: {
type: Object,
required: true,
},
},
data() {
return {
sysList: [],
checked:false,
detailList:[],
loading:false,
}
},
methods: {
getThirdSysDetail() {
let query = {
id: this.editQuery.id,
};
thirdSysDetail(query)
.then((response) => {
this.loading = false;
this.sysList = response.data.list || [];
})
.catch(() => {
this.loading = false;
this.sysList = [];
});
},
getDetailList(detailQuery) {
this.loading = true;
filterByUuid(detailQuery)
.then((response) => {
this.loading = false;
this.detailList = response.data || [];
})
.catch(() => {
this.loading = false;
this.detailList = [];
});
},
},
created() {
let ttquery = {
uuid: this.editQuery.uuid,
page: 1,
limit: 10,
};
this.getDetailList(ttquery);
this.getThirdSysDetail();
},
}
</script>
<style scoped>
</style>

@ -213,6 +213,7 @@
<el-input size="small" v-model="scope.row.batchNo" <el-input size="small" v-model="scope.row.batchNo"
:disabled="scope.row.index !== selectedIndex" :disabled="scope.row.index !== selectedIndex"
ref='inputBatchNoRef' ref='inputBatchNoRef'
@input="scope.row.batchNo =scope.row.batchNo.replace(/[\W]/g, '')"
placeholder="请输入批次号" style="width: 80%"></el-input> placeholder="请输入批次号" style="width: 80%"></el-input>
</template> </template>
</el-table-column> </el-table-column>

@ -293,6 +293,7 @@ export default {
id: "", id: "",
mainAction: null, mainAction: null,
action: null, action: null,
status: 5,
page: 1, page: 1,
limit: 20, limit: 20,
}, },
@ -343,6 +344,7 @@ export default {
}, },
addType: "edit", addType: "edit",
deleteData: { deleteData: {
status: 5,
id: "", id: "",
}, },
erpCheckStatus: { erpCheckStatus: {
@ -368,6 +370,7 @@ export default {
path: "", path: "",
}); });
this.filterQuery = { this.filterQuery = {
status: 5,
page: 1, page: 1,
limit: 20, limit: 20,
}; };
@ -447,11 +450,16 @@ export default {
this.deleteData.id = data; this.deleteData.id = data;
deleteByOrderId(this.deleteData) deleteByOrderId(this.deleteData)
.then((response) => { .then((response) => {
this.getList(); if (response.code == 20000) {
this.$message({ this.getList();
type: "success", this.$message({
message: "删除成功!", type: "success",
}); message: "删除成功!",
});
} else if (response.code == 520) {
this.$message.error("补录单据列表已不存在该扫码单据!");
this.getList();
}
}) })
.catch(() => { .catch(() => {
}); });

@ -1,148 +1,148 @@
<template> <template>
<div> <div>
<el-card class="el-card"> <el-card class="el-card">
<el-form <el-form
:inline="true" :inline="true"
:model="filterQuery" :model="filterQuery"
class="query-form" class="query-form"
size="mini" size="mini"
> >
<el-row> <el-row>
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-input <el-input
v-model="filterQuery.billNo" v-model="filterQuery.billNo"
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-select v-model="filterQuery.billAction" placeholder="请选择业务类型"> <el-select v-model="filterQuery.billAction" placeholder="请选择业务类型">
<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>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<span style="color: #000; margin-left: 10px; margin-right: 6px" <span style="color: #000; margin-left: 10px; margin-right: 6px"
>单据日期:</span >单据日期:</span
> >
<el-date-picker <el-date-picker
:picker-options="pickerOptions" :picker-options="pickerOptions"
v-model="actDateRange" v-model="actDateRange"
type="daterange" type="daterange"
format="yyyy 年 MM 月 dd 日" format="yyyy 年 MM 月 dd 日"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
range-separator="至" range-separator="至"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期" end-placeholder="结束日期"
> >
</el-date-picker> </el-date-picker>
</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 type="primary" icon="search" @click="importErps" <el-button type="primary" icon="search" @click="importErps"
>导入比对 >导入比对
</el-button </el-button
> >
<!-- <el-button type="primary" icon="search" @click="combineErps" <!-- <el-button type="primary" icon="search" @click="combineErps"
>合并下载</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 <el-table
v-loading="loading" v-loading="loading"
:data="list" :data="list"
highlight-current-row="true" highlight-current-row="true"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
@row-click="getOrderDetail" @row-click="getOrderDetail"
style="width: 100%" style="width: 100%"
> >
<el-table-column type="selection" width="55"></el-table-column> <el-table-column type="selection" width="55"></el-table-column>
<el-table-column label="序号" type="index"></el-table-column> <el-table-column label="序号" type="index"></el-table-column>
<el-table-column <el-table-column
label="订单ID" label="订单ID"
prop="billNo" prop="billNo"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="客户名称" label="客户名称"
prop="corpName" prop="corpName"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="单据日期" label="单据日期"
show-overflow-tooltip show-overflow-tooltip
prop="billdate" prop="billdate"
></el-table-column> ></el-table-column>
<el-table-column label="业务单据类型" prop="billType"></el-table-column> <el-table-column label="业务单据类型" prop="billType"></el-table-column>
<!-- <el-table-column label="下载状态" prop="isDownload"></el-table-column> --> <!-- <el-table-column label="下载状态" prop="isDownload"></el-table-column> -->
</el-table> </el-table>
<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>
</el-card> </el-card>
<el-card class="el-card"> <el-card class="el-card">
<el-table <el-table
v-loading="detailLoading" v-loading="detailLoading"
:data="detailList" :data="detailList"
style="width: 100%" style="width: 100%"
> >
<el-table-column label="序号" type="index"></el-table-column> <el-table-column label="序号" type="index"></el-table-column>
<el-table-column <el-table-column
label="产品ID" label="产品ID"
prop="productId" prop="productId"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="产品名称" label="产品名称"
prop="productName" prop="productName"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="批号" label="批号"
prop="batchNo" prop="batchNo"
: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>
<el-table-column label="单据数量" prop="reCount"></el-table-column> <el-table-column label="单据数量" prop="count"></el-table-column>
<el-table-column label="实际数量" prop="count"> <el-table-column label="实际数量" prop="reCount">
</el-table-column> </el-table-column>
</el-table> </el-table>
</el-card> </el-card>
</div> </div>
</template> </template>
<script> <script>
import { import {
combineErpOrder, combineErpOrder,
selectErpOrder, selectErpOrder,
getCloudErp, getCloudErp,
} from "../../api/inout/erpOrder"; } from "../../api/inout/erpOrder";
import {stockListDetail} from "../../api/warehouse/stockOrder" import {stockListDetail} from "../../api/warehouse/stockOrder"
@ -150,254 +150,254 @@ import {getBussinessType} from "../../api/basic/bussinessType";
import {getLocalBusType, filterByBus} from "../../api/basic/busLocalType"; import {getLocalBusType, filterByBus} from "../../api/basic/busLocalType";
export default { export default {
name: "orderId", name: "orderId",
props: { props: {
orderId: { orderId: {
type: Object, type: Object,
required: true, required: true,
},
orderAction: {
type: Object,
required: true,
},
curLocInv: {
type: Object,
required: true,
}
}, },
orderAction: { data() {
type: Object, return {
required: true, filterQuery: {
}, billcode: "",
curLocInv:{ billFlag: null,
type: Object, billAction: null,
required: true, startDate: null,
} endDate: null,
}, status: 3,
data() { page: 1,
return { limit: 5,
filterQuery: { locStorageCode: null,
billcode: "",
billFlag: null,
billAction: null,
startDate: null,
endDate: null,
status: 3,
page: 1,
limit: 5,
locStorageCode:null,
},
value: "",
total: 0,
list: [],
loading: false,
detailLoading: false,
detailList: [],
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]);
}, },
}, value: "",
{ total: 0,
text: "最近一个月", list: [],
onClick(picker) { loading: false,
const end = new Date(); detailLoading: false,
const start = new Date(); detailList: [],
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30); actDateRange: [],
picker.$emit("pick", [start, end]); 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]);
},
},
],
}, },
}, multipleSelection: [],
{ postQuery: {
text: "最近三个月", orderId: "",
onClick(picker) { purchaseinResponses: [],
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
picker.$emit("pick", [start, end]);
}, },
}, idQuery: {
], id: "",
}, },
multipleSelection: [], };
postQuery: {
orderId: "",
purchaseinResponses: [],
},
idQuery: {
id: "",
},
};
},
methods: {
onReset() {
this.$router.push({
path: "",
});
this.filterQuery = {
billNo: "",
billFlag: null,
billAction: null,
startDate: null,
endDate: null,
page: 1,
limit: 5,
status: 3,
locStorageCode:null,
};
this.actDateRange = [];
this.getList();
}, },
onSubmit() { methods: {
if (this.actDateRange != null) { onReset() {
this.filterQuery.startDate = this.actDateRange[0]; this.$router.push({
this.filterQuery.endDate = this.actDateRange[1]; path: "",
} else { });
this.filterQuery.startDate = null; this.filterQuery = {
this.filterQuery.endDate = null; billNo: "",
} billFlag: null,
this.getList(); billAction: null,
}, startDate: null,
getList() { endDate: null,
this.loading = true; page: 1,
this.filterQuery.locStorageCode = this.curLocInv; limit: 5,
stockListDetail(this.filterQuery) status: 3,
.then((response) => { locStorageCode: null,
this.loading = false; };
if (response.code == 20000) { this.actDateRange = [];
this.list = response.data.list || []; this.getList();
this.detailList = []; },
this.total = response.data.total || 0;
onSubmit() {
if (this.actDateRange != null) {
this.filterQuery.startDate = this.actDateRange[0];
this.filterQuery.endDate = this.actDateRange[1];
} else { } else {
this.$message.error(response.message); this.filterQuery.startDate = null;
this.filterQuery.endDate = null;
} }
}) this.getList();
.catch(() => { },
this.loading = false; getList() {
this.list = []; this.loading = true;
this.total = 0; this.filterQuery.locStorageCode = this.curLocInv;
}); stockListDetail(this.filterQuery)
}, .then((response) => {
this.loading = false;
if (response.code == 20000) {
this.list = response.data.list || [];
this.detailList = [];
this.total = response.data.total || 0;
} else {
this.$message.error(response.message);
}
})
.catch(() => {
this.loading = false;
this.list = [];
this.total = 0;
});
},
// //
getOrderDetail(row) { getOrderDetail(row) {
this.detailList = row.subErpOrders; this.detailList = row.subErpOrders;
}, },
importErps() { importErps() {
var selectData = this.multipleSelection; var selectData = this.multipleSelection;
this.postQuery.purchaseinResponses = [],
selectData.forEach((obj, index) => {
this.postQuery.purchaseinResponses.push(obj);
});
selectData.forEach((obj, index) => { if (this.postQuery.purchaseinResponses.length < 1) {
this.postQuery.purchaseinResponses.push(obj); this.$message.warning("选择的订单需大于1");
}); return;
}
this.postQuery.orderId = this.orderId;
selectErpOrder(this.postQuery)
.then((response) => {
if (response.code == 20000) {
this.loading = false;
this.$emit("closeManuDialog", true);
} else {
this.$message.error(response.message);
}
})
.catch(() => {
this.loading = false;
this.$emit("closeManuDialog", false);
});
},
combineErps() {
var selectData = this.multipleSelection;
if (this.postQuery.purchaseinResponses.length < 1) { selectData.forEach((obj, index) => {
this.$message.warning("选择的订单需大于1"); this.postQuery.docids.push(obj.docid);
return; });
}
this.postQuery.orderId = this.orderId; if (this.postQuery.docids.length < 1) {
selectErpOrder(this.postQuery) this.$message.warning("选择的订单需大于1");
.then((response) => { return;
if (response.code == 20000) {
this.loading = false;
this.$emit("closeManuDialog", true);
} else {
this.$message.error(response.message);
} }
})
.catch(() => {
this.loading = false;
this.$emit("closeManuDialog", false);
});
},
combineErps() {
var selectData = this.multipleSelection;
selectData.forEach((obj, index) => { combineErpOrder(this.postQuery)
this.postQuery.docids.push(obj.docid); .then((response) => {
}); if (response.code == 20000) {
this.loading = false;
this.$emit("closeManuDialog", true);
} else {
this.$message.error(response.message);
}
})
.catch(() => {
this.loading = false;
this.$emit("closeManuDialog", false);
});
},
if (this.postQuery.docids.length < 1) { handleSizeChange(val) {
this.$message.warning("选择的订单需大于1"); this.filterQuery.limit = val;
return; this.getList();
} },
handleCurrentChange(val) {
this.filterQuery.page = val;
this.getList();
},
handleSelectionChange(val) {
console.log(val);
this.multipleSelection = val;
},
getBusType() {
let query = {
enabled: true,
};
getLocalBusType(query)
.then((response) => {
this.busTypes = response.data.list || [];
// this.filterQuery.billAction = this.busTypes[0].action;
// this.getList();
this.getCurBillAction();
})
.catch(() => {
});
combineErpOrder(this.postQuery)
.then((response) => {
if (response.code == 20000) {
this.loading = false;
this.$emit("closeManuDialog", true);
} else {
this.$message.error(response.message);
}
})
.catch(() => {
this.loading = false;
this.$emit("closeManuDialog", false);
});
},
handleSizeChange(val) { },
this.filterQuery.limit = val;
this.getList(); getCurBillAction() {
}, let tQuery = {
handleCurrentChange(val) { action: this.orderAction
this.filterQuery.page = val; }
this.getList(); filterByBus(tQuery)
.then((response) => {
this.filterQuery.billAction = response.data;
this.getList();
})
.catch(() => {
});
}
}, },
handleSelectionChange(val) { components: {},
console.log(val); mounted() {
this.multipleSelection = val;
}, },
getBusType() { created() {
let query = { let end = new Date();
enabled: true, let start = new Date();
}; start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
getLocalBusType(query) this.actDateRange = [start, end];
.then((response) => {
this.busTypes = response.data.list || [];
// this.filterQuery.billAction = this.busTypes[0].action;
// this.getList();
this.getCurBillAction();
})
.catch(() => {
});
this.getBusType();
}, },
getCurBillAction() {
let tQuery = {
action: this.orderAction
}
filterByBus(tQuery)
.then((response) => {
this.filterQuery.billAction = response.data;
this.getList();
})
.catch(() => {
});
}
},
components: {},
mounted() {
},
created() {
let end = new Date();
let start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
this.actDateRange = [start, end];
this.getBusType();
},
}; };
</script> </script>
<style scoped> <style scoped>
.el-card { .el-card {
margin-right: 20px; margin-right: 20px;
/*transition: all .5s;*/ /*transition: all .5s;*/
} }
</style> </style>

@ -1001,12 +1001,18 @@ export default {
this.deleteData.id = data; this.deleteData.id = data;
deleteByOrderId(this.deleteData) deleteByOrderId(this.deleteData)
.then((response) => { .then((response) => {
this.getList();
this.refresgOrderDetail(); if (response.code == 20000) {
this.$message({ this.getList();
type: "success", this.refresgOrderDetail();
message: "删除成功!", this.$message({
}); type: "success",
message: "删除成功!",
});
} else if (response.code == 520) {
this.$message.error("校验异常单据列表已不存在该扫码单据!");
this.getList();
}
}) })
.catch(() => { .catch(() => {
}); });

@ -295,6 +295,7 @@ export default {
data() { data() {
return { return {
filterQuery: { filterQuery: {
status: 3,
id: "", id: "",
mainAction: null, mainAction: null,
action: null, action: null,
@ -352,6 +353,7 @@ export default {
edit: "编辑", edit: "编辑",
}, },
deleteData: { deleteData: {
status: 3,
id: "", id: "",
}, },
dialogTableVisible: false, dialogTableVisible: false,
@ -473,11 +475,18 @@ export default {
this.deleteData.id = data; this.deleteData.id = data;
deleteByOrderId(this.deleteData) deleteByOrderId(this.deleteData)
.then((response) => { .then((response) => {
this.getList();
this.$message({ if (response.code == 20000) {
type: "success", this.getList();
message: "删除成功!", this.$message({
}); type: "success",
message: "删除成功!",
});
} else if (response.code == 520) {
this.$message.error("异常单据列表已不存在该扫码单据!");
this.getList();
}
}) })
.catch(() => { .catch(() => {
}); });

@ -372,6 +372,7 @@ export default {
}, },
deleteData: { deleteData: {
id: "", id: "",
status: 10,
}, },
dialogTableVisible: false, dialogTableVisible: false,
formLoading: false, formLoading: false,
@ -611,11 +612,19 @@ export default {
this.deleteData.id = data; this.deleteData.id = data;
deleteByOrderId(this.deleteData) deleteByOrderId(this.deleteData)
.then((response) => { .then((response) => {
this.getList();
this.$message({ if (response.code == 20000) {
type: "success", this.getList();
message: "删除成功!", this.$message({
}); type: "success",
message: "删除成功!",
});
} else if (response.code == 520) {
this.$message.error("新增扫码单据列表已不存在该扫码单据!");
this.getList();
}
}) })
.catch(() => { .catch(() => {
}); });
@ -650,7 +659,8 @@ export default {
this.list.splice(i, 1); this.list.splice(i, 1);
break; break;
} }
}; }
;
this.$message.success("提交成功"); this.$message.success("提交成功");
} else { } else {
this.$message.error(response.message); this.$message.error(response.message);
@ -677,7 +687,7 @@ export default {
invChange() { invChange() {
this.subInvList = []; this.subInvList = [];
if(this.$isNotBlank(this.filterQuery.invWarehouseCode)){ if (this.$isNotBlank(this.filterQuery.invWarehouseCode)) {
this.filterQuery.invWarehouseCode = ""; this.filterQuery.invWarehouseCode = "";
} }

File diff suppressed because it is too large Load Diff

@ -51,10 +51,11 @@
<!-- <el-input v-model="formData.billdate" auto-complete="off"></el-input>--> <!-- <el-input v-model="formData.billdate" auto-complete="off"></el-input>-->
<el-date-picker <el-date-picker
v-model="formData.billdate" v-model="formData.billdate"
type="date" type="datetime"
placeholder="选择日期" placeholder="选择日期"
style="width: 100%" style="width: 100%"
:clearable="false" :clearable="false"
value-format="yyyy-MM-dd HH:mm:ss"
> >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
@ -69,7 +70,7 @@
</el-col> </el-col>
<el-col :span="7"> <el-col :span="7">
<el-form-item prop="billType"> <el-form-item prop="billType">
<el-select v-model="formData.billType" placeholder="请选择业务类型" <el-select v-model="formData.billType" placeholder="请选择业务类型" :disabled="codeArray.length>0"
@change="actionChange"> @change="actionChange">
<el-option <el-option
v-for="item in busTypes" v-for="item in busTypes"
@ -94,7 +95,7 @@
<el-select <el-select
v-model="formData.corpName" v-model="formData.corpName"
filterable filterable
remote remote :disabled="codeArray.length>0"
clearable="true" clearable="true"
reserve-keyword reserve-keyword
placeholder="请输入往来单位" placeholder="请输入往来单位"
@ -118,7 +119,7 @@
v-model="formData.corpName" v-model="formData.corpName"
filterable filterable
remote remote
clearable="true" clearable="true" :disabled="codeArray.length>0"
reserve-keyword reserve-keyword
placeholder="请输入仓库信息" placeholder="请输入仓库信息"
:remote-method="findStorageMethod" :remote-method="findStorageMethod"
@ -142,7 +143,7 @@
<el-option <el-option
v-for="item in fromSubStorageOptions" v-for="item in fromSubStorageOptions"
:key="item.code" :key="item.code"
:label="item.name" :label="item.name" :disabled="codeArray.length>0"
:value="item.code"> :value="item.code">
<span style="float: left">{{ item.name }}</span> <span style="float: left">{{ item.name }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span> <span style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
@ -153,7 +154,7 @@
</el-form-item> </el-form-item>
<el-form-item class="query-form-item" prop="fromCorp" <el-form-item class="query-form-item" prop="fromCorp"
v-if="curAction.corpType ==2 && curAction.genUnit"> v-if="curAction.corpType ==2 && curAction.genUnit">
<el-input v-model="formData.corpName" auto-complete="off" <el-input v-model="formData.corpName" auto-complete="off" :disabled="codeArray.length>0"
clearable clearable
placeholder="请输入病人住院号" placeholder="请输入病人住院号"
></el-input> ></el-input>
@ -171,6 +172,7 @@
<el-col :span="7"> <el-col :span="7">
<el-form-item prop="locStorageCode"> <el-form-item prop="locStorageCode">
<el-select v-model="formData.locStorageCode" placeholder="当前仓库信息" @change="locInChange" <el-select v-model="formData.locStorageCode" placeholder="当前仓库信息" @change="locInChange"
:disabled="codeArray.length>0"
clearable> clearable>
<el-option <el-option
v-for="item in storageList" v-for="item in storageList"
@ -193,6 +195,7 @@
<el-col :span="7"> <el-col :span="7">
<el-form-item prop="invWarehouseCode"> <el-form-item prop="invWarehouseCode">
<el-select v-model="formData.invWarehouseCode" placeholder="当前分库信息" <el-select v-model="formData.invWarehouseCode" placeholder="当前分库信息"
:disabled="codeArray.length>0"
clearable> clearable>
<el-option <el-option
v-for="item in subInvList" v-for="item in subInvList"
@ -217,7 +220,8 @@
<el-col :span="7"> <el-col :span="7">
<el-form-item prop="type" style="margin-right: 20px;" <el-form-item prop="type" style="margin-right: 20px;"
v-if="!(curAction.mainAction=='WareHouseIn' && curAction.corpType == 0)"> v-if="!(curAction.mainAction=='WareHouseIn' && curAction.corpType == 0)">
<el-checkbox v-model="formData.noInvOut"></el-checkbox> <el-checkbox v-model="formData.noInvOut" :disabled="codeArray.length>0">
</el-checkbox>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -259,6 +263,7 @@
<template slot-scope="scope"> <template slot-scope="scope">
<el-input size="small" v-model="scope.row.batchNo" <el-input size="small" v-model="scope.row.batchNo"
:disabled="scope.row.index !== selectedIndex" :disabled="scope.row.index !== selectedIndex"
@input="scope.row.batchNo =scope.row.batchNo.replace(/[\W]/g, '')"
ref='inputBatchNoRef' ref='inputBatchNoRef'
placeholder="请输入批次号" style="width: 80%"></el-input> placeholder="请输入批次号" style="width: 80%"></el-input>
</template> </template>

@ -262,7 +262,7 @@
</el-col> </el-col>
<el-col :span="7"> <el-col :span="7">
<el-form-item prop="count"> <el-form-item prop="count">
<el-input v-model="detailFormData.count" auto-complete="off" :disabled="true"></el-input> <el-input v-model="detailFormData.count" auto-complete="off" :disabled="true" type="number"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="3"> <el-col :span="3">

@ -231,6 +231,7 @@
<template slot-scope="scope"> <template slot-scope="scope">
<el-input size="small" v-model="scope.row.batchNo" <el-input size="small" v-model="scope.row.batchNo"
:disabled="scope.row.index !== selectedIndex" :disabled="scope.row.index !== selectedIndex"
@input="scope.row.batchNo =scope.row.batchNo.replace(/[\W]/g, '')"
ref='inputBatchNoRef' ref='inputBatchNoRef'
placeholder="请输入批次号" style="width: 80%"></el-input> placeholder="请输入批次号" style="width: 80%"></el-input>
</template> </template>
@ -561,7 +562,7 @@ export default {
if (this.$isBlank(this.codeArray[i].productDate) && this.$isBlank(this.codeArray[i].expireDate)) { if (this.$isBlank(this.codeArray[i].productDate) && this.$isBlank(this.codeArray[i].expireDate)) {
return this.$message.error('生产日期与失效日期不能全部为空'); return this.$message.error('生产日期与失效日期不能全部为空');
} }
if (this.$isBlank(this.codeArray[i].reCount) || this.codeArray[i].reCount <1) { if (this.$isBlank(this.codeArray[i].reCount) || this.codeArray[i].reCount < 1) {
return this.$message.error('配货数量不能小于0'); return this.$message.error('配货数量不能小于0');
} }
if (this.detailCountMax) { if (this.detailCountMax) {

@ -369,7 +369,8 @@
</el-col> </el-col>
<el-col :span="7"> <el-col :span="7">
<el-form-item prop="count"> <el-form-item prop="count">
<el-input v-model="detailFormData.count" auto-complete="off" :disabled="true"></el-input> <el-input v-model="detailFormData.count" auto-complete="off" :disabled="true"
type="number"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="3"> <el-col :span="3">
@ -452,7 +453,7 @@
</el-col> </el-col>
<el-col :span="7"> <el-col :span="7">
<el-form-item prop="price"> <el-form-item prop="price">
<el-input v-model="detailFormData.price" auto-complete="off" :disabled="false"></el-input> <el-input v-model="detailFormData.price" auto-complete="off" :disabled="false" type="number"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <el-col :span="3">--> <!-- <el-col :span="3">-->

@ -184,7 +184,7 @@
</el-col> </el-col>
<el-col :span="7"> <el-col :span="7">
<el-form-item prop="count"> <el-form-item prop="count">
<el-input v-model="detailFormData.count" auto-complete="off" :disabled="true"></el-input> <el-input v-model="detailFormData.count" auto-complete="off" :disabled="true" type="number"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="3"> <el-col :span="3">

@ -362,7 +362,7 @@
</el-col> </el-col>
<el-col :span="7"> <el-col :span="7">
<el-form-item prop="count"> <el-form-item prop="count">
<el-input v-model="detailFormData.count" auto-complete="off" :disabled="false"></el-input> <el-input v-model="detailFormData.count" auto-complete="off" :disabled="false" type="number"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="3"> <el-col :span="3">
@ -435,7 +435,7 @@
</el-col> </el-col>
<el-col :span="7"> <el-col :span="7">
<el-form-item prop="batchNo"> <el-form-item prop="batchNo">
<el-input v-model="detailFormData.price" auto-complete="off" :disabled="false"></el-input> <el-input v-model="detailFormData.price" auto-complete="off" :disabled="false" type="number"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>

@ -52,10 +52,11 @@
<!-- <el-input v-model="formData.billdate" auto-complete="off"></el-input>--> <!-- <el-input v-model="formData.billdate" auto-complete="off"></el-input>-->
<el-date-picker <el-date-picker
v-model="formData.billdate" v-model="formData.billdate"
type="date" type="datetime"
placeholder="选择日期" placeholder="选择日期"
style="width: 100%" style="width: 100%"
:clearable="false" :clearable="false"
value-format="yyyy-MM-dd HH:mm:ss"
> >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
@ -71,11 +72,9 @@
</el-col> </el-col>
<el-col :span="7"> <el-col :span="7">
<el-form-item prop="billType"> <el-form-item prop="billType">
<!--<el-select v-model="formData.billType" style="width: 100%" placeholder="业务类型" :disabled="true">--> <el-select v-model="formData.billType" placeholder="请选择业务类型" @change="getStorage"
<!--<el-option label="送货单" value="deliveryNote"></el-option>--> :disabled="codeArray.length>0"
<!--</el-select>--> clearable>
<!-- @change="getStorage"-->
<el-select v-model="formData.billType" placeholder="请选择业务类型" @change="getStorage" clearable>
<el-option <el-option
v-for="item in busTypes" v-for="item in busTypes"
:key="item.localName" :key="item.localName"
@ -110,6 +109,7 @@
<el-col :span="7"> <el-col :span="7">
<el-form-item prop="locStorageCode"> <el-form-item prop="locStorageCode">
<el-select v-model="formData.locStorageCode" placeholder="当前仓库信息" clearable <el-select v-model="formData.locStorageCode" placeholder="当前仓库信息" clearable
:disabled="codeArray.length>0"
@change="invChange"> @change="invChange">
<el-option <el-option
v-for="item in storageList" v-for="item in storageList"
@ -132,6 +132,7 @@
<el-col :span="7"> <el-col :span="7">
<el-form-item prop="invWarehouseCode"> <el-form-item prop="invWarehouseCode">
<el-select v-model="formData.invWarehouseCode" placeholder="当前分库信息" <el-select v-model="formData.invWarehouseCode" placeholder="当前分库信息"
:disabled="codeArray.length>0"
clearable> clearable>
<el-option <el-option
v-for="item in subInvList" v-for="item in subInvList"
@ -161,54 +162,9 @@
> >
</el-button-group> </el-button-group>
<!-- <el-row :gutter="20">-->
<!-- <el-col :span="3">-->
<!-- <div class="ao-text">-->
<!-- <span>扫码录入</span>-->
<!-- </div>-->
<!-- </el-col>-->
<!-- <el-col :span="10">-->
<!-- <el-form-item prop="code">-->
<!-- &lt;!&ndash; @keyup.native.enter="focusNext('iCount')" @focus="getInputFocus($event)"-->
<!-- @keypress.enter.native="selectProductFunction($event)"-->
<!-- &ndash;&gt;-->
<!-- <el-input-->
<!-- @keyup.enter.native="selectProductFunction($event)"-->
<!-- v-model="code"-->
<!-- auto-complete="off"-->
<!-- ref='inputRef'-->
<!-- @focus="getInputFocus($event)"-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- &lt;!&ndash; <el-col :span="3">&ndash;&gt;-->
<!-- &lt;!&ndash; <div class="ao-text">&ndash;&gt;-->
<!-- &lt;!&ndash; <span>数量</span>&ndash;&gt;-->
<!-- &lt;!&ndash; </div>&ndash;&gt;-->
<!-- &lt;!&ndash; </el-col>&ndash;&gt;-->
<!-- &lt;!&ndash; <el-col :span="4">&ndash;&gt;-->
<!-- &lt;!&ndash; <el-form-item prop="iCount">&ndash;&gt;-->
<!-- &lt;!&ndash; &lt;!&ndash; @keypress.enter.native="addCode()"&ndash;&gt;&ndash;&gt;-->
<!-- &lt;!&ndash; <el-input v-model="iCount" auto-complete="off" ref="iCount"&ndash;&gt;-->
<!-- &lt;!&ndash; @keypress.enter.native="iCountEnterFunction()"&ndash;&gt;-->
<!-- &lt;!&ndash; @focus="getInputFocus($event)"&ndash;&gt;-->
<!-- &lt;!&ndash; @input="iCountChange"&ndash;&gt;-->
<!-- &lt;!&ndash; oninput="value=value.replace(/[^\d]/g,'')"></el-input>&ndash;&gt;-->
<!-- &lt;!&ndash; </el-form-item>&ndash;&gt;-->
<!-- &lt;!&ndash; </el-col>&ndash;&gt;-->
<!-- </el-row>-->
<!-- highlight-current-row-->
<!-- @current-change="rowChange"-->
<el-table v-loading="loading" :data="codeArray" style="width: 100%;" <el-table v-loading="loading" :data="codeArray" style="width: 100%;"
:row-class-name="tableRowClassName" :row-class-name="tableRowClassName"
max-height="300" height="300" ref="multipleTable"> max-height="300" height="300" ref="multipleTable">
<!-- <el-table-column-->
<!-- type="selection"-->
<!-- width="55">-->
<!-- </el-table-column>-->
<el-table-column label="序号" type="index" width="50"></el-table-column> <el-table-column label="序号" type="index" width="50"></el-table-column>
<el-table-column width="150" <el-table-column width="150"
label="产品通用名" label="产品通用名"
@ -220,30 +176,11 @@
prop="spec" prop="spec"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
<!-- <el-table-column-->
<!-- label="批次号"-->
<!-- prop="batchNo"-->
<!-- show-overflow-tooltip-->
<!-- ></el-table-column>-->
<!-- <el-table-column-->
<!-- label="生产日期"-->
<!-- prop="productDate"-->
<!-- show-overflow-tooltip-->
<!-- ></el-table-column>-->
<!-- <el-table-column-->
<!-- label="失效日期"-->
<!-- prop="expireDate"-->
<!-- show-overflow-tooltip-->
<!-- ></el-table-column>-->
<!-- <el-table-column-->
<!-- label="数量"-->
<!-- prop="count"-->
<!-- show-overflow-tooltip-->
<!-- ></el-table-column>-->
<el-table-column width="150" label="批次号"> <el-table-column width="150" label="批次号">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input size="small" v-model="scope.row.batchNo" <el-input size="small" v-model="scope.row.batchNo"
:disabled="scope.row.index !== selectedIndex" :disabled="scope.row.index !== selectedIndex"
@input="scope.row.batchNo =scope.row.batchNo.replace(/[\W]/g, '')"
ref='inputBatchNoRef' ref='inputBatchNoRef'
placeholder="请输入批次号" style="width: 80%"></el-input> placeholder="请输入批次号" style="width: 80%"></el-input>
</template> </template>
@ -254,41 +191,15 @@
oninput="if(value.length>6)value=value.slice(0,6)" oninput="if(value.length>6)value=value.slice(0,6)"
type="number" type="number"
:disabled="false"></el-input> :disabled="false"></el-input>
<!-- <el-date-picker-->
<!-- type="date"-->
<!-- size="small" v-model="scope.row.productDate"-->
<!-- :disabled="scope.row.index !== selectedIndex"-->
<!-- placeholder="请选择生产日期" style="width: 80%"-->
<!-- value-format="yyMMdd"-->
<!-- format="yyyy-MM-dd"-->
<!-- >-->
<!-- </el-date-picker>-->
<!-- <el-input size="small" v-model="scope.row.productDate"-->
<!-- :disabled="scope.row.index !== selectedIndex"-->
<!-- placeholder="请输入生产日期" style="width: 80%"></el-input>-->
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="180" label="失效日期(yyMMdd)"> <el-table-column width="180" label="失效日期(yyMMdd)">
<template slot-scope="scope"> <template slot-scope="scope">
<!-- <el-input size="small" v-model="scope.row.expireDate"-->
<!-- :disabled="scope.row.index !== selectedIndex"-->
<!-- placeholder="请输入失效日期" style="width: 80%"></el-input>-->
<el-input v-model="scope.row.expireDate" auto-complete="off" <el-input v-model="scope.row.expireDate" auto-complete="off"
oninput="if(value.length>6)value=value.slice(0,6)" oninput="if(value.length>6)value=value.slice(0,6)"
type="number" type="number"
:disabled="false"></el-input> :disabled="false"></el-input>
<!-- <el-date-picker-->
<!-- type="date"-->
<!-- size="small" v-model="scope.row.expireDate"-->
<!-- :disabled="scope.row.index !== selectedIndex"-->
<!-- placeholder="请输入失效日期" style="width: 80%"-->
<!-- value-format="yyMMdd"-->
<!-- format="yyyy-MM-dd"-->
<!-- >-->
<!-- </el-date-picker>-->
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="150" label="单据数量"> <el-table-column width="150" label="单据数量">
@ -301,16 +212,6 @@
oninput="value=value.replace(/[^\d]/g,'')"></el-input> oninput="value=value.replace(/[^\d]/g,'')"></el-input>
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column width="150" label="实际数量">-->
<!-- <template slot-scope="scope">-->
<!-- <el-input size="small" v-model="scope.row.reCount"-->
<!-- placeholder="请输入数量" style="width: 80%"-->
<!-- type='number'-->
<!-- @change="tableCountChange(scope.row)"-->
<!-- :disabled="scope.row.index !== selectedIndex"-->
<!-- oninput="value=value.replace(/[^\d]/g,'')"></el-input>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column width="150" label="价格"> <el-table-column width="150" label="价格">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input size="small" v-model="scope.row.price" <el-input size="small" v-model="scope.row.price"
@ -321,11 +222,6 @@
</template> </template>
</el-table-column> </el-table-column>
<!--<el-table-column width="150"-->
<!--label="单据数量"-->
<!--prop="count"-->
<!--show-overflow-tooltip-->
<!--&gt;</el-table-column>-->
<el-table-column width="150" <el-table-column width="150"
label="注册/备案凭证号" label="注册/备案凭证号"
prop="zczbhhzbapzbh" prop="zczbhhzbapzbh"
@ -338,8 +234,6 @@
></el-table-column> ></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">
<!-- v-if="orderEditor && scope.row.index !== selectedIndex"-->
<el-button <el-button
type="text" type="text"
size="small" size="small"
@ -349,16 +243,6 @@
>编辑 >编辑
</el-button </el-button
> >
<!-- <el-button-->
<!-- type="text"-->
<!-- size="small"-->
<!-- v-if="orderEditor && scope.row.index === selectedIndex"-->
<!-- :disabled="scope.row.index !== selectedIndex"-->
<!-- @click.stop="true"-->
<!-- @click.native="saveCodeArray(scope.$index, scope.row)"-->
<!-- >保存-->
<!-- </el-button-->
<!-- >-->
<el-button <el-button
type="text" type="text"
size="small" size="small"
@ -378,15 +262,6 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<!-- <div class="block" v-if="orderEditor">-->
<!-- <el-pagination-->
<!-- @current-change="handleCurrentChange"-->
<!-- layout="prev, pager, next"-->
<!-- :page-size="query.limit"-->
<!-- :total="total">-->
<!-- </el-pagination>-->
<!-- </div>-->
</el-card> </el-card>
</el-form> </el-form>
@ -791,17 +666,6 @@ export default {
this.focusNext('iCount'); this.focusNext('iCount');
// let sc = this.selectedIndex + 'reCount';
// const _this = this;
// this.$nextTick(() => {
// setTimeout(function() {
// console.log(sc);
// console.log(_this.$refs[sc]);
// console.log(_this.$refs[sc].focus());
// _this.$refs[sc].focus();
// }, 1)
// // this.$refs['inputBatchNoRef'][0].focus()
// })
}, },
iCountChange() { iCountChange() {
// console.log(this.iCount) // console.log(this.iCount)
@ -1159,7 +1023,6 @@ export default {
billdate: "", billdate: "",
corpName: store.getters.companyName, corpName: store.getters.companyName,
customerId: store.getters.customerId, customerId: store.getters.customerId,
// billType: "deliveryNote",
billType: "", billType: "",
type: "2", type: "2",
locStorageCode: store.getters.locInvCode, locStorageCode: store.getters.locInvCode,
@ -1169,8 +1032,10 @@ export default {
this.iCount = 0; this.iCount = 0;
this.orderEditor = false; this.orderEditor = false;
this.formData.billdate = new Date(); this.formData.billdate = new Date();
this.findSubInvs();
} }
this.findSubInvs();
}, },
}; };
</script> </script>

@ -95,6 +95,17 @@
prop="qxlb" prop="qxlb"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></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-table>
<el-pagination <el-pagination
:page-size="listQuery.limit" :page-size="listQuery.limit"
@ -104,7 +115,17 @@
></el-pagination> ></el-pagination>
</div> </div>
</el-card> </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> </div>
</template> </template>
@ -114,7 +135,7 @@ import {
stockOrderDetailFilterProduct stockOrderDetailFilterProduct
} from "../../api/warehouse/stockOrder"; } from "../../api/warehouse/stockOrder";
import store from "../../store"; import store from "../../store";
import udiRlDetailDialog from "./../basic/UdiRlDetailDialog";
export default { export default {
name: "closeDialog", name: "closeDialog",
props: { props: {
@ -146,6 +167,7 @@ export default {
total: 1, total: 1,
currentRow: null, currentRow: null,
loading: false, loading: false,
udiRlDetailVisible:false,
multipleUdiSelection: [], multipleUdiSelection: [],
thirdSys: [], thirdSys: [],
thirdSysFk: null, thirdSysFk: null,
@ -195,12 +217,15 @@ export default {
unionCode: null, unionCode: null,
udiCode: null, udiCode: null,
ylqxzcrbarmc: "", ylqxzcrbarmc: "",
cpmctymc: "", thrPiId: null, cpmctymc: "",
thrPiId: null,
nameCode: "", nameCode: "",
ggxh: null, ggxh: null,
page: 1, page: 1,
limit: 20, limit: 20,
addType: 1, addType: 1,
billType: this.data.formData.billType,
corpId: this.data.formData.corpId,
}; };
this.getList(); this.getList();
}, },
@ -219,6 +244,11 @@ export default {
console.log(val); console.log(val);
this.currentRow = 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();
@ -253,10 +283,7 @@ export default {
intentBack() { intentBack() {
this.closeDialog(); this.closeDialog();
}, },
combine() {//012693548470801311200226172302271020022632100025 combine() {
// if (this.$isBlank(this.currentRow.id)) {
// return;
// }
let selection = this.$refs.multipleTable.selection; let selection = this.$refs.multipleTable.selection;
if (selection.length < 1) { if (selection.length < 1) {
this.$message.error('未选择产品'); this.$message.error('未选择产品');
@ -287,43 +314,13 @@ export default {
this.loading = false; this.loading = false;
}); });
// let tQuery = {
// id: this.currentRow.id
// };
// if (this.orderEditor) {
// tQuery.orderId = this.orderId;
// console.log(tQuery)
// addStockOrderDetailFromCodeById(tQuery).then((response) => {
// this.loading = false;
// if (response.code === 20000) {
// this.closeDialog(response);
// } else {
// this.$message.error(response.message);
// }
// }).catch(() => {
// this.loading = false;
// });
// } else {
// getStockOrderDetailInstrumentById(tQuery).then((response) => {
// this.loading = false;
// if (response.code === 20000) {
// this.closeDialog(response.data);
// } else {
// this.$message.error(response.message);
// }
// }).catch(() => {
// this.loading = false;
// });
// }
}, },
handleSelectionUdiChange(val) { handleSelectionUdiChange(val) {
console.log("----" + val);
this.multipleUdiSelection = val; this.multipleUdiSelection = val;
}, },
}, },
created() { created() {
if (this.$isNotBlank(this.data)) { if (this.$isNotBlank(this.data)) {
console.log(this.data.stockOrderLists);
this.listQuery.nameCode = this.data.udi; this.listQuery.nameCode = this.data.udi;
if (this.data.billType != null) { if (this.data.billType != null) {
this.listQuery.billType = this.data.billType; this.listQuery.billType = this.data.billType;
@ -335,6 +332,7 @@ export default {
this.getList(); this.getList();
} }
}, },
components: {udiRlDetailDialog},
}; };
</script> </script>

@ -347,7 +347,7 @@
</el-col> </el-col>
<el-col :span="7"> <el-col :span="7">
<el-form-item prop="count"> <el-form-item prop="count">
<el-input v-model="detailFormData.count" auto-complete="off" :disabled="true"></el-input> <el-input v-model="detailFormData.count" auto-complete="off" :disabled="true" type="number"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="3"> <el-col :span="3">

@ -235,7 +235,7 @@
</el-col> </el-col>
<el-col :span="7"> <el-col :span="7">
<el-form-item prop="count"> <el-form-item prop="count">
<el-input v-model="detailFormData.count" auto-complete="off" :disabled="true"></el-input> <el-input v-model="detailFormData.count" auto-complete="off" :disabled="true" type="number"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="3"> <el-col :span="3">

Loading…
Cancel
Save