界面优化

master
schry 2 years ago
parent 69315d9432
commit be2ea5725f

@ -11,7 +11,6 @@
</el-card>
<el-form :model="detailQuery" :rules="rules" ref="detailQuery" label-width="120px" style="margin-top: 20px">
<el-card>
<el-row type="flex" class="edit-row" style="margin-top: 20px">
<el-col :span="12">
<el-form-item label="产品通用名称:" class="query-form-item">
@ -60,8 +59,8 @@
</el-form-item>
</el-col>
</el-row>
<el-row type="flex" class="edit-row">
<el-col :span="12">
<el-row type="flex" class="el-row">
<el-col :span="12" class="el-col">
<el-form-item label="产品描述:" class="query-form-item">
<el-input
style="width: 80%"
@ -73,7 +72,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="12" class="el-col">
<el-form-item label="生产企业:" class="query-form-item">
<el-input
style="width: 80%"
@ -84,8 +83,8 @@
</el-form-item>
</el-col>
</el-row>
<el-row type="flex" class="edit-row">
<el-col :span="12">
<el-row type="flex" class="el-row">
<el-col :span="12" class="el-col">
<el-form-item label="商品名称:" class="query-form-item">
<el-input
style="width: 80%"
@ -95,7 +94,7 @@
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="12" class="el-col">
<el-form-item label="计量单位:" class="query-form-item">
<el-input
style="width: 80%"
@ -662,7 +661,7 @@ export default {
.query-form-item {
display: block !important;
margin-right: 10px;
margin-bottom: 5px;
margin-bottom: 0px;
}
.edit-row {

@ -34,8 +34,8 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="产品名称:" class="query-form-item">
<el-input v-model="filterQuery.cpmctymc" style="width: 90%" placeholder="请输入物资名称"
<el-form-item label="产品通用名称:" class="query-form-item">
<el-input v-model="filterQuery.cpmctymc" style="width: 90%" placeholder="请输入产品通用名称"
clearable="true"></el-input>
</el-form-item>
</el-col>
@ -76,18 +76,19 @@
border>
<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="companyName" show-overflow-tooltip>
<el-table-column label="填报者身份" prop="companyName" show-overflow-tooltip>
<!--企业类型-->填报者身份-->
<template slot-scope="scope">
<span>{{ companyTypeMap[scope.row.companyType] }}</span>
</template>
</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="nameCode" show-overflow-tooltip></el-table-column>
<!-- <el-table-column label="最小销售产品标识" prop="nameCode" show-overflow-tooltip></el-table-column>-->
<el-table-column label="产品DI标识" prop="nameCode" show-overflow-tooltip></el-table-column>
<el-table-column width="120" label="操作">
<template slot-scope="scope">
<el-button type="text" @click.native.stop="handleModifyClick(scope.row)">详情</el-button>

@ -74,8 +74,27 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="产品描述:" class="query-form-item">
<el-form-item label="填报者身份:" class="query-form-item">
<el-select
v-model="detailQuery.companyType"
placeholder="请选择填报者身份"
clearable
:disabled="true"
size="small"
style="width: 80%"
>
<el-option label="生产企业" :value="1"></el-option>
<el-option label="代理商" :value="2"></el-option>
<el-option label="购买方" :value="3"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex" class="edit-row">
<el-col :span="12">
<el-form-item label="产品描述:" class="query-form-item" show-overflow-tooltip>
<el-input
style="width: 80%"
size="small"
:disabled="true"
@ -84,7 +103,6 @@
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex" class="edit-row">
<el-col :span="12">
@ -147,20 +165,7 @@
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="企业类型:" class="query-form-item">
<el-select
v-model="detailQuery.companyType"
placeholder="请选择企业类型"
clearable
style="width: 80%"
>
<el-option label="生产企业" :value="1"></el-option>
<el-option label="代理商" :value="2"></el-option>
<el-option label="购买方" :value="3"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-card>
<el-card>
@ -701,7 +706,7 @@ export default {
.query-form-item {
display: block !important;
margin-right: 10px;
margin-bottom: 5px;
margin-bottom: 0px;
}
.edit-row {

@ -3,7 +3,7 @@
<el-card>
<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="产品DI标识" prop="nameCode" show-overflow-tooltip></el-table-column>
<el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip></el-table-column>
<el-table-column label="包装级别" prop="packLevel" show-overflow-tooltip></el-table-column>
<el-table-column label="包装层级" prop="bzcj" show-overflow-tooltip></el-table-column>
@ -19,7 +19,7 @@
<el-col :span="12" class="el-col">
<div class="text item">
<div class="itemTag">
<span>产品标识:&nbsp;</span>
<span>产品DI标识:&nbsp;</span>
</div>
<el-input
style="width: 65%"
@ -104,7 +104,7 @@
<el-col :span="12" class="el-col">
<div class="text item">
<div class="itemTag">
<span>产品标识:&nbsp;</span>
<span>产品DI标识:&nbsp;</span>
</div>
<el-input
style="width: 65%"

@ -37,7 +37,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="产品名称:" class="query-form-item">
<el-form-item label="产品通用名称:" class="query-form-item">
<el-select
v-model="filterQuery.cpmctymc"
filterable
@ -45,7 +45,7 @@
clearable="true"
:disabled="filterQuery.ylqxzcrbarmc==null || filterQuery.ylqxzcrbarmc==''"
reserve-keyword
placeholder="请输入产品名称"
placeholder="请输入产品通用名称"
:remote-method="getCpmctymcList"
:loading="loading"
style="width: 100%"
@ -73,7 +73,7 @@
:disabled="filterQuery.cpmctymc==null || filterQuery.cpmctymc=='' ||
filterQuery.ylqxzcrbarmc==null || filterQuery.ylqxzcrbarmc==''"
reserve-keyword
placeholder="请输入产品名称"
placeholder="请输入规格型号"
:remote-method="getGgxhList"
:loading="loading"
@change="ggxhChange"
@ -91,7 +91,7 @@
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="DI标识:" class="query-form-item">
<el-form-item label="产品DI标识:" class="query-form-item">
<el-select
v-model="filterQuery.nameCode"
filterable
@ -102,7 +102,7 @@
filterQuery.cpmctymc==null || filterQuery.cpmctymc=='' ||
filterQuery.ylqxzcrbarmc==null || filterQuery.ylqxzcrbarmc==''"
reserve-keyword
placeholder="请输入DI"
placeholder="请输入产品DI标识"
:remote-method="getNameCodeList"
:loading="loading"
@change="nameCodeChange"
@ -153,28 +153,29 @@
border highlight-current-row>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="单据号" prop="billNo" width="180"></el-table-column>
<el-table-column label="单据日期" prop="billDate" width="150"></el-table-column>
<el-table-column label="单据类型" prop="billType" width="150"></el-table-column>
<el-table-column label="客户端类型" prop="clientType" width="150"></el-table-column>
<el-table-column label="当前企业统一社会信用号" prop="companyCertNum" width="200"></el-table-column>
<el-table-column label="发货企业" prop="fromCorp" width="220"></el-table-column>
<el-table-column label="收货企业" prop="toCorp" width="150"></el-table-column>
<el-table-column label="所属企业" prop="companyIdFk" width="220" :formatter="formatCompanyName"></el-table-column>
<el-table-column label="出入库类型" prop="inOutType" width="150" :formatter="formaterInOutType"></el-table-column>
<el-table-column label="单据源头类型" prop="sourceType" width="150" :formatter="formaterSourceType"></el-table-column>
<el-table-column label="备注" prop="remark" width="220"></el-table-column>
<!-- <el-table-column label="单据类型" prop="billType" width="150"></el-table-column>-->
<!-- <el-table-column label="单据日期" prop="billDate" width="150"></el-table-column>-->
<!-- <el-table-column label="客户端类型" prop="clientType" width="150"></el-table-column>
<el-table-column label="当前企业统一社会信用号" prop="companyCertNum" width="200"></el-table-column>
<el-table-column label="单据创建者" prop="createUser" width="150"></el-table-column>
<el-table-column label="销毁原因" prop="destoryReason" width="150"></el-table-column>
<el-table-column label="执行销毁人证件号" prop="excuseCode" width="150"></el-table-column>
<el-table-column label="执行销毁人" prop="excuseUser" width="150"></el-table-column>
<el-table-column label="发货企业" prop="fromCorp" width="220"></el-table-column>
<el-table-column label="发货企业统一社会信用号" prop="fromCorpCreditNum" width="200"></el-table-column>
<el-table-column label="出入库类型" prop="inOutType" width="150" :formatter="formaterInOutType"></el-table-column>
<el-table-column label="退货原因" prop="returnReason" width="150"></el-table-column>
<el-table-column label="单据源头类型" prop="sourceType" width="150" :formatter="formaterSourceType"></el-table-column>
<el-table-column label="监督人证件号" prop="superviserCode" width="150"></el-table-column>
<el-table-column label="监督人姓名" prop="superviserUser" width="150"></el-table-column>
<el-table-column label="收货企业" prop="toCorp" width="150"></el-table-column>
<el-table-column label="收货企业统一社会信用号" prop="toCorpCreditNum" width="200"></el-table-column>
<el-table-column label="使用者信息" prop="toUserInfo" width="150"></el-table-column>
<el-table-column label="更新时间" prop="updateTime" width="220"></el-table-column>
<el-table-column label="上传人" prop="uploadUser" width="220"></el-table-column>
<el-table-column label="备注" prop="remark" width="220"></el-table-column>
<el-table-column label="上传人" prop="uploadUser" width="220"></el-table-column>-->
<el-table-column label="操作" width="100" fixed="right">
<template slot-scope="scope">
<el-button

@ -175,6 +175,14 @@
style="width: 100%"
border highlight-current-row>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="单据号" prop="billNo" width="180"></el-table-column>
<el-table-column label="发货企业" prop="fromCorp" width="220"></el-table-column>
<el-table-column label="收货企业" prop="toCorp" width="150"></el-table-column>
<el-table-column label="所属企业" prop="companyIdFk" width="220" :formatter="formatCompanyName"></el-table-column>
<el-table-column label="出入库类型" prop="inOutType" width="150" :formatter="formaterInOutType"></el-table-column>
<el-table-column label="单据源头类型" prop="sourceType" width="150" :formatter="formaterSourceType"></el-table-column>
<el-table-column label="备注" prop="remark" width="220"></el-table-column>
<!-- <el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="单据号" prop="billNo" width="180"></el-table-column>
<el-table-column label="单据日期" prop="billDate" width="150"></el-table-column>
<el-table-column label="单据类型" prop="billType" width="150"></el-table-column>
@ -197,7 +205,7 @@
<el-table-column label="使用者信息" prop="toUserInfo" width="150"></el-table-column>
<el-table-column label="更新时间" prop="updateTime" width="220"></el-table-column>
<el-table-column label="上传人" prop="uploadUser" width="220"></el-table-column>
<el-table-column label="备注" prop="remark" width="220"></el-table-column>
<el-table-column label="备注" prop="remark" width="220"></el-table-column>-->
<el-table-column label="操作" width="100" fixed="right">
<template slot-scope="scope">
<el-button

Loading…
Cancel
Save