Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/supplier/company/basicCompanyproductDetail.vue
ywj_dev
郑明梁 2 years ago
commit b1bf460002

@ -125,7 +125,7 @@
<el-card class="el-card">
<el-table v-loading="detailLoading" :data="detailList" style="width: 100%" border>
<el-table-column type="index" label="序号" width="50"></el-table-column>
<el-table-column label="产品通用名" prop="coName"></el-table-column>
<el-table-column label="物资名称" prop="coName"></el-table-column>
<el-table-column label="规格型号" prop="spec"></el-table-column>
<el-table-column label="批次号" prop="batchNo"></el-table-column>
<el-table-column label="生产日期" prop="productDate">
@ -141,7 +141,7 @@
<el-table-column label="实际数量" prop="reCount"></el-table-column>
<el-table-column label="单据数量" prop="count"></el-table-column>
<el-table-column label="价格" prop="price"></el-table-column>
<el-table-column label="生产厂家" prop="ylqxzcrbarmc"></el-table-column>
<el-table-column label="生产企业" prop="ylqxzcrbarmc"></el-table-column>
<el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh"></el-table-column>
</el-table>
@ -161,6 +161,7 @@
:close-on-click-modal="false"
:close-on-press-escape="false"
width="70%"
append-to-body
v-if="qrcodeDetailVisible"
@close='closeQRCodeDetailDialog'
>

@ -79,7 +79,7 @@
<el-table v-loading="loading" :data="codeArray" style="width: 100%;" border max-height="350" height="350" ref="multipleTable">
<el-table-column label="序号" type="index" width="50"></el-table-column>
<el-table-column label="产品通用名" prop="productName" show-overflow-tooltip width="200"></el-table-column>
<el-table-column label="物资名称" prop="productName" show-overflow-tooltip width="200"></el-table-column>
<el-table-column label="包装规格" prop="spec" show-overflow-tooltip width="200"></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>

@ -204,7 +204,7 @@
<el-col :span="12" class="el-col">
<div class="text item">
<div class="itemTag">
<span>生产厂家:&nbsp;</span>
<span>生产企业:&nbsp;</span>
</div>
<el-input
style="width: 65%"

@ -44,10 +44,10 @@
<el-row>
<el-col :span="6">
<el-form-item class="query-form-item" label="生产厂家:">
<el-form-item class="query-form-item" label="生产企业:">
<el-input v-model="erpQuery.manufactory"
clearable="true"
placeholder="生产厂家"></el-input>
placeholder="生产企业"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
@ -102,7 +102,7 @@
<el-table-column label="计量单位" prop="measname" show-overflow-tooltip></el-table-column>
<el-table-column label="规格型号" prop="spec" show-overflow-tooltip></el-table-column>
<el-table-column label="注册/备案凭证号" prop="registerNo" show-overflow-tooltip></el-table-column>
<el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip></el-table-column>
<el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip></el-table-column>
</el-table>
<pagination
v-show="pageTotal>0"

@ -9,8 +9,8 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="产品通用名:">
<el-input v-model="filterQuery.cpmctymc" style="width:90%" placeholder="请输入产品通用名" clearable="true"></el-input>
<el-form-item label="物资名称:">
<el-input v-model="filterQuery.cpmctymc" style="width:90%" placeholder="请输入物资名称" clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
@ -54,7 +54,7 @@
<el-table-column label="最小销售产品标识" prop="nameCode" width="140"></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="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>
@ -88,7 +88,7 @@
<el-table v-loading="loading" :data="detailList" style="width: 100%; margin-top: 20px" border @current-change="handleDetail" border highlight-current-row>
<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="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>

@ -22,8 +22,8 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item class="query-form-item" label="产品通用名:">
<el-input v-model="filterQuery.cpmctymc" placeholder="产品通用名" clearable="true"
<el-form-item class="query-form-item" label="物资名称:">
<el-input v-model="filterQuery.cpmctymc" placeholder="物资名称" clearable="true"
style="width: 90%"></el-input>
</el-form-item>
</el-col>
@ -79,7 +79,7 @@
<el-table-column label="最小销售产品标识" prop="nameCode" width="140" show-overflow-tooltip></el-table-column>
<el-table-column label="主系统产品编码" prop="mainId" 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="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>

@ -36,8 +36,8 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item class="query-form-item" label="产品通用名:">
<el-input v-model="filterQuery.cpmctymc" placeholder="产品通用名" clearable="true"
<el-form-item class="query-form-item" label="物资名称:">
<el-input v-model="filterQuery.cpmctymc" placeholder="物资名称" clearable="true"
style="width: 90%"></el-input>
</el-form-item>
</el-col>
@ -136,7 +136,7 @@
show-overflow-tooltip
></el-table-column>
<el-table-column
label="产品通用名"
label="物资名称"
prop="cpmctymc"
show-overflow-tooltip
></el-table-column>
@ -200,7 +200,7 @@
<el-table-column label="产品名称" prop="thirdName" show-overflow-tooltip></el-table-column>
<el-table-column label="规格型号" prop="spec" show-overflow-tooltip></el-table-column>
<el-table-column label="注册/备案凭证号" prop="registerNo" show-overflow-tooltip></el-table-column>
<el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip></el-table-column>
<el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip></el-table-column>
</el-table>
</el-card>
<el-card>
@ -214,7 +214,7 @@
<el-table v-loading="loading" :data="detailList" style="width: 100%; " border key="3"
highlight-current-row @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="cpmctymc" show-overflow-tooltip></el-table-column>
<el-table-column label="包装级别" prop="packLevel" show-overflow-tooltip></el-table-column>
<el-table-column label="包装单位" prop="packUnit" show-overflow-tooltip></el-table-column>
</el-table>
@ -645,7 +645,7 @@
<el-col :span="12" class="el-col">
<div class="text item">
<div class="itemTag">
<span>生产厂家:&nbsp;</span>
<span>生产企业:&nbsp;</span>
</div>
<el-input
style="width: 65%"

@ -11,11 +11,11 @@
<el-table :data="sysList" style="width: 100%; margin-bottom: 8px" key="2" 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="thirdId" show-overflow-tooltip></el-table-column>
<el-table-column label="物资编码" prop="thirdId" show-overflow-tooltip></el-table-column>
<el-table-column label="产品名称" prop="thirdName" show-overflow-tooltip></el-table-column>
<el-table-column label="规格型号" prop="spec" show-overflow-tooltip></el-table-column>
<el-table-column label="注册/备案凭证号" prop="registerNo" show-overflow-tooltip></el-table-column>
<el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip></el-table-column>
<el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip></el-table-column>
<el-table-column label="操作">
<template slot-scope="scope">
<el-button type="text" @click="addSelectErp(scope.row)" :disabled="scope.row.thirdId==editQuery.nameCode">
@ -45,7 +45,7 @@
<el-table v-loading="loading" :data="detailList" style="width: 100%; " border key="3" highlight-current-row
@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="cpmctymc" show-overflow-tooltip></el-table-column>
<el-table-column label="包装级别" prop="packLevel" show-overflow-tooltip></el-table-column>
<el-table-column label="包装单位" prop="packUnit" show-overflow-tooltip></el-table-column>
<el-table-column label="操作" width="180px">
@ -70,7 +70,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="生产厂家:">
<el-form-item label="生产企业:">
<el-input
style="width: 80%"
size="small"

@ -23,7 +23,7 @@
</el-row>
<el-row>
<el-col span="20">
<el-form-item label="产品通用名:">
<el-form-item label="物资名称:">
<el-input
style="width: 90%"
size="small"

@ -18,8 +18,8 @@
</el-form-item>
</el-col>
<el-col :span="6" >
<el-form-item label="产品通用名:">
<el-input v-model="filterQuery.cpmctymc" style="width: 90%" placeholder="请输入产品通用名" clearable="true"></el-input>
<el-form-item label="物资名称:">
<el-input v-model="filterQuery.cpmctymc" style="width: 90%" placeholder="请输入物资名称" clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="6" >
@ -75,7 +75,7 @@
<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="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>
@ -96,7 +96,7 @@
<el-table v-loading="loading" :data="detailList" style="width: 100%; margin-top: 20px" border @current-change="handleDetail" border highlight-current-row>
<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="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>

@ -28,14 +28,14 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="产品编码:">
<el-form-item label="物资编码:">
<el-input v-model="filterQuery.unionCode" style="width: 90%" placeholder="请输入DI/医保编码/商品条码"
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="产品通用名:">
<el-input v-model="filterQuery.cpmctymc" style="width: 90%" placeholder="请输入产品通用名"
<el-form-item label="物资名称:">
<el-input v-model="filterQuery.cpmctymc" style="width: 90%" placeholder="请输入物资名称"
clearable="true"></el-input>
</el-form-item>
</el-col>
@ -67,8 +67,8 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="第三方产品编码:">
<el-input v-model="filterQuery.thrPiId" style="width: 90%" placeholder="请输入第三方产品编码"
<el-form-item label="第三方物资编码:">
<el-input v-model="filterQuery.thrPiId" style="width: 90%" placeholder="请输入第三方物资编码"
clearable="true"></el-input>
</el-form-item>
</el-col>
@ -103,9 +103,9 @@
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="供应商" prop="companyName" show-overflow-tooltip></el-table-column>
<el-table-column label="最小销售产品标识" prop="nameCode" show-overflow-tooltip></el-table-column>
<el-table-column label="主系统产品编码" prop="mainId" show-overflow-tooltip></el-table-column>
<el-table-column label="主系统物资编码" prop="mainId" 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="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>

@ -42,7 +42,7 @@
<el-form-item class="query-form-item">
<el-input v-model="erpQuery.manufactory"
clearable="true"
placeholder="生产厂家"></el-input>
placeholder="生产企业"></el-input>
</el-form-item>
</el-row>
@ -89,7 +89,7 @@
<el-table-column label="计量单位" prop="measname"></el-table-column>
<el-table-column label="规格型号" prop="spec"></el-table-column>
<el-table-column label="注册/备案凭证号" prop="registerNo"></el-table-column>
<el-table-column label="生产厂家" prop="manufactory"></el-table-column>
<el-table-column label="生产企业" prop="manufactory"></el-table-column>
</el-table>
<el-pagination
:page-size="erpQuery.limit"

@ -5,7 +5,7 @@
<el-row>
<el-col :span="6">
<el-form-item label="物品编码:">
<el-input v-model="erpQuery.code"style="width: 90%" placeholder="请输入产品编码/商品条码/医保编码" clearable="true" @keyup.enter.native="keyupErp_submit($event)"></el-input>
<el-input v-model="erpQuery.code"style="width: 90%" placeholder="请输入物资编码/商品条码/医保编码" clearable="true" @keyup.enter.native="keyupErp_submit($event)"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
@ -26,8 +26,8 @@
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="生产厂家:">
<el-input v-model="erpQuery.manufactory" style="width: 90%" clearable="true" placeholder="请输入生产厂家" @keyup.enter.native="keyup_submit($event)"></el-input>
<el-form-item label="生产企业:">
<el-input v-model="erpQuery.manufactory" style="width: 90%" clearable="true" placeholder="请输入生产企业" @keyup.enter.native="keyup_submit($event)"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
@ -69,12 +69,12 @@
v-loading="erpLloading" @current-change="handleErpChange" @selection-change="handleSelectionChange">
<el-table-column v-if="isImport" type="selection" width="55"></el-table-column>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="产品编码" prop="code"></el-table-column>
<el-table-column label="物资编码" prop="code"></el-table-column>
<el-table-column label="产品名称" prop="name"></el-table-column>
<el-table-column label="计量单位" prop="measname"></el-table-column>
<el-table-column label="规格型号" prop="spec"></el-table-column>
<el-table-column label="注册/备案凭证号" prop="registerNo"></el-table-column>
<el-table-column label="生产厂家" prop="manufactory"></el-table-column>
<el-table-column label="生产企业" prop="manufactory"></el-table-column>
<el-table-column label="配送企业" prop="supName"></el-table-column>
</el-table>
<pagination
@ -400,7 +400,7 @@ export default {
return;
}
if (selected != '') {
this.$confirm("产品编码:" + selected + "已被添加,是否继续添加", "提示", {
this.$confirm("物资编码:" + selected + "已被添加,是否继续添加", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
@ -459,7 +459,7 @@ export default {
if (this.currentRow.checked) {
this.$confirm("产品编码:" + this.currentRow.code + "已被选入,是否继续选入", "提示", {
this.$confirm("物资编码:" + this.currentRow.code + "已被选入,是否继续选入", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",

@ -4,17 +4,17 @@
<el-table :data="sysList" style="width: 100%" key="2" 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="thirdId" show-overflow-tooltip></el-table-column>
<el-table-column label="物资编码" prop="thirdId" show-overflow-tooltip></el-table-column>
<el-table-column label="产品名称" prop="thirdName" show-overflow-tooltip></el-table-column>
<el-table-column label="规格型号" prop="spec" show-overflow-tooltip></el-table-column>
<el-table-column label="注册/备案凭证号" prop="registerNo" show-overflow-tooltip></el-table-column>
<el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip></el-table-column>
<el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip></el-table-column>
</el-table>
<el-table v-loading="loading" :data="detailList" style="width: 100%; margin-top: 20px" border key="3" @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="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>
@ -291,7 +291,7 @@
<el-col :span="12" class="el-col">
<div class="text item">
<div class="itemTag">
<span>生产厂家:&nbsp;</span>
<span>生产企业:&nbsp;</span>
</div>
<el-input
style="width: 65%"

@ -22,8 +22,8 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item class="query-form-item" label="产品通用名:">
<el-input v-model="filterQuery.cpmctymc" placeholder="产品通用名" clearable="true"
<el-form-item class="query-form-item" label="物资名称:">
<el-input v-model="filterQuery.cpmctymc" placeholder="物资名称" clearable="true"
style="width: 90%"></el-input>
</el-form-item>
</el-col>
@ -79,7 +79,7 @@
<el-table-column label="最小销售产品标识" prop="nameCode" width="140" show-overflow-tooltip></el-table-column>
<el-table-column label="主系统产品编码" prop="mainId" 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="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>

@ -237,7 +237,7 @@
<el-col :span="12" class="el-col">
<div class="text item">
<div class="itemTag">
<span>生产厂家:&nbsp;</span>
<span>生产企业:&nbsp;</span>
</div>
<el-input
style="width: 65%"

@ -110,7 +110,7 @@
</el-form-item>
</el-col>
<el-col :span="12" class="el-col">
<el-form-item label="生产厂家:">
<el-form-item label="生产企业:">
<el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入内容" v-model="editQuery.manufactory"></el-input>
</el-form-item>
</el-col>

@ -22,8 +22,8 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item class="query-form-item" label="产品通用名:">
<el-input v-model="listQuery.cpmctymc" placeholder="产品通用名" clearable="true"
<el-form-item class="query-form-item" label="物资名称:">
<el-input v-model="listQuery.cpmctymc" placeholder="物资名称" clearable="true"
style="width: 90%"></el-input>
</el-form-item>
</el-col>
@ -91,7 +91,7 @@
show-overflow-tooltip
></el-table-column>
<el-table-column
label="产品通用名"
label="物资名称"
prop="cpmctymc"
show-overflow-tooltip
></el-table-column>

@ -112,8 +112,8 @@
<el-card class="el-card">
<el-table v-loading="loading" :data="detailList" style="width: 100%">
<el-table-column label="序号" type="index" width="120"></el-table-column>
<el-table-column label="产品编码" prop="nameCode"></el-table-column>
<el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="物资编码" prop="nameCode"></el-table-column>
<el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="批次号" prop="batchNo"></el-table-column>
<el-table-column label="生产日期" prop="productDate"></el-table-column>

@ -20,12 +20,12 @@
show-overflow-tooltip
></el-table-column>
<el-table-column
label="生产厂家"
label="生产企业"
prop="ylqxzcrbarmc"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="产品通用名"
label="物资名称"
prop="cpmctymc"
show-overflow-tooltip
></el-table-column>
@ -92,7 +92,7 @@
></el-table-column>
<el-table-column label="规格型号" prop="spec" show-overflow-tooltip></el-table-column>
<el-table-column label="注册/备案凭证号" prop="registerNo" show-overflow-tooltip></el-table-column>
<el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip></el-table-column>
<el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip></el-table-column>
</el-table>
<el-table
@ -109,7 +109,7 @@
></el-table-column>
<el-table-column
label="产品通用名"
label="物资名称"
prop="cpmctymc"
show-overflow-tooltip
></el-table-column>
@ -435,7 +435,7 @@
<el-col :span="12" class="el-col">
<div class="text item">
<div class="itemTag">
<span>生产厂家:&nbsp;</span>
<span>生产企业:&nbsp;</span>
</div>
<el-input
style="width: 65%"

@ -114,7 +114,7 @@
<el-table v-loading="loading" :data="detailList" style="width: 100%" border>
<el-table-column label="序号" type="index" width="120"></el-table-column>
<el-table-column label="产品编码" prop="productId"></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="batchNo"></el-table-column>
<el-table-column label="生产日期" prop="productDate"></el-table-column>

@ -12,7 +12,7 @@
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column
label="产品通用名称"
label="物资名称称"
prop="coName"
show-overflow-tooltip
></el-table-column>

@ -241,17 +241,24 @@
prop="batchNo"
></el-table-column>
<el-table-column
label="数量"
label="送货数量"
prop="count"
></el-table-column>
<el-table-column
label="扫码数量"
prop="scanCount"
></el-table-column>
<el-table-column
label="计量单位"
prop="price"
></el-table-column>
<el-table-column
label="价格"
prop="price"
></el-table-column>
<!--todo-->
<el-table-column
label="生产日期"
prop="productDate"
@ -261,7 +268,7 @@
prop="expireDate"
></el-table-column>
<el-table-column
label="生产厂家"
label="生产企业"
prop="manufacturer"
show-overflow-tooltip
></el-table-column>
@ -335,11 +342,11 @@
prop="expireDate"
></el-table-column>
<el-table-column
label="单据数量"
label="送货数量"
prop="orderCount"
></el-table-column>
<el-table-column
label="扫码数量"
label="到货数量"
prop="reCount"
></el-table-column>
<el-table-column
@ -348,7 +355,7 @@
show-overflow-tooltip
></el-table-column>
<el-table-column
label="生产厂家"
label="生产企业"
prop="manufacturer"
show-overflow-tooltip
></el-table-column>

@ -225,7 +225,7 @@
prop="price"
></el-table-column>
<el-table-column
label="生产厂家"
label="生产企业"
prop="manufacturer"
show-overflow-tooltip
></el-table-column>

@ -234,7 +234,7 @@
prop="price"
></el-table-column>
<el-table-column
label="生产厂家"
label="生产企业"
prop="manufacturer"
show-overflow-tooltip
></el-table-column>
@ -321,7 +321,7 @@
show-overflow-tooltip
></el-table-column>
<el-table-column
label="生产厂家"
label="生产企业"
prop="manufacturer"
show-overflow-tooltip
></el-table-column>

@ -204,7 +204,7 @@
>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column
label="产品通用名称"
label="物资名称"
prop="coName"
show-overflow-tooltip
></el-table-column>
@ -237,7 +237,7 @@
prop="price"
></el-table-column>
<el-table-column
label="生产厂家"
label="生产企业"
prop="manufacturer"
show-overflow-tooltip
></el-table-column>
@ -288,7 +288,7 @@
>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column
label="产品通用名"
label="物资名称"
prop="coName"
show-overflow-tooltip
></el-table-column>
@ -324,7 +324,7 @@
show-overflow-tooltip
></el-table-column>
<el-table-column
label="生产厂家"
label="生产企业"
prop="manufacturer"
show-overflow-tooltip
></el-table-column>

@ -285,7 +285,7 @@
prop="price" width="100"
></el-table-column>
<el-table-column
label="生产厂家"
label="生产企业"
prop="manufacturer" width="160"
show-overflow-tooltip
></el-table-column>

@ -279,7 +279,7 @@
prop="price"
></el-table-column>
<el-table-column
label="生产厂家"
label="生产企业"
prop="manufacturer"
show-overflow-tooltip
></el-table-column>
@ -366,7 +366,7 @@
show-overflow-tooltip
></el-table-column>
<el-table-column
label="生产厂家"
label="生产企业"
prop="manufacturer"
show-overflow-tooltip
></el-table-column>

@ -97,7 +97,7 @@
>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column
label="产品通用名称"
label="物资名称"
prop="coName"
show-overflow-tooltip
></el-table-column>
@ -128,7 +128,7 @@
prop="price"
></el-table-column>
<el-table-column
label="生产厂家"
label="生产企业"
prop="manufacturer"
show-overflow-tooltip
></el-table-column>
@ -180,7 +180,7 @@
>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column
label="产品通用名"
label="物资名称"
prop="coName"
show-overflow-tooltip
></el-table-column>
@ -216,7 +216,7 @@
show-overflow-tooltip
></el-table-column>
<el-table-column
label="生产厂家"
label="生产企业"
prop="manufacturer"
show-overflow-tooltip
></el-table-column>

@ -247,7 +247,7 @@
prop="price"
></el-table-column>
<el-table-column
label="生产厂家"
label="生产企业"
prop="manufacturer"
show-overflow-tooltip
></el-table-column>
@ -334,7 +334,7 @@
show-overflow-tooltip
></el-table-column>
<el-table-column
label="生产厂家"
label="生产企业"
prop="manufacturer"
show-overflow-tooltip
></el-table-column>

@ -268,7 +268,7 @@
width="100"
></el-table-column>
<el-table-column
label="生产厂家"
label="生产企业"
prop="manufacturer"
width="160"
show-overflow-tooltip

@ -98,7 +98,7 @@
>
</el-table-column>
<el-table-column width="150"
label="生产厂家"
label="生产企业"
prop="manufacturer"
show-overflow-tooltip
></el-table-column>

@ -21,7 +21,7 @@
<el-table-column label="扫码数量" width="80" prop="count" show-overflow-tooltip></el-table-column>
<el-table-column label="实际数量" width="80" prop="reCount" show-overflow-tooltip></el-table-column>
<el-table-column label="价格" width="150" prop="price" show-overflow-tooltip></el-table-column>
<el-table-column label="生产厂家" width="150" prop="manufacturer" show-overflow-tooltip></el-table-column>
<el-table-column label="生产企业" width="150" prop="manufacturer" show-overflow-tooltip></el-table-column>
<el-table-column label="注册/备案凭证号" width="150" prop="certCode" show-overflow-tooltip></el-table-column>
</el-table>
</div>

@ -125,7 +125,7 @@
</el-table-column>
<el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
<el-table-column label="生产厂家" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
<el-table-column label="生产企业" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
<el-table-column label="操作" width="150">
<template slot-scope="scope">
<el-button type="text" size="small" :disabled="scope.row.index === selectedIndex" @click.stop="true" @click.native="rowChange(scope.row)">编辑</el-button>

@ -95,7 +95,7 @@
<el-table v-loading="loading" :data="detailList" style="width: 100%" border>
<el-table-column label="序号" type="index" width="120"></el-table-column>
<el-table-column label="产品编码" prop="nameCode"></el-table-column>
<el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="批次号" prop="batchNo"></el-table-column>
<el-table-column label="生产日期" prop="productDate"></el-table-column>

@ -83,7 +83,7 @@
<el-table v-loading="loading" :data="detailList" style="width: 100%" border>
<el-table-column label="序号" type="index" width="120"></el-table-column>
<el-table-column label="产品编码" prop="nameCode"></el-table-column>
<el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="批次号" prop="batchNo"></el-table-column>
<el-table-column label="生产日期" prop="productDate"></el-table-column>

@ -75,7 +75,7 @@
<el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
<el-table-column label="单据数量" prop="count" show-overflow-tooltip></el-table-column>
<el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
<el-table-column label="生产厂家" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
<el-table-column label="生产企业" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
</el-table>
</el-card>
</el-form>

@ -81,7 +81,7 @@
<el-table v-loading="loading" :data="detailList" style="width: 100%" border>
<el-table-column label="序号" type="index" width="120"></el-table-column>
<el-table-column label="产品编码" prop="nameCode"></el-table-column>
<el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="批次号" prop="batchNo"></el-table-column>
<el-table-column label="生产日期" prop="productDate"></el-table-column>

@ -215,7 +215,7 @@
prop="price"
></el-table-column>
<el-table-column
label="生产厂家"
label="生产企业"
prop="manufacturer"
show-overflow-tooltip
></el-table-column>

@ -56,7 +56,7 @@
<el-table v-loading="detailLoading" :data="detailList" style="width: 100%; margin-top: 10px;">
<el-table-column label="序号" type="index" width="50"></el-table-column>
<el-table-column label="条码" width="200" prop="code" show-overflow-tooltip></el-table-column>
<el-table-column label="产品通用名" prop="productName" width="200"></el-table-column>
<el-table-column label="物资名称" prop="productName" width="200"></el-table-column>
<el-table-column label="规格型号" prop="ggxh" width="180" show-overflow-tooltip></el-table-column>
<el-table-column label="批次号" prop="batchNo" width="150"></el-table-column>
<el-table-column label="序列号" prop="serialNo" width="150"></el-table-column>
@ -65,7 +65,7 @@
<el-table-column label="失效日期" prop="expireDate" width="150"></el-table-column>
<el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh"
show-overflow-tooltip></el-table-column>
<el-table-column label="生产厂家" prop="ylqxzcrbarmc"
<el-table-column label="生产企业" prop="ylqxzcrbarmc"
show-overflow-tooltip></el-table-column>
</el-table>

@ -63,7 +63,7 @@
border max-height="300" height="300">
<el-table-column label="序号" type="index" width="50"></el-table-column>
<el-table-column label="条码" width="180" prop="code" show-overflow-tooltip></el-table-column>
<el-table-column width="150" label="产品通用名" prop="productName" show-overflow-tooltip></el-table-column>
<el-table-column width="150" label="物资名称" prop="productName" show-overflow-tooltip></el-table-column>
<el-table-column width="150" label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
<el-table-column width="150" label="批次号" prop="batchNo"></el-table-column>
<el-table-column width="150" label="养护数量" prop="count"></el-table-column>
@ -97,7 +97,7 @@
show-overflow-tooltip></el-table-column>
<el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh"
show-overflow-tooltip></el-table-column>
<el-table-column label="生产厂家" prop="ylqxzcrbarmc"
<el-table-column label="生产企业" prop="ylqxzcrbarmc"
show-overflow-tooltip></el-table-column>
</el-table>
</el-form>

@ -100,7 +100,7 @@
<el-table v-loading="detailLoading" :data="detailList" style="width: 100%; margin-top: 10px;">
<el-table-column label="序号" type="index" width="50"></el-table-column>
<el-table-column label="条码" width="200" prop="code" show-overflow-tooltip></el-table-column>
<el-table-column label="产品通用名" prop="productName" width="200"></el-table-column>
<el-table-column label="物资名称" prop="productName" width="200"></el-table-column>
<el-table-column label="规格型号" prop="ggxh" width="180" show-overflow-tooltip></el-table-column>
<el-table-column label="批次号" prop="batchNo" width="150"></el-table-column>
<el-table-column label="序列号" prop="serialNo" width="150"></el-table-column>
@ -109,7 +109,7 @@
<el-table-column label="失效日期" prop="expireDate" width="150"></el-table-column>
<el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh"
show-overflow-tooltip></el-table-column>
<el-table-column label="生产厂家" prop="ylqxzcrbarmc"
<el-table-column label="生产企业" prop="ylqxzcrbarmc"
show-overflow-tooltip></el-table-column>
</el-table>

@ -82,7 +82,7 @@
<el-table v-loading="detailLoading" :data="detailList" style="width: 100%; margin-top: 10px;">
<el-table-column label="序号" type="index" width="50"></el-table-column>
<el-table-column label="条码" width="200" prop="code" show-overflow-tooltip></el-table-column>
<el-table-column label="产品通用名" prop="productName" width="200"></el-table-column>
<el-table-column label="物资名称" prop="productName" width="200"></el-table-column>
<el-table-column label="规格型号" prop="ggxh" width="180" show-overflow-tooltip></el-table-column>
<el-table-column label="批次号" prop="batchNo" width="150"></el-table-column>
<el-table-column label="序列号" prop="serialNo" width="150"></el-table-column>
@ -91,7 +91,7 @@
<el-table-column label="失效日期" prop="expireDate" width="150"></el-table-column>
<el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh"
show-overflow-tooltip></el-table-column>
<el-table-column label="生产厂家" prop="ylqxzcrbarmc"
<el-table-column label="生产企业" prop="ylqxzcrbarmc"
show-overflow-tooltip></el-table-column>
</el-table>

@ -148,7 +148,7 @@
<el-table-column label="序号" type="index" width="50"></el-table-column>
<el-table-column label="条码" width="180" prop="code" show-overflow-tooltip></el-table-column>
<el-table-column width="150"
label="产品通用名"
label="物资名称"
prop="productName"
show-overflow-tooltip
></el-table-column>
@ -185,7 +185,7 @@
show-overflow-tooltip></el-table-column>
<el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh"
show-overflow-tooltip></el-table-column>
<el-table-column label="生产厂家" prop="ylqxzcrbarmc"
<el-table-column label="生产企业" prop="ylqxzcrbarmc"
show-overflow-tooltip></el-table-column>
<el-table-column label="操作">
<template slot-scope="scope">

@ -115,7 +115,7 @@
highlight-current-row
border max-height="300" height="300">
<el-table-column label="序号" type="index" width="50"></el-table-column>
<el-table-column width="150" label="产品通用名" prop="productName" show-overflow-tooltip></el-table-column>
<el-table-column width="150" label="物资名称" prop="productName" show-overflow-tooltip></el-table-column>
<el-table-column width="150" label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
<el-table-column width="150" label="批次号" prop="batchNo"></el-table-column>
<el-table-column width="150" label="库存数量" prop="invNum"></el-table-column>
@ -123,7 +123,7 @@
<el-table-column label="生产日期(yyMMdd)" prop="produceDate"></el-table-column>
<el-table-column label="失效日期(yyMMdd)" prop="expireDate" show-overflow-tooltip></el-table-column>
<el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
<el-table-column label="生产厂家" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
<el-table-column label="生产企业" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
<el-table-column label="操作">
<template slot-scope="scope">
<el-button

@ -86,7 +86,7 @@
<el-table v-loading="detailLoading" :data="detailList" style="width: 100%; margin-top: 10px;">
<el-table-column label="序号" type="index" width="50"></el-table-column>
<el-table-column label="条码" width="150" prop="code" show-overflow-tooltip></el-table-column>
<el-table-column width="200" label="产品通用名" prop="productName"></el-table-column>
<el-table-column width="200" label="物资名称" prop="productName"></el-table-column>
<el-table-column width="150" label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
<el-table-column width="150" label="批次号" prop="batchNo"></el-table-column>
<el-table-column label="养护日期" prop="createTime" width="150"></el-table-column>
@ -118,7 +118,7 @@
show-overflow-tooltip></el-table-column>
<el-table-column width="250" label="注册/备案凭证号" prop="zczbhhzbapzbh"
show-overflow-tooltip></el-table-column>
<el-table-column width="200" label="生产厂家" prop="ylqxzcrbarmc"
<el-table-column width="200" label="生产企业" prop="ylqxzcrbarmc"
show-overflow-tooltip></el-table-column>
</el-table>

@ -69,7 +69,7 @@
<el-table v-loading="detailLoading" :data="detailList" style="width: 100%; margin-top: 10px;">
<el-table-column label="序号" type="index" width="50"></el-table-column>
<el-table-column label="条码" width="150" prop="code" show-overflow-tooltip></el-table-column>
<el-table-column width="200" label="产品通用名" prop="productName"></el-table-column>
<el-table-column width="200" label="物资名称" prop="productName"></el-table-column>
<el-table-column width="150" label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
<el-table-column width="150" label="批次号" prop="batchNo"></el-table-column>
<el-table-column label="养护日期" prop="createTime" width="150"></el-table-column>

@ -109,7 +109,7 @@
<el-table-column label="序号" type="index" width="50"></el-table-column>
<el-table-column label="条码" width="180" prop="code" show-overflow-tooltip></el-table-column>
<el-table-column width="150"
label="产品通用名"
label="物资名称"
prop="productName"
show-overflow-tooltip
></el-table-column>
@ -146,7 +146,7 @@
show-overflow-tooltip></el-table-column>
<el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh"
show-overflow-tooltip></el-table-column>
<el-table-column label="生产厂家" prop="ylqxzcrbarmc"
<el-table-column label="生产企业" prop="ylqxzcrbarmc"
show-overflow-tooltip></el-table-column>
<el-table-column label="操作" >
<template slot-scope="scope">

@ -49,7 +49,7 @@
<el-table-column label="失效日期" prop="expireDate" width="120"></el-table-column>
<el-table-column label="批准文号" prop="zczbhhzbapzbh" v-if="showSup" show-overflow-tooltip
width="120"></el-table-column>
<el-table-column label="生产厂家" prop="ylqxzcrbarmc" v-if="showSup" show-overflow-tooltip
<el-table-column label="生产企业" prop="ylqxzcrbarmc" v-if="showSup" show-overflow-tooltip
width="120"></el-table-column>
</el-table>
<pagination

@ -76,8 +76,8 @@
<el-col :span="6">
<el-form-item class="query-form-item" label="生产厂家:">
<el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="生产厂家"
<el-form-item class="query-form-item" label="生产企业:">
<el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="生产企业"
style="width: 90%"
clearable="true"></el-input>
</el-form-item>
@ -147,7 +147,7 @@
<!-- <el-table-column label="入库数量" prop="inCount" width="120"></el-table-column>-->
<!-- <el-table-column label="出库数量" prop="outCount" width="120"></el-table-column>-->
<el-table-column label="库存数量" prop="reCount" width="120"></el-table-column>
<el-table-column label="生产厂家" prop="ylqxzcrbarmc" v-if="showSup" show-overflow-tooltip
<el-table-column label="生产企业" prop="ylqxzcrbarmc" v-if="showSup" show-overflow-tooltip
width="180"></el-table-column>
<el-table-column label="注册/备案号" prop="zczbhhzbapzbh" v-if="showSup" show-overflow-tooltip

@ -76,8 +76,8 @@
<el-col :span="6">
<el-form-item class="query-form-item" label="生产厂家:">
<el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="生产厂家"
<el-form-item class="query-form-item" label="生产企业:">
<el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="生产企业"
style="width: 90%"
clearable="true"></el-input>
</el-form-item>
@ -147,7 +147,7 @@
<!-- <el-table-column label="入库数量" prop="inCount" width="120"></el-table-column>-->
<!-- <el-table-column label="出库数量" prop="outCount" width="120"></el-table-column>-->
<el-table-column label="库存数量" prop="reCount" width="120"></el-table-column>
<el-table-column label="生产厂家" prop="ylqxzcrbarmc" v-if="showSup" show-overflow-tooltip
<el-table-column label="生产企业" prop="ylqxzcrbarmc" v-if="showSup" show-overflow-tooltip
width="180"></el-table-column>
<el-table-column label="注册/备案号" prop="zczbhhzbapzbh" v-if="showSup" show-overflow-tooltip

@ -68,8 +68,8 @@
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item class="query-form-item" label="生产厂家:">
<el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="生产厂家"
<el-form-item class="query-form-item" label="生产企业:">
<el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="生产企业"
style="width: 90%"
clearable="true"></el-input>
</el-form-item>
@ -119,7 +119,7 @@
<el-table-column label="入库数量" prop="inCount" width="120"></el-table-column>
<el-table-column label="出库数量" prop="outCount" width="120"></el-table-column>
<el-table-column label="结余数量" prop="reCount" width="120"></el-table-column>
<el-table-column label="生产厂家" prop="ylqxzcrbarmc" v-if="showSup" show-overflow-tooltip
<el-table-column label="生产企业" prop="ylqxzcrbarmc" v-if="showSup" show-overflow-tooltip
width="120"></el-table-column>
<el-table-column label="供应商" prop="supName" v-if="showSup" show-overflow-tooltip
width="120"></el-table-column>

@ -4,15 +4,15 @@
<el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
<el-row>
<el-col :span="4">
<el-form-item class="query-form-item" label="产品标识DI:">
<el-input v-model="filterQuery.nameCode" placeholder="产品标识DI"
<el-form-item class="query-form-item" label="DI标识:">
<el-input v-model="filterQuery.nameCode" placeholder="DI标识"
style="width: 90%"
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item class="query-form-item" label="产品名称:">
<el-input v-model="filterQuery.cpmctymc" placeholder="产品名称"
<el-form-item class="query-form-item" label="物资名称:">
<el-input v-model="filterQuery.cpmctymc" placeholder="物资名称"
style="width: 90%"
clearable="true"></el-input>
</el-form-item>

@ -38,15 +38,17 @@
<el-card>
<el-button-group style="display: flex">
<el-button type="primary" size="small" @click.native.stop="selectProductFunction()" style="margin: 0px 60px 10px auto; height: 35px" :loading="loading">产品录入</el-button>
<el-button type="primary" size="small" @click.native.stop="selectProductFunction()" style="margin: 0px 0px 10px auto; height: 35px" :loading="loading">产品录入</el-button>
<el-button type="primary" size="small" @click.native.stop="stockOrderList()" style=" height: 35px">内部码</el-button>
</el-button-group>
<el-table v-loading="loading" :data="codeArray" style="width: 100%;" :row-class-name="tableRowClassName" border max-height="300" height="300" ref="multipleTable">
<el-table-column label="序号" type="index" width="50"></el-table-column>
<el-table-column label="产品通用名" prop="productName" show-overflow-tooltip></el-table-column>
<el-table-column label="物资名称" prop="productName" show-overflow-tooltip></el-table-column>
<el-table-column label="规格型号" prop="spec" show-overflow-tooltip></el-table-column>
<el-table-column label="计量单位" prop="measname" show-overflow-tooltip></el-table-column>
<el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip></el-table-column>
<el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip></el-table-column>
<el-table-column label="单据数量">
<template slot-scope="scope">
<el-input size="small" v-model="scope.row.count"
@ -109,12 +111,27 @@
:filterType="2"
></stockOrderNewSelectProduct>
</el-dialog>
<el-dialog
title="内部码打印"
:visible.sync="haveDistributionVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
width="80%"
v-if="haveDistributionVisible"
:append-to-body='true'
>
<stockOrder
></stockOrder>
</el-dialog>
</div>
</template>
<script>
import draggable from "vuedraggable";
import stockOrderNewSelectProduct from "@/views/inventory/inner/innerOrderSelectProduct";
import stockOrder from "@/views/basic/business/stockOrder";
import {
inserThrOrderWeb,
delInnerOrderDetail,
@ -162,6 +179,7 @@ export default {
formVisible: false,
deleteLoading: false,
orderNo: null,
haveDistributionVisible:false,
statusMap: {
1: "草稿",
2: "未审核",
@ -190,6 +208,7 @@ export default {
components: {
draggable,
stockOrderNewSelectProduct,
stockOrder,
},
methods: {
saveOrder(status) {
@ -258,6 +277,9 @@ export default {
updateOrderDetail(row);
this.selectedIndex = "";
},
stockOrderList(){
this.haveDistributionVisible = true;
},
selectProductFunction() {
if(this.query.id==null) {
inserThrOrderWeb({innerOrderEntity: this.formData,editStatus:1})

@ -22,8 +22,8 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="产品通用名:" class="query-form-item">
<el-input v-model="listQuery.cpmctymc" style="width: 90%" placeholder="请输入产品通用名" clearable="true"></el-input>
<el-form-item label="物资名称:" class="query-form-item">
<el-input v-model="listQuery.cpmctymc" style="width: 90%" placeholder="请输入物资名称" clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
@ -60,7 +60,7 @@
<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"></el-table-column>
<el-table-column label="产品通用名" prop="cpmctymc" 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>

@ -129,7 +129,7 @@
>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column
label="产品通用名"
label="物资名称"
prop="coName"
:show-overflow-tooltip="true"
></el-table-column>

@ -9,8 +9,8 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="产品通用名:">
<el-input v-model="filterQuery.cpmctymc" style="width:90%" placeholder="请输入产品通用名" clearable="true"></el-input>
<el-form-item label="物资名称:">
<el-input v-model="filterQuery.cpmctymc" style="width:90%" placeholder="请输入物资名称" clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
@ -54,7 +54,7 @@
<el-table-column label="最小销售产品标识" prop="nameCode" width="140"></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="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>
@ -87,7 +87,7 @@
<el-table v-loading="loading" :data="detailList" style="width: 100%; margin-top: 20px" border @current-change="handleDetail" border highlight-current-row>
<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="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>

@ -9,8 +9,8 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="产品通用名:">
<el-input v-model="filterQuery.cpmctymc" style="width:90%" placeholder="请输入产品通用名" clearable="true"></el-input>
<el-form-item label="物资名称:">
<el-input v-model="filterQuery.cpmctymc" style="width:90%" placeholder="请输入物资名称" clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
@ -53,7 +53,7 @@
<el-table-column label="最小销售产品标识" prop="nameCode" width="140"></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="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>
@ -86,7 +86,7 @@
<el-table v-loading="loading" :data="detailList" style="width: 100%; margin-top: 20px" border @current-change="handleDetail" border highlight-current-row>
<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="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>

@ -80,7 +80,7 @@
<el-card class="el-card">
<el-table v-loading="loading" :data="detailList" style="width: 100%" border highlight-current-row>
<el-table-column label="序号" type="index" width="120"></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="count"></el-table-column>
<el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip="true"></el-table-column>

@ -77,10 +77,10 @@
<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="50"></el-table-column>
<el-table-column label="产品通用名" prop="productName" show-overflow-tooltip></el-table-column>
<el-table-column label="物资名称" prop="productName" show-overflow-tooltip></el-table-column>
<el-table-column label="规格型号" prop="spec" show-overflow-tooltip></el-table-column>
<el-table-column label="计量单位" prop="measname" show-overflow-tooltip></el-table-column>
<el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip></el-table-column>
<el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip></el-table-column>
<el-table-column width="150" label="申购数量">
<template slot-scope="scope">
<el-input size="small" v-model="scope.row.count"
@ -93,7 +93,7 @@
</el-table-column>
<el-table-column label="供应商" prop="supName" show-overflow-tooltip></el-table-column>
<el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
<el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip></el-table-column>
<el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip></el-table-column>
<el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
<el-table-column label="操作" width="120">
<template slot-scope="scope">

@ -9,8 +9,8 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="产品通用名:">
<el-input v-model="filterQuery.cpmctymc" style="width:90%" placeholder="请输入产品通用名" clearable="true"></el-input>
<el-form-item label="物资名称:">
<el-input v-model="filterQuery.cpmctymc" style="width:90%" placeholder="请输入物资名称" clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
@ -54,7 +54,7 @@
<el-table-column label="最小销售产品标识" prop="nameCode" width="140"></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="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>
@ -87,7 +87,7 @@
<el-table v-loading="loading" :data="detailList" style="width: 100%; margin-top: 20px" border @current-change="handleDetail" border highlight-current-row>
<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="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>

@ -22,8 +22,8 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="产品通用名:" class="query-form-item">
<el-input v-model="listQuery.cpmctymc" style="width: 90%" placeholder="请输入产品通用名" clearable="true"></el-input>
<el-form-item label="物资名称:" class="query-form-item">
<el-input v-model="listQuery.cpmctymc" style="width: 90%" placeholder="请输入物资名称" clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
@ -60,7 +60,7 @@
<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"></el-table-column>
<el-table-column label="产品通用名" prop="cpmctymc" 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>

@ -9,7 +9,7 @@
<el-table v-loading="loading" :data="detailList" style="width: 100%; margin-top: 20px" border @current-change="handleDetail" border highlight-current-row>
<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="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>

@ -94,7 +94,7 @@
<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-column label="序号" type="index" width="50"></el-table-column>
<el-table-column label="产品通用名" prop="productName" show-overflow-tooltip></el-table-column>
<el-table-column label="物资名称" prop="productName" show-overflow-tooltip></el-table-column>
<el-table-column label="规格型号" prop="spec" show-overflow-tooltip></el-table-column>
<el-table-column width="150" label="单据数量" prop="count"></el-table-column>
<el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>

@ -78,7 +78,7 @@
<el-table v-loading="loading" :data="detailList" style="width: 100%">
<el-table-column label="序号" type="index" width="120"></el-table-column>
<!-- <el-table-column label="产品编码" prop="productId"></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="count"></el-table-column>
<el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip="true"></el-table-column>

@ -65,7 +65,7 @@
<el-card class="el-card">
<el-table v-loading="loading" :data="detailList" style="width: 100%" border highlight-current-row>
<el-table-column label="序号" type="index" width="120"></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="count"></el-table-column>
<el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip="true"></el-table-column>

@ -180,7 +180,7 @@
</el-table-column>
<el-table-column label="供应商" prop="supName" width="150" show-overflow-tooltip></el-table-column>
<el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" width="150" show-overflow-tooltip></el-table-column>
<el-table-column label="生产厂家" prop="manufactory" width="150" show-overflow-tooltip></el-table-column>
<el-table-column label="生产企业" prop="manufactory" width="150" show-overflow-tooltip></el-table-column>
<el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" width="150" show-overflow-tooltip></el-table-column>
</el-table>

@ -145,7 +145,7 @@
</el-table-column>
<el-table-column label="供应商" prop="supName" width="150" show-overflow-tooltip></el-table-column>
<el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" width="150" show-overflow-tooltip></el-table-column>
<el-table-column label="生产厂家" prop="manufactory" width="150" show-overflow-tooltip></el-table-column>
<el-table-column label="生产企业" prop="manufactory" width="150" show-overflow-tooltip></el-table-column>
<el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" width="150" show-overflow-tooltip></el-table-column>
<el-table-column label="操作" width="120" fixed="right">
<template slot-scope="scope">

@ -25,8 +25,8 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="产品通用名:" class="query-form-item">
<el-input v-model="listQuery.cpmctymc" style="width: 90%" placeholder="请输入产品通用名"
<el-form-item label="物资名称:" class="query-form-item">
<el-input v-model="listQuery.cpmctymc" style="width: 90%" placeholder="请输入物资名称"
clearable="true"></el-input>
</el-form-item>
</el-col>
@ -65,7 +65,7 @@
<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"></el-table-column>
<el-table-column label="产品通用名" prop="cpmctymc" 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>

@ -92,7 +92,7 @@
<el-table-column width="150" label="送货数量" prop="count"></el-table-column>
<el-table-column width="150" label="验收数量" prop="acceptCount"></el-table-column>
<el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" width="150" show-overflow-tooltip></el-table-column>
<el-table-column label="生产厂家" prop="manufactory" width="150" show-overflow-tooltip></el-table-column>
<el-table-column label="生产企业" prop="manufactory" width="150" show-overflow-tooltip></el-table-column>
<el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" width="150" show-overflow-tooltip></el-table-column>
</el-table>
</el-card>

@ -104,7 +104,7 @@
<el-table-column label="产品通用名" prop="productName" show-overflow-tooltip></el-table-column>
<el-table-column label="规格型号" prop="spec" show-overflow-tooltip></el-table-column>
<el-table-column label="计量单位" prop="measname" show-overflow-tooltip></el-table-column>
<el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip></el-table-column>
<el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip></el-table-column>
<el-table-column width="150" label="单据数量">
<template slot-scope="scope">
<el-input size="small" v-model="scope.row.count"

@ -117,7 +117,7 @@
</template>
</el-table-column>
<el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" width="150" show-overflow-tooltip></el-table-column>
<el-table-column label="生产厂家" prop="manufactory" width="150" show-overflow-tooltip></el-table-column>
<el-table-column label="生产企业" prop="manufactory" width="150" show-overflow-tooltip></el-table-column>
<el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" width="150" show-overflow-tooltip></el-table-column>
<el-table-column label="操作" width="120" fixed="right">
<template slot-scope="scope">

@ -101,10 +101,10 @@
<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-column label="序号" type="index" width="50"></el-table-column>
<el-table-column label="产品通用名" prop="productName" show-overflow-tooltip></el-table-column>
<el-table-column label="物资名称" prop="productName" show-overflow-tooltip></el-table-column>
<el-table-column label="规格型号" prop="spec" show-overflow-tooltip></el-table-column>
<el-table-column label="计量单位" prop="measname" show-overflow-tooltip></el-table-column>
<el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip></el-table-column>
<el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip></el-table-column>
<el-table-column width="150" label="单据数量">
<template slot-scope="scope">
<el-input size="small" v-model="scope.row.count"

@ -90,7 +90,7 @@
</el-table-column>
<el-table-column label="供应商" prop="supName" show-overflow-tooltip></el-table-column>
<el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
<el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip></el-table-column>
<el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip></el-table-column>
<el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
<el-table-column label="操作" width="120">
<template slot-scope="scope">

@ -19,7 +19,7 @@
clearable="true"></el-input>
</el-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 class="query-form-item">
<el-input v-model="listQuery.ggxh" placeholder="规格型号" clearable="true"></el-input>
@ -81,7 +81,7 @@
show-overflow-tooltip
></el-table-column>
<el-table-column
label="产品通用名"
label="物资名称"
prop="cpmctymc"
show-overflow-tooltip
></el-table-column>

@ -24,8 +24,8 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="产品通用名:" class="query-form-item">
<el-input v-model="listQuery.cpmctymc" style="width: 90%" placeholder="请输入产品通用名"
<el-form-item label="物资名称:" class="query-form-item">
<el-input v-model="listQuery.cpmctymc" style="width: 90%" placeholder="请输入物资名称"
clearable="true"></el-input>
</el-form-item>
</el-col>
@ -64,7 +64,7 @@
<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"></el-table-column>
<el-table-column label="产品通用名" prop="cpmctymc" 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>

@ -81,7 +81,7 @@
<el-table v-loading="loading" :data="detailList" style="width: 100%" border highlight-current-row>
<el-table-column label="序号" type="index" width="120"></el-table-column>
<!-- <el-table-column label="产品编码" prop="productId"></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="count"></el-table-column>
<el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip="true"></el-table-column>

@ -83,7 +83,7 @@
<el-table v-loading="loading" :data="detailList" style="width: 100%" border highlight-current-row>
<el-table-column label="序号" type="index" width="120"></el-table-column>
<!-- <el-table-column label="产品编码" prop="productId"></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="count"></el-table-column>
<el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip="true"></el-table-column>

@ -81,7 +81,7 @@
<el-table v-loading="loading" :data="detailList" style="width: 100%" border highlight-current-row>
<el-table-column label="序号" type="index" width="120"></el-table-column>
<!-- <el-table-column label="产品编码" prop="productId"></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="count"></el-table-column>
<el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip="true"></el-table-column>

@ -102,7 +102,7 @@
<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="50"></el-table-column>
<el-table-column label="产品通用名" prop="productName" show-overflow-tooltip></el-table-column>
<el-table-column label="物资名称" prop="productName" show-overflow-tooltip></el-table-column>
<el-table-column label="规格型号" prop="spec" show-overflow-tooltip></el-table-column>
<el-table-column width="150" label="退货数量" prop="count">
</el-table-column>

@ -104,7 +104,7 @@
<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="50"></el-table-column>
<el-table-column label="产品通用名" prop="productName" show-overflow-tooltip></el-table-column>
<el-table-column label="物资名称" prop="productName" show-overflow-tooltip></el-table-column>
<el-table-column label="规格型号" prop="spec" show-overflow-tooltip></el-table-column>
<el-table-column width="150" label="退货数量">
<template slot-scope="scope">

@ -81,7 +81,7 @@
<el-table v-loading="loading" :data="detailList" style="width: 100%" border highlight-current-row>
<el-table-column label="序号" type="index" width="120"></el-table-column>
<!-- <el-table-column label="产品编码" prop="productId"></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="count"></el-table-column>
<el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip="true"></el-table-column>

@ -162,7 +162,7 @@
<el-table-column label="生产日期" prop="productionDate" width="120"></el-table-column>
<el-table-column label="失效日期" prop="expireDate" width="120"></el-table-column>
<el-table-column label="供应商" prop="supName" width="150" show-overflow-tooltip></el-table-column>
<el-table-column label="生产厂家" prop="manufactory" width="150" show-overflow-tooltip></el-table-column>
<el-table-column label="生产企业" prop="manufactory" width="150" show-overflow-tooltip></el-table-column>
<el-table-column label="批准文号" prop="zczbhhzbapzbh" width="150" show-overflow-tooltip></el-table-column>
<el-table-column label="操作" width="100" fixed="right">
<template slot-scope="scope">

@ -75,7 +75,7 @@
<el-table-column label="入库数量" prop="inCount" width="120"></el-table-column>
<el-table-column label="出库数量" prop="outCount" width="120"></el-table-column>
<el-table-column label="结余数量" prop="reCount" width="120"></el-table-column>
<el-table-column label="生产厂家" prop="ylqxzcrbarmc" v-if="showSup" show-overflow-tooltip
<el-table-column label="生产企业" prop="ylqxzcrbarmc" v-if="showSup" show-overflow-tooltip
width="120"></el-table-column>
<el-table-column label="供应商" prop="supName" v-if="showSup" show-overflow-tooltip
width="120"></el-table-column>

@ -206,7 +206,7 @@
<el-col :span="12" class="el-col">
<div class="text item">
<div class="itemTag">
<span>生产厂家:&nbsp;</span>
<span>生产企业:&nbsp;</span>
</div>
<el-input
style="width: 65%"

@ -10,8 +10,8 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="产品通用名:">
<el-input v-model="filterQuery.cpmctymc" style="width: 90%" placeholder="请输入产品通用名"
<el-form-item label="物资名称:">
<el-input v-model="filterQuery.cpmctymc" style="width: 90%" placeholder="请输入物资名称"
clearable="true"></el-input>
</el-form-item>
</el-col>
@ -76,7 +76,7 @@
<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="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>

@ -10,8 +10,8 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="产品通用名:">
<el-input v-model="filterQuery.cpmctymc" style="width: 90%" placeholder="产品通用名"
<el-form-item label="物资名称:">
<el-input v-model="filterQuery.cpmctymc" style="width: 90%" placeholder="物资名称"
clearable="true"></el-input>
</el-form-item>
</el-col>
@ -66,7 +66,7 @@
<el-table-column label="最小销售产品标识" prop="nameCode" width="140"></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="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>
@ -89,7 +89,7 @@
<el-table v-loading="loading" :data="detailList" style="width: 100%; margin-top: 20px" border
@current-change="handleDetail" border highlight-current-row>
<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="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>
@ -354,7 +354,7 @@
<el-col :span="12" class="el-col">
<div class="text item">
<div class="itemTag">
<span>生产厂家:&nbsp;</span>
<span>生产企业:&nbsp;</span>
</div>
<el-input
style="width: 65%"

@ -8,7 +8,14 @@
<el-table-column label="产品名称" prop="thirdName" show-overflow-tooltip></el-table-column>
<el-table-column label="规格型号" prop="spec" show-overflow-tooltip></el-table-column>
<el-table-column label="注册/备案凭证号" prop="registerNo" show-overflow-tooltip></el-table-column>
<el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip></el-table-column>
<el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip></el-table-column>
<el-table-column label="操作">
<template slot-scope="scope">
<el-button type="text" @click="addSelectErp(scope.row)" :disabled="scope.row.thirdId==editQuery.nameCode">关联</el-button>
<el-button type="text" @click.native.stop="removeErp(scope.row)" :disabled="editQuery.flbm==null || scope.row.thirdId==null || scope.row.thirdId==''">解绑
</el-button>
</template>
</el-table-column>
</el-table>
</el-card>
<el-card>
@ -18,7 +25,12 @@
margin-bottom: 8px">
<span>产品标识:</span>
</div>
<div style=" float: right;
text-align: right;
margin-bottom: 8px;">
<el-button type="primary" size="mini" icon="search" @click="removeDi" v-if="productType!=1" style="text-align:right">DI
</el-button>
</div>
<el-table v-loading="loading" :data="detailList" style="width: 100%; " border key="3" highlight-current-row @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>
@ -449,7 +461,7 @@
<el-col :span="12" class="el-col">
<div class="text item">
<div class="itemTag">
<span>生产厂家:&nbsp;</span>
<span>生产企业:&nbsp;</span>
</div>
<el-input
style="width: 65%"

@ -61,7 +61,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="生产厂家:">
<el-form-item label="生产企业:">
<el-input style="width: 80%" size="small" splaceholder="请输入内容" v-model="editQuery.manufactory"
></el-input>
</el-form-item>

@ -20,7 +20,7 @@
></el-table-column>
<el-table-column label="规格型号" prop="spec" show-overflow-tooltip></el-table-column>
<el-table-column label="注册/备案凭证号" prop="registerNo" show-overflow-tooltip></el-table-column>
<el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip></el-table-column>
<el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip></el-table-column>
<el-table-column label="操作" fixed="right">
<template slot-scope="scope">
<el-button
@ -70,7 +70,7 @@
></el-table-column>
<el-table-column
label="产品通用名"
label="物资名称"
prop="cpmctymc"
show-overflow-tooltip
></el-table-column>
@ -140,7 +140,7 @@
<el-col :span="12" class="el-col">
<div class="text item">
<div class="itemTag">
<span>生产厂家:&nbsp;</span>
<span>生产企业:&nbsp;</span>
</div>
<el-input
style="width: 65%"

@ -22,7 +22,7 @@
<el-input
v-model="unionQuery.cpmctymc"
size="mini"
placeholder="产品通用名"
placeholder="物资名称"
></el-input>
</el-form-item>
<el-form-item class="query-form-item">

@ -18,7 +18,7 @@
<el-form-item class="query-form-item">
<el-input
v-model="productQuery.ylqxzcrbarmc"
placeholder="生产厂家"
placeholder="生产企业"
></el-input>
</el-form-item>
<el-form-item class="query-form-item">
@ -67,7 +67,7 @@
<el-table-column label="产品名称" prop="cpmctymc"></el-table-column>
<el-table-column label="规格型号" prop="ggxh"></el-table-column>
<el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh"></el-table-column>
<el-table-column label="生产厂家" prop="ylqxzcrbarmc"></el-table-column>
<el-table-column label="生产企业" prop="ylqxzcrbarmc"></el-table-column>
<el-table-column label="审核状态" prop="auditStatus" width="120">
<template slot-scope="scope">
<span>{{ auditStatusMap[scope.row.auditStatus] }}</span>

@ -42,7 +42,7 @@
<el-form-item class="query-form-item">
<el-input v-model="erpQuery.manufactory"
clearable="true"
placeholder="生产厂家"></el-input>
placeholder="生产企业"></el-input>
</el-form-item>
</el-row>
@ -89,7 +89,7 @@
<el-table-column label="计量单位" prop="measname"></el-table-column>
<el-table-column label="规格型号" prop="spec"></el-table-column>
<el-table-column label="注册/备案凭证号" prop="registerNo"></el-table-column>
<el-table-column label="生产厂家" prop="manufactory"></el-table-column>
<el-table-column label="生产企业" prop="manufactory"></el-table-column>
</el-table>
<el-pagination
:page-size="erpQuery.limit"

@ -43,10 +43,10 @@
<el-row>
<el-col :span="6">
<el-form-item label="生产厂家:">
<el-form-item label="生产企业:">
<el-input
v-model="erpQuery.manufactory" clearable="true"
placeholder="请输入生产厂家"
placeholder="请输入生产企业"
style="width: 90%"
@keyup.enter.native="keyup_submit($event)"
></el-input>
@ -107,7 +107,7 @@
<el-table-column label="计量单位" prop="measname"></el-table-column>
<el-table-column label="规格型号" prop="spec"></el-table-column>
<el-table-column label="注册/备案凭证号" prop="registerNo"></el-table-column>
<el-table-column label="生产厂家" prop="manufactory"></el-table-column>
<el-table-column label="生产企业" prop="manufactory"></el-table-column>
<el-table-column label="配送企业" prop="supName"></el-table-column>
</el-table>

@ -88,7 +88,7 @@
</el-form-item>
</el-col>
<el-col :span="12" class="el-col">
<el-form-item label="生产厂家:">
<el-form-item label="生产企业:">
<el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入内容" v-model="editQuery.manufactory"></el-input>
</el-form-item>
</el-col>

@ -100,7 +100,7 @@
<el-table v-loading="loading" :data="detailList" style="width: 100%" border highlight-current-row>
<el-table-column label="序号" type="index" width="120"></el-table-column>
<el-table-column label="产品编码" prop="productId"></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="batchNo"></el-table-column>
<el-table-column label="生产日期" prop="productDate"></el-table-column>

@ -26,8 +26,8 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="生产厂家:">
<el-input v-model="filterQuery.manufactory" clearable="true" style="width: 90%" placeholder="请输入生产厂家"></el-input>
<el-form-item label="生产企业:">
<el-input v-model="filterQuery.manufactory" clearable="true" style="width: 90%" placeholder="请输入生产企业"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
@ -72,7 +72,7 @@
<el-table-column label="规格型号" prop="spec" show-overflow-tooltip></el-table-column>
<el-table-column label="计量单位" prop="measname" show-overflow-tooltip></el-table-column>
<el-table-column label="注册证号" prop="registerNo" show-overflow-tooltip></el-table-column>
<el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip></el-table-column>
<el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip></el-table-column>
<el-table-column label="操作" width="60">
<template slot-scope="scope">
<el-button type="text" @click.native.stop="detailDialog(scope.row)">详情</el-button>

Loading…
Cancel
Save