Преглед на файлове

销售单店内调出加查询条件

chenrui преди 2 години
родител
ревизия
003d05e8df

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

@@ -57,6 +57,18 @@
                   ></v-select>
                   ></v-select>
                 </a-form-item>
                 </a-form-item>
               </a-col>
               </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>
             </template>
             <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
             <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>
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="storeTransferOutList-refresh">查询</a-button>
@@ -72,6 +84,7 @@
       <!-- 操作按钮 -->
       <!-- 操作按钮 -->
       <div class="table-operator">
       <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-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>
       </div>
       <!-- 统计 -->
       <!-- 统计 -->
       <a-alert type="info" style="margin-bottom:10px">
       <a-alert type="info" style="margin-bottom:10px">

+ 27 - 6
src/views/financialManagement/companyReceivablePayable/chooseBillModal.vue

@@ -13,12 +13,12 @@
       <div class="table-page-search-wrapper">
       <div class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
           <a-row :gutter="15">
           <a-row :gutter="15">
-            <a-col :md="6" :sm="24">
+            <a-col :md="7" :sm="24">
               <a-form-item label="单据号">
               <a-form-item label="单据号">
                 <a-input id="chooseBillModal-bizNo" v-model.trim="queryParam.bizNo" allowClear placeholder="请输入单据号"/>
                 <a-input id="chooseBillModal-bizNo" v-model.trim="queryParam.bizNo" allowClear placeholder="请输入单据号"/>
               </a-form-item>
               </a-form-item>
             </a-col>
             </a-col>
-            <a-col :md="6" :sm="24">
+            <a-col :md="7" :sm="24">
               <a-form-item label="单据类型">
               <a-form-item label="单据类型">
                 <v-select
                 <v-select
                   v-model="queryParam.bizType"
                   v-model="queryParam.bizType"
@@ -29,6 +29,11 @@
                   allowClear></v-select>
                   allowClear></v-select>
               </a-form-item>
               </a-form-item>
             </a-col>
             </a-col>
+            <a-col :md="10" :sm="24">
+              <a-form-item label="关联单据创建时间">
+                <rangeDate ref="createDate" @change="createDateChange" />
+              </a-form-item>
+            </a-col>
             <a-col :md="7" :sm="24">
             <a-col :md="7" :sm="24">
               <a-form-item label="审核时间">
               <a-form-item label="审核时间">
                 <rangeDate ref="rangeDate" @change="dateChange" />
                 <rangeDate ref="rangeDate" @change="dateChange" />
@@ -38,6 +43,16 @@
               <a-button style="margin-bottom: 18px;" type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="chooseBillModal-refresh">查询</a-button>
               <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-button style="margin: 0 0 18px 8px" @click="resetSearchForm" :disabled="disabled" id="chooseBillModal-reset">重置</a-button>
             </a-col>
             </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-row>
         </a-form>
         </a-form>
       </div>
       </div>
@@ -109,11 +124,12 @@ export default {
       // 表头
       // 表头
       columns: [
       columns: [
         { title: '序号', dataIndex: 'no', width: '6%', align: 'center' },
         { title: '序号', dataIndex: 'no', width: '6%', align: 'center' },
-        { title: '单据号', dataIndex: 'bizNo', width: '28%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '单据类型', dataIndex: 'bizTypeDictValue', width: '18%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '单据号', dataIndex: 'bizNo', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '单据类型', dataIndex: 'bizTypeDictValue', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '关联单据创建时间', dataIndex: 'auditTime', width: '25%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '审核时间', dataIndex: 'auditTime', width: '18%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '审核时间', dataIndex: 'auditTime', width: '18%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '金额', dataIndex: 'totalAmount', width: '15%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '余额', dataIndex: 'unsettleAmount', width: '15%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }
+        { title: '金额', dataIndex: 'totalAmount', width: '12%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '余额', dataIndex: 'unsettleAmount', width: '12%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }
       ],
       ],
       // 加载数据方法 必须为 Promise 对象
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
       loadData: parameter => {
@@ -149,6 +165,11 @@ export default {
     rowSelectionFun (obj) {
     rowSelectionFun (obj) {
       this.rowSelectionInfo = obj || null
       this.rowSelectionInfo = obj || null
     },
     },
+    // 关联单据创建时间
+    createDateChange (date) {
+      this.queryParam.auditBeginDate = date[0]
+      this.queryParam.auditEndDate = date[1]
+    },
     //  时间  change
     //  时间  change
     dateChange (date) {
     dateChange (date) {
       this.queryParam.auditBeginDate = date[0]
       this.queryParam.auditBeginDate = date[0]

+ 29 - 2
src/views/financialManagement/companyReceivablePayable/collectionPayment.vue

@@ -28,6 +28,31 @@
                 本次结算金额合计<strong>{{ toThousands(currentTotalBalance) }}</strong>
                 本次结算金额合计<strong>{{ toThousands(currentTotalBalance) }}</strong>
               </div>
               </div>
             </a-alert>
             </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-row>
+              </a-form>
+            </div>
             <!-- 列表 -->
             <!-- 列表 -->
             <a-table
             <a-table
               class="sTable"
               class="sTable"
@@ -183,10 +208,11 @@ import chooseBillModal from './chooseBillModal.vue'
 import { settleUnitSave, settleUnitPrint, settleUnitExport, settleInfoAllList } from '@/api/settle'
 import { settleUnitSave, settleUnitPrint, settleUnitExport, settleInfoAllList } from '@/api/settle'
 import Print from '@/views/common/print.vue'
 import Print from '@/views/common/print.vue'
 import settleAccount from '@/views/common/settleAccount'
 import settleAccount from '@/views/common/settleAccount'
+import rangeDate from '@/views/common/rangeDate.vue'
 import { hdPrint } from '@/libs/JGPrint'
 import { hdPrint } from '@/libs/JGPrint'
 export default {
 export default {
   name: 'CollectionPaymentDetail',
   name: 'CollectionPaymentDetail',
-  components: { STable, VSelect, chooseBillModal, Print, settleAccount },
+  components: { STable, VSelect, chooseBillModal, Print, settleAccount, rangeDate },
   mixins: [commonMixin],
   mixins: [commonMixin],
   data () {
   data () {
     this.amountSettledChange = debounce(this.amountSettledChange, 800)
     this.amountSettledChange = debounce(this.amountSettledChange, 800)
@@ -203,7 +229,8 @@ export default {
       chooseColumns: [
       chooseColumns: [
         { title: '序号', scopedSlots: { customRender: 'no' }, width: '5%', align: 'center' },
         { title: '序号', scopedSlots: { customRender: 'no' }, width: '5%', align: 'center' },
         { title: '单据号', dataIndex: 'bizNo', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '单据号', dataIndex: 'bizNo', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '单据类型', dataIndex: 'bizTypeDictValue', width: '15%', 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: 'auditTime', width: '15%', 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: '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) : '--') } },
         { title: '余额', dataIndex: 'unsettleAmount', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },

+ 14 - 0
src/views/salesManagement/salesQuery/list.vue

@@ -85,6 +85,18 @@
                   <v-select code="FLAG" id="salesManagementList-distributionFlag" v-model="queryParam.distributionFlag" allowClear placeholder="请选择是否铺货出库"></v-select>
                   <v-select code="FLAG" id="salesManagementList-distributionFlag" v-model="queryParam.distributionFlag" allowClear placeholder="请选择是否铺货出库"></v-select>
                 </a-form-model-item>
                 </a-form-model-item>
               </a-col>
               </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>
             </template>
             <a-col :md="6" :sm="24">
             <a-col :md="6" :sm="24">
               <span class="table-page-search-submitButtons">
               <span class="table-page-search-submitButtons">
@@ -111,6 +123,7 @@
       <div class="table-operator">
       <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-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-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-checkbox style="margin-left:10px;" v-model="isByCustQuery" id="sales-byCustQuery">按客户查询</a-checkbox>
         <a-popover placement="right">
         <a-popover placement="right">
           <template slot="content">
           <template slot="content">
@@ -118,6 +131,7 @@
           </template>
           </template>
           <a-icon type="question-circle" />
           <a-icon type="question-circle" />
         </a-popover>
         </a-popover>
+
       </div>
       </div>
       <a-alert type="info" style="margin-bottom:10px">
       <a-alert type="info" style="margin-bottom:10px">
         <div slot="message">
         <div slot="message">