|
|
@@ -17,7 +17,7 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="4">
|
|
|
- <el-form-item label="售达方" prop="kuinfo">
|
|
|
+ <el-form-item label="售达方" prop="kunnr">
|
|
|
<el-input placeholder="销售凭证" v-model="queryParams.kunnr" class="input-with-select" style="width: 100%;" size="mini">
|
|
|
<el-select v-model="queryParams.kunnrType" slot="prepend" placeholder="请选择" style="width: 75px;">
|
|
|
<el-option label="模糊" value="1">
|
|
|
@@ -60,7 +60,7 @@
|
|
|
<el-form-item label="凭证类型" prop="auarttList">
|
|
|
<!-- <el-input v-model="queryParams.pzinfo" placeholder="请输入销售凭证类型" clearable @keyup.enter.native="handleQuery" style="width: 260px;"/> -->
|
|
|
<el-select v-model="queryParams.auarttList" placeholder="请选择凭证类型" multiple collapse-tags style="width: 100%;" size="mini">
|
|
|
- <el-option v-for="dict in this.getDictDatas(DICT_TYPE.AUARTT) "
|
|
|
+ <el-option v-for="dict in this.getDictDatas(DICT_TYPE.C_AUARTT) "
|
|
|
:key="dict.value" :label="dict.label" :value="dict.value"/>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
@@ -165,7 +165,12 @@
|
|
|
<!-- <el-button type="success" plain icon="el-icon-bottom" size="mini" @click="openSyncForm(undefined)"
|
|
|
v-hasPermi="['contract:order:sync']">同步</el-button> -->
|
|
|
|
|
|
- <el-button type="success" plain icon="el-icon-bottom" size="mini" @click="openGenerateForm()" :disabled="multiple" >合同生成</el-button>
|
|
|
+ <el-col :span="1.5">
|
|
|
+ <el-button type="success" plain icon="el-icon-bottom" size="mini" @click="openGenerateForm()" :disabled="multiple" >合同生成</el-button>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="1.5">
|
|
|
+ <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading" >导出</el-button>
|
|
|
+ </el-col>
|
|
|
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
|
|
</el-row>
|
|
|
|
|
|
@@ -218,7 +223,7 @@
|
|
|
<el-table-column label="信用期" align="center" prop="zmonth" width="90" show-overflow-tooltip sortable="custom"/>
|
|
|
<el-table-column label="订单原因" align="center" prop="augru" width="100" show-overflow-tooltip sortable="custom"/>
|
|
|
<el-table-column label="订单原因解释" align="center" prop="augrut" width="140" show-overflow-tooltip sortable="custom"/>
|
|
|
- <el-table-column label="合同打印模板" align="center" prop="htdymb" width="130" show-overflow-tooltip sortable="custom"/>
|
|
|
+ <!-- <el-table-column label="合同打印模板" align="center" prop="htdymb" width="130" show-overflow-tooltip sortable="custom"/> -->
|
|
|
<el-table-column label="运输方式费用负担" align="center" prop="yffd" width="250" show-overflow-tooltip sortable="custom" />
|
|
|
<el-table-column label="付款方式" align="center" prop="fkfs" width="140" show-overflow-tooltip sortable="custom" />
|
|
|
<el-table-column label="产品质量" align="center" prop="cpzl" width="250" show-overflow-tooltip sortable="custom" />
|
|
|
@@ -259,6 +264,7 @@ import * as ExportOrderApi from '@/api/contract/exportContract/orderIndex';
|
|
|
// import OrderForm from './OrderForm';
|
|
|
import ContractGenerateForm from './components/ContractGenerateForm.vue';
|
|
|
import * as CompanyApi from '@/api/contract/company';
|
|
|
+import {Loading} from 'element-ui'
|
|
|
|
|
|
import OrderDetailsList from './components/OrderDetailsList.vue';
|
|
|
import {DICT_TYPE, getDictDatas} from "@/utils/dict";
|
|
|
@@ -298,7 +304,7 @@ export default {
|
|
|
pageNo: 1,
|
|
|
pageSize: 200,
|
|
|
buinfoList: [],
|
|
|
- audat: null,
|
|
|
+ audat: [],
|
|
|
kuinfo: null,
|
|
|
vbeln:null,
|
|
|
vbelnType:"1",
|
|
|
@@ -416,6 +422,7 @@ export default {
|
|
|
/** 导出按钮操作 */
|
|
|
async handleExport() {
|
|
|
await this.$modal.confirm('是否确认导出所有订单数据项?');
|
|
|
+ let downloadLoadingInstance;
|
|
|
try {
|
|
|
this.exportLoading = true;
|
|
|
if(this.queryParams.zzhtgklxList){
|
|
|
@@ -433,11 +440,14 @@ export default {
|
|
|
if(this.queryParams.vkinfoList){
|
|
|
this.queryParams.vkinfo = this.queryParams.vkinfoList.join(",")
|
|
|
}
|
|
|
+ this.exportLoading = true;
|
|
|
+ downloadLoadingInstance = Loading.service({ text: "正在导出数据，请稍候", spinner: "el-icon-loading", background: "rgba(0, 0, 0, 0.7)", })
|
|
|
const res = await ExportOrderApi.exportExportOrdertExcel(this.queryParams);
|
|
|
- this.$download.excel(res, '订单.xls');
|
|
|
+ this.$download.excel(res, '出口订单.xls');
|
|
|
} catch {
|
|
|
} finally {
|
|
|
this.exportLoading = false;
|
|
|
+ downloadLoadingInstance.close();
|
|
|
}
|
|
|
},
|
|
|
selectable(row, index) {
|
chen