|
@@ -230,6 +230,148 @@
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
+ <el-col v-if="!isCustomer" :xs="24" :sm="12" :lg="6">
|
|
|
+ <el-form-item label="特价编号" style="margin-bottom: 0">
|
|
|
+ <div class="fanwei">
|
|
|
+ <el-form-item prop="startSpecialNo">
|
|
|
+ <el-input v-model="screenForm.startSpecialNo" placeholder="开始" />
|
|
|
+ </el-form-item>
|
|
|
+ <span>-</span>
|
|
|
+ <el-form-item prop="endSpecialNo">
|
|
|
+ <el-input v-model="screenForm.endSpecialNo" placeholder="结束" />
|
|
|
+ </el-form-item>
|
|
|
+ </div>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col v-if="!isCustomer" :xs="24" :sm="12" :lg="6">
|
|
|
+ <el-form-item label="交单编号" style="margin-bottom: 0">
|
|
|
+ <div class="fanwei">
|
|
|
+ <el-form-item prop="startBillNo">
|
|
|
+ <el-input v-model="screenForm.startBillNo" placeholder="开始" />
|
|
|
+ </el-form-item>
|
|
|
+ <span>-</span>
|
|
|
+ <el-form-item prop="endBillNo">
|
|
|
+ <el-input v-model="screenForm.endBillNo" placeholder="结束" />
|
|
|
+ </el-form-item>
|
|
|
+ </div>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :xs="24" :sm="12" :lg="6">
|
|
|
+ <el-form-item label="寄厂日期" style="margin-bottom: 0">
|
|
|
+ <div class="fanwei">
|
|
|
+ <el-form-item prop="startInstallTime">
|
|
|
+ <el-date-picker
|
|
|
+ v-model="screenForm.startInstallTime"
|
|
|
+ value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
+ class="dateStyle"
|
|
|
+ type="datetime"
|
|
|
+ placeholder="选择日期"
|
|
|
+ />
|
|
|
+ </el-form-item>
|
|
|
+ <span>-</span>
|
|
|
+ <el-form-item prop="endInstallTime">
|
|
|
+ <el-date-picker
|
|
|
+ v-model="screenForm.endInstallTime"
|
|
|
+ value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
+ class="dateStyle"
|
|
|
+ type="datetime"
|
|
|
+ placeholder="选择日期"
|
|
|
+ />
|
|
|
+ </el-form-item>
|
|
|
+ </div>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :xs="24" :sm="12" :lg="6">
|
|
|
+ <el-form-item label="寄厂年度" prop="mailFactoryYear">
|
|
|
+ <el-input v-model="screenForm.mailFactoryYear" placeholder="请输入寄厂年度" />
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :xs="24" :sm="12" :lg="6">
|
|
|
+ <el-form-item label="确认日期" style="margin-bottom: 0">
|
|
|
+ <div class="fanwei">
|
|
|
+ <el-form-item prop="startConfirmDate">
|
|
|
+ <el-date-picker
|
|
|
+ v-model="screenForm.startConfirmDate"
|
|
|
+ value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
+ class="dateStyle"
|
|
|
+ type="datetime"
|
|
|
+ placeholder="选择日期"
|
|
|
+ />
|
|
|
+ </el-form-item>
|
|
|
+ <span>-</span>
|
|
|
+ <el-form-item prop="endConfirmDate">
|
|
|
+ <el-date-picker
|
|
|
+ v-model="screenForm.endConfirmDate"
|
|
|
+ value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
+ class="dateStyle"
|
|
|
+ type="datetime"
|
|
|
+ placeholder="选择日期"
|
|
|
+ />
|
|
|
+ </el-form-item>
|
|
|
+ </div>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :xs="24" :sm="12" :lg="6">
|
|
|
+ <el-form-item label="结算编号" prop="settlementNo">
|
|
|
+ <el-input v-model="screenForm.settlementNo" placeholder="请输入结算编号" />
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :xs="24" :sm="12" :lg="6">
|
|
|
+ <el-form-item label="结算日期" style="margin-bottom: 0">
|
|
|
+ <div class="fanwei">
|
|
|
+ <el-form-item prop="startSettlementDate">
|
|
|
+ <el-date-picker
|
|
|
+ v-model="screenForm.startSettlementDate"
|
|
|
+ value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
+ class="dateStyle"
|
|
|
+ type="datetime"
|
|
|
+ placeholder="选择日期"
|
|
|
+ />
|
|
|
+ </el-form-item>
|
|
|
+ <span>-</span>
|
|
|
+ <el-form-item prop="endSettlementDate">
|
|
|
+ <el-date-picker
|
|
|
+ v-model="screenForm.endSettlementDate"
|
|
|
+ value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
+ class="dateStyle"
|
|
|
+ type="datetime"
|
|
|
+ placeholder="选择日期"
|
|
|
+ />
|
|
|
+ </el-form-item>
|
|
|
+ </div>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :xs="24" :sm="12" :lg="6">
|
|
|
+ <el-form-item label="入厂日期" style="margin-bottom: 0">
|
|
|
+ <div class="fanwei">
|
|
|
+ <el-form-item prop="startInFactoryDate">
|
|
|
+ <el-date-picker
|
|
|
+ v-model="screenForm.startInFactoryDate"
|
|
|
+ value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
+ class="dateStyle"
|
|
|
+ type="datetime"
|
|
|
+ placeholder="选择日期"
|
|
|
+ />
|
|
|
+ </el-form-item>
|
|
|
+ <span>-</span>
|
|
|
+ <el-form-item prop="endInFactoryDate">
|
|
|
+ <el-date-picker
|
|
|
+ v-model="screenForm.endInFactoryDate"
|
|
|
+ value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
+ class="dateStyle"
|
|
|
+ type="datetime"
|
|
|
+ placeholder="选择日期"
|
|
|
+ />
|
|
|
+ </el-form-item>
|
|
|
+ </div>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+
|
|
|
+ <el-col :xs="24" :sm="12" :lg="6">
|
|
|
+ <el-form-item label="入厂类型" prop="inFactoryType">
|
|
|
+ <el-input v-model="screenForm.inFactoryType" placeholder="请输入入厂类型" />
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
</template>
|
|
|
</el-row>
|
|
|
</el-form>
|
|
@@ -284,6 +426,30 @@
|
|
|
<el-table-column
|
|
|
v-if="!isCustomer"
|
|
|
align="right"
|
|
|
+ label="特价项目编号"
|
|
|
+ prop="specialItemNo"
|
|
|
+ min-width="160"
|
|
|
+ show-overflow-tooltip
|
|
|
+ />
|
|
|
+ <el-table-column
|
|
|
+ v-if="!isCustomer"
|
|
|
+ align="right"
|
|
|
+ label="特价编号"
|
|
|
+ prop="specialNo"
|
|
|
+ min-width="160"
|
|
|
+ show-overflow-tooltip
|
|
|
+ />
|
|
|
+ <el-table-column
|
|
|
+ v-if="!isCustomer"
|
|
|
+ align="right"
|
|
|
+ label="交单编号"
|
|
|
+ prop="billNoNumber"
|
|
|
+ min-width="160"
|
|
|
+ show-overflow-tooltip
|
|
|
+ />
|
|
|
+ <el-table-column
|
|
|
+ v-if="!isCustomer"
|
|
|
+ align="right"
|
|
|
label="安装日期"
|
|
|
prop="installDate"
|
|
|
min-width="160"
|
|
@@ -338,6 +504,64 @@
|
|
|
<span>{{ scope.row.customerNumber }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
+
|
|
|
+ <el-table-column
|
|
|
+ v-if="!isCustomer"
|
|
|
+ align="left"
|
|
|
+ label="寄厂日期"
|
|
|
+ prop="mailFactoryDate"
|
|
|
+ min-width="160"
|
|
|
+ show-overflow-tooltip
|
|
|
+ />
|
|
|
+ <el-table-column
|
|
|
+ v-if="!isCustomer"
|
|
|
+ align="left"
|
|
|
+ label="寄厂年度"
|
|
|
+ prop="mailFactoryYear"
|
|
|
+ min-width="160"
|
|
|
+ show-overflow-tooltip
|
|
|
+ />
|
|
|
+ <el-table-column
|
|
|
+ align="left"
|
|
|
+ v-if="!isCustomer"
|
|
|
+ label="确认日期"
|
|
|
+ prop="confirmDate"
|
|
|
+ min-width="160"
|
|
|
+ show-overflow-tooltip
|
|
|
+ />
|
|
|
+ <el-table-column
|
|
|
+ align="left"
|
|
|
+ v-if="!isCustomer"
|
|
|
+ label="结算编号"
|
|
|
+ prop="settlementNo"
|
|
|
+ min-width="160"
|
|
|
+ show-overflow-tooltip
|
|
|
+ />
|
|
|
+ <el-table-column
|
|
|
+ v-if="!isCustomer"
|
|
|
+ align="left"
|
|
|
+ label="结算日期"
|
|
|
+ prop="settlementDate"
|
|
|
+ min-width="160"
|
|
|
+ show-overflow-tooltip
|
|
|
+ />
|
|
|
+ <el-table-column
|
|
|
+ align="left"
|
|
|
+ v-if="!isCustomer"
|
|
|
+ label="入厂日期"
|
|
|
+ prop="inFactoryDate"
|
|
|
+ min-width="160"
|
|
|
+ show-overflow-tooltip
|
|
|
+ />
|
|
|
+ <el-table-column
|
|
|
+ align="left"
|
|
|
+ label="入厂类型"
|
|
|
+ v-if="!isCustomer"
|
|
|
+ prop="inFactoryType"
|
|
|
+ min-width="160"
|
|
|
+ show-overflow-tooltip
|
|
|
+ />
|
|
|
+
|
|
|
<el-table-column align="left" label="经销商名称" prop="customerName" min-width="300" show-overflow-tooltip>
|
|
|
<template slot-scope="scope">
|
|
|
<CopyButton :copy-text="scope.row.customerName" />
|
|
@@ -578,7 +802,20 @@ export default {
|
|
|
endAcceptTime: '',
|
|
|
geLiInerNote: '',
|
|
|
startFactoryNo: '',
|
|
|
- endFactoryNo: ''
|
|
|
+ endFactoryNo: '',
|
|
|
+ startSpecialNo: '',
|
|
|
+ endSpecialNo: '',
|
|
|
+ startBillNo: '',
|
|
|
+ endBillNo: '',
|
|
|
+ mailFactoryYear: '',
|
|
|
+ startConfirmDate: '',
|
|
|
+ endConfirmDate: '',
|
|
|
+ settlementNo: '',
|
|
|
+ startSettlementDate: '',
|
|
|
+ endSettlementDate: '',
|
|
|
+ startInFactoryDate: '',
|
|
|
+ endInFactoryDate: '',
|
|
|
+ inFactoryType: ''
|
|
|
}, // 搜索表单
|
|
|
listLoading: false, // 列表加载loading
|
|
|
deduction: '全部',
|
|
@@ -745,4 +982,7 @@ export default {
|
|
|
.import-btn {
|
|
|
margin-left: 10px;
|
|
|
}
|
|
|
+span {
|
|
|
+ line-height: 28px;
|
|
|
+}
|
|
|
</style>
|