Forráskód Böngészése

财务收款新增查询条件

chenrui 3 éve
szülő
commit
512d5cd674
1 módosított fájl, 38 hozzáadás és 15 törlés
  1. 38 15
      src/views/financialManagement/financialCollection/list.vue

+ 38 - 15
src/views/financialManagement/financialCollection/list.vue

@@ -11,22 +11,32 @@
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="经销商名称">
-                <a-input id="financialCollectionList-settleClientName" v-model.trim="queryParam.settleClientName" allowClear placeholder="请输入经销商名称"/>
+              <a-form-item label="销售单号">
+                <a-input id="financialCollectionList-bizNo" v-model.trim="queryParam.bizNo" allowClear placeholder="请输入销售单号"/>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="商户级别">
-                <v-select
-                  v-model="queryParam.dealerLevel"
-                  ref="dealerLevel"
-                  id="financialCollectionList-dealerLevel"
-                  code="DEALER_LEVEL"
-                  placeholder="请选择商户级别"
-                  allowClear></v-select>
+              <a-form-item label="备货单号">
+                <a-input id="financialCollectionList-dispatchBillNo" v-model.trim="queryParam.dispatchBillNo" allowClear placeholder="请输入备货单号"/>
               </a-form-item>
             </a-col>
             <template v-if="advanced">
+              <a-col :md="6" :sm="24">
+                <a-form-item label="经销商名称">
+                  <a-input id="financialCollectionList-settleClientName" v-model.trim="queryParam.settleClientName" allowClear placeholder="请输入经销商名称"/>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="商户级别">
+                  <v-select
+                    v-model="queryParam.dealerLevel"
+                    ref="dealerLevel"
+                    id="financialCollectionList-dealerLevel"
+                    code="DEALER_LEVEL"
+                    placeholder="请选择商户级别"
+                    allowClear></v-select>
+                </a-form-item>
+              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="收款方式">
                   <v-select
@@ -65,6 +75,17 @@
                     allowClear></v-select>
                 </a-form-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="单据状态">
+                  <v-select
+                    v-model="queryParam.voidFlag"
+                    ref="voidFlag"
+                    id="financialCollectionList-voidFlag"
+                    code="VOID_FLAG"
+                    placeholder="请选择单据状态"
+                    allowClear></v-select>
+                </a-form-item>
+              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="收款时间">
                   <rangeDate ref="rangeSettleDate" @change="dateSettleChange" />
@@ -130,10 +151,6 @@
           <span :class="$hasPermissions('B_dispatchDetail')?'active':'common'" v-if="$hasPermissions('B_dispatchDetail')" @click="handleBhDetail(record)">{{ record.dispatchBillNo || '--' }}</span>
           <span v-else>{{ record.dispatchBillNo || '--' }}</span>
         </template>
-        <!-- 单据状态 -->
-        <template slot="voidFlag" slot-scope="text, record">
-          <span>{{ record.voidFlag==1 ? '作废' : record.voidFlag==0 ? '有效' : '--' }}</span>
-        </template>
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
           <a-button
@@ -167,6 +184,8 @@ export default {
       queryParam: { //  查询条件
         beginDate: getDate.getThreeMonthDays().starttime + ' 00:00:00',
         endDate: getDate.getCurrMonthDays().endtime + ' 23:59:59',
+        bizNo: '',
+        dispatchBillNo: '',
         beginDateSettle: '',
         endDateSettle: '',
         settleClientName: '',
@@ -175,6 +194,7 @@ export default {
         subareaSn: undefined,
         billStatus: undefined,
         settleState: undefined,
+        voidFlag: undefined,
         dealerProvinceSn: undefined,
         dealerCitySn: undefined,
         dealerCountySn: undefined
@@ -226,7 +246,7 @@ export default {
         { title: '备注', dataIndex: 'remark', width: '7%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '业务状态', dataIndex: 'billStatusDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '财务状态', dataIndex: 'settleStateDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '单据状态', dataIndex: 'voidFlag', scopedSlots: { customRender: 'voidFlag' }, width: '6%', align: 'center' },
+        { title: '单据状态', dataIndex: 'voidFlagDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '4%', align: 'center' }
       ]
       if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
@@ -254,6 +274,8 @@ export default {
       }
       this.queryParam.beginDate = getDate.getThreeMonthDays().starttime + ' 00:00:00'
       this.queryParam.endDate = getDate.getCurrMonthDays().endtime + ' 23:59:59'
+      this.queryParam.bizNo = ''
+      this.queryParam.dispatchBillNo = ''
       this.queryParam.beginDateSettle = ''
       this.queryParam.endDateSettle = ''
       this.queryParam.settleClientName = ''
@@ -262,6 +284,7 @@ export default {
       this.queryParam.subareaSn = undefined
       this.queryParam.billStatus = undefined
       this.queryParam.settleState = undefined
+      this.queryParam.voidFlag = undefined
       this.queryParam.dealerProvinceSn = undefined
       this.queryParam.dealerCitySn = undefined
       this.queryParam.dealerCountySn = undefined