Merge remote-tracking branch 'origin/master'

master
1178634255 2 years ago
commit 4a37115e5e

@ -12,8 +12,8 @@ VUE_APP_CONTEXT_PATH = '/'
# 监控地址
VUE_APP_MONITRO_ADMIN = 'http://localhost:9090/admin/login'
# xxl-job 控制台地址
VUE_APP_XXL_JOB_ADMIN = 'http://localhost:9100/xxl-job-admin'
# xxl-job 控制台地址
# 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true

@ -9,10 +9,10 @@ VUE_APP_TITLE = UDI协调平台
ENV = 'production'
# VUE_APP_BASE_API = 'http://116.204.71.86:9150/UDI_WMS_MC/'
# 线上
VUE_APP_BASE_API = 'http://116.204.71.86:9150/UDI_WMS_MC/'
# 叶东旭
VUE_APP_BASE_API = 'http://192.168.0.153:9150/UDI_CPT_SERVER/'
# VUE_APP_BASE_API = 'http://192.168.0.153:9150/UDI_CPT_SERVER/'
# 应用访问路径 例如使用前缀 /admin/
VUE_APP_CONTEXT_PATH = '/UDI_CPT_CLIENT/'

@ -1,154 +1,153 @@
<template>
<div>
<el-card>
<el-form v-show="showSearch" label-width="125px" size="mini">
<el-row type="flex">
<el-col :span="18">
<el-form-item label="UDI码:" class="query-form-item">
<el-input v-model="filterQuery.udiCode" placeholder="请输入UDI码"
clearable></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex">
<el-col :span="8">
<el-form-item label="医疗器械注册人:" class="query-form-item">
<el-select
v-model="filterQuery.ylqxzcrbarmc"
filterable
remote
clearable="true"
style="width: 100%"
reserve-keyword
placeholder="请输入医疗器械注册人"
:remote-method="getYlqxzcrbarmcList"
:loading="loading"
@change="ylqxzcrbarmcChange"
>
<el-option
v-for="item in fromOptions"
:key="item.ylqxzcrbarmc"
:label="item.ylqxzcrbarmc"
:value="item.ylqxzcrbarmc"
>
<el-form v-show="showSearch" label-width="125px" size="mini">
<el-row type="flex">
<el-col :span="18">
<el-form-item label="UDI码:" class="query-form-item">
<el-input v-model="filterQuery.udiCode" placeholder="请输入UDI码"
clearable></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex">
<el-col :span="8">
<el-form-item label="医疗器械注册人:" class="query-form-item">
<el-select
v-model="filterQuery.ylqxzcrbarmc"
filterable
remote
clearable="true"
style="width: 100%"
reserve-keyword
placeholder="请输入医疗器械注册人"
:remote-method="getYlqxzcrbarmcList"
:loading="loading"
@change="ylqxzcrbarmcChange"
>
<el-option
v-for="item in fromOptions"
:key="item.ylqxzcrbarmc"
:label="item.ylqxzcrbarmc"
:value="item.ylqxzcrbarmc"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="产品通用名称:" class="query-form-item">
<el-select
v-model="filterQuery.cpmctymc"
filterable
remote
clearable="true"
:disabled="filterQuery.ylqxzcrbarmc==null || filterQuery.ylqxzcrbarmc==''"
reserve-keyword
placeholder="请输入产品通用名称"
:remote-method="getCpmctymcList"
:loading="loading"
style="width: 100%"
@change="cpmctymcChange"
>
<el-option
v-for="item in cpmctymcList"
:key="item.cpmctymc"
:label="item.cpmctymc"
:value="item.cpmctymc"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="产品通用名称:" class="query-form-item">
<el-select
v-model="filterQuery.cpmctymc"
filterable
remote
clearable="true"
:disabled="filterQuery.ylqxzcrbarmc==null || filterQuery.ylqxzcrbarmc==''"
reserve-keyword
placeholder="请输入产品通用名称"
:remote-method="getCpmctymcList"
:loading="loading"
style="width: 100%"
@change="cpmctymcChange"
>
<el-option
v-for="item in cpmctymcList"
:key="item.cpmctymc"
:label="item.cpmctymc"
:value="item.cpmctymc"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="规格型号:" class="query-form-item">
<el-select
v-model="filterQuery.ggxh"
filterable
remote
style="width: 100%"
clearable="true"
:disabled="filterQuery.cpmctymc==null || filterQuery.cpmctymc=='' ||
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="规格型号:" class="query-form-item">
<el-select
v-model="filterQuery.ggxh"
filterable
remote
style="width: 100%"
clearable="true"
:disabled="filterQuery.cpmctymc==null || filterQuery.cpmctymc=='' ||
filterQuery.ylqxzcrbarmc==null || filterQuery.ylqxzcrbarmc==''"
reserve-keyword
placeholder="请输入规格型号"
:remote-method="getGgxhList"
:loading="loading"
@change="ggxhChange"
>
<el-option
v-for="item in ggxhList"
:key="item.ggxh"
:label="item.ggxh"
:value="item.ggxh"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="产品DI标识:" class="query-form-item">
<el-select
v-model="filterQuery.nameCode"
filterable
remote
style="width: 100%"
clearable="true"
:disabled="filterQuery.ggxh==null || filterQuery.ggxh=='' ||
reserve-keyword
placeholder="请输入规格型号"
:remote-method="getGgxhList"
:loading="loading"
@change="ggxhChange"
>
<el-option
v-for="item in ggxhList"
:key="item.ggxh"
:label="item.ggxh"
:value="item.ggxh"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="产品DI标识:" class="query-form-item">
<el-select
v-model="filterQuery.nameCode"
filterable
remote
style="width: 100%"
clearable="true"
:disabled="filterQuery.ggxh==null || filterQuery.ggxh=='' ||
filterQuery.cpmctymc==null || filterQuery.cpmctymc=='' ||
filterQuery.ylqxzcrbarmc==null || filterQuery.ylqxzcrbarmc==''"
reserve-keyword
placeholder="请输入产品DI标识"
:remote-method="getNameCodeList"
:loading="loading"
@change="nameCodeChange"
>
<el-option
v-for="item in nameCodeList"
:key="item.nameCode"
:label="item.nameCode"
:value="item.nameCode"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="批次号:" class="query-form-item">
<el-input
v-model="filterQuery.batchNo"
placeholder="请输入批次号"
style="width: 100%"
clearable="true"
:disabled="filterQuery.nameCode==null || filterQuery.nameCode=='' ||
reserve-keyword
placeholder="请输入产品DI标识"
:remote-method="getNameCodeList"
:loading="loading"
@change="nameCodeChange"
>
<el-option
v-for="item in nameCodeList"
:key="item.nameCode"
:label="item.nameCode"
:value="item.nameCode"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="批次号:" class="query-form-item">
<el-input
v-model="filterQuery.batchNo"
placeholder="请输入批次号"
style="width: 100%"
clearable="true"
:disabled="filterQuery.nameCode==null || filterQuery.nameCode=='' ||
filterQuery.ggxh==null || filterQuery.ggxh=='' ||
filterQuery.cpmctymc==null || filterQuery.cpmctymc=='' ||
filterQuery.ylqxzcrbarmc==null || filterQuery.ylqxzcrbarmc==''"
></el-input>
</el-form-item>
</el-col>
<el-col type="flex">
</el-col>
</el-row>
</el-form>
<div class="top-right-btn" style="display:flex;">
<el-button-group>
<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-search" @click="onSubmit" size="mini"
>查询
</el-button
>
</el-button-group>
</div>
></el-input>
</el-form-item>
</el-col>
<el-col type="flex">
</el-col>
</el-row>
</el-form>
<div class="top-right-btn" style="display:flex;">
<el-button-group>
<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-search" @click="onSubmit" size="mini"
>查询
</el-button
>
</el-button-group>
</div>
<el-divider style="margin: 15px"></el-divider>
</el-card>
</el-card>
<el-card>
<el-collapse v-model="activeNames">
<el-collapse-item name="1">
@ -156,7 +155,7 @@
<p class="form-title">生产信息</p>
</template>
<el-table v-loading="loading" :data="listOrder"
style="width: 100%"
style="width: 100%;margin-top: 15px"
@row-click="handleSelectionChange"
highlight-current-row border>
<el-table-column label="序号" type="index"></el-table-column>
@ -196,7 +195,8 @@
<el-table-column label="失效日期" prop="expireDate" width="180"></el-table-column>
<el-table-column label="序列号" prop="serialNo" width="120"></el-table-column>
<el-table-column label="包装层级" prop="bzcj" width="180"></el-table-column>
<el-table-column label="包装状态" prop="packState" width="180" :formatter="formaterPackState"></el-table-column>
<el-table-column label="包装状态" prop="packState" width="180"
:formatter="formaterPackState"></el-table-column>
<el-table-column label="操作" width="100" fixed="right">
<template slot-scope="scope">
<el-button
@ -467,13 +467,16 @@
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="单据号" prop="billNo" width="150"></el-table-column>
<el-table-column label="单据类型" prop="billType" width="100"></el-table-column>
<el-table-column label="单据源头类型" prop="sourceType" width="100" :formatter="formaterSourceType"></el-table-column>
<el-table-column label="出入库类型" prop="inOutType" width="100" :formatter="formaterInOutType"></el-table-column>
<el-table-column label="单据源头类型" prop="sourceType" width="100"
:formatter="formaterSourceType"></el-table-column>
<el-table-column label="出入库类型" prop="inOutType" width="100"
:formatter="formaterInOutType"></el-table-column>
<el-table-column label="单据日期" prop="billDate" width="150"></el-table-column>
<el-table-column label="更新时间" prop="updateTime" width="150"></el-table-column>
<el-table-column label="发货企业" prop="fromCorp" width="220"></el-table-column>
<el-table-column label="收货企业" prop="toCorp" width="220"></el-table-column>
<el-table-column label="所属企业" prop="companyIdFk" width="220" :formatter="formatCompanyName"></el-table-column>
<el-table-column label="所属企业" prop="companyIdFk" width="220"
:formatter="formatCompanyName"></el-table-column>
<!-- <el-table-column label="备注" prop="remark" width="220"></el-table-column>-->
@ -507,13 +510,13 @@
</el-collapse>
</el-card>
<!-- <pagination-->
<!-- v-show="total>0"-->
<!-- :total="total"-->
<!-- :limit.sync="filterQuery.limit"-->
<!-- :page.sync="filterQuery.page"-->
<!-- @pagination="getList"-->
<!-- ></pagination>-->
<!-- <pagination-->
<!-- v-show="total>0"-->
<!-- :total="total"-->
<!-- :limit.sync="filterQuery.limit"-->
<!-- :page.sync="filterQuery.page"-->
<!-- @pagination="getList"-->
<!-- ></pagination>-->
<el-dialog
title="单据-详情"
@ -522,187 +525,187 @@
width="60%"
top="5vh"
>
<el-form :model="formView" :rules="formRules" ref="dataForm" label-width="100px">
<el-row type="flex">
<el-col :span="11" type="flex">
<el-form-item label="单据号" prop="billNo">
<el-input v-model="formView.billNo" size="small" style="width: 90%" :disabled="true"
></el-input>
</el-form-item>
</el-col>
<el-col :span="11" class="el-col">
<el-form-item label="单据日期" prop="billDate">
<el-input v-model="formView.billDate" size="small"
style="width: 90%" :disabled="true"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex">
<el-col :span="11" class="el-col">
<el-form-item label="单据类型" prop="billType">
<el-input v-model="formView.billType" size="small"
style="width: 90%" :disabled="true"
></el-input>
</el-form-item>
</el-col>
<el-col :span="11" type="flex">
<el-form-item label="客户端类型" prop="clientType">
<el-input v-model="formView.clientType" size="small" style="width: 90%" :disabled="true"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11" class="el-col">
<el-form-item label="所属企业" prop="companyIdFk">
<el-input v-model="this.formateCompanyName" size="small"
style="width: 90%" :disabled="true"
></el-input>
</el-form-item>
</el-col>
<el-col :span="11" type="flex">
<el-form-item label="发货企业" prop="fromCorp">
<el-input v-model="formView.fromCorp" size="small" style="width: 90%" :disabled="true"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex">
<el-col :span="11" type="flex">
<el-form-item label="单据创建者" prop="createUser">
<el-input v-model="formView.createUser" size="small" style="width: 90%" :disabled="true"
></el-input>
</el-form-item>
</el-col>
<el-col :span="11" class="el-col">
<el-form-item label="销毁原因" prop="destoryReason">
<el-input v-model="formView.destoryReason" size="small"
style="width: 90%" :disabled="true"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex">
<el-col :span="11" class="el-col">
<el-form-item label="更新时间" prop="updateTime">
<el-input v-model="formView.updateTime" size="small"
style="width: 90%" :disabled="true"
></el-input>
</el-form-item>
</el-col>
<el-col :span="11" class="el-col">
<el-form-item label="执行销毁人" prop="excuseUser">
<el-input v-model="formView.excuseUser" size="small"
style="width: 90%" :disabled="true"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex">
</el-row>
<el-row type="flex">
<el-col :span="11" type="flex">
<el-form-item label="出入库类型" prop="inOutType">
<el-input v-model="this.formateInOutType" size="small" style="width: 90%" :disabled="true"
></el-input>
</el-form-item>
</el-col>
<el-col :span="11" class="el-col">
<el-form-item label="退货原因" prop="returnReason">
<el-input v-model="formView.returnReason" size="small"
style="width: 90%" :disabled="true"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex">
<el-col :span="11" type="flex">
<el-form-item label="单据源头类型" prop="sourceType">
<el-input v-model="this.formateSourceType" size="small" style="width: 90%" :disabled="true"
></el-input>
</el-form-item>
</el-col>
<el-col :span="11" class="el-col">
<el-form-item label="监督人证件号" prop="superviserCode">
<el-input v-model="formView.superviserCode" size="small"
style="width: 90%" :disabled="true"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex">
<el-col :span="11" type="flex">
<el-form-item label="监督人姓名" prop="superviserUser">
<el-input v-model="formView.superviserUser" size="small" style="width: 90%" :disabled="true"
></el-input>
</el-form-item>
</el-col>
<el-col :span="11" class="el-col">
<el-form-item label="收货企业" prop="toCorp">
<el-input v-model="formView.toCorp" size="small"
style="width: 90%" :disabled="true"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex">
<el-col :span="11" type="flex">
<el-form-item label="上传人" prop="uploadUser">
<el-input v-model="formView.uploadUser" size="small" style="width: 90%" :disabled="true"
></el-input>
</el-form-item>
</el-col>
<el-col :span="11" class="el-col">
<el-form-item label="使用者信息" prop="toUserInfo">
<el-input v-model="formView.toUserInfo" size="small"
style="width: 90%" :disabled="true"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex">
<el-form :model="formView" :rules="formRules" ref="dataForm" label-width="100px">
<el-row type="flex">
<el-col :span="11" type="flex">
<el-form-item label="单据号" prop="billNo">
<el-input v-model="formView.billNo" size="small" style="width: 90%" :disabled="true"
></el-input>
</el-form-item>
</el-col>
<el-col :span="11" class="el-col">
<el-form-item label="单据日期" prop="billDate">
<el-input v-model="formView.billDate" size="small"
style="width: 90%" :disabled="true"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex">
<el-col :span="11" class="el-col">
<el-form-item label="单据类型" prop="billType">
<el-input v-model="formView.billType" size="small"
style="width: 90%" :disabled="true"
></el-input>
</el-form-item>
</el-col>
<el-col :span="11" type="flex">
<el-form-item label="客户端类型" prop="clientType">
<el-input v-model="formView.clientType" size="small" style="width: 90%" :disabled="true"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11" class="el-col">
<el-form-item label="所属企业" prop="companyIdFk">
<el-input v-model="this.formateCompanyName" size="small"
style="width: 90%" :disabled="true"
></el-input>
</el-form-item>
</el-col>
<el-col :span="11" type="flex">
<el-form-item label="发货企业" prop="fromCorp">
<el-input v-model="formView.fromCorp" size="small" style="width: 90%" :disabled="true"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex">
<el-col :span="11" type="flex">
<el-form-item label="单据创建者" prop="createUser">
<el-input v-model="formView.createUser" size="small" style="width: 90%" :disabled="true"
></el-input>
</el-form-item>
</el-col>
<el-col :span="11" class="el-col">
<el-form-item label="销毁原因" prop="destoryReason">
<el-input v-model="formView.destoryReason" size="small"
style="width: 90%" :disabled="true"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex">
<el-col :span="11" class="el-col">
<el-form-item label="更新时间" prop="updateTime">
<el-input v-model="formView.updateTime" size="small"
style="width: 90%" :disabled="true"
></el-input>
</el-form-item>
</el-col>
<el-col :span="11" class="el-col">
<el-form-item label="执行销毁人" prop="excuseUser">
<el-input v-model="formView.excuseUser" size="small"
style="width: 90%" :disabled="true"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex">
</el-row>
<el-row type="flex">
<el-col :span="11" type="flex">
<el-form-item label="出入库类型" prop="inOutType">
<el-input v-model="this.formateInOutType" size="small" style="width: 90%" :disabled="true"
></el-input>
</el-form-item>
</el-col>
<el-col :span="11" class="el-col">
<el-form-item label="退货原因" prop="returnReason">
<el-input v-model="formView.returnReason" size="small"
style="width: 90%" :disabled="true"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex">
<el-col :span="11" type="flex">
<el-form-item label="单据源头类型" prop="sourceType">
<el-input v-model="this.formateSourceType" size="small" style="width: 90%" :disabled="true"
></el-input>
</el-form-item>
</el-col>
<el-col :span="11" class="el-col">
<el-form-item label="监督人证件号" prop="superviserCode">
<el-input v-model="formView.superviserCode" size="small"
style="width: 90%" :disabled="true"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex">
<el-col :span="11" type="flex">
<el-form-item label="监督人姓名" prop="superviserUser">
<el-input v-model="formView.superviserUser" size="small" style="width: 90%" :disabled="true"
></el-input>
</el-form-item>
</el-col>
<el-col :span="11" class="el-col">
<el-form-item label="收货企业" prop="toCorp">
<el-input v-model="formView.toCorp" size="small"
style="width: 90%" :disabled="true"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex">
<el-col :span="11" type="flex">
<el-form-item label="上传人" prop="uploadUser">
<el-input v-model="formView.uploadUser" size="small" style="width: 90%" :disabled="true"
></el-input>
</el-form-item>
</el-col>
<el-col :span="11" class="el-col">
<el-form-item label="使用者信息" prop="toUserInfo">
<el-input v-model="formView.toUserInfo" size="small"
style="width: 90%" :disabled="true"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex">
</el-row>
<el-row>
<el-col :span="11" type="flex">
<el-form-item label="当前企业统一社会信用号" prop="companyCertNum">
<el-input v-model="formView.companyCertNum" size="small" style="width: 90%" :disabled="true"
></el-input>
</el-form-item>
</el-col>
<el-col :span="11" type="flex">
<el-form-item label="执行销毁人证件号" prop="excuseCode">
<el-input v-model="formView.excuseCode" size="small" style="width: 90%" :disabled="true"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11" class="el-col">
<el-form-item label="发货企业统一社会信用号" prop="fromCorpCreditNum">
<el-input v-model="formView.fromCorpCreditNum" size="small"
style="width: 90%" :disabled="true"
></el-input>
</el-form-item>
</el-col>
<el-col :span="11" type="flex">
<el-form-item label="收货企业统一社会信用号" prop="toCorpCreditNum">
<el-input v-model="formView.toCorpCreditNum" size="small" style="width: 90%" :disabled="true"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11" type="flex">
<el-form-item label="备注" prop="remark">
<el-input v-model="formView.remark" size="small" style="width: 90%" :disabled="true"
></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-row>
<el-row>
<el-col :span="11" type="flex">
<el-form-item label="当前企业统一社会信用号" prop="companyCertNum">
<el-input v-model="formView.companyCertNum" size="small" style="width: 90%" :disabled="true"
></el-input>
</el-form-item>
</el-col>
<el-col :span="11" type="flex">
<el-form-item label="执行销毁人证件号" prop="excuseCode">
<el-input v-model="formView.excuseCode" size="small" style="width: 90%" :disabled="true"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11" class="el-col">
<el-form-item label="发货企业统一社会信用号" prop="fromCorpCreditNum">
<el-input v-model="formView.fromCorpCreditNum" size="small"
style="width: 90%" :disabled="true"
></el-input>
</el-form-item>
</el-col>
<el-col :span="11" type="flex">
<el-form-item label="收货企业统一社会信用号" prop="toCorpCreditNum">
<el-input v-model="formView.toCorpCreditNum" size="small" style="width: 90%" :disabled="true"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11" type="flex">
<el-form-item label="备注" prop="remark">
<el-input v-model="formView.remark" size="small" style="width: 90%" :disabled="true"
></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click.native="open = false" size="small">关闭</el-button>
</div>
@ -712,8 +715,10 @@
<script>
import {filterylqxzcrbarmc,filterCpmctymc,
filterGgxh, filterNameCode, sourceSearch,filterCompanyName} from "@/api/udi/udiTrace";
import {
filterylqxzcrbarmc, filterCpmctymc,
filterGgxh, filterNameCode, sourceSearch, filterCompanyName
} from "@/api/udi/udiTrace";
export default {
@ -749,35 +754,35 @@ export default {
}
},
methods: {
formaterSourceType(row){
formaterSourceType(row) {
if (row.sourceType == 1) {
this.formateSourceType = "起始位置"
return "起始位置"
}else if (row.sourceType == 2){
} else if (row.sourceType == 2) {
this.formateSourceType = "中间位置"
return "中间位置"
}else {
} else {
this.formateSourceType = "结束位置"
return "结束位置"
}
},
formaterInOutType(row){
formaterInOutType(row) {
if (row.inOutType == 1) {
this.formateInOutType = "入库"
return "入库"
}else {
} else {
this.formateInOutType = "出库"
return "出库"
}
},
formatCompanyName(row){
let temp = this.companyNameList.find(item=>{
formatCompanyName(row) {
let temp = this.companyNameList.find(item => {
return item.id == row.companyIdFk
})
this.formateCompanyName = temp.companyName
return temp && temp.companyName
},
getCompanyName(){
getCompanyName() {
let cQuery = {
page: 1,
limit: 10,
@ -787,7 +792,7 @@ export default {
console.log(this.companyNameList)
})
},
nameCodeChange(){
nameCodeChange() {
this.filterQuery.batchNo = null
},
ggxhChange() {
@ -945,6 +950,15 @@ div /deep/ .el-table .success-row {
/*transition: all .5s;*/
}
.form-title {
font-size: 16px;
font-family: Noto Sans SC;
font-weight: bold;
color: #303133;
padding-bottom: 17px;
padding-top: 17px;
}
.query-form-item {
display: block !important;
margin-bottom: 5px;

Loading…
Cancel
Save