aike/emis-frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://git.xdadan.loc/tanex/emis-frontend

Browse Source
This commit is contained in:
linfso 2024-05-17 08:50:24 +08:00
commit 9c515abc9b
2 changed files with 78 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

135
src/views/emis/emisTmsScanRecord/signForModificationAndDeletion.vue
View File

@ -1,69 +1,88 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-row :gutter="20"> <el-row :gutter="20">
<SearchForm :model="queryParams" ref="queryForm" size="small" :maxShow="8" label-width="100px" v-show="showSearch" @search="getList" @reset="resetQuery"> <!-- <search-form :model="queryParams" ref="queryForm" size="small" :maxShow="8" label-width="100px" v-show="showSearch" @search="getList" @reset="resetQuery"> -->
<el-form-item label="" prop="billCode"> <el-form ref="queryForm" size="mini" :model="queryParams" :rules="rules" label-width="100px">
<div slot="label"> <el-row :gutter="20">
<el-radio-group class="query-label" v-model="queryParams.params.queryOrderType"> <el-col :span="8">
<el-radio label="1">运单号</el-radio> <el-form-item label="" prop="billCode">
<el-radio label="0">订单号</el-radio> <div slot="label">
</el-radio-group> <el-radio-group class="query-label" v-model="queryParams.params.queryOrderType">
</div> <el-radio label="1">运单号</el-radio>
<el-input <el-radio label="0">订单号</el-radio>
v-model="queryParams.billCode" </el-radio-group>
:placeholder="$t('多个流水号逗号或换行隔开')" </div>
clearable <el-input
type="textarea" v-model="queryParams.billCode"
rows="2" :placeholder="$t('多个流水号逗号或换行隔开')"
/> clearable
</el-form-item> type="textarea"
<!-- </el-col> --> rows="2"
<!-- <el-col :span="16"> --> />
<el-form-item label="签收时间" prop="dateTimeRange"> </el-form-item>
<elDateAdvPicker clearable v-model="dateTimeRange" @dateTimeChange="onDateSelect" ></elDateAdvPicker> </el-col>
</el-form-item> <el-col :span="8">
<!-- </el-col> --> <el-form-item label="签收时间" prop="dateTimeRange">
<!-- <el-col :span="8"> --> <elDateAdvPicker clearable v-model="dateTimeRange" @dateTimeChange="onDateSelect" ></elDateAdvPicker>
<el-form-item :label="$t('录入网点')" prop="recordSiteCode" label-width="100px"> </el-form-item>
<EmisSiteSimplePicker v-model="queryParams.recordSiteCode" @onChange="onScanSiteSelect" ></EmisSiteSimplePicker> </el-col>
</el-form-item> </el-row>
<!-- </el-col> --> <el-row :gutter="20">
<!-- <el-col :span="8"> --> <el-col :span="8">
<el-form-item :label="$t('派件员')" prop="dispatchOrSendManCode" label-width="100px"> <el-form-item :label="$t('录入网点')" prop="recordSiteCode" label-width="100px">
<EmisUserSimplePicker v-model="queryParams.dispatchOrSendManCode" postCode="RSD" @onChange="onStaffSelect" ></EmisUserSimplePicker> <EmisSiteSimplePicker v-model="queryParams.recordSiteCode" @onChange="onScanSiteSelect" ></EmisSiteSimplePicker>
</el-form-item> </el-form-item>
<!-- </el-col> --> </el-col>
<el-form-item :label="$t('删除备注')" prop="delRemark" label-width="100px"> <el-col :span="8">
<el-checkbox v-model="queryParams.delChecked">删除后清空备注</el-checkbox> <el-form-item :label="$t('派件员')" prop="dispatchOrSendManCode" label-width="100px">
<!-- <span>{{$t('删除备注')}}</span> <EmisUserSimplePicker v-model="queryParams.dispatchOrSendManCode" postCode="RSD" @onChange="onStaffSelect" ></EmisUserSimplePicker>
<div slot="label"> </el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="8">
<el-form-item :label="$t('删除备注')" prop="delRemark" label-width="100px">
<el-checkbox v-model="queryParams.delChecked">删除后清空备注</el-checkbox> <el-checkbox v-model="queryParams.delChecked">删除后清空备注</el-checkbox>
</div> --> <!-- <span>{{$t('删除备注')}}</span>
<el-input <div slot="label">
v-model="queryParams.delRemark" <el-checkbox v-model="queryParams.delChecked">删除后清空备注</el-checkbox>
:placeholder="$t('请输入删除备注')" </div> -->
clearable <el-input
type="textarea" v-model="queryParams.delRemark"
rows="2" :placeholder="$t('请输入删除备注')"
/> clearable
</el-form-item> type="textarea"
</SearchForm> rows="2"
/>
</el-form-item>
</el-col>
</el-row>
</el-form>
<!-- </search-form> -->
</el-row > </el-row >
<xd-table v-loading="loading" <xd-table v-loading="loading"
border stripe ref="multipleTable"
size="small" border stripe
:data="emisElectronicPagApplyList" size="small"
:showSearch.sync="showSearch" :data="tmsScanList"
:queryParams="queryParams" :showSearch.sync="showSearch"
:total="total" :queryParams="queryParams"
@queryTable="getList" :total="total"
@selection-change="handleSelectionChange" @queryTable="getList"
@sort-change="handleSortChange" @selection-change="handleSelectionChange"
v-if="tableHeight" :max-height="tableHeight + 'px'" v-if="tableHeight" :max-height="tableHeight + 'px'"
> >
<div slot="toolbar"> <div slot="toolbar">
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
size="mini"
@click="getList"
>查询</el-button>
</el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
type="danger" type="danger"
@ -80,7 +99,7 @@
type="primary" type="primary"
plain plain
size="mini" size="mini"
@click="getList" @click="handleExport"
>导出</el-button> >导出</el-button>
</el-col> </el-col>
</el-row> </el-row>

2
src/views/emis/emisTmsScanRecord/signatureRecordQuery.vue
View File

@ -69,7 +69,7 @@
type="primary" type="primary"
plain plain
size="mini" size="mini"
@click="getList" @click="handleExport"
>导出</el-button> >导出</el-button>
</el-col> </el-col>
</el-row> </el-row>