lilei 3 days ago
parent
commit
3de9370715

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
 {
   "message": "发现有新版本发布,确定更新系统?",
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
   "vendorJsVersion": "",
-  "version": 1757904068571
+  "version": 1758519723164
 }
 }

+ 43 - 9
src/views/financialManagement/companyReceivablePayable/list.vue

@@ -21,6 +21,17 @@
                   allowClear></v-select>
                   allowClear></v-select>
               </a-form-item>
               </a-form-item>
             </a-col>
             </a-col>
+            <a-col :span="6">
+              <a-form-item label="审核时间">
+                <rangeDate
+                  id="companyReceivablePayableList-auditdate"
+                  allowClear
+                  :hasDisabledAreaTime="false"
+                  ref="rangeDate"
+                  :value="auditTime"
+                  @change="auditDateChange" />
+              </a-form-item>
+            </a-col>
             <a-col :md="6" :sm="24">
             <a-col :md="6" :sm="24">
               <span class="table-page-search-submitButtons">
               <span class="table-page-search-submitButtons">
                 <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="companyReceivablePayableList-refresh">查询</a-button>
                 <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="companyReceivablePayableList-refresh">查询</a-button>
@@ -91,10 +102,12 @@
 import { commonMixin } from '@/utils/mixin'
 import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import { STable, VSelect } from '@/components'
 import { downloadExcel } from '@/libs/JGPrint.js'
 import { downloadExcel } from '@/libs/JGPrint.js'
+import getDate from '@/libs/getDate.js'
+import rangeDate from '@/views/common/rangeDate.vue'
 import { settleUnitClientList, settleInfoQuerySum, exportClientUnSettle } from '@/api/settle'
 import { settleUnitClientList, settleInfoQuerySum, exportClientUnSettle } from '@/api/settle'
 export default {
 export default {
   name: 'CollectionPaymentList',
   name: 'CollectionPaymentList',
-  components: { STable, VSelect },
+  components: { STable, VSelect, rangeDate },
   mixins: [commonMixin],
   mixins: [commonMixin],
   data () {
   data () {
     const _this = this
     const _this = this
@@ -103,29 +116,41 @@ export default {
       exportLoading: false,
       exportLoading: false,
       disabled: false, //  查询、重置按钮是否可操作
       disabled: false, //  查询、重置按钮是否可操作
       tableHeight: 0,
       tableHeight: 0,
+      auditTime: [ // 创建时间
+        getDate.getMonthDays(3).starttime,
+        getDate.getMonthDays(3).endtime
+      ],
       // 查询参数
       // 查询参数
       queryParam: {
       queryParam: {
         settleClientNameCurrent: '', // 客户名称
         settleClientNameCurrent: '', // 客户名称
-        settleClientType: undefined // 单位类型
+        settleClientType: undefined, // 单位类型
+        auditBeginDate: '', // 开始审核时间
+        auditEndDate: '' // 结束审核时间
       },
       },
       // 表头
       // 表头
       columns: [
       columns: [
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
-        { title: '客户名称', width: '20%', align: 'center', scopedSlots: { customRender: 'customerName' } },
-        { title: '单位类型', dataIndex: 'settleClientTypeDictValue', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '应收金额', dataIndex: 'unSettleAmountReceipt', width: '20%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '应付金额', dataIndex: 'unSettleAmountPay', width: '20%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: '15%', align: 'center' }
+        { title: '客户名称', width: '15%', align: 'center', scopedSlots: { customRender: 'customerName' } },
+        { title: '单位类型', dataIndex: 'settleClientTypeDictValue', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '应收金额', dataIndex: 'unSettleAmountReceipt', width: '9%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '已收金额', dataIndex: 'unSettleAmountReceipt', width: '9%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '待收金额', dataIndex: 'unSettleAmountReceipt', width: '9%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '应付金额', dataIndex: 'unSettleAmountPay', width: '9%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '已付金额', dataIndex: 'unSettleAmountReceipt', width: '9%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '未付金额', dataIndex: 'unSettleAmountReceipt', width: '9%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '折让金额', dataIndex: 'unSettleAmountReceipt', width: '9%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
       ],
       ],
       // 加载数据方法 必须为 Promise 对象
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
       loadData: parameter => {
         this.disabled = true
         this.disabled = true
         this.spinning = true
         this.spinning = true
-        return settleUnitClientList(Object.assign(parameter, this.queryParam)).then(res => {
+        const params = Object.assign(parameter, this.queryParam)
+        this.getTotal(params)
+        return settleUnitClientList(params).then(res => {
           let data
           let data
           if (res.status == 200) {
           if (res.status == 200) {
             data = res.data
             data = res.data
-            this.getTotal(Object.assign(parameter, this.queryParam))
             const no = (data.pageNo - 1) * data.pageSize
             const no = (data.pageNo - 1) * data.pageSize
             for (var i = 0; i < data.list.length; i++) {
             for (var i = 0; i < data.list.length; i++) {
               data.list[i].no = no + i + 1
               data.list[i].no = no + i + 1
@@ -156,6 +181,12 @@ export default {
         downloadExcel(res, '单位收付款客户')
         downloadExcel(res, '单位收付款客户')
       })
       })
     },
     },
+    // 选择审核时间
+    auditDateChange (date) {
+      this.auditTime = date
+      this.queryParam.auditBeginDate = date[0]
+      this.queryParam.auditEndDate = date[1]
+    },
     //  详情
     //  详情
     handleDetail (row) {
     handleDetail (row) {
       if (row.settleClientType == 'CUSTOMER') {
       if (row.settleClientType == 'CUSTOMER') {
@@ -186,6 +217,9 @@ export default {
     resetSearchForm () {
     resetSearchForm () {
       this.queryParam.settleClientNameCurrent = ''
       this.queryParam.settleClientNameCurrent = ''
       this.queryParam.settleClientType = undefined
       this.queryParam.settleClientType = undefined
+      this.$refs.rangeDate.resetDate(this.auditTime)
+      this.queryParam.auditBeginDate = getDate.getMonthDays(3).starttime
+      this.queryParam.auditEndDate = getDate.getMonthDays(3).endtime
       this.$refs.table.refresh(true)
       this.$refs.table.refresh(true)
     },
     },
     // 页面初始化
     // 页面初始化

+ 37 - 9
src/views/financialManagement/companyReceivablePayableNew/list.vue

@@ -21,6 +21,17 @@
                   allowClear></v-select>
                   allowClear></v-select>
               </a-form-item>
               </a-form-item>
             </a-col>
             </a-col>
+            <a-col :span="6">
+              <a-form-item label="审核时间">
+                <rangeDate
+                  id="crpnList-auditdate"
+                  allowClear
+                  :hasDisabledAreaTime="false"
+                  ref="rangeDate"
+                  :value="auditTime"
+                  @change="auditDateChange" />
+              </a-form-item>
+            </a-col>
             <a-col :md="6" :sm="24">
             <a-col :md="6" :sm="24">
               <span class="table-page-search-submitButtons">
               <span class="table-page-search-submitButtons">
                 <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="crpnList-refresh">查询</a-button>
                 <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="crpnList-refresh">查询</a-button>
@@ -95,10 +106,12 @@
 import { commonMixin } from '@/utils/mixin'
 import { commonMixin } from '@/utils/mixin'
 import { downloadExcel } from '@/libs/JGPrint.js'
 import { downloadExcel } from '@/libs/JGPrint.js'
 import { STable, VSelect } from '@/components'
 import { STable, VSelect } from '@/components'
+import getDate from '@/libs/getDate.js'
+import rangeDate from '@/views/common/rangeDate.vue'
 import { settleUnitClientList, settleInfoQuerySum, exportClientUnSettle } from '@/api/settle'
 import { settleUnitClientList, settleInfoQuerySum, exportClientUnSettle } from '@/api/settle'
 export default {
 export default {
   name: 'CollectionPaymentList',
   name: 'CollectionPaymentList',
-  components: { STable, VSelect },
+  components: { STable, VSelect, rangeDate },
   mixins: [commonMixin],
   mixins: [commonMixin],
   data () {
   data () {
     const _this = this
     const _this = this
@@ -107,29 +120,41 @@ export default {
       disabled: false, //  查询、重置按钮是否可操作
       disabled: false, //  查询、重置按钮是否可操作
       tableHeight: 0, // 表格高度
       tableHeight: 0, // 表格高度
       exportLoading: false,
       exportLoading: false,
+      auditTime: [ // 创建时间
+        getDate.getMonthDays(3).starttime,
+        getDate.getMonthDays(3).endtime
+      ],
       // 查询参数
       // 查询参数
       queryParam: {
       queryParam: {
         settleClientNameCurrent: '', // 客户名称
         settleClientNameCurrent: '', // 客户名称
-        settleClientType: undefined // 单位类型
+        settleClientType: undefined, // 单位类型
+        auditBeginDate: '', // 开始审核时间
+        auditEndDate: '' // 结束审核时间
       },
       },
       // 表头
       // 表头
       columns: [
       columns: [
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
-        { title: '客户名称', width: '20%', align: 'center', scopedSlots: { customRender: 'customerName' } },
-        { title: '单位类型', dataIndex: 'settleClientTypeDictValue', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '应收金额', dataIndex: 'unSettleAmountReceipt', width: '20%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '应付金额', dataIndex: 'unSettleAmountPay', width: '20%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: '15%', align: 'center' }
+        { title: '客户名称', width: '15%', align: 'center', scopedSlots: { customRender: 'customerName' } },
+        { title: '单位类型', dataIndex: 'settleClientTypeDictValue', width: '9%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '应收金额', dataIndex: 'unSettleAmountReceipt', width: '9%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '已收金额', dataIndex: 'unSettleAmountReceipt', width: '9%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '待收金额', dataIndex: 'unSettleAmountReceipt', width: '9%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '应付金额', dataIndex: 'unSettleAmountPay', width: '9%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '已付金额', dataIndex: 'unSettleAmountReceipt', width: '9%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '未付金额', dataIndex: 'unSettleAmountReceipt', width: '9%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '折让金额', dataIndex: 'unSettleAmountReceipt', width: '9%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
       ],
       ],
       // 加载数据方法 必须为 Promise 对象
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
       loadData: parameter => {
         this.disabled = true
         this.disabled = true
         this.spinning = true
         this.spinning = true
-        return settleUnitClientList(Object.assign(parameter, this.queryParam)).then(res => {
+        const params = Object.assign(parameter, this.queryParam)
+        this.getTotal(params)
+        return settleUnitClientList(params).then(res => {
           let data
           let data
           if (res.status == 200) {
           if (res.status == 200) {
             data = res.data
             data = res.data
-            this.getTotal(Object.assign(parameter, this.queryParam))
             const no = (data.pageNo - 1) * data.pageSize
             const no = (data.pageNo - 1) * data.pageSize
             for (var i = 0; i < data.list.length; i++) {
             for (var i = 0; i < data.list.length; i++) {
               data.list[i].no = no + i + 1
               data.list[i].no = no + i + 1
@@ -182,6 +207,9 @@ export default {
     },
     },
     //  重置
     //  重置
     resetSearchForm () {
     resetSearchForm () {
+      this.$refs.rangeDate.resetDate(this.auditTime)
+      this.queryParam.auditBeginDate = getDate.getMonthDays(3).starttime
+      this.queryParam.auditEndDate = getDate.getMonthDays(3).endtime
       this.queryParam.settleClientNameCurrent = ''
       this.queryParam.settleClientNameCurrent = ''
       this.queryParam.settleClientType = undefined
       this.queryParam.settleClientType = undefined
       this.$refs.table.refresh(true)
       this.$refs.table.refresh(true)

+ 9 - 2
src/views/reportData/salesReturnReport/detailList.vue

@@ -23,6 +23,11 @@
               <a-input id="salesDetailReportList-salesReturnNo" v-model.trim="queryParam.salesReturnNo" allowClear placeholder="请输入销售退货单号"/>
               <a-input id="salesDetailReportList-salesReturnNo" v-model.trim="queryParam.salesReturnNo" allowClear placeholder="请输入销售退货单号"/>
             </a-form-model-item>
             </a-form-model-item>
           </a-col>
           </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-model-item label="客户关系">
+              <v-select code="CUSTOMER_RELATION_TYPE" id="salesDetailReportList-buyerRelationType" v-model="queryParam.buyerRelationType" allowClear placeholder="请选择客户关系"></v-select>
+            </a-form-model-item>
+          </a-col>
           <a-col :md="6" :sm="24">
           <a-col :md="6" :sm="24">
             <a-form-model-item label="客户名称">
             <a-form-model-item label="客户名称">
               <custList id="salesDetailReportList-buyerName" ref="custSatelliteList" @change="custSatelliteChange"></custList>
               <custList id="salesDetailReportList-buyerName" ref="custSatelliteList" @change="custSatelliteChange"></custList>
@@ -50,7 +55,7 @@
               </a-form-model-item>
               </a-form-model-item>
             </a-col>
             </a-col>
           </template>
           </template>
-          <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
+          <a-col :md="24" :sm="24" style="margin-bottom: 10px;text-align: center;">
             <a-button type="primary" @click="handleSearch" :disabled="disabled" id="salesDetailReportList-refresh">查询</a-button>
             <a-button type="primary" @click="handleSearch" :disabled="disabled" id="salesDetailReportList-refresh">查询</a-button>
             <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="salesDetailReportList-reset">重置</a-button>
             <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="salesDetailReportList-reset">重置</a-button>
             <a-button
             <a-button
@@ -132,7 +137,8 @@ export default {
           code: '', //  产品编码
           code: '', //  产品编码
           name: '' //  产品名称
           name: '' //  产品名称
         },
         },
-        salesReturnNo: ''
+        salesReturnNo: '',
+        buyerRelationType: undefined //  客户类型
       },
       },
       rules: {
       rules: {
         'time': [{ required: true, message: '请选择审核时间', trigger: 'change' }]
         'time': [{ required: true, message: '请选择审核时间', trigger: 'change' }]
@@ -236,6 +242,7 @@ export default {
       this.queryParam.salesReturnNo = ''
       this.queryParam.salesReturnNo = ''
       this.queryParam.buyerNameCurrent = undefined
       this.queryParam.buyerNameCurrent = undefined
       this.queryParam.buyerSnCurrent = undefined
       this.queryParam.buyerSnCurrent = undefined
+      this.queryParam.buyerRelationType = undefined
       this.$refs.custSatelliteList.resetForm()
       this.$refs.custSatelliteList.resetForm()
       this.queryParam.productEntity.productBrandSn = undefined
       this.queryParam.productEntity.productBrandSn = undefined
       this.queryParam.productEntity.productTypeSn1 = ''
       this.queryParam.productEntity.productTypeSn1 = ''

+ 9 - 2
src/views/reportData/salesReturnReport/list.vue

@@ -23,12 +23,17 @@
               <a-input id="salesReturnReportList-salesReturnNo" v-model.trim="queryParam.salesReturnNo" allowClear placeholder="请输入销售退货单号"/>
               <a-input id="salesReturnReportList-salesReturnNo" v-model.trim="queryParam.salesReturnNo" allowClear placeholder="请输入销售退货单号"/>
             </a-form-model-item>
             </a-form-model-item>
           </a-col>
           </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-model-item label="客户关系">
+              <v-select code="CUSTOMER_RELATION_TYPE" id="salesReturnReportList-buyerRelationType" v-model="queryParam.buyerRelationType" allowClear placeholder="请选择客户关系"></v-select>
+            </a-form-model-item>
+          </a-col>
           <a-col :md="6" :sm="24">
           <a-col :md="6" :sm="24">
             <a-form-model-item label="客户名称">
             <a-form-model-item label="客户名称">
               <custList id="salesReturnReportList-buyerName" ref="custSatelliteList" @change="custSatelliteChange"></custList>
               <custList id="salesReturnReportList-buyerName" ref="custSatelliteList" @change="custSatelliteChange"></custList>
             </a-form-model-item>
             </a-form-model-item>
           </a-col>
           </a-col>
-          <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
+          <a-col :md="24" :sm="24" style="margin-bottom: 10px;text-align: center;">
             <a-button type="primary" @click="handleSearch" :disabled="disabled" id="salesReturnReportList-refresh">查询</a-button>
             <a-button type="primary" @click="handleSearch" :disabled="disabled" id="salesReturnReportList-refresh">查询</a-button>
             <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="salesReturnReportList-reset">重置</a-button>
             <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="salesReturnReportList-reset">重置</a-button>
             <a-button
             <a-button
@@ -96,7 +101,8 @@ export default {
         endDate: '', // 结束时间
         endDate: '', // 结束时间
         buyerNameCurrent: undefined, // 客户名称
         buyerNameCurrent: undefined, // 客户名称
         buyerSnCurrent: undefined, // 客户sn
         buyerSnCurrent: undefined, // 客户sn
-        salesReturnNo: '' // 销售退货单号
+        salesReturnNo: '', // 销售退货单号
+        buyerRelationType: undefined // 客户关系
       },
       },
       rules: {
       rules: {
         'time': [{ required: true, message: '请选择审核时间', trigger: 'change' }]
         'time': [{ required: true, message: '请选择审核时间', trigger: 'change' }]
@@ -199,6 +205,7 @@ export default {
       this.queryParam.salesReturnNo = ''
       this.queryParam.salesReturnNo = ''
       this.queryParam.buyerNameCurrent = undefined
       this.queryParam.buyerNameCurrent = undefined
       this.queryParam.buyerSnCurrent = undefined
       this.queryParam.buyerSnCurrent = undefined
+      this.queryParam.buyerRelationType = undefined
       this.$refs.custSatelliteList.resetForm()
       this.$refs.custSatelliteList.resetForm()
       this.$refs.ruleForm.resetFields()
       this.$refs.ruleForm.resetFields()
       this.totalData = null
       this.totalData = null

+ 21 - 7
src/views/salesManagement/salesQueryNew/detail.vue

@@ -18,12 +18,15 @@
           <div style="margin-top: 5px;">
           <div style="margin-top: 5px;">
             <PrintPanel ref="printBox" position="bottomRight" :disabled="localDataSource.length==0" @handlePrint="handlePrint">
             <PrintPanel ref="printBox" position="bottomRight" :disabled="localDataSource.length==0" @handlePrint="handlePrint">
               <div style="padding:10px;line-height: 30px;" slot="extendCons">
               <div style="padding:10px;line-height: 30px;" slot="extendCons">
-                <a-checkbox v-model="printAllName" :checked="printAllName" id="salesQuery-printAllName">打印完整产品名称</a-checkbox>
-                <a-checkbox v-model="printOrgCode" :checked="printOrgCode" id="salesQuery-printOrgCode">打印原厂编码</a-checkbox>
-                <a-checkbox v-model="printPrice" :checked="printPrice" id="salesQuery-printPrice">打印售价</a-checkbox>
+                <div>打印内容(多选)</div>
+                <a-checkbox v-model="printNo" :checked="printNo" id="salesQuery-printNo">销售单号</a-checkbox>
+                <a-checkbox v-model="printAllName" :checked="printAllName" id="salesQuery-printAllName">完整产品名称</a-checkbox>
+                <a-checkbox v-model="printOrgCode" :checked="printOrgCode" id="salesQuery-printOrgCode">原厂编码</a-checkbox>
                 <br>
                 <br>
-                <a-checkbox v-model="printRemarks" :checked="printRemarks" id="salesQuery-printRemarks">打印备注</a-checkbox>
-                <!-- <a-checkbox v-model="printNo" :checked="printNo" id="salesQuery-printNo">打印销售单号</a-checkbox> -->
+                <a-checkbox v-model="printPrice" :checked="printPrice" id="salesQuery-printPrice">售价</a-checkbox>
+                <a-checkbox v-model="printRemarks" :checked="printRemarks" id="salesQuery-printRemarks">备注</a-checkbox>
+                <a-checkbox v-model="printWarehouse" :checked="printWarehouse" id="salesQuery-printWarehouse">仓库仓位</a-checkbox>
+                <a-checkbox v-model="printDate" :checked="printDate" id="salesQuery-printDate">打印时间</a-checkbox>
               </div>
               </div>
             </PrintPanel>
             </PrintPanel>
           </div>
           </div>
@@ -162,6 +165,8 @@ export default {
       printRemarks: false, // 是否打印备注
       printRemarks: false, // 是否打印备注
       printPrice: false, // 是否打印价格
       printPrice: false, // 是否打印价格
       printNo: true, // 是否打印销售单号
       printNo: true, // 是否打印销售单号
+      printDate: false, // 是否打印日期
+      printWarehouse: false, // 是否打印仓库
       showOutInModal: false, // 出库明细弹框
       showOutInModal: false, // 出库明细弹框
       // 加载数据方法 必须为 Promise 对象
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
       loadData: parameter => {
@@ -267,7 +272,9 @@ export default {
         printAllName: this.printAllName ? 1 : 0,
         printAllName: this.printAllName ? 1 : 0,
         remarksShowFlag: this.printRemarks ? 1 : 0,
         remarksShowFlag: this.printRemarks ? 1 : 0,
         printNo: this.printNo ? 1 : 0,
         printNo: this.printNo ? 1 : 0,
-        priceFlag: this.printPrice ? 1 : 0
+        priceFlag: this.printPrice ? 1 : 0,
+        printWarehouse: this.printWarehouse ? 1 : 0,
+        printDate: this.printDate ? 1 : 0
       }
       }
       if (type == 'export') { //  导出
       if (type == 'export') { //  导出
         url = salesDetailExport
         url = salesDetailExport
@@ -307,8 +314,9 @@ export default {
         vm.printAllName = localStorage.getItem('printAllName-' + this.$store.state.user.info.orgId) == 'true'
         vm.printAllName = localStorage.getItem('printAllName-' + this.$store.state.user.info.orgId) == 'true'
         vm.printRemarks = localStorage.getItem('printRemarks-' + this.$store.state.user.info.orgId) == 'true'
         vm.printRemarks = localStorage.getItem('printRemarks-' + this.$store.state.user.info.orgId) == 'true'
         vm.printPrice = localStorage.getItem('printPrice-' + this.$store.state.user.info.orgId) == 'true'
         vm.printPrice = localStorage.getItem('printPrice-' + this.$store.state.user.info.orgId) == 'true'
+        vm.printWarehouse = localStorage.getItem('printWarehouse-' + this.$store.state.user.info.orgId) == 'true'
+        vm.printDate = localStorage.getItem('printDate-' + this.$store.state.user.info.orgId) == 'true'
         const printNo = localStorage.getItem('printNo-' + this.$store.state.user.info.orgId)
         const printNo = localStorage.getItem('printNo-' + this.$store.state.user.info.orgId)
-        console.log(printNo)
         vm.printNo = printNo ? printNo == 'true' : true
         vm.printNo = printNo ? printNo == 'true' : true
         // 查询列表
         // 查询列表
         vm.$refs.table.refresh(true)
         vm.$refs.table.refresh(true)
@@ -331,6 +339,12 @@ export default {
     printAllName (newValue, oldValue) {
     printAllName (newValue, oldValue) {
       localStorage.setItem('printAllName-' + this.$store.state.user.info.orgId, newValue)
       localStorage.setItem('printAllName-' + this.$store.state.user.info.orgId, newValue)
     },
     },
+    printDate (newValue, oldValue) {
+      localStorage.setItem('printDate-' + this.$store.state.user.info.orgId, newValue)
+    },
+    printWarehouse (newValue, oldValue) {
+      localStorage.setItem('printWarehouse-' + this.$store.state.user.info.orgId, newValue)
+    },
     printNo (newValue, oldValue) {
     printNo (newValue, oldValue) {
       localStorage.setItem('printNo-' + this.$store.state.user.info.orgId, newValue)
       localStorage.setItem('printNo-' + this.$store.state.user.info.orgId, newValue)
     }
     }

+ 23 - 6
src/views/salesManagement/salesQueryNew/edit.vue

@@ -24,11 +24,16 @@
         <div style="margin-top: 5px;">
         <div style="margin-top: 5px;">
           <PrintPanel ref="printBox" :disabled="dataSource.length==0" @handlePrint="handlePrint">
           <PrintPanel ref="printBox" :disabled="dataSource.length==0" @handlePrint="handlePrint">
             <div style="padding:10px;" slot="extendCons">
             <div style="padding:10px;" slot="extendCons">
-              <a-checkbox v-model="printAllName" :checked="printAllName" id="salesQuery-printAllName">打印完整产品名称</a-checkbox>
-              <a-checkbox v-model="printOrgCode" :checked="printOrgCode" id="salesQuery-printOrgCode">打印原厂编码</a-checkbox>
-              <a-checkbox v-model="printPrice" :checked="printPrice" id="salesQuery-printPrice">打印售价</a-checkbox>
-              <a-checkbox v-model="printRemarks" :checked="printRemarks" id="salesQuery-printRemarks">打印备注</a-checkbox>
-              <a-checkbox v-model="printNo" :checked="printNo" id="salesQuery-printNo">打印销售单号</a-checkbox>
+              <div style="padding:10px 0">打印内容(多选)</div>
+              <a-checkbox v-model="printNo" :checked="printNo" id="salesQuery-printNo">销售单号</a-checkbox>
+              <a-checkbox v-model="printAllName" :checked="printAllName" id="salesQuery-printAllName">完整产品名称</a-checkbox>
+              <a-checkbox v-model="printOrgCode" :checked="printOrgCode" id="salesQuery-printOrgCode">原厂编码</a-checkbox>
+              <div style="padding:10px 0">
+                <a-checkbox v-model="printPrice" :checked="printPrice" id="salesQuery-printPrice">售价</a-checkbox>
+                <a-checkbox v-model="printRemarks" :checked="printRemarks" id="salesQuery-printRemarks">备注</a-checkbox>
+                <a-checkbox v-model="printWarehouse" :checked="printWarehouse" id="salesQuery-printWarehouse">仓库仓位</a-checkbox>
+                <a-checkbox v-model="printDate" :checked="printDate" id="salesQuery-printDate">打印时间</a-checkbox>
+              </div>
             </div>
             </div>
           </PrintPanel>
           </PrintPanel>
           <a-divider type="vertical" v-if="detailData&&detailData.totalCategory" />
           <a-divider type="vertical" v-if="detailData&&detailData.totalCategory" />
@@ -387,6 +392,8 @@ export default {
       printAllName: false, // 是否打印全部名称
       printAllName: false, // 是否打印全部名称
       printRemarks: false, // 是否打印备注
       printRemarks: false, // 是否打印备注
       printNo: true, // 是否打印销售单号
       printNo: true, // 是否打印销售单号
+      printDate: false, // 是否打印日期
+      printWarehouse: false, // 是否打印仓库
       printPrice: false, // 是否打印价格
       printPrice: false, // 是否打印价格
       // 加载数据方法 必须为 Promise 对象
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
       loadData: parameter => {
@@ -493,7 +500,9 @@ export default {
         printAllName: this.printAllName ? 1 : 0,
         printAllName: this.printAllName ? 1 : 0,
         remarksShowFlag: this.printRemarks ? 1 : 0,
         remarksShowFlag: this.printRemarks ? 1 : 0,
         printNo: this.printNo ? 1 : 0,
         printNo: this.printNo ? 1 : 0,
-        priceFlag: this.printPrice ? 1 : 0
+        priceFlag: this.printPrice ? 1 : 0,
+        printWarehouse: this.printWarehouse ? 1 : 0,
+        printDate: this.printDate ? 1 : 0
       }
       }
       if (type == 'export') { //  导出
       if (type == 'export') { //  导出
         url = salesDetailExport
         url = salesDetailExport
@@ -935,6 +944,8 @@ export default {
         vm.printAllName = localStorage.getItem('printAllName-' + this.$store.state.user.info.orgId) == 'true'
         vm.printAllName = localStorage.getItem('printAllName-' + this.$store.state.user.info.orgId) == 'true'
         vm.printRemarks = localStorage.getItem('printRemarks-' + this.$store.state.user.info.orgId) == 'true'
         vm.printRemarks = localStorage.getItem('printRemarks-' + this.$store.state.user.info.orgId) == 'true'
         vm.printPrice = localStorage.getItem('printPrice-' + this.$store.state.user.info.orgId) == 'true'
         vm.printPrice = localStorage.getItem('printPrice-' + this.$store.state.user.info.orgId) == 'true'
+        vm.printWarehouse = localStorage.getItem('printWarehouse-' + this.$store.state.user.info.orgId) == 'true'
+        vm.printDate = localStorage.getItem('printDate-' + this.$store.state.user.info.orgId) == 'true'
         const printNo = localStorage.getItem('printNo-' + this.$store.state.user.info.orgId)
         const printNo = localStorage.getItem('printNo-' + this.$store.state.user.info.orgId)
         vm.printNo = printNo ? printNo == 'true' : true
         vm.printNo = printNo ? printNo == 'true' : true
         // 获取详情
         // 获取详情
@@ -956,6 +967,12 @@ export default {
     printRemarks (newValue, oldValue) {
     printRemarks (newValue, oldValue) {
       localStorage.setItem('printRemarks-' + this.$store.state.user.info.orgId, newValue)
       localStorage.setItem('printRemarks-' + this.$store.state.user.info.orgId, newValue)
     },
     },
+    printDate (newValue, oldValue) {
+      localStorage.setItem('printDate-' + this.$store.state.user.info.orgId, newValue)
+    },
+    printWarehouse (newValue, oldValue) {
+      localStorage.setItem('printWarehouse-' + this.$store.state.user.info.orgId, newValue)
+    },
     printNo (newValue, oldValue) {
     printNo (newValue, oldValue) {
       localStorage.setItem('printNo-' + this.$store.state.user.info.orgId, newValue)
       localStorage.setItem('printNo-' + this.$store.state.user.info.orgId, newValue)
     },
     },

+ 12 - 1
src/views/salesManagement/salesReturn/queryPart.vue

@@ -25,6 +25,15 @@
                 <a-input id="salesReturn-productList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
                 <a-input id="salesReturn-productList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
               </a-form-item>
               </a-form-item>
             </a-col>
             </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="可退货数量">
+                <a-select id="salesReturn-productList-thnums" v-model.trim="queryParam.thnums" placeholder="请选择" allowClear>
+                  <a-select-option value="1">大于0</a-select-option>
+                  <a-select-option value="2">等于0</a-select-option>
+                  <a-select-option value="3">全部</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="salesReturn-productList-refresh">查询</a-button>
             <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="salesReturn-productList-refresh">查询</a-button>
@@ -165,7 +174,8 @@ export default {
         salesBillNo: '', //  销售单号
         salesBillNo: '', //  销售单号
         productName: '', // 产品名称
         productName: '', // 产品名称
         productCode: '', //  产品编码
         productCode: '', //  产品编码
-        oosFlag: undefined // 是否急件
+        oosFlag: undefined, // 是否急件
+        thnums: undefined
       },
       },
       buyerSn: '', // 客户sn
       buyerSn: '', // 客户sn
       priceType: '', // 价格类型
       priceType: '', // 价格类型
@@ -360,6 +370,7 @@ export default {
       this.queryParam.productName = ''
       this.queryParam.productName = ''
       this.queryParam.productCode = ''
       this.queryParam.productCode = ''
       this.queryParam.oosFlag = undefined
       this.queryParam.oosFlag = undefined
+      this.queryParam.thnums = undefined
       this.$refs.table.refresh(true)
       this.$refs.table.refresh(true)
     },
     },
     // 初始化,客户sn、价格类型
     // 初始化,客户sn、价格类型