1.大中型我的订单新增查询条件

src/components/MoreSearchBar/index.vue

@@ -2,33 +2,45 @@
     <div>
         <div class="bar-container">
             <el-row>
-                <el-col :xs="24" :sm="12" :lg="4" :span="6" style="margin-right: 8px;"> 
+                <el-col :xs="24" :sm="12" :lg="4" :span="6" style="margin-right: 8px;">
                     <el-input v-if="keyword" v-model="listQuery.keyword" placeholder="关键字搜索..." clearable>
                     </el-input>
                 </el-col>
-               
+
                 <el-col :xs="24" :sm="12" :lg="3" :span="6">
-                    <el-select v-if="nodeCode" v-model="listQuery.nodeCode" placeholder="流程节点" clearable filterable class="filter-item" >
-                     <el-option v-for="(item, index) in nodes" :key="index" :label="item.name" :value="item.code" />
+                    <el-select v-if="nodeCode" v-model="listQuery.nodeCode" placeholder="流程节点" clearable filterable
+                        class="filter-item">
+                        <el-option v-for="(item, index) in nodes" :key="index" :label="item.name" :value="item.code" />
                     </el-select>
                 </el-col>
                 <el-col :xs="24" :sm="12" :lg="6" :span="6">
-                        <el-date-picker v-if="orderDateSearch"  clearable v-model="orderDate" type="daterange" align="center" unlink-panels
-                            range-separator="至" start-placeholder="下单日期（开始）" end-placeholder="下单日期（结束）" :picker-options="pickerOptions"
-                            value-format="yyyy-MM-dd">
-                        </el-date-picker>
-                    </el-col>
-                <el-col :xs="24" :sm="12" :lg="9" :span="6">
-                    <el-button class="filter-item"  type="success" @click="searchList" v-loading.fullscreen.lock="loading" round>搜索
+                    <el-date-picker class="filter-item" v-if="orderDateSearch" clearable v-model="orderDate"
+                        type="daterange" align="center" unlink-panels range-separator="至" start-placeholder="下单日期（开始）"
+                        end-placeholder="下单日期（结束）" :picker-options="pickerOptions" value-format="yyyy-MM-dd">
+                    </el-date-picker>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="3" :span="6">
+                    <el-switch v-if="delivery" v-model="listQuery.delivery" active-text="已送达"
+                        inactive-text="未送达">
+                    </el-switch>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="3" :span="6">
+                    <el-switch v-if="hasRealAmount" v-model="listQuery.hasRealAmount" active-text="已收款"
+                        inactive-text="未收款">
+                    </el-switch>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6" :span="6">
+                    <el-button class="filter-item" type="success" @click="searchList" v-loading.fullscreen.lock="loading"
+                        round>搜索
                     </el-button>
                     <el-button class="filter-item" round type="info" @click="resetSearch()">重置
                     </el-button>
-                    <el-button class="filter-item"  @click="moreSearch()" round>更多搜索<i :class="moreSearchIcon"></i>
+                    <el-button class="filter-item" @click="moreSearch()" round>更多搜索<i :class="moreSearchIcon"></i>
                     </el-button>
                     <slot name="otherButton"></slot>
                 </el-col>
             </el-row>
-            <div v-if="business==='MAJOR_BUSINESS'" v-show="moreSearchBar" class="moreSearchStyle">
+            <div v-if="business === 'MAJOR_BUSINESS'" v-show="moreSearchBar" class="moreSearchStyle">
                 <el-row class="row">
                     <el-col :xs="24" :sm="12" :lg="3" :span="6">
                         <el-select v-if="financial" clearable v-model="listQuery.financial" placeholder="金融类型">
@@ -37,88 +49,90 @@
                         </el-select>
                     </el-col>
                     <el-col :xs="24" :sm="12" :lg="3" :span="6" style="margin-right: 8px;">
-                        <el-input v-if="orderId" v-model="listQuery.orderId" placeholder="订单号" clearable >
+                        <el-input v-if="orderId" v-model="listQuery.orderId" placeholder="订单号" clearable>
                         </el-input>
                     </el-col>
                     <el-col :xs="24" :sm="12" :lg="3" :span="6" style="margin-right: 8px;">
-                        <el-input v-if="productionNo" v-model="listQuery.productionNo" placeholder="产品号" clearable >
+                        <el-input v-if="productionNo" v-model="listQuery.productionNo" placeholder="产品号" clearable>
                         </el-input>
                     </el-col>
                     <el-col :xs="24" :sm="12" :lg="3" :span="6" style="margin-right: 8px;">
-                        <el-input v-if="clientName" v-model="listQuery.clienteleName" placeholder="客户名称" clearable >
+                        <el-input v-if="clientName" v-model="listQuery.clienteleName" placeholder="客户名称" clearable>
                         </el-input>
                     </el-col>
                     <el-col :xs="24" :sm="12" :lg="3" :span="6" style="margin-right: 8px;">
-                        <el-input v-if="clientSubName" v-model="listQuery.clienteleSubName" placeholder="业务来源" clearable >
+                        <el-input v-if="clientSubName" v-model="listQuery.clienteleSubName" placeholder="业务来源" clearable>
                         </el-input>
                     </el-col>
                     <el-col :xs="24" :sm="12" :lg="3" :span="6">
-                        <el-select v-if="clientManager"  clearable filterable v-model="listQuery.clientManagerId" placeholder="客户经理">
+                        <el-select v-if="clientManager" clearable filterable v-model="listQuery.clientManagerId"
+                            placeholder="客户经理">
                             <el-option v-for="(item, id) in clientManagers" :key="id" :label="item.name" :value="item.id" />
                         </el-select>
                     </el-col>
                     <el-col :xs="24" :sm="12" :lg="3" :span="6">
-                        <el-select v-if="principal" v-model="listQuery.principalId" placeholder="负责人" clearable  filterable class="filter-item"
-                            >
+                        <el-select v-if="principal" v-model="listQuery.principalId" placeholder="负责人" clearable filterable
+                            class="filter-item">
                             <el-option v-for="(item, id) in principals" :key="id" :label="item.name" :value="item.id" />
                         </el-select>
                     </el-col>
                     <el-col :xs="24" :sm="12" :lg="3" :span="6">
-                        <el-select v-if="businessObjectType" clearable  v-model="listQuery.businessObjectType" placeholder="评估对象类型">
+                        <el-select v-if="businessObjectType" clearable v-model="listQuery.businessObjectType"
+                            placeholder="评估对象类型">
                             <el-option value="土地" label="土地">土地</el-option>
                             <el-option value="房地产" label="房地产">房地产</el-option>
                         </el-select>
                     </el-col>
                     <el-col :xs="24" :sm="12" :lg="3" :span="6">
-                        <el-select v-if="department"  clearable v-model="listQuery.departmentId" placeholder="接单部门">
-                            <el-option v-for="(d,id) in trunDep" :key="id" :label="d.name" :value="d.id"></el-option> 
+                        <el-select v-if="department" clearable v-model="listQuery.departmentId" placeholder="接单部门">
+                            <el-option v-for="(d, id) in trunDep" :key="id" :label="d.name" :value="d.id"></el-option>
                         </el-select>
                     </el-col>
                     <el-col :xs="24" :sm="12" :lg="3" :span="6">
-                        <el-select v-if="productionType"  clearable v-model="listQuery.production" placeholder="产品类型">
+                        <el-select v-if="productionType" clearable v-model="listQuery.production" placeholder="产品类型">
                             <el-option value="STATEMENT" label="意见书">意见书</el-option>
                             <el-option value="REPORT" label="报告">报告</el-option>
                             <el-option value="LETTER" label="复评函">复评函</el-option>
                             <el-option value="ORDER" label="订单">订单</el-option>
                         </el-select>
                     </el-col>
-                 
+
                 </el-row>
             </div>
-            <div v-if="business==='PERSONAL_BUSINESS'" v-show="moreSearchBar" class="moreSearchStyle">
+            <div v-if="business === 'PERSONAL_BUSINESS'" v-show="moreSearchBar" class="moreSearchStyle">
                 <el-row class="row">
                     <el-col :xs="24" :sm="12" :lg="3" :span="6" style="margin-right: 8px;">
-                        <el-input v-if="clientName" v-model="listQuery.clientName" placeholder="客户名称" clearable >
+                        <el-input v-if="clientName" v-model="listQuery.clientName" placeholder="客户名称" clearable>
                         </el-input>
                     </el-col>
                     <el-col :xs="24" :sm="12" :lg="3" :span="6" style="margin-right: 8px;">
-                        <el-input v-if="clientSubName" v-model="listQuery.clientSubName" placeholder="业务来源" clearable >
+                        <el-input v-if="clientSubName" v-model="listQuery.clientSubName" placeholder="业务来源" clearable>
                         </el-input>
                     </el-col>
                     <el-col :xs="24" :sm="12" :lg="3" :span="6" style="margin-right: 8px;">
-                        <el-input v-if="clientManager" v-model="listQuery.clientManager" placeholder="客户经理" clearable >
+                        <el-input v-if="clientManager" v-model="listQuery.clientManager" placeholder="客户经理" clearable>
                         </el-input>
                     </el-col>
                     <el-col :xs="24" :sm="12" :lg="3" :span="6" style="margin-right: 8px;">
-                        <el-input v-if="outwardStaffName" v-model="listQuery.outwardStaffName" placeholder="外业人员" clearable >
+                        <el-input v-if="outwardStaffName" v-model="listQuery.outwardStaffName" placeholder="外业人员" clearable>
                         </el-input>
                     </el-col>
                     <el-col :xs="24" :sm="12" :lg="3" :span="6" style="margin-right: 8px;">
-                        <el-input v-if="inwardStaffName" v-model="listQuery.inwardStaffName" placeholder="内业人员" clearable >
+                        <el-input v-if="inwardStaffName" v-model="listQuery.inwardStaffName" placeholder="内业人员" clearable>
                         </el-input>
                     </el-col>
                     <el-col :xs="24" :sm="12" :lg="3" :span="6" style="margin-right: 8px;">
-                        <el-input v-if="pricingStaffName" v-model="listQuery.pricingStaffName" placeholder="定价内业" clearable >
+                        <el-input v-if="pricingStaffName" v-model="listQuery.pricingStaffName" placeholder="定价内业" clearable>
                         </el-input>
                     </el-col>
                     <el-col :xs="24" :sm="12" :lg="3" :span="6" style="margin-right: 8px;">
-                        <el-input v-if="handlerName" v-model="listQuery.handlerName" placeholder="处理人" clearable >
+                        <el-input v-if="handlerName" v-model="listQuery.handlerName" placeholder="处理人" clearable>
                         </el-input>
                     </el-col>
                 </el-row>
             </div>
         </div>
-       
+
     </div>
 </template>
 
@@ -130,115 +144,125 @@ export default {
 
     },
     props: {
-        listQuery:{
+        listQuery: {
             type: Object,
-            require:true
+            require: true
         },
-        keyword:{
+        keyword: {
             type: Boolean,
-            require:false,
-            default:true
+            require: false,
+            default: true
         },
-        business:{
+        business: {
             type: String,
-            require:true,
+            require: true,
+        },
+        financial: {
+            type: Boolean,
+            require: false,
+            default: true
+        },
+        nodeCode: {
+            type: Boolean,
+            require: false,
+            default: true
         },
-        financial:{
+        clientName: {
             type: Boolean,
-            require:false,
-            default:true
+            require: false,
+            default: true
         },
-        nodeCode:{
+        orderId: {
             type: Boolean,
-            require:false,
-            default:true
+            require: false,
+            default: false
         },
-        clientName:{
+        productionNo: {
             type: Boolean,
-            require:false,
-            default:true
+            require: false,
+            default: false
         },
-        orderId:{
+        clientManager: {
             type: Boolean,
-            require:false,
-            default:false
+            require: false,
+            default: true
         },
-        productionNo:{
+        principal: {
             type: Boolean,
-            require:false,
-            default:false
+            require: false,
+            default: true
         },
-        clientManager:{
+        department: {
             type: Boolean,
-            require:false,
-            default:true
+            require: false,
+            default: true
         },
-        principal:{
+        orderDateSearch: {
             type: Boolean,
-            require:false,
-            default:true
+            require: false,
+            default: true
         },
-        department:{
+        delivery: {
             type: Boolean,
-            require:false,
-            default:true
+            require: false,
+            default: false
         },
-        orderDateSearch:{
+        hasRealAmount: {
             type: Boolean,
-            require:false,
-            default:true
+            require: false,
+            default: false
         },
-        businessObjectType:{
+        businessObjectType: {
             type: Boolean,
-            require:false,
-            default:true
+            require: false,
+            default: true
         },
-        nodes:{
+        nodes: {
             type: Array,
-            require:false,
-            default:function(){
+            require: false,
+            default: function () {
                 return [];
             }
         },
-        clientName:{
+        clientName: {
             type: Boolean,
-            require:false,
-            default:true
+            require: false,
+            default: true
         },
-        clientSubName:{
+        clientSubName: {
             type: Boolean,
-            require:false,
-            default:true
+            require: false,
+            default: true
         },
-        clientManager:{
+        clientManager: {
             type: Boolean,
-            require:false,
-            default:true
+            require: false,
+            default: true
         },
-        outwardStaffName:{
+        outwardStaffName: {
             type: Boolean,
-            require:false,
-            default:true
+            require: false,
+            default: true
         },
-        inwardStaffName:{
+        inwardStaffName: {
             type: Boolean,
-            require:false,
-            default:true
+            require: false,
+            default: true
         },
-        pricingStaffName:{
+        pricingStaffName: {
             type: Boolean,
-            require:false,
-            default:true
+            require: false,
+            default: true
         },
-        handlerName:{
+        handlerName: {
             type: Boolean,
-            require:false,
-            default:true
+            require: false,
+            default: true
         },
-        productionType:{
+        productionType: {
             type: Boolean,
-            require:false,
-            default:false
+            require: false,
+            default: false
         },
     },
 
@@ -247,12 +271,12 @@ export default {
 
     },
     created() {
-        if (this.business==='MAJOR_BUSINESS'){
+        if (this.business === 'MAJOR_BUSINESS') {
             this.getMajorTurnDepartment();
             this.getAllotDepartmentUser();
             this.getClientManager();
         }
-     
+
     },
     data() {
         return {
@@ -287,10 +311,10 @@ export default {
             moreSearchIcon: "el-icon-arrow-right",
             orderDate: '',
             trunDep: [],
-            allotDepartment:[],
-            clientManagers:[],
-            principals:[],
-            loading:false
+            allotDepartment: [],
+            clientManagers: [],
+            principals: [],
+            loading: false
         }
 
     },
@@ -314,7 +338,7 @@ export default {
                 this.listQuery.startDate = this.orderDate[0] + ' 00:00:00';
                 this.listQuery.endDate = this.orderDate[1] + ' 23:59:59';
             }
-            this.$emit('fliterSearch',this.listQuery);
+            this.$emit('fliterSearch', this.listQuery);
             setTimeout(() => {
                 this.loading = false;
             }, 500);
@@ -336,25 +360,25 @@ export default {
                 }
             })
         },
-        getAllotDepartment(){
-            this.$api.department.allot(this.business).then(res=>{
-            if (res.code === 200){
-                this.allotDepartment = res.data;
-            }
+        getAllotDepartment() {
+            this.$api.department.allot(this.business).then(res => {
+                if (res.code === 200) {
+                    this.allotDepartment = res.data;
+                }
             })
         },
-        getClientManager(){
+        getClientManager() {
             const post = "客户经理"
-            this.$api.user.postUser(post).then(res=>{
-                if (res.code === 200){
+            this.$api.user.postUser(post).then(res => {
+                if (res.code === 200) {
                     this.clientManagers = res.data;
                 }
             })
         },
-        getAllotDepartmentUser(){
+        getAllotDepartmentUser() {
             const businessType = "MAJOR_BUSINESS"
-            this.$api.user.allotDepartmentUser(businessType).then(res=>{
-                if (res.code === 200 && res.data!=null){
+            this.$api.user.allotDepartmentUser(businessType).then(res => {
+                if (res.code === 200 && res.data != null) {
                     this.principals = res.data;
                 }
             })
@@ -363,13 +387,14 @@ export default {
 }
 </script>
 <style scoped lang="css">
-
-.row{
+.row {
     margin-top: 10px;
 }
-.bar-container{
+
+.bar-container {
     width: 1650px;
 }
+
 .moreSearchStyle {
     animation: scale-in-ver-top .2s cubic-bezier(.25, .46, .45, .94) both
 }

src/views/major/myOrder.vue

@@ -6,18 +6,19 @@
     <y-page-list-layout :page-list="pageData" :page-para="listQuery" :get-page-list="getList">
       <template slot="left">
         <MoreSearchBar business="MAJOR_BUSINESS" @fliterSearch="fliterSearch" @resetParams="resetParams"
-          :listQuery="listQuery" :nodeCode="false" :financial="false" :clientManager="false" :businessObjectType="false"
+          :listQuery="listQuery" :nodeCode="false" :financial="false" :delivery="true" :hasRealAmount="true" :clientManager="false" :businessObjectType="false"
           :department="false" :orderId="true" :productionNo="true" :productionType="true">
           <template v-slot:otherButton>
             <PermissionButton menu-code="_views_major_order" class-name="filter-item" type="danger"
-              icon="el-icon-circle-plus-outline" :page-jump="true" round 
+              icon="el-icon-circle-plus-outline" :page-jump="true" round
               :page-query="{ 'couldEdit': true, 'couldBack': true }" />
-              <el-button class="filter-item" round type="success" @click="exportMyOrder()" :disabled="!listQuery.startDate && !listQuery.endDate">导出
-              </el-button>
+            <el-button class="filter-item" round type="success" @click="exportMyOrder()"
+              :disabled="!listQuery.startDate && !listQuery.endDate">导出
+            </el-button>
           </template>
         </MoreSearchBar>
       </template>
-      <parentTable :data="pageData.records" slot="table" style="width: 100%;" >
+      <parentTable :data="pageData.records" slot="table" style="width: 100%;">
         <el-table-column label="订单名称" align="center" show-overflow-tooltip width='300'>
           <template slot-scope="{row}">
             <span>{{ row.orderName }}</span>
@@ -30,17 +31,20 @@
         </el-table-column>
         <el-table-column label="产品号" align="center" width='200'>
           <template slot-scope="{row}">
-            <span>{{ row.productionNo?row.productionNo:'--' }}</span>
+            <span>{{ row.productionNo ? row.productionNo : '--' }}</span>
           </template>
         </el-table-column>
         <el-table-column label="产品类型" align="center" width='120'>
           <template slot-scope="{row}">
-            <span>{{ row.production?(row.production==='REPORT'?'报告':(row.production==='STATEMENT'?'意见书':'复评函' )):'订单'}}</span>
+            <span>{{ row.production ? (row.production === 'REPORT' ? '报告' : (row.production === 'STATEMENT' ? '意见书' :
+              '复评函'
+            )) : '订单' }}</span>
           </template>
         </el-table-column>
         <el-table-column label="当前节点" align="center" width='200'>
           <template slot-scope="{row}">
-            <span>{{ row.currentNodeName==null?(row.ifSaveFile===true?'已归档':'撰写节点'):row.currentNodeName}}</span>
+            <span>{{ row.currentNodeName == null ? (row.ifSaveFile === true ? '已归档' : '撰写节点') : row.currentNodeName
+            }}</span>
           </template>
         </el-table-column>
         <el-table-column label="负责人" align="center" width='120'>
@@ -55,17 +59,18 @@
         </el-table-column>
         <el-table-column label="实收款(元)" align="center" width='120'>
           <template slot-scope="{row}">
-            <span style="color:red;font-weight:bold">{{ row.realAmount?row.realAmount:'--' }}</span>
+            <span style="color:red;font-weight:bold">{{ row.realAmount ? row.realAmount : '--' }}</span>
           </template>
         </el-table-column>
         <el-table-column label="应收款(元)" align="center" width='120'>
           <template slot-scope="{row}">
-            <span>{{ row.shouldAmount?row.shouldAmount:(row.orderShouldAmount?row.orderShouldAmount:'--') }}</span>
+            <span>{{ row.shouldAmount ? row.shouldAmount : (row.orderShouldAmount ? row.orderShouldAmount : '--')
+            }}</span>
           </template>
         </el-table-column>
         <el-table-column label="开票金额(元)" align="center" width='120'>
           <template slot-scope="{row}">
-            <span style="color:red;font-weight:bold">{{ row.invoiceAmount?row.invoiceAmount:'--' }}</span>
+            <span style="color:red;font-weight:bold">{{ row.invoiceAmount ? row.invoiceAmount : '--' }}</span>
           </template>
         </el-table-column>
         <el-table-column label="客户名称" align="center" width='120' show-overflow-tooltip>
@@ -95,7 +100,7 @@
         </el-table-column>
         <el-table-column label="送达状态" align="center" width='120'>
           <template slot-scope="{row}">
-            <span>{{ row.delivery?'已送达':'--' }}</span>
+            <span>{{ row.delivery ? '已送达' : '--' }}</span>
           </template>
         </el-table-column>
         <el-table-column label="下单时间" align="center" width='200'>
@@ -105,13 +110,14 @@
         </el-table-column>
         <el-table-column fixed="right" label="操作" width="250" align="center">
           <template slot-scope="{row}">
-              <PermissionButton menu-code="_views_myOrder_detail" class-name="filter-item" type="text" :page-jump="true"
-                size="mini"
-                :page-query="{ 'couldEdit': true, 'id': row.businessId, 'back': '/major/my/order', 'recall': true, 'couldBack': true ,'orderId':row.orderId}" />
-              <el-button :disabled="!row.id" type="text" size="small" @click="openShouldAmountDialog(row)">应收款</el-button>
-              <!-- <el-button type="text" size="small" @click="openAllotProductionDialog(row)">实收款分配</el-button> -->
-              <el-button :disabled="!row.id" type="text" size="small" @click="openFinanceInvoiceDialog(row.orderFundId,row.realAmount,row.clienteleName,row.clienteleSubName,row.productionFundId)">申请开票</el-button>
-              <el-button type="text" size="small" @click="productionList(row.businessId)">产品包</el-button>
+            <PermissionButton menu-code="_views_myOrder_detail" class-name="filter-item" type="text" :page-jump="true"
+              size="mini"
+              :page-query="{ 'couldEdit': true, 'id': row.businessId, 'back': '/major/my/order', 'recall': true, 'couldBack': true, 'orderId': row.orderId }" />
+            <el-button :disabled="!row.id" type="text" size="small" @click="openShouldAmountDialog(row)">应收款</el-button>
+            <!-- <el-button type="text" size="small" @click="openAllotProductionDialog(row)">实收款分配</el-button> -->
+            <el-button :disabled="!row.id" type="text" size="small"
+              @click="openFinanceInvoiceDialog(row.orderFundId, row.realAmount, row.clienteleName, row.clienteleSubName, row.productionFundId)">申请开票</el-button>
+            <el-button type="text" size="small" @click="productionList(row.businessId)">产品包</el-button>
           </template>
         </el-table-column>
       </parentTable>
@@ -145,7 +151,7 @@
       <el-button type="danger" round @click="openNewInvoiceDialog">新增开票</el-button>
       <div style="margin-top:30px;">
         <el-table :data="invoiceData" stripe :header-row-style="{ color: '#333333', 'font-size': '14px' }" border
-        style="width: 100%; margin-top:20px;font-size: 14px;">
+          style="width: 100%; margin-top:20px;font-size: 14px;">
           <el-table-column align="center" prop="title" label="发票抬头" width="180">
           </el-table-column>
           <el-table-column align="center" prop="taxNo" label="税号" width="180">
@@ -171,8 +177,10 @@
           </el-table-column>
           <el-table-column fixed="right" label="操作" width="200" align="center">
             <template slot-scope="{row}">
-              <el-button :disabled="row.state != '审核中'" @click="invoiceDetail(row.id)" type="text" size="small">修改</el-button>
-              <el-button :disabled="row.state != '已开票'" @click="cancellation(row.id)" type="text" size="small">申请作废</el-button>
+              <el-button :disabled="row.state != '审核中'" @click="invoiceDetail(row.id)" type="text"
+                size="small">修改</el-button>
+              <el-button :disabled="row.state != '已开票'" @click="cancellation(row.id)" type="text"
+                size="small">申请作废</el-button>
               <el-button @click="copyInvoice(row)" type="text" size="small">复制</el-button>
             </template>
           </el-table-column>
@@ -199,7 +207,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-        
+
         </el-row>
         <el-row>
           <el-col :xs="24" :sm="12" :lg="12" :span="6">
@@ -212,7 +220,8 @@
             <el-form-item label="计划开票日期：" prop="planMakeDate"
               :rules="{ required: true, message: '计划开票日期不能为空', trigger: 'blur' }" label-width="140px"
               class="postInfo-container-item">
-              <el-date-picker v-model="invoice.planMakeDate" type="date" placeholder="选择日期" value-format="yyyy-MM-dd" style="width:100%">
+              <el-date-picker v-model="invoice.planMakeDate" type="date" placeholder="选择日期" value-format="yyyy-MM-dd"
+                style="width:100%">
               </el-date-picker>
             </el-form-item>
           </el-col>
@@ -227,9 +236,8 @@
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="12" :span="6">
-            <el-form-item label="是否收款:" label-width="140px"
-              class="postInfo-container-item">
-              <el-radio-group :value="invoice.realPayAmount?'已收款':'未收款'">
+            <el-form-item label="是否收款:" label-width="140px" class="postInfo-container-item">
+              <el-radio-group :value="invoice.realPayAmount ? '已收款' : '未收款'">
                 <el-radio label="已收款"></el-radio>
                 <el-radio label="未收款"></el-radio>
               </el-radio-group>
@@ -247,7 +255,7 @@
               <el-input v-model.trim="invoice.itemQuantity" class="filter-item" />
             </el-form-item>
           </el-col>
-         
+
         </el-row>
         <el-row>
           <el-col :xs="24" :sm="12" :lg="12" :span="6">
@@ -259,7 +267,8 @@
         <el-row>
           <el-col :xs="24" :sm="12" :lg="24" :span="6">
             <el-form-item label="备注：" prop="remark" label-width="140px" class="postInfo-container-item">
-              <el-input v-model.trim="invoice.remark" type="textarea" :autosize="{ minRows: 5, maxRows: 8}"  class="filter-item" />
+              <el-input v-model.trim="invoice.remark" type="textarea" :autosize="{ minRows: 5, maxRows: 8 }"
+                class="filter-item" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -372,8 +381,9 @@
               <span style="margin-left:30px;font-size:16px;font-weight:bold; color:red">实收款金额：{{ r.realAmount != null ?
                 r.realAmount : 0 }}￥</span>
               <span style="margin-left:30px;font-size:16px;">应收款金额：{{ r.shouldAmount != null ?
-                r.shouldAmount : 0   }}￥</span>
-              <el-button style="margin-left:30px;" type="text" size="small" @click="openShouldAmountDialog(r)">填写应收款</el-button>
+                r.shouldAmount : 0 }}￥</span>
+              <el-button style="margin-left:30px;" type="text" size="small"
+                @click="openShouldAmountDialog(r)">填写应收款</el-button>
               <el-button
                 v-if="(r.productionNo === reportNo && r.production != 'STATEMENT' && r.repertoryState != null && !r.repertoryState)"
                 style="float: right; padding: 3px 0;margin-left:10px" type="text"
@@ -574,6 +584,8 @@ export default {
         keyword: null,
         startDate: null,
         endDate: null,
+        delivery: false,
+        hasRealAmount: false
       },
       shouldAmountDialog: false,
       makeInvoiceListDialog: false,
@@ -592,10 +604,10 @@ export default {
         businessType: null,
         businessId: null,
         businessSubId: null,
-        orderFundId:null,
+        orderFundId: null,
         productionFundId: null,
         evaluateAmount: null,
-        orderShouldAmount:null,
+        orderShouldAmount: null,
       },
       invoiceData: [],
       invoice: {
@@ -617,9 +629,9 @@ export default {
         taxRate: null,
         taxAmount: null,
         remark: null,
-        realPayAmount:null,
-        realAmount:null,
-        realMakeDate:null
+        realPayAmount: null,
+        realAmount: null,
+        realMakeDate: null
       },
       outWarehouse: {
         id: null,
@@ -749,7 +761,7 @@ export default {
       this.$refs.fund.validate(valid => {
         if (valid) {
           //设置订单应收款
-          if (!this.fund.id){
+          if (!this.fund.id) {
             this.fund.id = this.fund.orderFundId;
             if (this.fund.id) {
               this.$api.orderFund.edit(this.fund).then(res => {
@@ -791,34 +803,34 @@ export default {
                   });
                 }
               })
-              }
-          }else{
+            }
+          } else {
             //设置产品应收款
             this.fund.productionShouldAmount = this.fund.shouldAmount;
             this.fund.id = this.fund.productionFundId;
-            if (this.fund.id){
+            if (this.fund.id) {
               this.$api.productionFund.edit(this.fund).then(res => {
-              if (res.code === 200 && res.data) {
-                this.$notify({
-                  title: '成功',
-                  message: '订单应收款已完善',
-                  type: 'success',
-                  duration: 1000
-                });
-                this.getList();
-                this.shouldAmountDialog = false;
-                this.shouldAmountDialog = false;
-                this.productionList(this.todoBusinessId, this.reportNo == null ? this.statementNo : this.reportNo)
-              } else {
-                this.$notify({
-                  title: '失败',
-                  message: '订单应收款保存错误',
-                  type: 'error',
-                  duration: 1000
-                });
-              }
-            })
-            }else{
+                if (res.code === 200 && res.data) {
+                  this.$notify({
+                    title: '成功',
+                    message: '订单应收款已完善',
+                    type: 'success',
+                    duration: 1000
+                  });
+                  this.getList();
+                  this.shouldAmountDialog = false;
+                  this.shouldAmountDialog = false;
+                  this.productionList(this.todoBusinessId, this.reportNo == null ? this.statementNo : this.reportNo)
+                } else {
+                  this.$notify({
+                    title: '失败',
+                    message: '订单应收款保存错误',
+                    type: 'error',
+                    duration: 1000
+                  });
+                }
+              })
+            } else {
               this.$api.productionFund.add(this.fund).then(res => {
                 if (res.code === 200 && res.data) {
                   this.$notify({
@@ -858,13 +870,13 @@ export default {
       this.fund.evaluateAmount = null
     },
     getFinanceInvoiceList() {
-      this.$api.financeInvoice.getList(this.invoice.orderFundId,this.invoice.productionFundId).then(res => {
+      this.$api.financeInvoice.getList(this.invoice.orderFundId, this.invoice.productionFundId).then(res => {
         if (res.code === 200) {
           this.invoiceData = res.data
         }
       })
     },
-    openFinanceInvoiceDialog(orderFundId,realAmount,clientName,clientSubName,productionFundId) {
+    openFinanceInvoiceDialog(orderFundId, realAmount, clientName, clientSubName, productionFundId) {
       if (!orderFundId) {
         this.$notify({
           title: '提示',
@@ -879,7 +891,7 @@ export default {
         this.invoice.orderFundId = orderFundId;
         this.invoice.realPayAmount = realAmount;
         this.invoice.productionFundId = productionFundId;
-        this.invoice.title = clientName+clientSubName;
+        this.invoice.title = clientName + clientSubName;
         this.getFinanceInvoiceList();
       }
     },
@@ -976,41 +988,41 @@ export default {
       this.newInvoiceDialog = true;
     },
     cancellation(id) {
-         const h = this.$createElement
-            this.$prompt(
-              h('p', null, [h('span', { style: 'color: red' }, '请输入作废原因：')]),'开票作废',{
-              confirmButtonText: '确认',
-              cancelButtonText: '取消',
-              type: 'error',
-              inputValidator: (value) => { 
-                if (!value) {
-                  return '作废原因不能为空'
-                }
-              },
-          }).then(({value}) => {
-            this.invoice.reason = value;
-            this.invoice.id = id;
-            this.$api.financeInvoice.cancellation(this.invoice).then(res => {
-              if (res.code === 200 && res.data) {
-                  this.$notify({
-                      title: '成功',
-                      message: '作废申请已提交',
-                      type: 'success',
-                      duration: 2000
-                  });
-                  this.getFinanceInvoiceList();
-              } else {
-                  this.$notify({
-                      title: '失败',
-                      message: '作废提交失败',
-                      type: 'error',
-                      duration: 2000
-              });
-            }
-          })
-            
-          })
+      const h = this.$createElement
+      this.$prompt(
+        h('p', null, [h('span', { style: 'color: red' }, '请输入作废原因：')]), '开票作废', {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'error',
+        inputValidator: (value) => {
+          if (!value) {
+            return '作废原因不能为空'
+          }
         },
+      }).then(({ value }) => {
+        this.invoice.reason = value;
+        this.invoice.id = id;
+        this.$api.financeInvoice.cancellation(this.invoice).then(res => {
+          if (res.code === 200 && res.data) {
+            this.$notify({
+              title: '成功',
+              message: '作废申请已提交',
+              type: 'success',
+              duration: 2000
+            });
+            this.getFinanceInvoiceList();
+          } else {
+            this.$notify({
+              title: '失败',
+              message: '作废提交失败',
+              type: 'error',
+              duration: 2000
+            });
+          }
+        })
+
+      })
+    },
     openApplyOutWarehouseList(row) {
       console.log(row)
       if (row.shouldAmount) {
@@ -1245,7 +1257,7 @@ export default {
       this.orderProduction.orderName = row.orderName;
       this.orderProduction.realAmount = row.realAmount;
       this.orderProduction.orderFundId = row.orderFundId;
-      
+
     },
     getProductionList(orderFundId) {
       if (orderFundId) {
@@ -1305,28 +1317,28 @@ export default {
       }
       this.getList();
     },
-    stateStyle(state){
-        if (state==='已开票'){
-          return 'color:green'
-        }else{
-          return 'color:red'
-        }
+    stateStyle(state) {
+      if (state === '已开票') {
+        return 'color:green'
+      } else {
+        return 'color:red'
+      }
     },
-    copyInvoice(row){
-        this.invoice = row;
-        this.invoice.id = null;
-        this.invoice.state = null;
-        this.invoice.reason = null;
-        this.invoice.created = null;
-        this.invoice.modified = null;
-        this.newInvoiceDialog = true;
+    copyInvoice(row) {
+      this.invoice = row;
+      this.invoice.id = null;
+      this.invoice.state = null;
+      this.invoice.reason = null;
+      this.invoice.created = null;
+      this.invoice.modified = null;
+      this.newInvoiceDialog = true;
     },
     // 大中型我的订单导出
     exportMyOrder() {
-        this.$utils.exportUtil(
-            "/majorProduction/exportMyOrder", this.listQuery,
-            "导出"
-        );
+      this.$utils.exportUtil(
+        "/majorProduction/exportMyOrder", this.listQuery,
+        "导出"
+      );
     }
   }