瀏覽代碼

添加查询条件

chenrui 2 年之前
父節點
當前提交
b2c8d2a58f

+ 27 - 1
src/views/allocationManagement/storeTransferOut/edit.vue

@@ -49,6 +49,23 @@
                         <ProductType id="storeTransferOutEdit-productType" placeholder="请选择产品分类" :isDealer="true" @change="changeProductType" v-model="productType"></ProductType>
                       </a-form-model-item>
                     </a-col>
+                    <a-col :md="6" :sm="24">
+                      <a-form-item label="是否有库存">
+                        <a-select @change="handleHasQty" allowClear :value="queryParam.existStockFlag" placeholder="请选择查看是否有库存">
+                          <a-select-option value="1">
+                            是
+                          </a-select-option>
+                          <a-select-option value="0">
+                            否
+                          </a-select-option>
+                        </a-select>
+                      </a-form-item>
+                    </a-col>
+                    <a-col :md="6" :sm="24">
+                      <a-form-item label="">
+                        <a-checkbox style="margin-left:10px;" v-model="queryParam.enableFlag" id="sales-byCustQuery">包括禁用产品</a-checkbox>
+                      </a-form-item>
+                    </a-col>
                   </template>
                   <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
                     <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="storeTransferOutList-refresh">查询</a-button>
@@ -238,7 +255,9 @@ export default {
         brandSn: undefined,
         productTypeSn1: undefined,
         productTypeSn2: undefined,
-        productTypeSn3: undefined
+        productTypeSn3: undefined,
+        existStockFlag: undefined,
+        enableFlag: undefined // 是否包含禁用产品
       },
       chooseQueryParam: {
         productCode: '',
@@ -255,6 +274,7 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
+        this.queryParam.enableFlag = this.queryParam.enableFlag ? 1 : 0
         return productQuery(Object.assign(parameter, this.queryParam, { 'currentQtyFlag': 0 })).then(res => {
           const data = res.data
           const no = (data.pageNo - 1) * data.pageSize
@@ -341,6 +361,8 @@ export default {
       this.queryParam.productTypeSn1 = undefined
       this.queryParam.productTypeSn2 = undefined
       this.queryParam.productTypeSn3 = undefined
+      this.queryParam.existStockFlag = undefined
+      this.queryParam.enableFlag = undefined
       this.productType = []
       this.$refs.table.refresh(true)
     },
@@ -497,6 +519,10 @@ export default {
       this.getWarehouseList()
       this.resetSearchForm()
       this.chooseResetSearchForm()
+    },
+    // 查看是否有库存、
+    handleHasQty (val) {
+      this.queryParam.existStockFlag = val
     }
   },
   mounted () {

+ 0 - 13
src/views/allocationManagement/storeTransferOut/list.vue

@@ -57,18 +57,6 @@
                   ></v-select>
                 </a-form-item>
               </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="是否有库存">
-                  <a-select @change="handleHasQty" allowClear :value="queryParam.stockEmptyFlag" placeholder="请选择查看是否有库存">
-                    <a-select-option value="0">
-                      是
-                    </a-select-option>
-                    <a-select-option value="1">
-                      否
-                    </a-select-option>
-                  </a-select>
-                </a-form-item>
-              </a-col>
             </template>
             <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="storeTransferOutList-refresh">查询</a-button>
@@ -84,7 +72,6 @@
       <!-- 操作按钮 -->
       <div class="table-operator">
         <a-button id="storeTransferOutList-add" v-if="$hasPermissions('B_storeTransferOutNews')" type="primary" class="button-error" @click="openModal=true">新增</a-button>
-        <a-checkbox style="margin-left:10px;" v-model="isByCustQuery" id="sales-byCustQuery">包括禁用产品</a-checkbox>
       </div>
       <!-- 统计 -->
       <a-alert type="info" style="margin-bottom:10px">

+ 8 - 13
src/views/financialManagement/companyReceivablePayable/chooseBillModal.vue

@@ -43,16 +43,6 @@
               <a-button style="margin-bottom: 18px;" type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="chooseBillModal-refresh">查询</a-button>
               <a-button style="margin: 0 0 18px 8px" @click="resetSearchForm" :disabled="disabled" id="chooseBillModal-reset">重置</a-button>
             </a-col>
-            <a-col :md="24" :sm="24" style="margin-bottom: 18px;">
-              <a-radio-group name="radioGroup" :default-value="1">
-                <a-radio :value="1">
-                  关联单据创建时间正序
-                </a-radio>
-                <a-radio :value="2">
-                  审核时间正序
-                </a-radio>
-              </a-radio-group>
-            </a-col>
           </a-row>
         </a-form>
       </div>
@@ -118,7 +108,9 @@ export default {
         auditBeginDate: '',
         auditEndDate: '',
         bizNo: '',
-        bizType: undefined
+        bizType: undefined,
+        bizCreateBeginDate: undefined,
+        bizCreateEndDate: undefined
       },
       allData: [],
       // 表头
@@ -167,8 +159,8 @@ export default {
     },
     // 关联单据创建时间
     createDateChange (date) {
-      this.queryParam.auditBeginDate = date[0]
-      this.queryParam.auditEndDate = date[1]
+      this.queryParam.bizCreateBeginDate = date[0]
+      this.queryParam.bizCreateEndDate = date[1]
     },
     //  时间  change
     dateChange (date) {
@@ -183,8 +175,11 @@ export default {
     // 重置
     resetSearchForm () {
       this.$refs.rangeDate.resetDate()
+      this.$refs.createDate.resetDate()
       this.queryParam.auditBeginDate = ''
       this.queryParam.auditEndDate = ''
+      this.queryParam.bizCreateBeginDate = ''
+      this.queryParam.bizCreateEndDate = ''
       this.queryParam.bizNo = ''
       this.queryParam.bizType = undefined
       this.$refs.table.refresh(true)

+ 35 - 22
src/views/financialManagement/companyReceivablePayable/collectionPayment.vue

@@ -30,26 +30,17 @@
             </a-alert>
             <!-- 查询条件 -->
             <div class="table-page-search-wrapper">
-              <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
-                <a-col :md="8" :sm="24">
-                  <a-form-item label="关联单据创建时间">
-                    <rangeDate ref="createDate" @change="createDateChange" />
-                  </a-form-item>
-                </a-col>
-                <a-col :md="5" :sm="24">
-                  <a-button style="margin-bottom: 18px;" type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="chooseBillModal-refresh">查询</a-button>
-                  <a-button style="margin: 0 0 18px 8px" @click="resetSearchForm" :disabled="disabled" id="chooseBillModal-reset">重置</a-button>
-                </a-col>
-                <a-col :md="24" :sm="24" style="margin-bottom: 18px;">
-                  <a-radio-group name="radioGroup" :default-value="1">
-                    <a-radio :value="1">
-                      关联单据创建时间正序
-                    </a-radio>
-                    <a-radio :value="2">
-                      审核时间正序
-                    </a-radio>
-                  </a-radio-group>
-                </a-col>
+              <a-form layout="inline">
+                <a-row :gutter="15">
+                  <a-col :md="8" :sm="24">
+                    <a-form-item label="关联单据创建时间">
+                      <rangeDate ref="createDate" @change="createDateChange" />
+                    </a-form-item>
+                  </a-col>
+                  <a-col :md="6" :sm="24">
+                    <a-button style="margin-bottom: 18px;" type="primary" @click="getsettleInfoAllList" :disabled="disabled" id="collectionPayment-refresh">查询</a-button>
+                    <a-button style="margin: 0 0 18px 8px" @click="resetSearchForm" :disabled="disabled" id="collectionPayment-reset">重置</a-button>
+                  </a-col>
                 </a-row>
               </a-form>
             </div>
@@ -219,6 +210,7 @@ export default {
     this.amountSettledTotalChange = debounce(this.amountSettledTotalChange, 800)
     const _this = this
     return {
+      disabled: false,
       spinning: false,
       loading: false, //  表格加载中
       chooseQueryParam: {
@@ -230,7 +222,7 @@ export default {
         { title: '序号', scopedSlots: { customRender: 'no' }, width: '5%', align: 'center' },
         { title: '单据号', dataIndex: 'bizNo', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '单据类型', dataIndex: 'bizTypeDictValue', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '关联单据创建时间', dataIndex: 'auditTime', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '关联单据创建时间', dataIndex: 'bizCreateDate', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '审核时间', dataIndex: 'auditTime', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '金额', dataIndex: 'totalAmount', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '余额', dataIndex: 'unsettleAmount', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
@@ -251,6 +243,10 @@ export default {
         settleAccountName: undefined,
         remark: ''
       },
+      queryParam: {
+        bizCreateBeginDate: undefined,
+        bizCreateEndDate: undefined
+      },
       rules: {
         amountSettled: [{ required: true, message: '请输入本次结算金额,系统将自动分配到已选单据上', trigger: 'change' }],
         discountAmount: [{ required: true, message: '请输入折让金额', trigger: 'blur' }],
@@ -440,17 +436,34 @@ export default {
     },
     // 默认获取所有单据
     getsettleInfoAllList () {
-      settleInfoAllList({ settleClientSn: this.$route.params.sn, settleClientType: this.$route.params.type, notEqZero: 1 }).then(res => {
+      this.loading = true
+      this.disabled = true
+      const ajaxData = Object.assign(this.queryParam, { settleClientSn: this.$route.params.sn, settleClientType: this.$route.params.type, notEqZero: 1 })
+      settleInfoAllList(ajaxData).then(res => {
         res.data.map(item => {
           item.settleAmount = item.unsettleAmount
         })
         this.chooseLoadData = res.data || []
+        this.loading = false
+        this.disabled = false
         this.amountSettledChange()
       })
     },
     pageInit () {
       this.chooseLoadData = []
       this.getsettleInfoAllList()
+    },
+    // 关联单据创建时间
+    createDateChange (date) {
+      this.queryParam.bizCreateBeginDate = date[0]
+      this.queryParam.bizCreateEndDate = date[1]
+    },
+    // 重置
+    resetSearchForm () {
+      this.$refs.createDate.resetDate()
+      this.queryParam.bizCreateBeginDate = ''
+      this.queryParam.bizCreateEndDate = ''
+      this.getsettleInfoAllList()
     }
   },
   mounted () {

+ 1 - 13
src/views/salesManagement/salesQuery/list.vue

@@ -85,18 +85,7 @@
                   <v-select code="FLAG" id="salesManagementList-distributionFlag" v-model="queryParam.distributionFlag" allowClear placeholder="请选择是否铺货出库"></v-select>
                 </a-form-model-item>
               </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="是否有库存">
-                  <a-select @change="handleHasQty" allowClear :value="queryParam.stockEmptyFlag" placeholder="请选择查看是否有库存">
-                    <a-select-option value="0">
-                      是
-                    </a-select-option>
-                    <a-select-option value="1">
-                      否
-                    </a-select-option>
-                  </a-select>
-                </a-form-item>
-              </a-col>
+
             </template>
             <a-col :md="6" :sm="24">
               <span class="table-page-search-submitButtons">
@@ -123,7 +112,6 @@
       <div class="table-operator">
         <a-button type="primary" class="button-error" v-if="$hasPermissions('B_salesNews')" @click="handleAdd(0)">新增(零售)</a-button>
         <a-button type="primary" class="button-warning" v-if="$hasPermissions('B_salesNews')" @click="handleAdd(1)">新增(铺货)</a-button>
-        <a-checkbox style="margin-left:10px;" v-model="isByCustQuery" id="sales-byCustQuery">包括禁用产品</a-checkbox>
         <a-checkbox style="margin-left:10px;" v-model="isByCustQuery" id="sales-byCustQuery">按客户查询</a-checkbox>
         <a-popover placement="right">
           <template slot="content">

+ 19 - 1
src/views/salesManagement/salesQuery/queryPart.vue

@@ -58,6 +58,18 @@
                 <input type="file" id="filed" accept="image/jpeg,image/png" hidden="" @change="filePreview">
               </a-form-model-item>
             </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="是否有库存">
+                <a-select @change="handleHasQty" allowClear :value="queryParam.existStockFlag" placeholder="请选择查看是否有库存">
+                  <a-select-option value="1">
+                    是
+                  </a-select-option>
+                  <a-select-option value="0">
+                    否
+                  </a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
           </template>
           <a-col flex="200px" style="margin-bottom: 10px;">
             <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="productInfoList-refresh">查询</a-button>
@@ -204,7 +216,8 @@ export default {
         productTypeSn2: '', //  产品二级分类
         productTypeSn3: '', //  产品三级分类
         warehouseSn: undefined, //  仓库、
-        enableFlag: '1'
+        enableFlag: '1',
+        existStockFlag: undefined
       },
       priceType: '',
       buyerSn: '',
@@ -370,6 +383,7 @@ export default {
       this.queryParam.productTypeSn3 = ''
       this.queryParam.warehouseSn = undefined
       this.queryParam.productCodeList = undefined
+      this.queryParam.existStockFlag = undefined
       this.queryParam.vinCode = ''
       this.productType = []
       this.$refs.ruleForm.resetFields()
@@ -478,6 +492,10 @@ export default {
       this.queryParam.productTypeSn1 = val[0] ? val[0] : ''
       this.queryParam.productTypeSn2 = val[1] ? val[1] : ''
       this.queryParam.productTypeSn3 = val[2] ? val[2] : ''
+    },
+    // 查看是否有库存、
+    handleHasQty (val) {
+      this.queryParam.existStockFlag = val
     }
   },
   watch: {