|
|
@@ -1,97 +1,70 @@
|
|
|
<template>
|
|
|
<basic-container v-if="show">
|
|
|
- <avue-crud :option="option"
|
|
|
- :data="dataList"
|
|
|
- ref="crud"
|
|
|
- v-model="form"
|
|
|
- :page.sync="page"
|
|
|
- :table-loading="loading"
|
|
|
- :search.sync="search"
|
|
|
- @row-del="rowDel"
|
|
|
- :before-open="beforeOpen"
|
|
|
- :before-close="beforeClose"
|
|
|
- :cell-style="cellStyle"
|
|
|
- @search-change="searchChange"
|
|
|
- @search-reset="searchReset"
|
|
|
- @selection-change="selectionChange"
|
|
|
- @current-change="currentChange"
|
|
|
- @size-change="sizeChange"
|
|
|
- @refresh-change="refreshChange"
|
|
|
- @on-load="onLoad"
|
|
|
- @expand-change="expandChange"
|
|
|
- @saveColumn="saveColumn"
|
|
|
- @resetColumn="resetColumn"
|
|
|
- @search-criteria-switch="searchCriteriaSwitch"
|
|
|
- >
|
|
|
+ <avue-crud :option="option" :data="dataList" ref="crud" v-model="form" :page.sync="page" :table-loading="loading"
|
|
|
+ :search.sync="search" @row-del="rowDel" :before-open="beforeOpen" :before-close="beforeClose"
|
|
|
+ :cell-style="cellStyle" @search-change="searchChange" @search-reset="searchReset"
|
|
|
+ @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
|
|
|
+ @refresh-change="refreshChange" @on-load="onLoad" @expand-change="expandChange" @saveColumn="saveColumn"
|
|
|
+ @resetColumn="resetColumn" @search-criteria-switch="searchCriteriaSwitch">
|
|
|
<template slot="corpIdSearch">
|
|
|
- <select-component
|
|
|
- v-model="search.corpId"
|
|
|
- :configuration="configuration"
|
|
|
- ></select-component>
|
|
|
+ <select-component v-model="search.corpId" :configuration="configuration"></select-component>
|
|
|
</template>
|
|
|
<template slot="salesNameSearch">
|
|
|
- <user-com
|
|
|
- v-model="search.salesName"
|
|
|
- style="width: 100%"
|
|
|
- ></user-com>
|
|
|
+ <user-com v-model="search.salesName" style="width: 100%"></user-com>
|
|
|
</template>
|
|
|
<template slot-scope="{row,size}" slot="search">
|
|
|
</template>
|
|
|
<template slot-scope="scope" slot="expand" width="48px">
|
|
|
<el-table :data="scope.row.insideList" v-loading="scope.row.loading">
|
|
|
- <el-table-column align="center" width="40"></el-table-column>
|
|
|
- <el-table-column label="提单号" prop="billNo" align="center" show-overflow-tooltip width="150"></el-table-column>
|
|
|
- <el-table-column label="合同号" prop="orgOrderNo" align="center" show-overflow-tooltip width="150"></el-table-column>
|
|
|
- <el-table-column label="货物名称" prop="priceCategory" align="center" show-overflow-tooltip width="150"></el-table-column>
|
|
|
- <el-table-column label="件数" prop="orderQuantity" align="center" show-overflow-tooltip width="120"></el-table-column>
|
|
|
- <el-table-column label="发票重量" prop="invoiceWeight" align="center" show-overflow-tooltip width="150"></el-table-column>
|
|
|
- <el-table-column label="码单重量" prop="billWeight" align="center" show-overflow-tooltip width="120"></el-table-column>
|
|
|
- <el-table-column label="发票金额" prop="amount" align="center" show-overflow-tooltip width="120"></el-table-column>
|
|
|
- <el-table-column label="已发件数" prop="actualQuantity" align="center" show-overflow-tooltip width="120"></el-table-column>
|
|
|
+ <el-table-column align="center" width="40"></el-table-column>
|
|
|
+ <el-table-column label="提单号" prop="billNo" align="center" show-overflow-tooltip width="150"></el-table-column>
|
|
|
+ <el-table-column label="合同号" prop="orgOrderNo" align="center" show-overflow-tooltip width="150">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="货物名称" prop="priceCategory" align="center" show-overflow-tooltip width="150">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="件数" prop="orderQuantity" align="center" show-overflow-tooltip width="120">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="发票重量" prop="invoiceWeight" align="center" show-overflow-tooltip width="150">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="码单重量" prop="billWeight" align="center" show-overflow-tooltip width="120">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="发票金额" prop="amount" align="center" show-overflow-tooltip width="120">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="已发件数" prop="actualQuantity" align="center" show-overflow-tooltip width="120">
|
|
|
+ </el-table-column>
|
|
|
</el-table>
|
|
|
</template>
|
|
|
<template slot="menuLeft">
|
|
|
- <el-button size="small"
|
|
|
- type="success"
|
|
|
- :disabled="selectionList.length != 1"
|
|
|
- @click.stop="copyBill"
|
|
|
- >复制单据
|
|
|
+ <el-button size="small" type="success" :disabled="selectionList.length != 1" @click.stop="copyBill">复制单据
|
|
|
</el-button>
|
|
|
</template>
|
|
|
<template slot-scope="scope" slot="menu">
|
|
|
- <el-button
|
|
|
- type="text"
|
|
|
- icon="el-icon-delete"
|
|
|
- size="small"
|
|
|
- @click.stop="rowDel(scope.row,scope.index)"
|
|
|
- >删除
|
|
|
+ <el-button type="text" icon="el-icon-delete" size="small" v-if="scope.row.status == 0 || scope.row.status == 4"
|
|
|
+ @click.stop="rowDel(scope.row, scope.index)">删除
|
|
|
</el-button>
|
|
|
</template>
|
|
|
<template slot-scope="scope" slot="orderNo">
|
|
|
- <span style="color: #409EFF;cursor: pointer" @click.stop="beforeOpenPage(scope.row)">{{ scope.row.orderNo }}</span>
|
|
|
+ <span style="color: #409EFF;cursor: pointer" @click.stop="beforeOpenPage(scope.row)">{{ scope.row.orderNo
|
|
|
+ }}</span>
|
|
|
</template>
|
|
|
<template slot-scope="scope" slot="corpId">
|
|
|
- <span style="color: #409EFF;cursor: pointer" @click.stop="beforeOpenPage(scope.row)">{{ scope.row.corpsName }}</span>
|
|
|
+ <span style="color: #409EFF;cursor: pointer" @click.stop="beforeOpenPage(scope.row)">{{ scope.row.corpsName
|
|
|
+ }}</span>
|
|
|
</template>
|
|
|
<template slot-scope="scope" slot="orderQuantity">
|
|
|
- <span>{{ scope.row.orderQuantity | roundNumbers}}</span>
|
|
|
+ <span>{{ scope.row.orderQuantity | roundNumbers }}</span>
|
|
|
</template>
|
|
|
<template slot-scope="scope" slot="actualQuantity">
|
|
|
- <span>{{ scope.row.actualQuantity | roundNumbers}}</span>
|
|
|
+ <span>{{ scope.row.actualQuantity | roundNumbers }}</span>
|
|
|
</template>
|
|
|
</avue-crud>
|
|
|
</basic-container>
|
|
|
- <detail-page
|
|
|
- ref="detail"
|
|
|
- @goBack="goBack"
|
|
|
- :detailData="detailData"
|
|
|
- v-else
|
|
|
- ></detail-page>
|
|
|
+ <detail-page ref="detail" @goBack="goBack" :detailData="detailData" v-else></detail-page>
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
import option from "./config/mainList.json";
|
|
|
-import {selectSaleList,removeList,detailSaleList} from "@/api/importTrade/salesContract"
|
|
|
+import { selectSaleList, removeList, detailSaleList } from "@/api/importTrade/salesContract"
|
|
|
import detailPage from "./detailsPage.vue";
|
|
|
import { roundNumbers } from "@/util/validate";
|
|
|
|
|
|
@@ -101,35 +74,35 @@ export default {
|
|
|
return {
|
|
|
option: {},
|
|
|
dataList: [],
|
|
|
- loading:false,
|
|
|
- show:true,
|
|
|
- selectionList:[],
|
|
|
+ loading: false,
|
|
|
+ show: true,
|
|
|
+ selectionList: [],
|
|
|
page: {
|
|
|
pageSize: 10,
|
|
|
pagerCount: 5,
|
|
|
total: 0,
|
|
|
},
|
|
|
form: {},
|
|
|
- detailData:{},
|
|
|
+ detailData: {},
|
|
|
search: {},
|
|
|
- viewDisabled:false,
|
|
|
- configuration:{
|
|
|
- multipleChoices:false,
|
|
|
- multiple:false,
|
|
|
- disabled:false,
|
|
|
- searchShow:true,
|
|
|
- collapseTags:false,
|
|
|
- clearable:true,
|
|
|
- placeholder:'请点击右边按钮选择',
|
|
|
- dicData:[]
|
|
|
+ viewDisabled: false,
|
|
|
+ configuration: {
|
|
|
+ multipleChoices: false,
|
|
|
+ multiple: false,
|
|
|
+ disabled: false,
|
|
|
+ searchShow: true,
|
|
|
+ collapseTags: false,
|
|
|
+ clearable: true,
|
|
|
+ placeholder: '请点击右边按钮选择',
|
|
|
+ dicData: []
|
|
|
},
|
|
|
}
|
|
|
},
|
|
|
- components:{
|
|
|
+ components: {
|
|
|
detailPage
|
|
|
},
|
|
|
filters: {
|
|
|
- roundNumbers(val){
|
|
|
+ roundNumbers(val) {
|
|
|
return roundNumbers(val);
|
|
|
}
|
|
|
},
|
|
|
@@ -140,20 +113,20 @@ export default {
|
|
|
this.option = await this.getColumnData(this.getColumnName(38), option);
|
|
|
},
|
|
|
activated() {
|
|
|
- if(!this.show && !this.$store.getters.entranceXsStatus){
|
|
|
+ if (!this.show && !this.$store.getters.entranceXsStatus) {
|
|
|
this.show = true;
|
|
|
}
|
|
|
setTimeout(() => {
|
|
|
- if(this.$route.query.check && this.show){
|
|
|
- this.detailData={
|
|
|
- check:this.$route.query.check
|
|
|
+ if (this.$route.query.check && this.show) {
|
|
|
+ this.detailData = {
|
|
|
+ check: this.$route.query.check
|
|
|
}
|
|
|
this.show = false;
|
|
|
this.$store.commit("XSACE_IN_DETAIL");
|
|
|
} else if (this.$route.query.params) {
|
|
|
- this.detailData={
|
|
|
- id:this.$route.query.params,
|
|
|
- view:true,
|
|
|
+ this.detailData = {
|
|
|
+ id: this.$route.query.params,
|
|
|
+ view: true,
|
|
|
}
|
|
|
this.show = false;
|
|
|
this.$store.commit("XSACE_IN_DETAIL");
|
|
|
@@ -187,7 +160,7 @@ export default {
|
|
|
this.onLoad(this.page);
|
|
|
});
|
|
|
},
|
|
|
- copyBill(){
|
|
|
+ copyBill() {
|
|
|
this.detailData = {
|
|
|
id: this.selectionList[0].id,
|
|
|
status: 'copy'
|
|
|
@@ -206,13 +179,13 @@ export default {
|
|
|
tableName: 'business_order',
|
|
|
billId: row.id,
|
|
|
no: localStorage.getItem('browserID'),
|
|
|
- billNo:row.orderNo
|
|
|
+ billNo: row.orderNo
|
|
|
}
|
|
|
|
|
|
this.detailData = {
|
|
|
id: row.id,
|
|
|
- view:true,
|
|
|
- lockData:lockData,
|
|
|
+ view: true,
|
|
|
+ lockData: lockData,
|
|
|
};
|
|
|
this.show = false;
|
|
|
this.$store.commit("XSACE_IN_DETAIL");
|
|
|
@@ -231,7 +204,7 @@ export default {
|
|
|
this.onLoad(this.page, params);
|
|
|
done()
|
|
|
},
|
|
|
- openDisabled(){
|
|
|
+ openDisabled() {
|
|
|
this.viewDisabled = false
|
|
|
},
|
|
|
searchReset() {
|
|
|
@@ -251,15 +224,15 @@ export default {
|
|
|
},
|
|
|
paramsAdjustment(params) {
|
|
|
params = Object.assign({}, this.search);
|
|
|
- if (params.businesDate && params.businesDate.length !==0 ) { //发货
|
|
|
- params.contractStartDate = params.businesDate[0]+ " " + "00:00:00";
|
|
|
+ if (params.businesDate && params.businesDate.length !== 0) { //发货
|
|
|
+ params.contractStartDate = params.businesDate[0] + " " + "00:00:00";
|
|
|
params.contractEndDate = params.businesDate[1] + " " + "23:59:59";
|
|
|
- this.$delete(params,'businesDate')
|
|
|
+ this.$delete(params, 'businesDate')
|
|
|
}
|
|
|
- if (params.advanceCollectionDate && params.advanceCollectionDate.length !==0 ) {
|
|
|
- params.orderStartDate = params.advanceCollectionDate[0]+ " " + "00:00:00";
|
|
|
+ if (params.advanceCollectionDate && params.advanceCollectionDate.length !== 0) {
|
|
|
+ params.orderStartDate = params.advanceCollectionDate[0] + " " + "00:00:00";
|
|
|
params.orderEndDate = params.advanceCollectionDate[1] + " " + "23:59:59";
|
|
|
- this.$delete(params,'advanceCollectionDate')
|
|
|
+ this.$delete(params, 'advanceCollectionDate')
|
|
|
}
|
|
|
return params
|
|
|
},
|
|
|
@@ -273,25 +246,25 @@ export default {
|
|
|
this.dataList = res.data.data.records
|
|
|
this.page.total = res.data.data.total
|
|
|
this.dataList.forEach(item => {
|
|
|
- this.$set(item,'insideList',[])
|
|
|
- this.$set(item,'loading', true)
|
|
|
+ this.$set(item, 'insideList', [])
|
|
|
+ this.$set(item, 'loading', true)
|
|
|
})
|
|
|
if (this.page.total) {
|
|
|
this.option.height = window.innerHeight - 200;
|
|
|
}
|
|
|
- }).finally(()=>{
|
|
|
+ }).finally(() => {
|
|
|
this.loading = false
|
|
|
})
|
|
|
},
|
|
|
goBack() {
|
|
|
- this.detailData=this.$options.data().detailData
|
|
|
+ this.detailData = this.$options.data().detailData
|
|
|
this.show = true;
|
|
|
- this.onLoad(this.page,this.search)
|
|
|
+ this.onLoad(this.page, this.search)
|
|
|
},
|
|
|
- searchCriteriaSwitch(type){
|
|
|
- if (type){
|
|
|
+ searchCriteriaSwitch(type) {
|
|
|
+ if (type) {
|
|
|
this.option.height = this.option.height - 145
|
|
|
- }else {
|
|
|
+ } else {
|
|
|
this.option.height = this.option.height + 145
|
|
|
}
|
|
|
this.$refs.crud.getTableHeight()
|
|
|
@@ -328,13 +301,15 @@ export default {
|
|
|
</script>
|
|
|
|
|
|
<style scoped>
|
|
|
- ::v-deep .el-table__expanded-cell{
|
|
|
- padding: 0 !important;
|
|
|
- }
|
|
|
- /deep/ .el-table__expanded-cell .el-table__header-wrapper .cell {
|
|
|
- font-size: 8px !important;
|
|
|
- }
|
|
|
- /deep/ .el-table__body-wrapper .cell {
|
|
|
- font-size: 8px;
|
|
|
- }
|
|
|
+::v-deep .el-table__expanded-cell {
|
|
|
+ padding: 0 !important;
|
|
|
+}
|
|
|
+
|
|
|
+/deep/ .el-table__expanded-cell .el-table__header-wrapper .cell {
|
|
|
+ font-size: 8px !important;
|
|
|
+}
|
|
|
+
|
|
|
+/deep/ .el-table__body-wrapper .cell {
|
|
|
+ font-size: 8px;
|
|
|
+}
|
|
|
</style>
|
qukaidi