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

src/components/MoreSearchBar/index.vue

@@ -19,15 +19,26 @@
                         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" style="margin-top: 5px;">
-                    <el-switch v-if="delivery" v-model="listQuery.delivery" @change="searchList" active-text="已送达"
-                        inactive-text="未送达">
-                    </el-switch>
+                <el-col :xs="24" :sm="12" :lg="2" :span="6" style="margin-right: 5px;">
+                    <el-select v-if="delivery" v-model="listQuery.delivery" @change="searchList" placeholder="送达状态">
+                        <el-option label="全部">全部</el-option>
+                        <el-option :value="true" label="已送达">已送达</el-option>
+                        <el-option :value="false" label="未送达">未送达</el-option>
+                    </el-select>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="2" :span="6" style="margin-right: 5px;">
+                    <el-select v-if="hasRealAmount" v-model="listQuery.hasRealAmount" @change="searchList" placeholder="收款状态">
+                        <el-option label="全部">全部</el-option>
+                        <el-option :value="true" label="已收款">已收款</el-option>
+                        <el-option :value="false" label="未收款">未收款</el-option>
+                    </el-select>
                 </el-col>
-                <el-col :xs="24" :sm="12" :lg="3" :span="6" style="margin-top: 5px;">
-                    <el-switch v-if="hasRealAmount" v-model="listQuery.hasRealAmount" @change="searchList" active-text="已收款"
-                        inactive-text="未收款">
-                    </el-switch>
+                <el-col :xs="24" :sm="12" :lg="2" :span="6" style="margin-right: 5px;">
+                    <el-select v-if="hasShouldAmount" v-model="listQuery.hasShouldAmount" @change="searchList" placeholder="是否设置应收款">
+                        <el-option label="全部">全部</el-option>
+                        <el-option :value="true" label="已设置">已设置</el-option>
+                        <el-option :value="false" label="未设置">未设置</el-option>
+                    </el-select>
                 </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"
@@ -212,6 +223,11 @@ export default {
             require: false,
             default: false
         },
+        hasShouldAmount: {
+            type: Boolean,
+            require: false,
+            default: false
+        },
         businessObjectType: {
             type: Boolean,
             require: false,

src/views/major/myOrder.vue

@@ -6,7 +6,7 @@
     <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" :delivery="true" :hasRealAmount="true" :clientManager="false" :businessObjectType="false"
+          :listQuery="listQuery" :nodeCode="false" :financial="false" :delivery="true" :hasRealAmount="true" :hasShouldAmount="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"
@@ -583,9 +583,7 @@ export default {
         descs: 'id',
         keyword: null,
         startDate: null,
-        endDate: null,
-        delivery: false,
-        hasRealAmount: false
+        endDate: null
       },
       shouldAmountDialog: false,
       makeInvoiceListDialog: false,
@@ -1312,7 +1310,7 @@ export default {
       this.$router.push({ query: {} });
       this.listQuery = {
         current: 1,
-        size: 20,
+        size: 10,
         descs: 'created',
       }
       this.getList();