|
@@ -32,7 +32,7 @@
|
|
|
</el-radio-group>
|
|
|
</template>
|
|
|
<template #search>
|
|
|
- <el-form ref="searchForm" :model="searchForm" label-width="90px" size="mini" label-position="left">
|
|
|
+ <el-form ref="searchForm" :model="searchForm" label-width="120px" size="mini" label-position="left">
|
|
|
<el-row :gutter="20">
|
|
|
<el-col :xs="24" :sm="12" :lg="6">
|
|
|
<el-form-item label="经销商名称" prop="customerId">
|
|
@@ -67,6 +67,11 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :xs="24" :sm="12" :lg="6">
|
|
|
+ <el-form-item label="工程登录编号" prop="enginRecordNo">
|
|
|
+ <el-input v-model="searchForm.enginRecordNo" placeholder="请输入"></el-input>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :xs="24" :sm="12" :lg="6">
|
|
|
<el-form-item label="开始时间" prop="startTime">
|
|
|
<el-date-picker
|
|
|
class="selectStyle"
|
|
@@ -208,6 +213,20 @@
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
align="left"
|
|
|
+ fixed="left"
|
|
|
+ label="工程登录编号"
|
|
|
+ prop="enginRecordNo"
|
|
|
+ min-width="150"
|
|
|
+ show-overflow-tooltip
|
|
|
+ >
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <CopyButton :copyText="scope.row.enginRecordNo" />
|
|
|
+ <span>{{ scope.row.enginRecordNo }}</span>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+
|
|
|
+ <el-table-column
|
|
|
+ align="left"
|
|
|
label="钱包"
|
|
|
prop="walletName"
|
|
|
fixed="left"
|
|
@@ -507,7 +526,8 @@ export default {
|
|
|
endTime: '',
|
|
|
customerNumber: '',
|
|
|
billType: '',
|
|
|
- remark: ''
|
|
|
+ remark: '',
|
|
|
+ enginRecordNo:''
|
|
|
}, //搜索表单
|
|
|
listLoading: false, // 列表加载loading
|
|
|
|
|
@@ -559,7 +579,9 @@ export default {
|
|
|
pageNum: this.currentPage,
|
|
|
type: this.bill,
|
|
|
customerName: this.$route.query.customerName,
|
|
|
- customerNumber: this.$route.query.customerNumber
|
|
|
+ customerNumber: this.$route.query.customerNumber,
|
|
|
+ enginRecordNo:this.searchForm.enginRecordNo,
|
|
|
+
|
|
|
}
|
|
|
} else if (this.isCustomer) {
|
|
|
return {
|
|
@@ -568,7 +590,9 @@ export default {
|
|
|
pageNum: this.currentPage,
|
|
|
type: this.bill,
|
|
|
customerName: this.$store.state.user.customerName,
|
|
|
- customerNumber: this.$store.state.user.customerNumber
|
|
|
+ customerNumber: this.$store.state.user.customerNumber,
|
|
|
+ enginRecordNo:this.searchForm.enginRecordNo,
|
|
|
+
|
|
|
}
|
|
|
} else {
|
|
|
return {
|
|
@@ -577,7 +601,9 @@ export default {
|
|
|
pageNum: this.currentPage,
|
|
|
type: this.bill,
|
|
|
customerName: this.customerName,
|
|
|
- customerNumber: this.customerNumber
|
|
|
+ customerNumber: this.customerNumber,
|
|
|
+ enginRecordNo:this.searchForm.enginRecordNo,
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -1216,6 +1242,7 @@ export default {
|
|
|
billNo: this.searchForm.billNo,
|
|
|
billType: this.searchForm.billType,
|
|
|
customerId: this.searchForm.customerId,
|
|
|
+ enginRecordNo:this.searchForm.enginRecordNo,
|
|
|
customerName: '',
|
|
|
customerNumber: this.searchForm.customerNumber,
|
|
|
customerWalletId: this.searchForm.customerWalletId,
|