Merge remote-tracking branch 'origin/master'

master
1178634255 2 years ago
commit 52cf088fd4

@ -1,161 +1,162 @@
<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;">
<el-button-group> <div class="top-right-btn" style="display:flex;">
<el-button icon="el-icon-view" type="primary" @click="hideSearch">/ <el-button-group>
</el-button> <el-button icon="el-icon-view" type="primary" @click="hideSearch">/
<el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button> </el-button>
<el-button type="primary" icon="el-icon-search" @click="onSubmit" size="mini" <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
</el-button-group> >
</div> </el-button-group>
</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">
<template slot="title"> <template slot="title">
<p class="form-title">生产信息</p> <p class="form-title">生产信息</p>
</template> </template>
<el-table v-loading="loading" :data="listOrder" <el-table v-loading="manuOrderLoading" :data="listOrder"
style="width: 100%;margin-top: 15px" style="width: 100%"
@row-click="handleSelectionChange" @row-click="handleSelectionChange"
highlight-current-row border> highlight-current-row border>
<el-table-column label="序号" type="index"></el-table-column> <el-table-column label="序号" type="index"></el-table-column>
@ -195,8 +196,7 @@
<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" <el-table-column label="包装状态" prop="packState" width="180" :formatter="formaterPackState"></el-table-column>
: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
@ -461,22 +461,19 @@
<template slot="title"> <template slot="title">
<p class="form-title">出入库单据信息</p> <p class="form-title">出入库单据信息</p>
</template> </template>
<el-table v-loading="loading" :data="list" <el-table v-loading="loading" :data="this.list"
style="width: 100%" style="width: 100%"
border highlight-current-row> border highlight-current-row>
<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" <el-table-column label="单据源头类型" prop="sourceType" width="100" :formatter="formaterSourceType"></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="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" <el-table-column label="所属企业" prop="companyIdFk" width="220" :formatter="formatCompanyName"></el-table-column>
: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>-->
@ -510,13 +507,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="单据-详情"
@ -525,187 +522,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>
@ -715,15 +712,15 @@
<script> <script>
import { import {filterylqxzcrbarmc,filterCpmctymc,
filterylqxzcrbarmc, filterCpmctymc, filterGgxh, filterNameCode, sourceSearch,filterCompanyName,getTraceManuOrderList,
filterGgxh, filterNameCode, sourceSearch, filterCompanyName getManuCodeRelList} from "@/api/udi/udiTrace";
} from "@/api/udi/udiTrace";
export default { export default {
data() { data() {
return { return {
monitorOrder: "", // id便
filterQuery: { filterQuery: {
udiCode: null, udiCode: null,
ylqxzcrbarmc: null, ylqxzcrbarmc: null,
@ -737,7 +734,11 @@ export default {
}, },
total: 0, total: 0,
loading: false, loading: false,
manuOrderLoading: false,
manuCodeRelLoading: false,
list: [], list: [],
listOrder: [],
listCodeRel: [],
open: false, open: false,
formView: {}, formView: {},
manuOrderFormView: {}, manuOrderFormView: {},
@ -754,35 +755,89 @@ export default {
} }
}, },
methods: { methods: {
formaterSourceType(row) { getManuCodeRel() {
if (this.currentRow == null || isBlank(this.currentRow.billNo)) {
this.$message.error("请先选择需要查询的单据!")
return;
}
this.manuCodeRelLoading = true;
this.manuCodeRelQuery.manuOrderNo = this.currentRow.billNo;
getManuCodeRelList(this.manuCodeRelQuery).then((res) => {
this.manuCodeRelLoading = false;
if (res.code === 20000) {
this.listCodeRel = res.data.list || [];
this.codeRelTotal = res.data.total || 0;
console.log(this.listCodeRel)
} else {
this.$message.error(res.message);
this.listCodeRel = [];
this.codeRelTotal = 0;
}
}).catch((error) => {
this.manuCodeRelLoading = false;
this.$message.error(error.message);
this.listCodeRel = [];
this.codeRelTotal = 0;
})
},
getManuOrderList() {
//
this.listCodeRel = null;
this.loading = true;
getTraceManuOrderList(this.filterQuery).then((res) => {
this.loading = false;
if (res.code === 20000) {
this.listOrder = res.data.list || [];
this.total = res.data.total || 0;
console.log(this.listOrder)
} else {
this.$message.error(res.message);
this.listOrder = [];
this.total = 0;
}
}).catch((error) => {
this.loading = false;
this.$message.error(error.message);
this.listOrder = [];
this.total = 0;
})
},
orderTimeOut() {
//
this.filterQuery.page = 1;
this.getList()
// 使
this.monitorOrder = setTimeout(this.orderTimeOut, 10000);
},
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){
let temp = this.companyNameList.find(item => { this.companyNameList.find(item=>{
return item.id == row.companyIdFk if (item.id == row.companyIdFk) {
this.formateCompanyName = item.companyName
}
}) })
this.formateCompanyName = temp.companyName
return temp && temp.companyName
}, },
getCompanyName() { getCompanyName(){
let cQuery = { let cQuery = {
page: 1, page: 1,
limit: 10, limit: 10,
@ -792,7 +847,7 @@ export default {
console.log(this.companyNameList) console.log(this.companyNameList)
}) })
}, },
nameCodeChange() { nameCodeChange(){
this.filterQuery.batchNo = null this.filterQuery.batchNo = null
}, },
ggxhChange() { ggxhChange() {
@ -896,11 +951,16 @@ export default {
limit: 10, limit: 10,
}; };
this.list = null this.list = null
clearTimeout(this.monitorOrder);
this.monitorOrder = null
//this.total = 0 //this.total = 0
}, },
onSubmit() { onSubmit() {
this.filterQuery.page = 1; this.orderTimeOut()
this.getList() if (this.list != null) {
clearTimeout(this.monitorOrder);
this.monitorOrder = null
}
}, },
getList() { getList() {
this.loading = true; this.loading = true;
@ -909,7 +969,7 @@ export default {
if (res.code === 20000) { if (res.code === 20000) {
this.list = res.data || []; this.list = res.data || [];
this.total = res.data.total || 0; this.total = res.data.total || 0;
console.log(this.list) console.log(res.data)
} else { } else {
this.$message.error(res.message); this.$message.error(res.message);
this.list = []; this.list = [];
@ -925,6 +985,11 @@ export default {
}, },
created() { created() {
this.getCompanyName() this.getCompanyName()
},
beforeDestroy() {
if (this.monitorOrder) {
clearTimeout(this.monitorOrder)
}
} }
} }
</script> </script>
@ -950,15 +1015,6 @@ div /deep/ .el-table .success-row {
/*transition: all .5s;*/ /*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 { .query-form-item {
display: block !important; display: block !important;
margin-bottom: 5px; margin-bottom: 5px;

@ -482,11 +482,11 @@ export default {
} }
}, },
formatCompanyName(row){ formatCompanyName(row){
let temp = this.companyNameList.find(item=>{ this.companyNameList.find(item=>{
return item.id == row.companyIdFk if (item.id == row.companyIdFk) {
this.companyNameDetail = item.companyName
}
}) })
this.companyNameDetail = temp.companyName
return temp && temp.companyName
}, },
geCompanyNameList(query) { geCompanyNameList(query) {
let cQuery = { let cQuery = {

Loading…
Cancel
Save