Ver código fonte

样式修改

chenrui 2 anos atrás
pai
commit
24b6d16059

+ 41 - 47
src/views/reportData/actualSalesReport/list.vue

@@ -2,7 +2,7 @@
   <a-card size="small" :bordered="false" class="actualSalesReportList-wrap">
     <a-spin :spinning="spinning" tip="Loading...">
       <!-- 搜索条件 -->
-      <div class="table-page-search-wrapper">
+      <div class="table-page-search-wrapper newTableSearchName">
         <a-form-model
           id="actualSalesReportList-form"
           ref="ruleForm"
@@ -33,41 +33,35 @@
                   allowClear></v-select>
               </a-form-model-item>
             </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-model-item label="所在区域">
+                <subarea id="actualSalesReportList-allocateTypeSn" v-model="queryParam.dealer.subareaSn"></subarea>
+              </a-form-model-item>
+            </a-col>
             <template v-if="advanced">
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="所在区域">
-                  <subarea id="actualSalesReportList-allocateTypeSn" v-model="queryParam.dealer.subareaSn"></subarea>
-                </a-form-model-item>
-              </a-col>
               <a-col :md="12" :sm="24">
                 <a-row>
-                  <a-form-model-item label="地区" style="margin-bottom: 0!important;">
+                  <a-form-model-item label="地区" >
                     <a-col span="7">
-                      <a-form-model-item prop="dealerProvinceSn" style="margin: 0;">
-                        <a-select v-model="queryParam.dealer.provinceSn" allowClear @change="getCityList" placeholder="请选择省">
-                          <a-select-option v-for="item in addrProvinceList" :value="item.id" :key="item.id + 'a'">{{ item.name }}</a-select-option>
-                        </a-select>
-                      </a-form-model-item>
+                      <a-select v-model="queryParam.dealer.provinceSn" allowClear @change="getCityList" placeholder="请选择省">
+                        <a-select-option v-for="item in addrProvinceList" :value="item.id" :key="item.id + 'a'">{{ item.name }}</a-select-option>
+                      </a-select>
                     </a-col>
                     <a-col span="7" offset="1">
-                      <a-form-model-item prop="dealerCitySn" style="margin: 0;">
-                        <a-select v-model="queryParam.dealer.citySn" allowClear @change="getAreaList" placeholder="请选择市">
-                          <a-select-option v-for="item in addrCityList" :value="item.id" :key="item.id + 'b'">{{ item.name }}</a-select-option>
-                        </a-select>
-                      </a-form-model-item>
+                      <a-select v-model="queryParam.dealer.citySn" allowClear @change="getAreaList" placeholder="请选择市">
+                        <a-select-option v-for="item in addrCityList" :value="item.id" :key="item.id + 'b'">{{ item.name }}</a-select-option>
+                      </a-select>
                     </a-col>
                     <a-col span="7" offset="1">
-                      <a-form-model-item prop="dealerCountySn" style="margin: 0;">
-                        <a-select v-model="queryParam.dealer.districtSn" allowClear placeholder="请选择区/县">
-                          <a-select-option v-for="item in addrDistrictList" :value="item.id" :key="item.id + 'c'">{{ item.name }}</a-select-option>
-                        </a-select>
-                      </a-form-model-item>
+                      <a-select v-model="queryParam.dealer.districtSn" allowClear placeholder="请选择区/县">
+                        <a-select-option v-for="item in addrDistrictList" :value="item.id" :key="item.id + 'c'">{{ item.name }}</a-select-option>
+                      </a-select>
                     </a-col>
                   </a-form-model-item>
                 </a-row>
               </a-col>
             </template>
-            <a-col :md="6" :sm="24">
+            <a-col :md="24" :sm="24" style="text-align:center;">
               <a-button type="primary" @click="handleSearch" :disabled="disabled" id="actualSalesReportList-refresh">查询</a-button>
               <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="actualSalesReportList-reset">重置</a-button>
               <a-button
@@ -212,7 +206,7 @@ export default {
   },
   computed: {
     columns () {
-      let _this=this
+      const _this = this
       const arr = [
         { title: '区域', dataIndex: 'dealer.subareaNameSet', width: 90, align: 'center', customRender: function (text) { return (text && text.length > 0) ? text.join('/') : '--' } },
         { title: '省份', dataIndex: 'dealer.provinceName', width: 90, align: 'center', customRender: function (text) { return text || '--' } },
@@ -230,42 +224,42 @@ export default {
                   dataIndex: 'jpLqqAmount',
                   align: 'right',
                   width: 80,
-                  customRender: function (text) { return (text || text == 0) ?  _this.toThousands(text) : '--' }
+                  customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
                 },
                 {
                   title: '变速箱滤清器',
                   dataIndex: 'jpBsxLqqAmount',
                   align: 'right',
                   width: 80,
-                  customRender: function (text) { return (text || text == 0) ?  _this.toThousands(text) : '--' }
+                  customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
                 },
                 {
                   title: '雨刮片',
                   dataIndex: 'jpYgpAmount',
                   align: 'right',
                   width: 80,
-                  customRender: function (text) { return (text || text == 0) ?  _this.toThousands(text) : '--' }
+                  customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
                 },
                 {
                   title: '喇叭',
                   dataIndex: 'jpLbAmount',
                   align: 'right',
                   width: 80,
-                  customRender: function (text) { return (text || text == 0) ?  _this.toThousands(text) : '--' }
+                  customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
                 },
                 {
                   title: '刹车片',
                   dataIndex: 'jpScpAmount',
                   align: 'right',
                   width: 80,
-                  customRender: function (text) { return (text || text == 0) ?  _this.toThousands(text) : '--' }
+                  customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
                 },
                 {
                   title: '感应线',
                   dataIndex: 'jpGyxAmount',
                   align: 'right',
                   width: 80,
-                  customRender: function (text) { return (text || text == 0) ?  _this.toThousands(text) : '--' }
+                  customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
                 }
               ]
             },
@@ -278,21 +272,21 @@ export default {
                   dataIndex: 'gpLqqAmount',
                   align: 'right',
                   width: 80,
-                  customRender: function (text) { return (text || text == 0) ?  _this.toThousands(text) : '--' }
+                  customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
                 },
                 {
                   title: '雨刮片',
                   dataIndex: 'gpYgpAmount',
                   align: 'right',
                   width: 80,
-                  customRender: function (text) { return (text || text == 0) ?  _this.toThousands(text) : '--' }
+                  customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
                 },
                 {
                   title: '刹车片',
                   dataIndex: 'gpScpAmount',
                   align: 'right',
                   width: 80,
-                  customRender: function (text) { return (text || text == 0) ?  _this.toThousands(text) : '--' }
+                  customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
                 }
               ]
             },
@@ -305,14 +299,14 @@ export default {
                   dataIndex: 'wsDhxqAmount',
                   align: 'right',
                   width: 80,
-                  customRender: function (text) { return (text || text == 0) ?  _this.toThousands(text) : '--' }
+                  customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
                 },
                 {
                   title: '灯泡',
                   dataIndex: 'wsDpAmount',
                   align: 'right',
                   width: 80,
-                  customRender: function (text) { return (text || text == 0) ?  _this.toThousands(text) : '--' }
+                  customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
                 }
               ]
             },
@@ -321,35 +315,35 @@ export default {
               dataIndex: 'hjAmount',
               align: 'right',
               width: 80,
-              customRender: function (text) { return (text || text == 0) ?  _this.toThousands(text) : '--' }
+              customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
             },
             {
               title: '德路斯',
               dataIndex: 'dlsAmount',
               align: 'right',
               width: 80,
-              customRender: function (text) { return (text || text == 0) ?  _this.toThousands(text) : '--' }
+              customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
             },
             {
               title: 'TBU',
               dataIndex: 'tbuAmount',
               align: 'right',
               width: 80,
-              customRender: function (text) { return (text || text == 0) ?  _this.toThousands(text) : '--' }
+              customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
             },
             {
               title: 'TBU-P',
               dataIndex: 'tbupAmount',
               align: 'right',
               width: 80,
-              customRender: function (text) { return (text || text == 0) ?  _this.toThousands(text) : '--' }
+              customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
             },
             {
               title: '布瑞斯',
               dataIndex: 'brsAmount',
               align: 'right',
               width: 80,
-              customRender: function (text) { return (text || text == 0) ?  _this.toThousands(text) : '--' }
+              customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
             }
           ]
         },
@@ -361,49 +355,49 @@ export default {
               dataIndex: 'ngkAmount',
               align: 'right',
               width: 80,
-              customRender: function (text) { return (text || text == 0) ?  _this.toThousands(text) : '--' }
+              customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
             },
             {
               title: '飞利浦',
               dataIndex: 'flpAmount',
               align: 'right',
               width: 80,
-              customRender: function (text) { return (text || text == 0) ?  _this.toThousands(text) : '--' }
+              customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
             },
             {
               title: '车仆',
               dataIndex: 'cpAmount',
               align: 'right',
               width: 80,
-              customRender: function (text) { return (text || text == 0) ?  _this.toThousands(text) : '--' }
+              customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
             },
             {
               title: '瓦尔塔',
               dataIndex: 'wetAmount',
               align: 'right',
               width: 80,
-              customRender: function (text) { return (text || text == 0) ?  _this.toThousands(text) : '--' }
+              customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
             },
             {
               title: '雷贝斯托',
               dataIndex: 'lbstAmount',
               align: 'right',
               width: 80,
-              customRender: function (text) { return (text || text == 0) ?  _this.toThousands(text) : '--' }
+              customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
             },
             {
               title: '德尔福',
               dataIndex: 'defAmount',
               align: 'right',
               width: 80,
-              customRender: function (text) { return (text || text == 0) ?  _this.toThousands(text) : '--' }
+              customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
             },
             {
               title: '巴诺德',
               dataIndex: 'bndAmount',
               align: 'right',
               width: 80,
-              customRender: function (text) { return (text || text == 0) ?  _this.toThousands(text) : '--' }
+              customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
             }
           ]
         }

+ 18 - 24
src/views/reportData/billingReturnReport/list.vue

@@ -2,7 +2,7 @@
   <a-card size="small" :bordered="false" class="billingReturnReportList-wrap">
     <a-spin :spinning="spinning" tip="Loading...">
       <!-- 搜索条件 -->
-      <div class="table-page-search-wrapper">
+      <div class="table-page-search-wrapper newTableSearchName">
         <a-form-model
           id="returnSlipReportList-form"
           ref="ruleForm"
@@ -33,41 +33,35 @@
                   allowClear></v-select>
               </a-form-model-item>
             </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-model-item label="所在区域">
+                <subarea id="billingReturnReportList-subareaSn" v-model="queryParam.subareaSn"></subarea>
+              </a-form-model-item>
+            </a-col>
             <template v-if="advanced">
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="所在区域">
-                  <subarea id="billingReturnReportList-subareaSn" v-model="queryParam.subareaSn"></subarea>
-                </a-form-model-item>
-              </a-col>
               <a-col :md="12" :sm="24">
                 <a-row>
-                  <a-form-model-item label="地区" style="margin-bottom: 0!important;">
+                  <a-form-model-item label="地区">
                     <a-col span="7">
-                      <a-form-model-item prop="provinceSn" style="margin: 0;">
-                        <a-select v-model="queryParam.provinceSn" allowClear @change="getCityList" placeholder="请选择省">
-                          <a-select-option v-for="item in addrProvinceList" :value="item.id" :key="item.id + 'a'">{{ item.name }}</a-select-option>
-                        </a-select>
-                      </a-form-model-item>
+                      <a-select v-model="queryParam.provinceSn" allowClear @change="getCityList" placeholder="请选择省">
+                        <a-select-option v-for="item in addrProvinceList" :value="item.id" :key="item.id + 'a'">{{ item.name }}</a-select-option>
+                      </a-select>
                     </a-col>
                     <a-col span="7" offset="1">
-                      <a-form-model-item prop="citySn" style="margin: 0;">
-                        <a-select v-model="queryParam.citySn" allowClear @change="getAreaList" placeholder="请选择市">
-                          <a-select-option v-for="item in addrCityList" :value="item.id" :key="item.id + 'b'">{{ item.name }}</a-select-option>
-                        </a-select>
-                      </a-form-model-item>
+                      <a-select v-model="queryParam.citySn" allowClear @change="getAreaList" placeholder="请选择市">
+                        <a-select-option v-for="item in addrCityList" :value="item.id" :key="item.id + 'b'">{{ item.name }}</a-select-option>
+                      </a-select>
                     </a-col>
                     <a-col span="7" offset="1">
-                      <a-form-model-item prop="districtSn" style="margin: 0;">
-                        <a-select v-model="queryParam.districtSn" allowClear placeholder="请选择区/县">
-                          <a-select-option v-for="item in addrDistrictList" :value="item.id" :key="item.id + 'c'">{{ item.name }}</a-select-option>
-                        </a-select>
-                      </a-form-model-item>
+                      <a-select v-model="queryParam.districtSn" allowClear placeholder="请选择区/县">
+                        <a-select-option v-for="item in addrDistrictList" :value="item.id" :key="item.id + 'c'">{{ item.name }}</a-select-option>
+                      </a-select>
                     </a-col>
                   </a-form-model-item>
                 </a-row>
               </a-col>
             </template>
-            <a-col :md="6" :sm="24">
+            <a-col :md="24" :sm="24" style="text-align:center;">
               <a-button type="primary" @click="handleSearch" :disabled="disabled" id="billingReturnReportList-refresh">查询</a-button>
               <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="billingReturnReportList-reset">重置</a-button>
               <a-button
@@ -388,7 +382,7 @@ export default {
         // { title: '开单退货合计金额', width: 90, dataIndex: 'totalAmount', align: 'center', customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' } }
       ]
       // if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
-        arr.splice(arr.length, 0, { title: '开单退货合计金额', width: 90, dataIndex: 'totalAmount', align: 'right', customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' } })
+      arr.splice(arr.length, 0, { title: '开单退货合计金额', width: 90, dataIndex: 'totalAmount', align: 'right', customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' } })
       // }
       return arr
     }

+ 17 - 23
src/views/reportData/returnGoodsPresentation/list.vue

@@ -2,7 +2,7 @@
   <a-card size="small" :bordered="false" class="returnGoodsPresentationList-wrap">
     <a-spin :spinning="spinning" tip="Loading...">
       <!-- 搜索条件 -->
-      <div class="table-page-search-wrapper">
+      <div class="table-page-search-wrapper newTableSearchName">
         <a-form-model
           id="returnGoodsPresentationList-form"
           ref="ruleForm"
@@ -33,12 +33,12 @@
                   allowClear></v-select>
               </a-form-model-item>
             </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-model-item label="退货单号">
+                <a-input id="returnGoodsPresentationList-salesReturnBillNo" v-model.trim="queryParam.salesReturnBillNo" allowClear placeholder="请输入退货单号"/>
+              </a-form-model-item>
+            </a-col>
             <template v-if="advanced">
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="退货单号">
-                  <a-input id="returnGoodsPresentationList-salesReturnBillNo" v-model.trim="queryParam.salesReturnBillNo" allowClear placeholder="请输入退货单号"/>
-                </a-form-model-item>
-              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="所在区域">
                   <subarea id="returnGoodsPresentationList-subareaSn" v-model="queryParam.dealer.subareaSn"></subarea>
@@ -48,31 +48,25 @@
                 <a-row>
                   <a-form-model-item label="地区" style="margin-bottom: 0!important;">
                     <a-col span="7">
-                      <a-form-model-item prop="dealerProvinceSn" style="margin: 0;">
-                        <a-select v-model="queryParam.dealer.provinceSn" allowClear @change="getCityList" placeholder="请选择省">
-                          <a-select-option v-for="item in addrProvinceList" :value="item.id" :key="item.id + 'a'">{{ item.name }}</a-select-option>
-                        </a-select>
-                      </a-form-model-item>
+                      <a-select v-model="queryParam.dealer.provinceSn" allowClear @change="getCityList" placeholder="请选择省">
+                        <a-select-option v-for="item in addrProvinceList" :value="item.id" :key="item.id + 'a'">{{ item.name }}</a-select-option>
+                      </a-select>
                     </a-col>
                     <a-col span="7" offset="1">
-                      <a-form-model-item prop="dealerCitySn" style="margin: 0;">
-                        <a-select v-model="queryParam.dealer.citySn" allowClear @change="getAreaList" placeholder="请选择市">
-                          <a-select-option v-for="item in addrCityList" :value="item.id" :key="item.id + 'b'">{{ item.name }}</a-select-option>
-                        </a-select>
-                      </a-form-model-item>
+                      <a-select v-model="queryParam.dealer.citySn" allowClear @change="getAreaList" placeholder="请选择市">
+                        <a-select-option v-for="item in addrCityList" :value="item.id" :key="item.id + 'b'">{{ item.name }}</a-select-option>
+                      </a-select>
                     </a-col>
                     <a-col span="7" offset="1">
-                      <a-form-model-item prop="dealerCountySn" style="margin: 0;">
-                        <a-select v-model="queryParam.dealer.districtSn" allowClear placeholder="请选择区/县">
-                          <a-select-option v-for="item in addrDistrictList" :value="item.id" :key="item.id + 'c'">{{ item.name }}</a-select-option>
-                        </a-select>
-                      </a-form-model-item>
+                      <a-select v-model="queryParam.dealer.districtSn" allowClear placeholder="请选择区/县">
+                        <a-select-option v-for="item in addrDistrictList" :value="item.id" :key="item.id + 'c'">{{ item.name }}</a-select-option>
+                      </a-select>
                     </a-col>
                   </a-form-model-item>
                 </a-row>
               </a-col>
             </template>
-            <a-col :md="6" :sm="24">
+            <a-col :md="24" :sm="24" style="text-align:center;">
               <a-button type="primary" @click="handleSearch" :disabled="disabled" id="returnGoodsPresentationList-refresh">查询</a-button>
               <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="returnGoodsPresentationList-reset">重置</a-button>
               <a-button
@@ -422,7 +416,7 @@ export default {
         // { title: '开单退货单合计金额', width: 90, dataIndex: 'totalAmount', align: 'center', customRender: function (text) { return (text || text == 0) ?  _this.toThousands(text) : '--' } }
       ]
       // if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
-        arr.splice(arr.length, 0, { title: '开单退货单合计金额', width: 90, dataIndex: 'totalAmount', align: 'right', customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' } })
+      arr.splice(arr.length, 0, { title: '开单退货单合计金额', width: 90, dataIndex: 'totalAmount', align: 'right', customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' } })
       // }
       return arr
     }

+ 17 - 23
src/views/reportData/returnSlipReport/list.vue

@@ -2,7 +2,7 @@
   <a-card size="small" :bordered="false" class="returnSlipReportList-wrap">
     <a-spin :spinning="spinning" tip="Loading...">
       <!-- 搜索条件 -->
-      <div class="table-page-search-wrapper">
+      <div class="table-page-search-wrapper newTableSearchName">
         <a-form-model
           id="returnSlipReportList-form"
           ref="ruleForm"
@@ -33,12 +33,12 @@
                   allowClear></v-select>
               </a-form-model-item>
             </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="退货单号">
+                <a-input id="returnSlipReportList-salesReturnBillNo" v-model.trim="queryParam.salesReturnBillNo" allowClear placeholder="请输入退货单号"/>
+              </a-form-item>
+            </a-col>
             <template v-if="advanced">
-              <a-col :md="6" :sm="24">
-                <a-form-item label="退货单号">
-                  <a-input id="returnSlipReportList-salesReturnBillNo" v-model.trim="queryParam.salesReturnBillNo" allowClear placeholder="请输入退货单号"/>
-                </a-form-item>
-              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="所在区域">
                   <subarea id="returnSlipReportList-subareaSn" v-model="queryParam.subareaSn"></subarea>
@@ -48,31 +48,25 @@
                 <a-row>
                   <a-form-model-item label="地区" style="margin-bottom: 0!important;">
                     <a-col span="7">
-                      <a-form-model-item prop="provinceSn" style="margin: 0;">
-                        <a-select v-model="queryParam.provinceSn" allowClear @change="getCityList" placeholder="请选择省">
-                          <a-select-option v-for="item in addrProvinceList" :value="item.id" :key="item.id + 'a'">{{ item.name }}</a-select-option>
-                        </a-select>
-                      </a-form-model-item>
+                      <a-select v-model="queryParam.provinceSn" allowClear @change="getCityList" placeholder="请选择省">
+                        <a-select-option v-for="item in addrProvinceList" :value="item.id" :key="item.id + 'a'">{{ item.name }}</a-select-option>
+                      </a-select>
                     </a-col>
                     <a-col span="7" offset="1">
-                      <a-form-model-item prop="citySn" style="margin: 0;">
-                        <a-select v-model="queryParam.citySn" allowClear @change="getAreaList" placeholder="请选择市">
-                          <a-select-option v-for="item in addrCityList" :value="item.id" :key="item.id + 'b'">{{ item.name }}</a-select-option>
-                        </a-select>
-                      </a-form-model-item>
+                      <a-select v-model="queryParam.citySn" allowClear @change="getAreaList" placeholder="请选择市">
+                        <a-select-option v-for="item in addrCityList" :value="item.id" :key="item.id + 'b'">{{ item.name }}</a-select-option>
+                      </a-select>
                     </a-col>
                     <a-col span="7" offset="1">
-                      <a-form-model-item prop="districtSn" style="margin: 0;">
-                        <a-select v-model="queryParam.districtSn" allowClear placeholder="请选择区/县">
-                          <a-select-option v-for="item in addrDistrictList" :value="item.id" :key="item.id + 'c'">{{ item.name }}</a-select-option>
-                        </a-select>
-                      </a-form-model-item>
+                      <a-select v-model="queryParam.districtSn" allowClear placeholder="请选择区/县">
+                        <a-select-option v-for="item in addrDistrictList" :value="item.id" :key="item.id + 'c'">{{ item.name }}</a-select-option>
+                      </a-select>
                     </a-col>
                   </a-form-model-item>
                 </a-row>
               </a-col>
             </template>
-            <a-col :md="6" :sm="24">
+            <a-col :md="24" :sm="24" style="text-align:center;">
               <a-button type="primary" @click="handleSearch" :disabled="disabled" id="returnSlipReportList-refresh">查询</a-button>
               <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="returnSlipReportList-reset">重置</a-button>
               <a-button
@@ -430,7 +424,7 @@ export default {
         // { title: '开单退货单合计金额', width: 90, dataIndex: 'totalAmount', align: 'center', customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' } }
       ]
       // if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
-        arr.splice(arr.length, 0, { title: '开单退货单合计金额', width: 90, dataIndex: 'totalAmount', align: 'right', customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' } })
+      arr.splice(arr.length, 0, { title: '开单退货单合计金额', width: 90, dataIndex: 'totalAmount', align: 'right', customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' } })
       // }
       return arr
     }

+ 18 - 24
src/views/reportData/salesAmountReport/list.vue

@@ -2,7 +2,7 @@
   <a-card size="small" :bordered="false" class="salesAmountReportList-wrap">
     <a-spin :spinning="spinning" tip="Loading...">
       <!-- 搜索条件 -->
-      <div class="table-page-search-wrapper">
+      <div class="table-page-search-wrapper newTableSearchName">
         <a-form-model
           id="salesAmountReportList-form"
           ref="ruleForm"
@@ -33,41 +33,35 @@
                   allowClear></v-select>
               </a-form-model-item>
             </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-model-item label="所在区域">
+                <subarea id="salesAmountReportList-allocateTypeSn" v-model="queryParam.dealer.subareaSn"></subarea>
+              </a-form-model-item>
+            </a-col>
             <template v-if="advanced">
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="所在区域">
-                  <subarea id="salesAmountReportList-allocateTypeSn" v-model="queryParam.dealer.subareaSn"></subarea>
-                </a-form-model-item>
-              </a-col>
               <a-col :md="12" :sm="24">
                 <a-row>
-                  <a-form-model-item label="地区" style="margin-bottom: 0!important;">
+                  <a-form-model-item label="地区">
                     <a-col span="7">
-                      <a-form-model-item prop="dealerProvinceSn" style="margin: 0;">
-                        <a-select v-model="queryParam.dealer.provinceSn" allowClear @change="getCityList" placeholder="请选择省">
-                          <a-select-option v-for="item in addrProvinceList" :value="item.id" :key="item.id + 'a'">{{ item.name }}</a-select-option>
-                        </a-select>
-                      </a-form-model-item>
+                      <a-select v-model="queryParam.dealer.provinceSn" allowClear @change="getCityList" placeholder="请选择省">
+                        <a-select-option v-for="item in addrProvinceList" :value="item.id" :key="item.id + 'a'">{{ item.name }}</a-select-option>
+                      </a-select>
                     </a-col>
                     <a-col span="7" offset="1">
-                      <a-form-model-item prop="dealerCitySn" style="margin: 0;">
-                        <a-select v-model="queryParam.dealer.citySn" allowClear @change="getAreaList" placeholder="请选择市">
-                          <a-select-option v-for="item in addrCityList" :value="item.id" :key="item.id + 'b'">{{ item.name }}</a-select-option>
-                        </a-select>
-                      </a-form-model-item>
+                      <a-select v-model="queryParam.dealer.citySn" allowClear @change="getAreaList" placeholder="请选择市">
+                        <a-select-option v-for="item in addrCityList" :value="item.id" :key="item.id + 'b'">{{ item.name }}</a-select-option>
+                      </a-select>
                     </a-col>
                     <a-col span="7" offset="1">
-                      <a-form-model-item prop="dealerCountySn" style="margin: 0;">
-                        <a-select v-model="queryParam.dealer.districtSn" allowClear placeholder="请选择区/县">
-                          <a-select-option v-for="item in addrDistrictList" :value="item.id" :key="item.id + 'c'">{{ item.name }}</a-select-option>
-                        </a-select>
-                      </a-form-model-item>
+                      <a-select v-model="queryParam.dealer.districtSn" allowClear placeholder="请选择区/县">
+                        <a-select-option v-for="item in addrDistrictList" :value="item.id" :key="item.id + 'c'">{{ item.name }}</a-select-option>
+                      </a-select>
                     </a-col>
                   </a-form-model-item>
                 </a-row>
               </a-col>
             </template>
-            <a-col :md="6" :sm="24">
+            <a-col :md="24" :sm="24" style="text-align:center;">
               <a-button type="primary" @click="handleSearch" :disabled="disabled" id="salesAmountReportList-refresh">查询</a-button>
               <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="salesAmountReportList-reset">重置</a-button>
               <a-button
@@ -389,7 +383,7 @@ export default {
         // { title: '开单销售合计金额', width: 90, dataIndex: 'totalAmount', align: 'center', customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' } }
       ]
       // if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
-        arr.splice(arr.length, 0, { title: '开单销售合计金额', width: 90, dataIndex: 'totalAmount', align: 'right', customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' } })
+      arr.splice(arr.length, 0, { title: '开单销售合计金额', width: 90, dataIndex: 'totalAmount', align: 'right', customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' } })
       // }
       return arr
     }

+ 17 - 23
src/views/reportData/salesPresentation/list.vue

@@ -2,7 +2,7 @@
   <a-card size="small" :bordered="false" class="salesPresentationList-wrap">
     <a-spin :spinning="spinning" tip="Loading...">
       <!-- 搜索条件 -->
-      <div class="table-page-search-wrapper">
+      <div class="table-page-search-wrapper newTableSearchName">
         <a-form-model
           id="salesPresentationList-form"
           ref="ruleForm"
@@ -33,12 +33,12 @@
                   allowClear></v-select>
               </a-form-model-item>
             </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-model-item label="销售单号">
+                <a-input id="salesPresentationList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
+              </a-form-model-item>
+            </a-col>
             <template v-if="advanced">
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="销售单号">
-                  <a-input id="salesPresentationList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
-                </a-form-model-item>
-              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="所在区域">
                   <subarea id="salesPresentationList-subareaSn" v-model="queryParam.dealer.subareaSn"></subarea>
@@ -48,31 +48,25 @@
                 <a-row>
                   <a-form-model-item label="地区" style="margin-bottom: 0!important;">
                     <a-col span="7">
-                      <a-form-model-item prop="dealerProvinceSn" style="margin: 0;">
-                        <a-select v-model="queryParam.dealer.provinceSn" allowClear @change="getCityList" placeholder="请选择省">
-                          <a-select-option v-for="item in addrProvinceList" :value="item.id" :key="item.id + 'a'">{{ item.name }}</a-select-option>
-                        </a-select>
-                      </a-form-model-item>
+                      <a-select v-model="queryParam.dealer.provinceSn" allowClear @change="getCityList" placeholder="请选择省">
+                        <a-select-option v-for="item in addrProvinceList" :value="item.id" :key="item.id + 'a'">{{ item.name }}</a-select-option>
+                      </a-select>
                     </a-col>
                     <a-col span="7" offset="1">
-                      <a-form-model-item prop="dealerCitySn" style="margin: 0;">
-                        <a-select v-model="queryParam.dealer.citySn" allowClear @change="getAreaList" placeholder="请选择市">
-                          <a-select-option v-for="item in addrCityList" :value="item.id" :key="item.id + 'b'">{{ item.name }}</a-select-option>
-                        </a-select>
-                      </a-form-model-item>
+                      <a-select v-model="queryParam.dealer.citySn" allowClear @change="getAreaList" placeholder="请选择市">
+                        <a-select-option v-for="item in addrCityList" :value="item.id" :key="item.id + 'b'">{{ item.name }}</a-select-option>
+                      </a-select>
                     </a-col>
                     <a-col span="7" offset="1">
-                      <a-form-model-item prop="dealerCountySn" style="margin: 0;">
-                        <a-select v-model="queryParam.dealer.districtSn" allowClear placeholder="请选择区/县">
-                          <a-select-option v-for="item in addrDistrictList" :value="item.id" :key="item.id + 'c'">{{ item.name }}</a-select-option>
-                        </a-select>
-                      </a-form-model-item>
+                      <a-select v-model="queryParam.dealer.districtSn" allowClear placeholder="请选择区/县">
+                        <a-select-option v-for="item in addrDistrictList" :value="item.id" :key="item.id + 'c'">{{ item.name }}</a-select-option>
+                      </a-select>
                     </a-col>
                   </a-form-model-item>
                 </a-row>
               </a-col>
             </template>
-            <a-col :md="6" :sm="24">
+            <a-col :md="24" :sm="24" style="text-align:center;">
               <a-button type="primary" @click="handleSearch" :disabled="disabled" id="salesPresentationList-refresh">查询</a-button>
               <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="salesPresentationList-reset">重置</a-button>
               <a-button
@@ -423,7 +417,7 @@ export default {
         // { title: '开单销售单合计金额', width: 90, dataIndex: 'totalAmount', align: 'center', customRender: function (text) { return (text || text == 0) ?  _this.toThousands(text) : '--' } }
       ]
       // if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
-        arr.splice(arr.length, 0, { title: '开单销售单合计金额', width: 90, dataIndex: 'totalAmount', align: 'right', customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' } })
+      arr.splice(arr.length, 0, { title: '开单销售单合计金额', width: 90, dataIndex: 'totalAmount', align: 'right', customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' } })
       // }
       return arr
     }

+ 18 - 24
src/views/reportData/salesReturnReport/list.vue

@@ -2,7 +2,7 @@
   <a-card size="small" :bordered="false" class="salesReturnReportList-wrap">
     <a-spin :spinning="spinning" tip="Loading...">
       <!-- 搜索条件 -->
-      <div class="table-page-search-wrapper">
+      <div class="table-page-search-wrapper newTableSearchName">
         <a-form-model
           id="salesReturnReportList-form"
           ref="ruleForm"
@@ -33,41 +33,35 @@
                   allowClear></v-select>
               </a-form-model-item>
             </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-model-item label="所在区域">
+                <subarea id="salesReturnReportList-subareaSn" v-model="queryParam.subareaSn"></subarea>
+              </a-form-model-item>
+            </a-col>
             <template v-if="advanced">
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="所在区域">
-                  <subarea id="salesReturnReportList-subareaSn" v-model="queryParam.subareaSn"></subarea>
-                </a-form-model-item>
-              </a-col>
               <a-col :md="12" :sm="24">
                 <a-row>
-                  <a-form-model-item label="地区" style="margin-bottom: 0!important;">
+                  <a-form-model-item label="地区">
                     <a-col span="7">
-                      <a-form-model-item prop="provinceSn" style="margin: 0;">
-                        <a-select v-model="queryParam.provinceSn" allowClear @change="getCityList" placeholder="请选择省">
-                          <a-select-option v-for="item in addrProvinceList" :value="item.id" :key="item.id + 'a'">{{ item.name }}</a-select-option>
-                        </a-select>
-                      </a-form-model-item>
+                      <a-select v-model="queryParam.provinceSn" allowClear @change="getCityList" placeholder="请选择省">
+                        <a-select-option v-for="item in addrProvinceList" :value="item.id" :key="item.id + 'a'">{{ item.name }}</a-select-option>
+                      </a-select>
                     </a-col>
                     <a-col span="7" offset="1">
-                      <a-form-model-item prop="citySn" style="margin: 0;">
-                        <a-select v-model="queryParam.citySn" allowClear @change="getAreaList" placeholder="请选择市">
-                          <a-select-option v-for="item in addrCityList" :value="item.id" :key="item.id + 'b'">{{ item.name }}</a-select-option>
-                        </a-select>
-                      </a-form-model-item>
+                      <a-select v-model="queryParam.citySn" allowClear @change="getAreaList" placeholder="请选择市">
+                        <a-select-option v-for="item in addrCityList" :value="item.id" :key="item.id + 'b'">{{ item.name }}</a-select-option>
+                      </a-select>
                     </a-col>
                     <a-col span="7" offset="1">
-                      <a-form-model-item prop="districtSn" style="margin: 0;">
-                        <a-select v-model="queryParam.districtSn" allowClear placeholder="请选择区/县">
-                          <a-select-option v-for="item in addrDistrictList" :value="item.id" :key="item.id + 'c'">{{ item.name }}</a-select-option>
-                        </a-select>
-                      </a-form-model-item>
+                      <a-select v-model="queryParam.districtSn" allowClear placeholder="请选择区/县">
+                        <a-select-option v-for="item in addrDistrictList" :value="item.id" :key="item.id + 'c'">{{ item.name }}</a-select-option>
+                      </a-select>
                     </a-col>
                   </a-form-model-item>
                 </a-row>
               </a-col>
             </template>
-            <a-col :md="6" :sm="24">
+            <a-col :md="24" :sm="24" style="text-align:center;">
               <a-button type="primary" @click="handleSearch" :disabled="disabled" id="salesReturnReportList-refresh">查询</a-button>
               <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="salesReturnReportList-reset">重置</a-button>
               <a-button
@@ -409,7 +403,7 @@ export default {
         // { title: '实售退货合计金额', width: 90, dataIndex: 'totalAmount', align: 'center', customRender: function (text) { return (text || text == 0) ?  _this.toThousands(text) : '--' } }
       ]
       // if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
-        arr.splice(arr.length, 0, { title: '实售退货合计金额', width: 90, dataIndex: 'totalAmount', align: 'right', customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' } })
+      arr.splice(arr.length, 0, { title: '实售退货合计金额', width: 90, dataIndex: 'totalAmount', align: 'right', customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' } })
       // }
       return arr
     }

+ 18 - 24
src/views/reportData/salesSlipReport/list.vue

@@ -2,7 +2,7 @@
   <a-card size="small" :bordered="false" class="salesSlipReportList-wrap">
     <a-spin :spinning="spinning" tip="Loading...">
       <!-- 搜索条件 -->
-      <div class="table-page-search-wrapper">
+      <div class="table-page-search-wrapper newTableSearchName">
         <a-form-model
           id="salesSlipReportList-form"
           ref="ruleForm"
@@ -33,12 +33,12 @@
                   allowClear></v-select>
               </a-form-model-item>
             </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-model-item label="销售单号">
+                <a-input id="salesSlipReportList-allocateTypeSn" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
+              </a-form-model-item>
+            </a-col>
             <template v-if="advanced">
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="销售单号">
-                  <a-input id="salesSlipReportList-allocateTypeSn" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
-                </a-form-model-item>
-              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="所在区域">
                   <subarea id="salesSlipReportList-allocateTypeSn" v-model="queryParam.dealer.subareaSn"></subarea>
@@ -46,33 +46,27 @@
               </a-col>
               <a-col :md="12" :sm="24">
                 <a-row>
-                  <a-form-model-item label="地区" style="margin-bottom: 0!important;">
+                  <a-form-model-item label="地区" >
                     <a-col span="7">
-                      <a-form-model-item prop="dealerProvinceSn" style="margin: 0;">
-                        <a-select v-model="queryParam.dealer.provinceSn" allowClear @change="getCityList" placeholder="请选择省">
-                          <a-select-option v-for="item in addrProvinceList" :value="item.id" :key="item.id + 'a'">{{ item.name }}</a-select-option>
-                        </a-select>
-                      </a-form-model-item>
+                      <a-select v-model="queryParam.dealer.provinceSn" allowClear @change="getCityList" placeholder="请选择省">
+                        <a-select-option v-for="item in addrProvinceList" :value="item.id" :key="item.id + 'a'">{{ item.name }}</a-select-option>
+                      </a-select>
                     </a-col>
                     <a-col span="7" offset="1">
-                      <a-form-model-item prop="dealerCitySn" style="margin: 0;">
-                        <a-select v-model="queryParam.dealer.citySn" allowClear @change="getAreaList" placeholder="请选择市">
-                          <a-select-option v-for="item in addrCityList" :value="item.id" :key="item.id + 'b'">{{ item.name }}</a-select-option>
-                        </a-select>
-                      </a-form-model-item>
+                      <a-select v-model="queryParam.dealer.citySn" allowClear @change="getAreaList" placeholder="请选择市">
+                        <a-select-option v-for="item in addrCityList" :value="item.id" :key="item.id + 'b'">{{ item.name }}</a-select-option>
+                      </a-select>
                     </a-col>
                     <a-col span="7" offset="1">
-                      <a-form-model-item prop="dealerCountySn" style="margin: 0;">
-                        <a-select v-model="queryParam.dealer.districtSn" allowClear placeholder="请选择区/县">
-                          <a-select-option v-for="item in addrDistrictList" :value="item.id" :key="item.id + 'c'">{{ item.name }}</a-select-option>
-                        </a-select>
-                      </a-form-model-item>
+                      <a-select v-model="queryParam.dealer.districtSn" allowClear placeholder="请选择区/县">
+                        <a-select-option v-for="item in addrDistrictList" :value="item.id" :key="item.id + 'c'">{{ item.name }}</a-select-option>
+                      </a-select>
                     </a-col>
                   </a-form-model-item>
                 </a-row>
               </a-col>
             </template>
-            <a-col :md="6" :sm="24">
+            <a-col :md="24" :sm="24" style="text-align:center;">
               <a-button type="primary" @click="handleSearch" :disabled="disabled" id="salesSlipReportList-refresh">查询</a-button>
               <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="salesSlipReportList-reset">重置</a-button>
               <a-button
@@ -430,7 +424,7 @@ export default {
         // { title: '开单销售单合计金额', width: 90, dataIndex: 'totalAmount', align: 'center', customRender: function (text) { return (text || text == 0) ?  _this.toThousands(text) : '--' } }
       ]
       // if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
-        arr.splice(7, 0, { title: '开单销售单合计金额', width: 90, dataIndex: 'totalAmount', align: 'center', customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' } })
+      arr.splice(7, 0, { title: '开单销售单合计金额', width: 90, dataIndex: 'totalAmount', align: 'center', customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' } })
       // }
       return arr
     }