lilei il y a 2 ans
Parent
commit
d29857307d

+ 1 - 1
public/version.json

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

+ 1 - 1
src/views/financialManagement/companyReceivablePayable/detail.vue

@@ -100,7 +100,7 @@ export default {
         { title: '类型', dataIndex: 'bizTypeDictValue', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '类型', dataIndex: 'bizTypeDictValue', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '审核时间', dataIndex: 'auditTime', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '审核时间', dataIndex: 'auditTime', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '金额', dataIndex: 'totalAmount', width: '17%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '金额', dataIndex: 'totalAmount', width: '17%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '余额', dataIndex: 'unsettleAmount', width: '17%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }
+        { title: '结算余额', dataIndex: 'unsettleAmount', width: '17%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }
       ],
       ],
       // 加载数据方法 必须为 Promise 对象
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
       loadData: parameter => {

+ 12 - 23
src/views/financialManagement/companyReceivablePayableNew/collectionPayment.vue

@@ -4,16 +4,15 @@
       <a-page-header :ghost="false" :backIcon="false" class="collectionPayment-back" >
       <a-page-header :ghost="false" :backIcon="false" class="collectionPayment-back" >
         <!-- 自定义的二级文字标题 -->
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle">
         <template slot="subTitle">
-          <p style=" display: inline-block;margin-right:30px;color: #000;font-size: 16px;font-weight: 600;">客户:{{ $route.params.name!='undefined'?$route.params.name: '--' }}</p>
+          <span style="margin-right:30px;color: #000;font-size: 16px;font-weight: 600;">客户:{{ $route.params.name!='undefined'?$route.params.name: '--' }}</span>
           <a-button id="purchaseNewOrderEdit-back-btn" type="link" @click="handleBack" class="button-default"> <a-icon type="rollback" /> 返回列表</a-button>
           <a-button id="purchaseNewOrderEdit-back-btn" type="link" @click="handleBack" class="button-default"> <a-icon type="rollback" /> 返回列表</a-button>
         </template>
         </template>
         <template slot="extra" v-if="$hasPermissions('B_cPayment_printAndExport')">
         <template slot="extra" v-if="$hasPermissions('B_cPayment_printAndExport')">
           <div style="margin-top: 5px;">
           <div style="margin-top: 5px;">
             <PrintPanel ref="printBox" @handlePrint="handlePrint">
             <PrintPanel ref="printBox" @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="printRemarks" :checked="printRemarks" id="salesQuery-printRemarks">打印备注</a-checkbox>
+                <a-checkbox v-model="printTotalKs" :checked="printTotalKs" id="salesQuery-printTotalKs">打印总款数</a-checkbox>
+                <a-checkbox v-model="printTotalNums" :checked="printTotalNums" id="salesQuery-printTotalNums">打印总数量</a-checkbox>
               </div>
               </div>
             </PrintPanel>
             </PrintPanel>
             <a-divider type="vertical" />
             <a-divider type="vertical" />
@@ -240,9 +239,8 @@ export default {
       isChangeAs: false,
       isChangeAs: false,
       maxAmountSettled: 0,
       maxAmountSettled: 0,
       enableFundAccount: false,
       enableFundAccount: false,
-      printOrgCode: false, // 打印原创编码
-      printAllName: false, // 打印全部名称
-      printRemarks: false // 打印备注
+      printTotalKs: false, // 打印原创编码
+      printTotalNums: false, // 打印全部名称
     }
     }
   },
   },
   computed: {
   computed: {
@@ -276,27 +274,22 @@ export default {
       return val
       return val
     }
     }
   },
   },
-  watch: {
-    printOrgCode (newValue, oldValue) {
-      localStorage.setItem('printOrgCode-' + this.$store.state.user.info.orgId, newValue)
-    },
-    printRemarks (newValue, oldValue) {
-      localStorage.setItem('printRemarks-' + this.$store.state.user.info.orgId, newValue)
-    },
-    printAllName (newValue, oldValue) {
-      localStorage.setItem('printAllName-' + this.$store.state.user.info.orgId, newValue)
-    }
-  },
   methods: {
   methods: {
     ...mapActions(['GetSettleAccountState']),
     ...mapActions(['GetSettleAccountState']),
     // 打印预览/快捷打印
     // 打印预览/快捷打印
     handlePrint (type, printerType) {
     handlePrint (type, printerType) {
       const _this = this
       const _this = this
       const params = _this.getParams()
       const params = _this.getParams()
+      
       _this.spinning = true
       _this.spinning = true
-      let url = settleUnitPrint
+      let url = ''
       if (type == 'export') { //  导出
       if (type == 'export') { //  导出
         url = settleUnitExport
         url = settleUnitExport
+      }else{
+        url = settleUnitPrint
+        // 打印
+        params.printTotalKs = params.printTotalKs ? 1 : 0
+        params.printTotalNums = params.printTotalNums ? 1 : 0
       }
       }
       // 打印或导出
       // 打印或导出
       hdPrint(printerType, type, url, params, '单位应收应付', function () {
       hdPrint(printerType, type, url, params, '单位应收应付', function () {
@@ -448,10 +441,6 @@ export default {
     pageInit () {
     pageInit () {
       const vm = this
       const vm = this
       vm.$nextTick(() => {
       vm.$nextTick(() => {
-      // 是否默认打印原厂编码
-        vm.printOrgCode = localStorage.getItem('printOrgCode-' + 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.chooseLoadData = []
         vm.chooseLoadData = []
         vm.getsettleInfoAllList()
         vm.getsettleInfoAllList()
       })
       })

+ 9 - 7
src/views/financialManagement/companyReceivablePayableNew/detail.vue

@@ -4,7 +4,7 @@
       <a-page-header :ghost="false" :backIcon="false" class="companyCollectionPaymentDetail-cont" >
       <a-page-header :ghost="false" :backIcon="false" class="companyCollectionPaymentDetail-cont" >
         <!-- 自定义的二级文字标题 -->
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle">
         <template slot="subTitle">
-          <p style=" display: inline-block;margin-right: 30px;color: #000;font-size: 16px;font-weight: 600;">客户:{{ $route.params.name!='undefined'?$route.params.name: '--' }}</p>
+          <span style="margin-right: 30px;color: #000;font-size: 16px;font-weight: 600;">客户:{{ $route.params.name!='undefined'?$route.params.name: '--' }}</span>
           <a-button id="companyCollectionPaymentDetail-back-btn" type="link" @click="handleBack" class="button-default"> <a-icon type="rollback" /> 返回列表</a-button>
           <a-button id="companyCollectionPaymentDetail-back-btn" type="link" @click="handleBack" class="button-default"> <a-icon type="rollback" /> 返回列表</a-button>
         </template>
         </template>
       </a-page-header>
       </a-page-header>
@@ -95,12 +95,14 @@ export default {
       exportLoading: false, // 导出loading
       exportLoading: false, // 导出loading
       // 表头
       // 表头
       columns: [
       columns: [
-        { title: '序号', dataIndex: 'no', width: '6%', align: 'center' },
-        { title: '单据号', dataIndex: 'bizNo', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '类型', dataIndex: 'bizTypeDictValue', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '审核时间', dataIndex: 'auditTime', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '金额', dataIndex: 'totalAmount', width: '17%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '余额', dataIndex: 'unsettleAmount', width: '17%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }
+        { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
+        { title: '单据号', dataIndex: 'bizNo', width: '16%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '类型', dataIndex: 'bizTypeDictValue', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '审核时间', dataIndex: 'auditTime', width: '16%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '总款数', dataIndex: 'totalAmount', width: '12%', align: 'right', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '总数量', dataIndex: 'totalAmount', width: '12%', align: 'right', customRender: function (text) { return ((text || text == 0) ? 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 => {