UDI
/
udi-spms-vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

界面修改

Browse Source
ywj_dev
anthonywj 3 years ago
parent ed5914fb99
commit 8ac885ffd8
4 changed files with 156 additions and 92 deletions
Show Stats Download Patch File Download Diff File

131
src/views/inventory/InvPreProducts.vue
Unescape Escape View File

@ -3,28 +3,51 @@
<el-card class="el-card"> <el-card class="el-card">
<el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch"> <el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
<el-row> <el-row>
<el-col :span="4"> <el-col :span="20">
<el-form-item class="query-form-item" label="产品标识DI:"> <el-form-item class="query-form-item" label-width="100px" label="UDI码:">
<el-input v-model="filterQuery.nameCode" placeholder="产品标识DI" <el-input
style="width: 90%" id="inputer"
clearable="true"></el-input> v-model="filterQuery.udiCode"
placeholder="UDI码"
ref='inputRef'
@keypress.enter.native="enterKey($event)"
clearable
></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> </el-row>
<el-form-item class="query-form-item" label="产品名称:"> <el-row>
<el-input v-model="filterQuery.cpmctymc" placeholder="产品名称" <el-col :span="6">
style="width: 90%" <el-form-item class="query-form-item" label="所属仓库:">
clearable="true"></el-input> <el-select v-model="filterQuery.invCode" placeholder="请选择所属仓库" clearable="true"
style="width: 90%"
>
<el-option
v-for="item in invList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="6">
<el-form-item class="query-form-item" label="批次号:"> <el-form-item class="query-form-item" label="货位:">
<el-input v-model="filterQuery.batchNo" placeholder="批次号" <el-input v-model="filterQuery.nameCode" placeholder="货位"
style="width: 90%" style="width: 90%"
clearable="true"></el-input> clearable="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <!-- <el-col :span="6">-->
<!-- <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="6">
<el-form-item class="query-form-item" label="供应商名称:"> <el-form-item class="query-form-item" label="供应商名称:">
<el-select <el-select
v-model="filterQuery.supId" v-model="filterQuery.supId"
@ -50,43 +73,44 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6">
<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>
</el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="4"> <el-col :span="6">
<el-form-item class="query-form-item" label="规格型号:"> <el-form-item class="query-form-item" label="注册/备案号:">
<el-input v-model="filterQuery.ggxh" placeholder="规格型号" <el-input v-model="filterQuery.zczbhhzbapzbh" placeholder="注册/备案号"
style="width: 90%" style="width: 90%"
clearable="true"></el-input> clearable="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="6">
<el-form-item class="query-form-item" label="批准文号:"> <el-form-item class="query-form-item" label="产品名称:">
<el-input v-model="filterQuery.zczbhhzbapzbh" placeholder="批准文号" <el-input v-model="filterQuery.cpmctymc" placeholder="产品名称"
style="width: 90%" style="width: 90%"
clearable="true"></el-input> clearable="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="6">
<el-form-item class="query-form-item" label="生产厂家:"> <el-form-item class="query-form-item" label="规格型号:">
<el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="生产厂家" <el-input v-model="filterQuery.ggxh" placeholder="规格型号"
style="width: 90%" style="width: 90%"
clearable="true"></el-input> clearable="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="6">
<el-form-item class="query-form-item" label="所属仓库:"> <el-form-item class="query-form-item" label="批次号:">
<el-select v-model="filterQuery.invCode" placeholder="请选择所属仓库" clearable="true" <el-input v-model="filterQuery.batchNo" placeholder="批次号"
style="width: 90%" style="width: 90%"
> clearable="true"></el-input>
<el-option
v-for="item in invList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -110,23 +134,28 @@
<el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
border> border>
<el-table-column label="序号" type="index"></el-table-column> <el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="产品标识" prop="nameCode"></el-table-column> <el-table-column label="仓库" prop="invName" v-if="showSup"
<el-table-column label="产品名称" prop="cpmctymc"></el-table-column> show-overflow-tooltip width="120"></el-table-column>
<el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column> <el-table-column label="货位" prop="spaceName" v-if="showSup"
show-overflow-tooltip width="120"></el-table-column>
<el-table-column label="DI标识" prop="nameCode" width="140"></el-table-column>
<el-table-column label="物资名称" prop="cpmctymc" width="180"></el-table-column>
<el-table-column label="规格型号" prop="ggxh" width="180" show-overflow-tooltip></el-table-column>
<el-table-column label="批次号" prop="batchNo" width="120"></el-table-column> <el-table-column label="批次号" prop="batchNo" width="120"></el-table-column>
<el-table-column label="生产日期" prop="productionDate" width="120"></el-table-column> <!-- <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="expireDate" width="120"></el-table-column>-->
<el-table-column label="入库数量" prop="inCount" width="120"></el-table-column> <!-- <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="outCount" width="120"></el-table-column>-->
<el-table-column label="结余数量" prop="reCount" 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> width="180"></el-table-column>
<el-table-column label="注册/备案号" prop="zczbhhzbapzbh" v-if="showSup" show-overflow-tooltip
width="180"></el-table-column>
<el-table-column label="供应商" prop="supName" v-if="showSup" show-overflow-tooltip <el-table-column label="供应商" prop="supName" v-if="showSup" show-overflow-tooltip
width="120"></el-table-column> width="180"></el-table-column>
<el-table-column label="部门" prop="deptName" v-if="showSup" <!-- <el-table-column label="部门" prop="deptName" v-if="showSup"-->
show-overflow-tooltip width="120"></el-table-column> <!-- show-overflow-tooltip width="120"></el-table-column>-->
<el-table-column label="仓库" prop="invName" v-if="showSup"
show-overflow-tooltip width="120"></el-table-column>
<el-table-column label="操作" width="150"> <el-table-column label="操作" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@ -185,6 +214,7 @@ export default {
return { return {
showSearch: true, showSearch: true,
filterQuery: { filterQuery: {
udiCode: null,
nameCode: null, nameCode: null,
cpmctymc: null, cpmctymc: null,
ggxh: null, ggxh: null,
@ -210,6 +240,7 @@ export default {
showSup: false, showSup: false,
detailDialogVisible: false, detailDialogVisible: false,
inputQuery: { inputQuery: {
udiCode: null,
relId: null, relId: null,
cpmctymc: null, cpmctymc: null,
nameCode: null, nameCode: null,

8
src/views/supplier/company/basicCompanyProducts.vue
Unescape Escape View File

@ -79,7 +79,7 @@
<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="ggxh" show-overflow-tooltip></el-table-column>
<el-table-column label="注册/备案凭证" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column> <el-table-column label="注册/备案凭证" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
<el-table-column label="器械类别" prop="qxlb" show-overflow-tooltip></el-table-column> <el-table-column label="物资分类" prop="qxlb" show-overflow-tooltip></el-table-column>
<el-table-column v-if="isSpCombine" label="锁定状态" prop="lockStatus" show-overflow-tooltip> <el-table-column v-if="isSpCombine" label="锁定状态" prop="lockStatus" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ lockStatusMap[scope.row.lockStatus] }} {{ lockStatusMap[scope.row.lockStatus] }}
@ -94,13 +94,17 @@
<el-button v-if="scope.row.lockStatus!=3" type="text" size="small" <el-button v-if="scope.row.lockStatus!=3" type="text" size="small"
@click.native.stop="handleModifyClick(scope.row)">编辑 @click.native.stop="handleModifyClick(scope.row)">编辑
</el-button> </el-button>
<el-button v-if=" scope.row.lockStatus!=3" type="text" size="small"
@click.native.stop="handleDetailClick(scope.row)">详情
</el-button>
<el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)"
> >
<span class="el-dropdown-link"> <span class="el-dropdown-link">
<i class="el-icon-d-arrow-right el-icon--right"></i>更多 <i class="el-icon-d-arrow-right el-icon--right"></i>更多
</span> </span>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<el-dropdown-item command="handleDetailClick" v-if=" scope.row.lockStatus!=3">详情</el-dropdown-item> <!-- <el-dropdown-item command="handleDetailClick" v-if=" scope.row.lockStatus!=3">详情</el-dropdown-item>-->
<el-dropdown-item command="sumitLockStatus" v-if="isSpCombine" :disabled="scope.row.lockStatus===3"> <el-dropdown-item command="sumitLockStatus" v-if="isSpCombine" :disabled="scope.row.lockStatus===3">
提交审核 提交审核
</el-dropdown-item> </el-dropdown-item>

38
src/views/supplier/company/basicCompanyProductsImport.vue
Unescape Escape View File

@ -48,7 +48,7 @@
<el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button> <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
<el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button> <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
<el-button type="primary" icon="el-icon-search" @click="submitSearch">查询</el-button> <el-button type="primary" icon="el-icon-search" @click="submitSearch">查询</el-button>
<el-button type="primary" icon="el-icon-upload" @click="selectExport">选中导入</el-button>
</el-button-group> </el-button-group>
</div> </div>
@ -298,7 +298,16 @@
<el-card class="el-card"> <el-card class="el-card">
<el-form :model="repEditQuery" ref="editQuery" border label-width="100px"> <el-form :model="repEditQuery" ref="editQuery" border label-width="100px">
<el-row :gutter="20" class="el-row" type="flex"> <el-row :gutter="20" class="el-row" type="flex">
<H3 style="margin-left: 10px;margin-bottom: 15px">{{ replTitle }}</H3>
<el-col :span="18" class="el-col">
<H3 style="margin-left: 10px;margin-bottom: 15px">{{ replTitle }}</H3>
</el-col>
<div style=" float: right;
text-align: right;
margin-bottom: 8px;"
>
<el-button type="primary" icon="el-icon-upload" @click="selectExport">选中导入</el-button>
</div>
</el-row> </el-row>
<el-row :gutter="20" class="el-row" type="flex" style="margin-top: 15px"> <el-row :gutter="20" class="el-row" type="flex" style="margin-top: 15px">
<el-col :span="12" class="el-col"> <el-col :span="12" class="el-col">
@ -584,7 +593,24 @@ export default {
}, },
loading: false, loading: false,
editQuery: null, editQuery: null,
repEditQuery: {}, repEditQuery: {
sptm: null,
ybbm: null,
measname: null,
manufactory: null,
spmc: null,
cpms: null,
price: null,
basicPrductRemak1: null,
basicPrductRemak2: null,
basicPrductRemak3: null,
basicPrductRemak4: null,
basicPrductRemak5: null,
basicPrductRemak6: null,
basicPrductRemak7: null,
basicPrductRemak8: null,
},
relevanceEdit: { relevanceEdit: {
id: null, id: null,
thirdId: "", thirdId: "",
@ -793,9 +819,9 @@ export default {
this.repEditQuery.spmc = this.currentRow.spmc; this.repEditQuery.spmc = this.currentRow.spmc;
this.repEditQuery.cpms = this.currentRow.cpms; this.repEditQuery.cpms = this.currentRow.cpms;
if (isBlank(this.relevanceEdit.cpms)) { // if (isBlank(this.relevanceEdit.cpms)) {
this.repEditQuery.cpms =this.currentRow.cpmctymc+this.currentRow.ggxh // this.repEditQuery.cpms =this.currentRow.cpmctymc+this.currentRow.ggxh
} // }
}, },
handleErpChange(val) { handleErpChange(val) {

71
src/views/supplier/products/supProductsAddDi.vue
Unescape Escape View File

@ -1,7 +1,7 @@
<template> <template>
<div> <div>
<el-card class="el-card"> <el-card class="el-card">
<el-form :model="filterQuery" label-width="100px" v-show="showSearch"> <el-form :model="filterQuery" label-width="100px" v-show="showSearch">
<el-row> <el-row>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="DI产品标识:"> <el-form-item label="DI产品标识:">
@ -12,32 +12,33 @@
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="产品名称:"> <el-form-item label="产品名称:">
<el-input v-model="filterQuery.name" style="width: 90%" clearable placeholder="请输入产品名称" ></el-input> <el-input v-model="filterQuery.name" style="width: 90%" clearable placeholder="请输入产品名称"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="规格型号:"> <el-form-item label="规格型号:">
<el-input v-model="filterQuery.spec" style="width: 90%" clearable placeholder="请输入规格型号"></el-input> <el-input v-model="filterQuery.spec" style="width: 90%" clearable placeholder="请输入规格型号"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="注册人:"> <el-form-item label="注册人:">
<el-input v-model="filterQuery.registerNo" style="width: 90%" clearable placeholder="请输入注册/备案凭证"></el-input> <el-input v-model="filterQuery.registerNo" style="width: 90%" clearable
placeholder="请输入注册/备案凭证"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="审核状态:">
<el-select v-model="filterQuery.checkStatus" style="width: 90%" placeholder="请选择审核状态">
<el-option label="全部" value=""></el-option>
<el-option label="已审核" value="2"></el-option>
<el-option label="未审核" value="1"></el-option>
<el-option label="未通过" value="3"></el-option>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row>
<el-col :span="6">
<el-form-item label="审核状态:">
<el-select v-model="filterQuery.checkStatus" style="width: 90%" placeholder="请选择审核状态">
<el-option label="全部" value=""></el-option>
<el-option label="已审核" value="2"></el-option>
<el-option label="未审核" value="1"></el-option>
<el-option label="未通过" value="3"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-form> </el-form>
@ -67,7 +68,9 @@
<el-table-column label="操作" width="120"> <el-table-column label="操作" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" size="small" @click="detail(scope.row)">详情</el-button> <el-button type="text" size="small" @click="detail(scope.row)">详情</el-button>
<el-button type="text" size="small" :disabled="scope.row.status ==2" @click="deleteProduct(scope.row.id)">删除</el-button> <el-button type="text" size="small" :disabled="scope.row.status ==2" @click="deleteProduct(scope.row.id)">
删除
</el-button>
</template> </template>
</el-table-column> </el-table-column>
@ -149,7 +152,7 @@
</template> </template>
<script> <script>
import { getThrDiProducts, delThrDiProducts, getDiProductDetail } from '@/api/supplier/supProductsAddDi' import {getThrDiProducts, delThrDiProducts, getDiProductDetail} from '@/api/supplier/supProductsAddDi'
import thrAddDiProductSelectUdi from '@/views/supplier/products/supAddDiProductSelectUdi' import thrAddDiProductSelectUdi from '@/views/supplier/products/supAddDiProductSelectUdi'
import thrAddProductSelectUdi from '@/views/supplier/products/supProductsAdd' import thrAddProductSelectUdi from '@/views/supplier/products/supProductsAdd'
import selectDiDetail from './selectDIDetailDialog' import selectDiDetail from './selectDIDetailDialog'
@ -159,7 +162,7 @@ export default {
data() { data() {
return { return {
showSearch: true, showSearch: true,
thisDetail:null, thisDetail: null,
filterQuery: { filterQuery: {
code: null, code: null,
name: null, name: null,
@ -249,20 +252,20 @@ export default {
this.getList() this.getList()
}, },
detail(row) { detail(row) {
if(row.type==1){ if (row.type == 1) {
let query = { uuid: row.uuid } let query = {uuid: row.uuid}
getDiProductDetail(query).then((res) => { getDiProductDetail(query).then((res) => {
if (res.code === 20000) { if (res.code === 20000) {
this.diDetails = res.data this.diDetails = res.data
this.detailDialog = true this.detailDialog = true
} else { } else {
this.$message.error('参数错误') this.$message.error('参数错误')
} }
}) })
}else{ } else {
this.thisDetail = row; this.thisDetail = row;
this.thrProductsDetailVisible = true; this.thrProductsDetailVisible = true;
} }
}, },
deleteProduct(id) { deleteProduct(id) {
let query = { let query = {
@ -292,7 +295,7 @@ export default {
} }
}, },
components: { components: {
thrAddDiProductSelectUdi, selectDiDetail,thrAddProductSelectUdi,thrProductsDetail thrAddDiProductSelectUdi, selectDiDetail, thrAddProductSelectUdi, thrProductsDetail
}, },
mounted() { mounted() {
}, },

Write Preview
Loading…
Cancel
Save