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

Merge pull request 'develop' (#213) from develop into master

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-frontend/pulls/213
This commit is contained in:
wuteng 2026-03-11 16:29:20 +08:00
commit 228697edb3
2 changed files with 100 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/emis/emisCreditSalesmen/index.vue
View File

@ -423,7 +423,7 @@ export default {
excel.export_json_to_excel({
header: tHeader,
data,
filename: '月结客户额度列表',
filename: '现金客户额度列表',
autoWidth: true
})
loadingInstance.close()

202
src/views/emis/emisTmsSiteBatchMiss/indexV2.vue
View File

@ -1,111 +1,104 @@
<template>
<XdPageContainer class="app-container">
<SearchForm slot="pageHeader" :model="queryParams" ref="queryForm" size="small" :maxShow="30" label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<SearchForm slot="pageHeader" class="queryForm" :model="queryParams" ref="queryForm" size="mini" :maxShow="8"
label-width="100px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<el-row>
<el-col :span="9">
<el-form-item :label="$t('运单号')" prop="billCode">
<XdTextareaInput v-model="queryParams.billCode" :placeholder="$t('多个流水号逗号或换行隔开')" clearable :rows="4" />
</el-form-item>
<el-form-item :label="$t('运单号')" prop="billCode">
<XdTextareaInput
v-model="queryParams.billCode"
:placeholder="$t('多个流水号逗号或换行隔开')"
clearable
:rows="1"
/>
</el-form-item>
<el-form-item label="发货时间" prop="deliveryTime">
<elDateAdvPicker v-model="dateTimeRange"></elDateAdvPicker>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item :label="$t('寄件网点')" prop="sendSiteCode">
<EmisSiteSimplePicker1 v-model="queryParams.sendSiteCode"></EmisSiteSimplePicker1>
</el-form-item>
<el-form-item label="漏组次数" prop="missCount">
<el-select clearable v-model="queryParams.missCount" placeholder="请选择">
<el-option label="人工修改运单" :value="-7"></el-option>
<el-option label="运单分批后未组完" :value="-6"></el-option>
<el-option label="组批次完成" :value="-4"></el-option>
<el-option label="从未组批次" :value="-1"></el-option>
<el-option label="未创建线路" :value="-3"></el-option>
<el-option label="漏组网点" :value="1"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="线路" prop="lineCode">
<TransLinePicker v-model="queryParams.lineCode" isInitiated="true"></TransLinePicker>
</el-form-item>
<el-form-item label="产品类型" prop="productType">
<TransProductPicker placeholder="产品类型" v-model="queryParams.productType"
:transLineCode="queryParams.lineCode"></TransProductPicker>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="起始网点" prop="startSiteCode">
<EmisSiteSimplePicker1 v-model="queryParams.startSiteCode"></EmisSiteSimplePicker1>
</el-form-item>
<el-form-item label="下一网点" prop="nextSiteCode">
<EmisSiteSimplePicker1 v-model="queryParams.nextSiteCode"></EmisSiteSimplePicker1>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="0">
<el-col :span="9">
<el-form-item label="节点负责人" prop="manager">
<EmpNamePicker1 :placeholder="$t('请选择')" v-model="queryParams.manager"></EmpNamePicker1>
</el-form-item>
<el-form-item label="线路负责人" prop="transManager">
<EmpNamePicker2 :placeholder="$t('请选择')" v-model="queryParams.transManager"></EmpNamePicker2>
</el-form-item>
<el-form-item label="发货时间" prop="">
<elDateAdvPicker v-model="dateTimeRange" ></elDateAdvPicker>
</el-form-item>
<el-form-item label="线路" prop="lineCode">
<TransLinePicker v-model="queryParams.lineCode" isInitiated="true" ></TransLinePicker>
</el-form-item>
<el-form-item label="产品类型" prop="productType">
<TransProductPicker placeholder="产品类型" v-model="queryParams.productType" :transLineCode="queryParams.lineCode" ></TransProductPicker>
</el-form-item>
<el-form-item label="起始网点" prop="startSiteCode">
<EmisSiteSimplePicker1 v-model="queryParams.startSiteCode" ></EmisSiteSimplePicker1>
</el-form-item>
<el-form-item label="下一网点" prop="nextSiteCode">
<EmisSiteSimplePicker1 v-model="queryParams.nextSiteCode" ></EmisSiteSimplePicker1>
</el-form-item>
<el-form-item label="供应商" prop="supplierCode">
<EmisSupplierPicker :placeholder="$t('请选择')" v-model="queryParams.supplierCode" ></EmisSupplierPicker>
</el-form-item>
<el-form-item label="节点负责人" prop="manager" label-width="90px">
<EmpNamePicker1 :placeholder="$t('请选择')" v-model="queryParams.manager" ></EmpNamePicker1>
</el-form-item>
<el-form-item label="线路负责人" prop="transManager" label-width="90px">
<EmpNamePicker2 :placeholder="$t('请选择')" v-model="queryParams.transManager" ></EmpNamePicker2>
</el-form-item>
<el-form-item label="漏组次数" prop="missCount">
<el-select clearable v-model="queryParams.missCount" placeholder="请选择">
<el-option label="人工修改运单" :value="-7"></el-option>
<el-option label="运单分批后未组完" :value="-6"></el-option>
<!-- <el-option label="其他" :value="-5"></el-option> -->
<el-option label="组批次完成" :value="-4"></el-option>
<el-option label="从未组批次" :value="-1"></el-option>
<!-- <el-option label="组批次错误" :value="-2"></el-option> -->
<el-option label="未创建线路" :value="-3"></el-option>
<el-option label="漏组网点" :value="1"></el-option>
<!-- <el-option label="漏组1批次" :value="1"></el-option>
<el-option label="漏组2批次" :value="2"></el-option>
<el-option label="漏组3批次" :value="3"></el-option>
<el-option label="漏组4批次" :value="4"></el-option>
<el-option label="漏组5批次" :value="5"></el-option>
<el-option label="漏组6批次" :value="6"></el-option>
<el-option label="漏组7批次" :value="7"></el-option>
<el-option label="漏组8批次" :value="8"></el-option>
<el-option label="漏组9批次" :value="9"></el-option> -->
</el-select>
</el-form-item>
<el-form-item label="是否问题件" prop="blIsQuestion" label-width="90px">
<el-select clearable v-model="queryParams.blIsQuestion" placeholder="请选择">
<el-option :key="1" label="是" value="1">是</el-option>
<el-option :key="0" label="否" value="0">否</el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('漏组批次原因')" prop="missReason" label-width="120px">
<el-input
v-model="queryParams.missReason"
:placeholder="$t('漏组批次原因')"
clearable
/>
</el-form-item>
<!-- 寄件网点 -->
<el-form-item :label="$t('寄件网点')" prop="sendSiteCode" >
<EmisSiteSimplePicker1 v-model="queryParams.sendSiteCode" ></EmisSiteSimplePicker1>
</el-form-item>
<el-form-item :label="$t('销售联系人')" prop="salesmen" label-width="85px">
<EmpNamePicker3 :placeholder="$t('请选择')" v-model="queryParams.salesmen" ></EmpNamePicker3>
</el-form-item>
<el-form-item :label="$t('回款联系人')" prop="payee" label-width="85px">
<EmpNamePicker4 :placeholder="$t('请选择')" v-model="queryParams.payee" ></EmpNamePicker4>
</el-form-item>
<el-form-item :label="$t('录入人')" prop="registerManName">
<EmpNamePicker5 :placeholder="$t('请选择')" v-model="queryParams.registerManName" ></EmpNamePicker5>
</el-form-item>
<el-form-item label="问题件方式" prop="params.problemQueryType" label-width="90px">
<el-select clearable="" v-model="queryParams.params.problemQueryType" placeholder="请选择">
<el-option label="只查问题件类型" :value="1"></el-option>
<el-option label="剔除问题件类型" :value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item label="问题件类型" prop="params.problemQueryIds" label-width="90px">
<ProblemTypeMultiplePicker v-model="queryParams.params.problemQueryIds" ></ProblemTypeMultiplePicker>
</el-form-item>
<el-form-item label="签收状态" prop="blSign">
<el-select clearable v-model="queryParams.blSign" placeholder="请选择">
<el-option label="已签收" :value="1"></el-option>
<el-option label="未签收" :value="0"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item :label="$t('销售联系人')" prop="salesmen">
<EmpNamePicker3 :placeholder="$t('请选择')" v-model="queryParams.salesmen"></EmpNamePicker3>
</el-form-item>
<el-form-item :label="$t('回款联系人')" prop="payee">
<EmpNamePicker4 :placeholder="$t('请选择')" v-model="queryParams.payee"></EmpNamePicker4>
</el-form-item>
<el-form-item :label="$t('录入人')" prop="registerManName">
<EmpNamePicker5 :placeholder="$t('请选择')" v-model="queryParams.registerManName"></EmpNamePicker5>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="是否问题件" prop="blIsQuestion">
<el-select clearable v-model="queryParams.blIsQuestion" placeholder="请选择">
<el-option :key="1" label="是" value="1">是</el-option>
<el-option :key="0" label="否" value="0">否</el-option>
</el-select>
</el-form-item>
<el-form-item label="问题件方式" prop="params.problemQueryType">
<el-select clearable="" v-model="queryParams.params.problemQueryType" placeholder="请选择">
<el-option label="只查问题件类型" :value="1"></el-option>
<el-option label="剔除问题件类型" :value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item label="问题件类型" prop="params.problemQueryIds">
<ProblemTypeMultiplePicker v-model="queryParams.params.problemQueryIds"></ProblemTypeMultiplePicker>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="供应商" prop="supplierCode">
<EmisSupplierPicker :placeholder="$t('请选择')" v-model="queryParams.supplierCode"></EmisSupplierPicker>
</el-form-item>
<el-form-item :label="$t('漏组批次原因')" prop="missReason">
<el-input v-model="queryParams.missReason" :placeholder="$t('漏组批次原因')" clearable />
</el-form-item>
<el-form-item label="签收状态" prop="blSign">
<el-select clearable v-model="queryParams.blSign" placeholder="请选择">
<el-option label="已签收" :value="1"></el-option>
<el-option label="未签收" :value="0"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
</SearchForm>
<XdTable
v-loading="loading"
@ -665,4 +658,7 @@ export default {
color: #0955ee;
cursor: pointer;
}
.queryForm .el-form-item {
margin-bottom: 0px !important;
}
</style>