采购订单等相关修改

prod
anthonywj 2 years ago
parent f051fe5540
commit 48c0ea97ca

@ -33,38 +33,33 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="11"> <el-col :span="11">
<el-form-item class="query-form-item" prop="billType" label="单据类型"> <el-form-item prop="locStorageCode" label="当前仓库">
<el-select v-model="formData.action" placeholder="请选择单据类型" style="width: 90%" <el-select v-model="formData.invCode" placeholder="当前仓库信息" @change="locCHange" style="width: 90%">
@change="actionChange">
<el-option <el-option
v-for="item in busTypeOptions" v-for="item in curInvOptions"
:key="item.name" :key="item.name"
:label="item.name" :label="item.name"
:value="item.action"> :value="item.code">
<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-col> </el-col>
<el-col :span="11"> <el-col :span="11">
<el-form-item prop="locStorageCode" label="当前仓库"> <el-form-item class="query-form-item" prop="billType" label="单据类型">
<el-select v-model="formData.invCode" placeholder="当前仓库信息" @change="locCHange" style="width: 90%"> <el-select v-model="formData.action" placeholder="请选择单据类型" style="width: 90%"
@change="actionChange">
<el-option <el-option
v-for="item in curInvOptions" v-for="item in busTypeOptions"
:key="item.name" :key="item.name"
:label="item.name" :label="item.name"
:value="item.code"> :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-col> </el-col>
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="11"> <el-col :span="11">
@ -125,10 +120,7 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<el-table v-loading="detailLoading" <el-table v-loading="detailLoading"
@ -200,7 +192,7 @@ import {getLocalJoinByUser} from "@/api/basic/busLocalType";
import {submitOrderWeb} from "@/api/inout/order"; import {submitOrderWeb} from "@/api/inout/order";
import {orderChange} from "@/api/inout/order"; import {orderChange} from "@/api/inout/order";
import {getBizDetailList} from "@/api/inout/orderDetailBiz"; import {getBizDetailList} from "@/api/inout/orderDetailBiz";
import {filterSubByInv, findInvByUser} from "@/api/system/invSubWarehouse"; import {filterSubByInv, findByFrom, findInvByUser} from "@/api/system/invSubWarehouse";
import {isBlank} from "@/utils/strUtil"; import {isBlank} from "@/utils/strUtil";
import {convertDate} from "@/utils/date" import {convertDate} from "@/utils/date"
import {findByInvUser} from "@/api/basic/busType"; import {findByInvUser} from "@/api/basic/busType";
@ -231,6 +223,10 @@ export default {
fromType: 2, fromType: 2,
actDate: new Date(), actDate: new Date(),
action: null, action: null,
fromInvCode: null,
locStorageCode: null, locStorageCode: null,
fromSubInvCode: null, fromSubInvCode: null,
invWarehouseCode: null, invWarehouseCode: null,
@ -289,7 +285,7 @@ export default {
let products = []; let products = [];
this.detailList.forEach(item => { this.detailList.forEach(item => {
let product = { let product = {
relId: item.relId, relId: item.bindRlFk,
batchNo: item.batchNo batchNo: item.batchNo
}; };
products.push(product); products.push(product);
@ -421,12 +417,12 @@ export default {
this.curAction = this.getActionItem(item); this.curAction = this.getActionItem(item);
if (this.curAction.corpType == 0 || this.curAction.corpType == 2 || (this.curAction.corpType == 1 && !this.curAction.genUnit)) { if (this.curAction.corpType == 0 || this.curAction.corpType == 2 || (this.curAction.corpType == 1 && !this.curAction.genUnit)) {
//1. //1.
this.orderFormData.fromCorp = null; this.formData.fromCorp = null;
this.findMethod(); this.findMethod();
} else if (this.curAction.corpType == 3) { } else if (this.curAction.corpType == 3) {
//2. //2.
this.orderFormData.fromInvCode = null; this.formData.fromInvCode = null;
this.findFromInvList(); this.findFromInvList();
} }
}, },
@ -438,6 +434,22 @@ export default {
} }
}, },
//
findFromInvList(val) {
let cQuery = {
locInvCode: this.formData.invCode,
};
findByFrom(cQuery)
.then((response) => {
this.fromInvOptions = response.data || [];
if (val == 1) {
this.formData.fromInvCode = this.fromInvOptions[0].code;
}
})
.catch(() => {
});
},
changeFun(row) { changeFun(row) {
let _this = this; let _this = this;
_this.multipId = []; //ID _this.multipId = []; //ID

@ -173,13 +173,6 @@
</el-button> </el-button>
<!-- <el-button-->
<!-- type="text"-->
<!-- size="small"-->
<!-- @click.native.stop="deleteDialog(scope.row)"-->
<!-- >删除-->
<!-- </el-button-->
<!-- >-->
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

@ -126,6 +126,7 @@
<el-table-column label="物资名称" prop="productName" show-overflow-tooltip="true"></el-table-column> <el-table-column label="物资名称" prop="productName" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column> <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="计量单位" prop="measname" show-overflow-tooltip="true" width="100"></el-table-column> <el-table-column label="计量单位" prop="measname" show-overflow-tooltip="true" width="100"></el-table-column>
<el-table-column label="价格" prop="price" show-overflow-tooltip="true" width="100"></el-table-column>
<el-table-column label="申购数量" prop="count"></el-table-column> <el-table-column label="申购数量" prop="count"></el-table-column>
<el-table-column label="注册/备案号" prop="zczbhhzbapzbh"></el-table-column> <el-table-column label="注册/备案号" prop="zczbhhzbapzbh"></el-table-column>
<el-table-column label="生产厂家" prop="manufactory"></el-table-column> <el-table-column label="生产厂家" prop="manufactory"></el-table-column>

@ -124,6 +124,7 @@
<el-table-column label="物资名称" prop="productName" show-overflow-tooltip="true"></el-table-column> <el-table-column label="物资名称" prop="productName" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column> <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="计量单位" prop="measname" show-overflow-tooltip="true" width="100"></el-table-column> <el-table-column label="计量单位" prop="measname" show-overflow-tooltip="true" width="100"></el-table-column>
<el-table-column label="价格" prop="price" show-overflow-tooltip="true" width="100"></el-table-column>
<el-table-column label="申购数量" prop="count"></el-table-column> <el-table-column label="申购数量" prop="count"></el-table-column>
<el-table-column label="注册/备案号" prop="zczbhhzbapzbh"></el-table-column> <el-table-column label="注册/备案号" prop="zczbhhzbapzbh"></el-table-column>
<el-table-column label="生产厂家" prop="manufactory"></el-table-column> <el-table-column label="生产厂家" prop="manufactory"></el-table-column>

@ -34,7 +34,8 @@
<el-row style="margin-top: -10px"> <el-row style="margin-top: -10px">
<el-col :span="11"> <el-col :span="11">
<el-form-item label="紧急程度:" prop="emergency"> <el-form-item label="紧急程度:" prop="emergency">
<el-select v-model="formData.emergency" :disabled="true" placeholder="请选择紧急程度" style="width: 90%" clearable> <el-select v-model="formData.emergency" :disabled="true" placeholder="请选择紧急程度" style="width: 90%"
clearable>
<el-option label="正常" :value=1></el-option> <el-option label="正常" :value=1></el-option>
<el-option label="较急" :value=2></el-option> <el-option label="较急" :value=2></el-option>
<el-option label="特急" :value=3></el-option> <el-option label="特急" :value=3></el-option>
@ -73,7 +74,8 @@
</el-col> </el-col>
<el-col :span="11"> <el-col :span="11">
<el-form-item label="审核说明:" prop="billNo"> <el-form-item label="审核说明:" prop="billNo">
<el-input v-model="formData.auditRemark" style="width: 90%" auto-complete="off" type="textarea" autosize></el-input> <el-input v-model="formData.auditRemark" style="width: 90%" auto-complete="off" type="textarea"
autosize></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -81,7 +83,8 @@
<el-row> <el-row>
<el-col :span="11"> <el-col :span="11">
<el-form-item label="采购说明:" prop="billNo"> <el-form-item label="采购说明:" prop="billNo">
<el-input v-model="formData.remark" style="width: 90%":disabled="true" auto-complete="off" type="textarea" autosize></el-input> <el-input v-model="formData.remark" style="width: 90%" :disabled="true" auto-complete="off"
type="textarea" autosize></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <el-col :span="11">--> <!-- <el-col :span="11">-->
@ -94,7 +97,8 @@
<el-row v-show="formData.autoPurchase"> <el-row v-show="formData.autoPurchase">
<el-col :span="11"> <el-col :span="11">
<el-form-item label="入库仓库:" prop="locStorageCode"> <el-form-item label="入库仓库:" prop="locStorageCode">
<el-select v-model="formData.targetSubInv" placeholder="入库仓库信息" style="width: 90%" @change="targetInvChange" clearable> <el-select v-model="formData.targetSubInv" placeholder="入库仓库信息" style="width: 90%"
@change="targetInvChange" clearable>
<el-option <el-option
v-for="item in tarSubList" v-for="item in tarSubList"
:key="item.name" :key="item.name"
@ -124,12 +128,14 @@
</el-card> </el-card>
<el-card> <el-card>
<el-table v-loading="loading" :data="codeArray" style="width: 100%;" :row-class-name="tableRowClassName" border highlight-current-row max-height="300" height="300" ref="multipleTable"> <el-table v-loading="loading" :data="codeArray" style="width: 100%;" :row-class-name="tableRowClassName" border
highlight-current-row max-height="300" height="300" ref="multipleTable">
<el-table-column label="序号" type="index" width="60"></el-table-column> <el-table-column label="序号" type="index" width="60"></el-table-column>
<el-table-column label="DI/物资编码" prop="nameCode"></el-table-column> <el-table-column label="DI/物资编码" prop="nameCode"></el-table-column>
<el-table-column label="物资名称" prop="productName" show-overflow-tooltip="true"></el-table-column> <el-table-column label="物资名称" prop="productName" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column> <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="计量单位" prop="measname" show-overflow-tooltip="true" width="100"></el-table-column> <el-table-column label="计量单位" prop="measname" show-overflow-tooltip="true" width="100"></el-table-column>
<el-table-column label="价格" prop="price" show-overflow-tooltip="true" width="100"></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.count" <el-input size="small" v-model="scope.row.count"

@ -141,6 +141,7 @@
<el-table-column label="物资名称" prop="productName" show-overflow-tooltip="true"></el-table-column> <el-table-column label="物资名称" prop="productName" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column> <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="计量单位" prop="measname" show-overflow-tooltip="true" width="100"></el-table-column> <el-table-column label="计量单位" prop="measname" show-overflow-tooltip="true" width="100"></el-table-column>
<el-table-column label="价格" prop="price" show-overflow-tooltip="true" width="100"></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.count" <el-input size="small" v-model="scope.row.count"
@ -169,7 +170,7 @@
</el-form> </el-form>
<el-dialog <el-dialog
title="产品录入" title="物资录入"
:visible.sync="selectProductVisible" :visible.sync="selectProductVisible"
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false" :close-on-press-escape="false"

@ -143,6 +143,7 @@
<el-table-column label="物资名称" prop="productName" show-overflow-tooltip="true"></el-table-column> <el-table-column label="物资名称" prop="productName" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column> <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="计量单位" prop="measname" show-overflow-tooltip="true" width="100"></el-table-column> <el-table-column label="计量单位" prop="measname" show-overflow-tooltip="true" width="100"></el-table-column>
<el-table-column label="价格" prop="price" show-overflow-tooltip="true" width="100"></el-table-column>
<el-table-column label="申购数量" prop="count"></el-table-column> <el-table-column label="申购数量" prop="count"></el-table-column>
<el-table-column label="注册/备案号" prop="zczbhhzbapzbh"></el-table-column> <el-table-column label="注册/备案号" prop="zczbhhzbapzbh"></el-table-column>
<el-table-column label="生产厂家" prop="manufactory"></el-table-column> <el-table-column label="生产厂家" prop="manufactory"></el-table-column>

@ -75,16 +75,18 @@
<el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row> <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row>
<el-table-column label="序号" type="index" width="60"></el-table-column> <el-table-column label="序号" type="index" width="60"></el-table-column>
<el-table-column label="采购单号" prop="billNo"></el-table-column> <el-table-column label="采购单号" prop="billNo" width="140" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="DI/物资编码" prop="productId"></el-table-column> <el-table-column label="DI/物资编码" prop="productId" width="140" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="物资名称" prop="productName"></el-table-column> <el-table-column label="物资名称" prop="productName" width="140" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="规格型号" prop="spec"></el-table-column> <el-table-column label="规格型号" prop="spec" width="160" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="采购数量" prop="count"></el-table-column> <el-table-column label="采购数量" prop="count" width="100" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="计量单位" prop="measname"></el-table-column> <el-table-column label="计量单位" prop="measname" width="100" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="供应商" prop="supName"></el-table-column> <el-table-column label="价格" prop="price" width="100"
<el-table-column label="生产企业" prop="manufactory"></el-table-column> show-overflow-tooltip="true"></el-table-column>
<el-table-column label="注册/备案号" prop="zczbhhzbapzbh"></el-table-column> <el-table-column label="供应商" prop="supName" width="160" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="注册/备案人" prop="ylqxzcrbarmc"></el-table-column> <el-table-column label="生产企业" prop="manufactory" width="160" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="注册/备案号" prop="zczbhhzbapzbh" width="160" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="注册/备案人" prop="ylqxzcrbarmc" width="160" show-overflow-tooltip="true"></el-table-column>
</el-table> </el-table>
<pagination <pagination

@ -3,45 +3,57 @@
<el-card class="el-card"> <el-card class="el-card">
<el-form :model="listQuery" label-width="120px" v-show="showSearch"> <el-form :model="listQuery" label-width="120px" v-show="showSearch">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="18">
<el-form-item label="UDI码:" class="query-form-item"> <el-form-item label="UDI码:" class="query-form-item">
<el-input v-model="listQuery.udiCode" style="width: 96%" placeholder="请扫描或输入UDI码" clearable="true" <el-input v-model="listQuery.udiCode" style="width: 96%" placeholder="请扫描或输入UDI码" 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-col> </el-col>
<el-col :span="6"> <!-- <el-col :span="6">-->
<el-form-item label="第三方物资编码:" class="query-form-item"> <!-- <el-form-item label="第三方物资编码:" class="query-form-item">-->
<el-input v-model="listQuery.thrPiId" style="width: 90%" placeholder="请输入第三方物资编码" <!-- <el-input v-model="listQuery.thrPiId" style="width: 90%" placeholder="请输入第三方物资编码"-->
clearable="true"></el-input> <!-- clearable="true"></el-input>-->
</el-form-item> <!-- </el-form-item>-->
</el-col> <!-- </el-col>-->
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="6"> <el-col :span="8">
<el-form-item label="物品编码:" class="query-form-item"> <el-form-item label="物品编码:" class="query-form-item">
<el-input v-model="listQuery.unionCode" style="width: 90%" placeholder="请输入DI/医保编码/商品条码" <el-input v-model="listQuery.unionCode" style="width: 90%" placeholder="请输入DI/医保编码/商品条码"
clearable="true"></el-input> clearable="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="8">
<el-form-item label="产品通用名:" class="query-form-item"> <el-form-item label="产品通用名:" class="query-form-item">
<el-input v-model="listQuery.cpmctymc" style="width: 90%" placeholder="请输入产品通用名" <el-input v-model="listQuery.cpmctymc" style="width: 90%" placeholder="请输入产品通用名"
clearable="true"></el-input> clearable="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="8">
<el-form-item label="规格型号:" class="query-form-item"> <el-form-item label="规格型号:" class="query-form-item">
<el-input v-model="listQuery.ggxh" style="width: 90%" placeholder="请输入规格型号" clearable="true"></el-input> <el-input v-model="listQuery.ggxh" style="width: 90%" placeholder="请输入规格型号" clearable="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> </el-row>
<el-row>
<el-col :span="8">
<el-form-item label="生产企业:" class="query-form-item"> <el-form-item label="生产企业:" class="query-form-item">
<el-input v-model="listQuery.ylqxzcrbarmc" style="width: 90%" placeholder="请输入生产企业/注册备案人" <el-input v-model="listQuery.manufactory" style="width: 90%" placeholder="请输入生产企业"
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="注册/备案证号:" class="query-form-item">
<el-input v-model="listQuery.zczbhhzbapzbh" style="width: 90%" placeholder="注册/备案证号"
clearable="true"></el-input> clearable="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<div class="top-right-btn"> <div class="top-right-btn">
@ -62,15 +74,15 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="序号" type="index"></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="DI/物资编码" 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="cpmctymc" show-overflow-tooltip width="140"></el-table-column>
<el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc"></el-table-column> <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip width="140"></el-table-column>
<el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip></el-table-column> <el-table-column label="计量单位" prop="measname" show-overflow-tooltip width="100"></el-table-column>
<el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column> <el-table-column label="价格" prop="price" width="100"></el-table-column>
<el-table-column label="注册/备案凭证" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column> <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip width="160"></el-table-column>
<el-table-column label="器械类别" prop="qxlb" show-overflow-tooltip></el-table-column> <el-table-column label="注册/备案凭证" prop="zczbhhzbapzbh" show-overflow-tooltip width="160"></el-table-column>
<el-table-column label="配送企业" prop="companyName" show-overflow-tooltip></el-table-column> <el-table-column label="配送企业" prop="companyName" show-overflow-tooltip width="160"></el-table-column>
<el-table-column label="操作" width="160"> <el-table-column label="操作" width="90" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" size="small" @click.native.stop="handleDetailClick(scope.row)">详情</el-button> <el-button type="text" size="small" @click.native.stop="handleDetailClick(scope.row)">详情</el-button>
</template> </template>
@ -161,6 +173,8 @@ export default {
thrPiId: null, thrPiId: null,
page: 1, page: 1,
limit: 10, limit: 10,
zczbhhzbapzbh: null,
manufactory: null,
}, },
combineQuery: { combineQuery: {
thirdId: "", thirdId: "",
@ -336,7 +350,8 @@ export default {
count: 1, count: 1,
orderIdFk: this.pId, orderIdFk: this.pId,
supId: this.multipleSelection.customerId, supId: this.multipleSelection.customerId,
zczbhhzbapzbh: this.multipleSelection.zczbhhzbapzbh zczbhhzbapzbh: this.multipleSelection.zczbhhzbapzbh,
price:this.multipleSelection.price
}; };
addOrderDetail(tQuery).then((response) => { addOrderDetail(tQuery).then((response) => {
this.loading = false; this.loading = false;
@ -379,6 +394,8 @@ export default {
} }
} }
this.getList();
}, },
}; };
</script> </script>

Loading…
Cancel
Save