接口查询修改

master
anthonywj 2 years ago
parent 5a49f41ae1
commit 2ce75d99d5

@ -4,7 +4,7 @@ VUE_APP_TITLE = UDI监管平台
# 开发环境配置 # 开发环境配置
ENV = 'development' ENV = 'development'
VUE_APP_BASE_API = 'http://127.0.0.1:9998' VUE_APP_BASE_API = 'http://192.168.0.166:9998'
# 应用访问路径 例如使用前缀 /admin/ # 应用访问路径 例如使用前缀 /admin/
VUE_APP_CONTEXT_PATH = '/' VUE_APP_CONTEXT_PATH = '/'

@ -7,6 +7,7 @@ export function getTraceOrderList(query) {
params: query params: query
}) })
} }
//查询记录 //查询记录
export function getTraceRecordList(query) { export function getTraceRecordList(query) {
return axios({ return axios({
@ -15,6 +16,7 @@ export function getTraceRecordList(query) {
params: query params: query
}) })
} }
//生产信息 //生产信息
export function getTraceManuOrderList(query) { export function getTraceManuOrderList(query) {
return axios({ return axios({
@ -80,6 +82,14 @@ export function filterylqxzcrbarmc(query) {
}); });
} }
export function getRecordResult(query) {
return axios({
url: '/udi/trace/record/result',
method: 'get',
params: query
})
}
//任务列表 //任务列表
export function getTraceTaskList(query) { export function getTraceTaskList(query) {

@ -1,154 +1,154 @@
<template> <template>
<div> <div>
<el-card> <el-card>
<el-form v-show="showSearch" label-width="125px" size="mini"> <el-form v-show="showSearch" label-width="125px" size="mini">
<el-row type="flex"> <el-row type="flex">
<el-col :span="18"> <el-col :span="18">
<el-form-item label="UDI码:" class="query-form-item"> <el-form-item label="UDI码:" class="query-form-item">
<el-input v-model="filterQuery.udiCode" placeholder="请输入UDI码" <el-input v-model="filterQuery.udiCode" placeholder="请输入UDI码"
clearable></el-input> clearable></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row type="flex"> <el-row type="flex">
<el-col :span="8"> <el-col :span="8">
<el-form-item label="医疗器械注册人:" class="query-form-item"> <el-form-item label="医疗器械注册人:" class="query-form-item">
<el-select <el-select
v-model="filterQuery.ylqxzcrbarmc" v-model="filterQuery.ylqxzcrbarmc"
filterable filterable
remote remote
clearable="true" clearable="true"
style="width: 100%" style="width: 100%"
reserve-keyword reserve-keyword
placeholder="请输入医疗器械注册人" placeholder="请输入医疗器械注册人"
:remote-method="getYlqxzcrbarmcList" :remote-method="getYlqxzcrbarmcList"
:loading="loading" :loading="loading"
@change="ylqxzcrbarmcChange" @change="ylqxzcrbarmcChange"
> >
<el-option <el-option
v-for="item in fromOptions" v-for="item in fromOptions"
:key="item.ylqxzcrbarmc" :key="item.ylqxzcrbarmc"
:label="item.ylqxzcrbarmc" :label="item.ylqxzcrbarmc"
:value="item.ylqxzcrbarmc" :value="item.ylqxzcrbarmc"
> >
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="产品通用名称:" class="query-form-item"> <el-form-item label="产品通用名称:" class="query-form-item">
<el-select <el-select
v-model="filterQuery.cpmctymc" v-model="filterQuery.cpmctymc"
filterable filterable
remote remote
clearable="true" clearable="true"
:disabled="filterQuery.ylqxzcrbarmc==null || filterQuery.ylqxzcrbarmc==''" :disabled="filterQuery.ylqxzcrbarmc==null || filterQuery.ylqxzcrbarmc==''"
reserve-keyword reserve-keyword
placeholder="请输入产品通用名称" placeholder="请输入产品通用名称"
:remote-method="getCpmctymcList" :remote-method="getCpmctymcList"
:loading="loading" :loading="loading"
style="width: 100%" style="width: 100%"
@change="cpmctymcChange" @change="cpmctymcChange"
> >
<el-option <el-option
v-for="item in cpmctymcList" v-for="item in cpmctymcList"
:key="item.cpmctymc" :key="item.cpmctymc"
:label="item.cpmctymc" :label="item.cpmctymc"
:value="item.cpmctymc" :value="item.cpmctymc"
> >
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="规格型号:" class="query-form-item"> <el-form-item label="规格型号:" class="query-form-item">
<el-select <el-select
v-model="filterQuery.ggxh" v-model="filterQuery.ggxh"
filterable filterable
remote remote
style="width: 100%" style="width: 100%"
clearable="true" clearable="true"
:disabled="filterQuery.cpmctymc==null || filterQuery.cpmctymc=='' || :disabled="filterQuery.cpmctymc==null || filterQuery.cpmctymc=='' ||
filterQuery.ylqxzcrbarmc==null || filterQuery.ylqxzcrbarmc==''" filterQuery.ylqxzcrbarmc==null || filterQuery.ylqxzcrbarmc==''"
reserve-keyword reserve-keyword
placeholder="请输入规格型号" placeholder="请输入规格型号"
:remote-method="getGgxhList" :remote-method="getGgxhList"
:loading="loading" :loading="loading"
@change="ggxhChange" @change="ggxhChange"
> >
<el-option <el-option
v-for="item in ggxhList" v-for="item in ggxhList"
:key="item.ggxh" :key="item.ggxh"
:label="item.ggxh" :label="item.ggxh"
:value="item.ggxh" :value="item.ggxh"
> >
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="产品DI标识:" class="query-form-item"> <el-form-item label="产品DI标识:" class="query-form-item">
<el-select <el-select
v-model="filterQuery.nameCode" v-model="filterQuery.nameCode"
filterable filterable
remote remote
style="width: 100%" style="width: 100%"
clearable="true" clearable="true"
:disabled="filterQuery.ggxh==null || filterQuery.ggxh=='' || :disabled="filterQuery.ggxh==null || filterQuery.ggxh=='' ||
filterQuery.cpmctymc==null || filterQuery.cpmctymc=='' || filterQuery.cpmctymc==null || filterQuery.cpmctymc=='' ||
filterQuery.ylqxzcrbarmc==null || filterQuery.ylqxzcrbarmc==''" filterQuery.ylqxzcrbarmc==null || filterQuery.ylqxzcrbarmc==''"
reserve-keyword reserve-keyword
placeholder="请输入产品DI标识" placeholder="请输入产品DI标识"
:remote-method="getNameCodeList" :remote-method="getNameCodeList"
:loading="loading" :loading="loading"
@change="nameCodeChange" @change="nameCodeChange"
> >
<el-option <el-option
v-for="item in nameCodeList" v-for="item in nameCodeList"
:key="item.nameCode" :key="item.nameCode"
:label="item.nameCode" :label="item.nameCode"
:value="item.nameCode" :value="item.nameCode"
> >
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="批次号:" class="query-form-item"> <el-form-item label="批次号:" class="query-form-item">
<el-input <el-input
v-model="filterQuery.batchNo" v-model="filterQuery.batchNo"
placeholder="请输入批次号" placeholder="请输入批次号"
style="width: 100%" style="width: 100%"
clearable="true" clearable="true"
:disabled="filterQuery.nameCode==null || filterQuery.nameCode=='' || :disabled="filterQuery.nameCode==null || filterQuery.nameCode=='' ||
filterQuery.ggxh==null || filterQuery.ggxh=='' || filterQuery.ggxh==null || filterQuery.ggxh=='' ||
filterQuery.cpmctymc==null || filterQuery.cpmctymc=='' || filterQuery.cpmctymc==null || filterQuery.cpmctymc=='' ||
filterQuery.ylqxzcrbarmc==null || filterQuery.ylqxzcrbarmc==''" filterQuery.ylqxzcrbarmc==null || filterQuery.ylqxzcrbarmc==''"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col type="flex"> <el-col type="flex">
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<div class="top-right-btn" style="display:flex;"> <div class="top-right-btn" style="display:flex;">
<el-button-group> <el-button-group>
<el-button icon="el-icon-view" type="primary" @click="hideSearch">/ <el-button icon="el-icon-view" type="primary" @click="hideSearch">/
</el-button> </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="onSubmit" size="mini" <el-button type="primary" icon="el-icon-search" @click="getList" size="mini"
>查询 >查询
</el-button </el-button
> >
</el-button-group> </el-button-group>
</div> </div>
<el-divider style="margin: 15px"></el-divider> <el-divider style="margin: 15px"></el-divider>
</el-card> </el-card>
<el-card> <el-card>
<el-collapse v-model="activeNames"> <el-collapse v-model="activeNames">
<el-collapse-item name="1"> <el-collapse-item name="1">
@ -196,7 +196,8 @@
<el-table-column label="失效日期" prop="expireDate" width="180"></el-table-column> <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="serialNo" width="120"></el-table-column>
<el-table-column label="包装层级" prop="bzcj" width="180"></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"> <el-table-column label="操作" width="100" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@ -467,13 +468,16 @@
<el-table-column label="序号" type="index"></el-table-column> <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="billNo" width="150"></el-table-column>
<el-table-column label="单据类型" prop="billType" width="100"></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="sourceType" width="100"
<el-table-column label="出入库类型" prop="inOutType" width="100" :formatter="formaterInOutType"></el-table-column> :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="billDate" width="150"></el-table-column>
<el-table-column label="更新时间" prop="updateTime" 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="fromCorp" width="220"></el-table-column>
<el-table-column label="收货企业" prop="toCorp" 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>--> <!-- <el-table-column label="备注" prop="remark" width="220"></el-table-column>-->
@ -507,13 +511,13 @@
</el-collapse> </el-collapse>
</el-card> </el-card>
<!-- <pagination--> <!-- <pagination-->
<!-- v-show="total>0"--> <!-- v-show="total>0"-->
<!-- :total="total"--> <!-- :total="total"-->
<!-- :limit.sync="filterQuery.limit"--> <!-- :limit.sync="filterQuery.limit"-->
<!-- :page.sync="filterQuery.page"--> <!-- :page.sync="filterQuery.page"-->
<!-- @pagination="getList"--> <!-- @pagination="getList"-->
<!-- ></pagination>--> <!-- ></pagination>-->
<el-dialog <el-dialog
title="单据-详情" title="单据-详情"
@ -522,187 +526,187 @@
width="60%" width="60%"
top="5vh" top="5vh"
> >
<el-form :model="formView" :rules="formRules" ref="dataForm" label-width="100px"> <el-form :model="formView" :rules="formRules" ref="dataForm" label-width="100px">
<el-row type="flex"> <el-row type="flex">
<el-col :span="11" type="flex"> <el-col :span="11" type="flex">
<el-form-item label="单据号" prop="billNo"> <el-form-item label="单据号" prop="billNo">
<el-input v-model="formView.billNo" size="small" style="width: 90%" :disabled="true" <el-input v-model="formView.billNo" size="small" style="width: 90%" :disabled="true"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="11" class="el-col"> <el-col :span="11" class="el-col">
<el-form-item label="单据日期" prop="billDate"> <el-form-item label="单据日期" prop="billDate">
<el-input v-model="formView.billDate" size="small" <el-input v-model="formView.billDate" size="small"
style="width: 90%" :disabled="true" style="width: 90%" :disabled="true"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row type="flex"> <el-row type="flex">
<el-col :span="11" class="el-col"> <el-col :span="11" class="el-col">
<el-form-item label="单据类型" prop="billType"> <el-form-item label="单据类型" prop="billType">
<el-input v-model="formView.billType" size="small" <el-input v-model="formView.billType" size="small"
style="width: 90%" :disabled="true" style="width: 90%" :disabled="true"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="11" type="flex"> <el-col :span="11" type="flex">
<el-form-item label="客户端类型" prop="clientType"> <el-form-item label="客户端类型" prop="clientType">
<el-input v-model="formView.clientType" size="small" style="width: 90%" :disabled="true" <el-input v-model="formView.clientType" size="small" style="width: 90%" :disabled="true"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="11" class="el-col"> <el-col :span="11" class="el-col">
<el-form-item label="所属企业" prop="companyIdFk"> <el-form-item label="所属企业" prop="companyIdFk">
<el-input v-model="this.formateCompanyName" size="small" <el-input v-model="this.formateCompanyName" size="small"
style="width: 90%" :disabled="true" style="width: 90%" :disabled="true"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="11" type="flex"> <el-col :span="11" type="flex">
<el-form-item label="发货企业" prop="fromCorp"> <el-form-item label="发货企业" prop="fromCorp">
<el-input v-model="formView.fromCorp" size="small" style="width: 90%" :disabled="true" <el-input v-model="formView.fromCorp" size="small" style="width: 90%" :disabled="true"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row type="flex"> <el-row type="flex">
<el-col :span="11" type="flex"> <el-col :span="11" type="flex">
<el-form-item label="单据创建者" prop="createUser"> <el-form-item label="单据创建者" prop="createUser">
<el-input v-model="formView.createUser" size="small" style="width: 90%" :disabled="true" <el-input v-model="formView.createUser" size="small" style="width: 90%" :disabled="true"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="11" class="el-col"> <el-col :span="11" class="el-col">
<el-form-item label="销毁原因" prop="destoryReason"> <el-form-item label="销毁原因" prop="destoryReason">
<el-input v-model="formView.destoryReason" size="small" <el-input v-model="formView.destoryReason" size="small"
style="width: 90%" :disabled="true" style="width: 90%" :disabled="true"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row type="flex"> <el-row type="flex">
<el-col :span="11" class="el-col"> <el-col :span="11" class="el-col">
<el-form-item label="更新时间" prop="updateTime"> <el-form-item label="更新时间" prop="updateTime">
<el-input v-model="formView.updateTime" size="small" <el-input v-model="formView.updateTime" size="small"
style="width: 90%" :disabled="true" style="width: 90%" :disabled="true"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="11" class="el-col"> <el-col :span="11" class="el-col">
<el-form-item label="执行销毁人" prop="excuseUser"> <el-form-item label="执行销毁人" prop="excuseUser">
<el-input v-model="formView.excuseUser" size="small" <el-input v-model="formView.excuseUser" size="small"
style="width: 90%" :disabled="true" style="width: 90%" :disabled="true"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row type="flex"> <el-row type="flex">
</el-row> </el-row>
<el-row type="flex"> <el-row type="flex">
<el-col :span="11" type="flex"> <el-col :span="11" type="flex">
<el-form-item label="出入库类型" prop="inOutType"> <el-form-item label="出入库类型" prop="inOutType">
<el-input v-model="this.formateInOutType" size="small" style="width: 90%" :disabled="true" <el-input v-model="this.formateInOutType" size="small" style="width: 90%" :disabled="true"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="11" class="el-col"> <el-col :span="11" class="el-col">
<el-form-item label="退货原因" prop="returnReason"> <el-form-item label="退货原因" prop="returnReason">
<el-input v-model="formView.returnReason" size="small" <el-input v-model="formView.returnReason" size="small"
style="width: 90%" :disabled="true" style="width: 90%" :disabled="true"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row type="flex"> <el-row type="flex">
<el-col :span="11" type="flex"> <el-col :span="11" type="flex">
<el-form-item label="单据源头类型" prop="sourceType"> <el-form-item label="单据源头类型" prop="sourceType">
<el-input v-model="this.formateSourceType" size="small" style="width: 90%" :disabled="true" <el-input v-model="this.formateSourceType" size="small" style="width: 90%" :disabled="true"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="11" class="el-col"> <el-col :span="11" class="el-col">
<el-form-item label="监督人证件号" prop="superviserCode"> <el-form-item label="监督人证件号" prop="superviserCode">
<el-input v-model="formView.superviserCode" size="small" <el-input v-model="formView.superviserCode" size="small"
style="width: 90%" :disabled="true" style="width: 90%" :disabled="true"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row type="flex"> <el-row type="flex">
<el-col :span="11" type="flex"> <el-col :span="11" type="flex">
<el-form-item label="监督人姓名" prop="superviserUser"> <el-form-item label="监督人姓名" prop="superviserUser">
<el-input v-model="formView.superviserUser" size="small" style="width: 90%" :disabled="true" <el-input v-model="formView.superviserUser" size="small" style="width: 90%" :disabled="true"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="11" class="el-col"> <el-col :span="11" class="el-col">
<el-form-item label="收货企业" prop="toCorp"> <el-form-item label="收货企业" prop="toCorp">
<el-input v-model="formView.toCorp" size="small" <el-input v-model="formView.toCorp" size="small"
style="width: 90%" :disabled="true" style="width: 90%" :disabled="true"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row type="flex"> <el-row type="flex">
<el-col :span="11" type="flex"> <el-col :span="11" type="flex">
<el-form-item label="上传人" prop="uploadUser"> <el-form-item label="上传人" prop="uploadUser">
<el-input v-model="formView.uploadUser" size="small" style="width: 90%" :disabled="true" <el-input v-model="formView.uploadUser" size="small" style="width: 90%" :disabled="true"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="11" class="el-col"> <el-col :span="11" class="el-col">
<el-form-item label="使用者信息" prop="toUserInfo"> <el-form-item label="使用者信息" prop="toUserInfo">
<el-input v-model="formView.toUserInfo" size="small" <el-input v-model="formView.toUserInfo" size="small"
style="width: 90%" :disabled="true" style="width: 90%" :disabled="true"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row type="flex"> <el-row type="flex">
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="11" type="flex"> <el-col :span="11" type="flex">
<el-form-item label="当前企业统一社会信用号" prop="companyCertNum"> <el-form-item label="当前企业统一社会信用号" prop="companyCertNum">
<el-input v-model="formView.companyCertNum" size="small" style="width: 90%" :disabled="true" <el-input v-model="formView.companyCertNum" size="small" style="width: 90%" :disabled="true"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="11" type="flex"> <el-col :span="11" type="flex">
<el-form-item label="执行销毁人证件号" prop="excuseCode"> <el-form-item label="执行销毁人证件号" prop="excuseCode">
<el-input v-model="formView.excuseCode" size="small" style="width: 90%" :disabled="true" <el-input v-model="formView.excuseCode" size="small" style="width: 90%" :disabled="true"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="11" class="el-col"> <el-col :span="11" class="el-col">
<el-form-item label="发货企业统一社会信用号" prop="fromCorpCreditNum"> <el-form-item label="发货企业统一社会信用号" prop="fromCorpCreditNum">
<el-input v-model="formView.fromCorpCreditNum" size="small" <el-input v-model="formView.fromCorpCreditNum" size="small"
style="width: 90%" :disabled="true" style="width: 90%" :disabled="true"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="11" type="flex"> <el-col :span="11" type="flex">
<el-form-item label="收货企业统一社会信用号" prop="toCorpCreditNum"> <el-form-item label="收货企业统一社会信用号" prop="toCorpCreditNum">
<el-input v-model="formView.toCorpCreditNum" size="small" style="width: 90%" :disabled="true" <el-input v-model="formView.toCorpCreditNum" size="small" style="width: 90%" :disabled="true"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="11" type="flex"> <el-col :span="11" type="flex">
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input v-model="formView.remark" size="small" style="width: 90%" :disabled="true" <el-input v-model="formView.remark" size="small" style="width: 90%" :disabled="true"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click.native="open = false" size="small">关闭</el-button> <el-button @click.native="open = false" size="small">关闭</el-button>
</div> </div>
@ -712,9 +716,11 @@
<script> <script>
import {isBlank} from "@/utils/strUtil"; import {isBlank} from "@/utils/strUtil";
import {filterylqxzcrbarmc,filterCpmctymc, import {
filterGgxh, filterNameCode, sourceSearch,filterCompanyName,getTraceManuOrderList, filterylqxzcrbarmc, filterCpmctymc,
getManuCodeRelList} from "@/api/udi/udiTrace"; filterGgxh, filterNameCode, sourceSearch, filterCompanyName, getTraceManuOrderList,
getManuCodeRelList, getRecordResult
} from "@/api/udi/udiTrace";
export default { export default {
@ -797,13 +803,14 @@ export default {
this.codeRelTotal = 0; this.codeRelTotal = 0;
}) })
}, },
getManuOrderList() { getRecordResult() {
// //
this.listCodeRel = null; this.listCodeRel = null;
this.loading = true; this.loading = true;
this.manuOrderQuery.recordCode = this.list.recordCode let query = {
console.log(this.manuOrderQuery.recordCode); recordCode: this.recordCode,
getTraceManuOrderList(this.manuOrderQuery).then((res) => { }
getRecordResult(query).then((res) => {
this.loading = false; this.loading = false;
if (res.code === 20000) { if (res.code === 20000) {
this.listOrder = res.data.list || []; this.listOrder = res.data.list || [];
@ -825,46 +832,43 @@ export default {
// //
this.filterQuery.page = 1; this.filterQuery.page = 1;
if((this.list == undefined || this.list.length <= 0)){ if ((this.list == undefined || this.list.length <= 0)) {
this.getList() this.getRecordResult()
if (this.manuOrderQuery.recordCode != null || this.manuOrderQuery.recordCode != "") {
this.getManuOrderList()
}
} }
// 使 // 使
if(this.list == undefined || this.list.length <= 0){ if (this.list == undefined || this.list.length <= 0) {
this.monitorOrder = setTimeout(this.orderTimeOut, 10000); this.monitorOrder = setTimeout(this.orderTimeOut, 10000);
} }
}, },
formaterSourceType(row){ formaterSourceType(row) {
if (row.sourceType == 1) { if (row.sourceType == 1) {
this.formateSourceType = "起始位置" this.formateSourceType = "起始位置"
return "起始位置" return "起始位置"
}else if (row.sourceType == 2){ } else if (row.sourceType == 2) {
this.formateSourceType = "中间位置" this.formateSourceType = "中间位置"
return "中间位置" return "中间位置"
}else { } else {
this.formateSourceType = "结束位置" this.formateSourceType = "结束位置"
return "结束位置" return "结束位置"
} }
}, },
formaterInOutType(row){ formaterInOutType(row) {
if (row.inOutType == 1) { if (row.inOutType == 1) {
this.formateInOutType = "入库" this.formateInOutType = "入库"
return "入库" return "入库"
}else { } else {
this.formateInOutType = "出库" this.formateInOutType = "出库"
return "出库" return "出库"
} }
}, },
formatCompanyName(row){ formatCompanyName(row) {
this.companyNameList.find(item=>{ this.companyNameList.find(item => {
if (item.id == row.companyIdFk) { if (item.id == row.companyIdFk) {
this.formateCompanyName = item.companyName this.formateCompanyName = item.companyName
} }
}) })
}, },
getCompanyName(){ getCompanyName() {
let cQuery = { let cQuery = {
page: 1, page: 1,
limit: 10, limit: 10,
@ -874,7 +878,7 @@ export default {
console.log(this.companyNameList) console.log(this.companyNameList)
}) })
}, },
nameCodeChange(){ nameCodeChange() {
this.filterQuery.batchNo = null this.filterQuery.batchNo = null
}, },
ggxhChange() { ggxhChange() {
@ -977,7 +981,6 @@ export default {
this.formView = obj this.formView = obj
} }
}) })
console.log(this.formView)
this.open = true this.open = true
}, },
onReset() { onReset() {
@ -995,36 +998,19 @@ export default {
page: 1, page: 1,
limit: 10, limit: 10,
}; };
this.manuOrderQuery = {
recordCode: null,
page: 1,
limit: 10,
},
this.list = "", this.list = "",
this.listOrder = null, this.listOrder = null,
this.listCodeRel = null, this.listCodeRel = null,
clearTimeout(this.monitorOrder); clearTimeout(this.monitorOrder);
this.monitorOrder = "" this.monitorOrder = ""
//this.total = 0
},
onSubmit() {
// if(this.list != undefined || this.list.length > 0){
// clearTimeout(this.monitorOrder);
// this.monitorOrder = ""
// }else {
// this.orderTimeOut()
// }
this.orderTimeOut()
}, },
getList() { getList() {
this.loading = true; this.loading = true;
sourceSearch(this.filterQuery).then((res) => { sourceSearch(this.filterQuery).then((res) => {
this.loading = false; this.loading = false;
if (res.code === 20000) { if (res.code === 20000) {
this.list = res.data || []; this.recordCode = res.data;
this.total = res.data.total || 0; this.orderTimeOut();
this.recordCode = res.data.recordCode
console.log(this.recordCode)
} else { } else {
this.$message.error(res.message); this.$message.error(res.message);
this.list = []; this.list = [];
@ -1041,8 +1027,8 @@ export default {
created() { created() {
this.getCompanyName() this.getCompanyName()
if (this.list > 0) { if (this.list > 0) {
clearTimeout(this.monitorOrder); clearTimeout(this.monitorOrder);
this.monitorOrder = "" this.monitorOrder = ""
} }
}, },
beforeDestroy() { beforeDestroy() {

Loading…
Cancel
Save