lilei hace 2 años
padre
commit
522cb28ddd

+ 1 - 1
public/version.json

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

+ 1 - 1
src/api/sales.js

@@ -134,7 +134,7 @@ export const supperCodeByVin = (params) => {
 // 销售 详情  打印
 export const salesDetailPrint = params => {
   const data = {
-    url: `/sales/print/${params.sn}/${params.type}/${params.printOrgCode}`,
+    url: `/sales/print/${params.sn}/${params.type}/${params.printOrgCode}/${params.printAllName}`,
     method: 'get'
   }
   // 喷墨打印

+ 1 - 1
src/views/financialManagement/financialCollection/list.vue

@@ -96,7 +96,7 @@
       >
         <!-- 关联单号 -->
         <template slot="bizNo" slot-scope="text, record">
-          <span class="table-td-link" v-if="$hasPermissions('B_salesDetail')" @click="handleDetail(record)">{{ record.bizNo }}</span>
+          <span class="table-td-link" @click="handleDetail(record)">{{ record.bizNo }}</span>
         </template>
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">

+ 8 - 1
src/views/financialManagement/financialPayment/list.vue

@@ -93,6 +93,10 @@
         :defaultLoadData="false"
         bordered
       >
+        <!-- 关联单号 -->
+        <template slot="bizNo" slot-scope="text, record">
+          <span class="table-td-link" @click="handleDetail(record)">{{ record.bizNo }}</span>
+        </template>
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
           <a-button
@@ -164,7 +168,7 @@ export default {
       columns: [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '付款单号', dataIndex: 'settleNo', width: '14%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '发货单号', dataIndex: 'bizNo', width: '14%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '关联单号', dataIndex: 'bizNo', scopedSlots: { customRender: 'bizNo' }, width: '14%', align: 'center' },
         { title: '商户名称', dataIndex: 'settleClientName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '应付金额', dataIndex: 'totalAmount', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? ('¥' + text) : '--') } },
         { title: '已付金额', dataIndex: 'settledAmount', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? ('¥' + text) : '--') } },
@@ -214,6 +218,9 @@ export default {
     }
   },
   methods: {
+    handleDetail (row) {
+
+    },
     ...mapActions(['GetSettleAccountState']),
     // 表格选中项
     rowSelectionFun (obj) {

+ 13 - 5
src/views/inventoryManagement/inventoryChecking/detailModal.vue

@@ -32,7 +32,7 @@
             class="button-warning"
             id="inventoryCheckingDetail-export-btn"
             :disabled="localDataSource.length==0"
-            @click="handlePrint('export')">导出Excel</a-button>
+            @click="handleExport('export')">导出Excel</a-button>
         </div>
         <a-descriptions size="small" :column="2">
           <a-descriptions-item label="盘点单号" :span="2">
@@ -152,6 +152,8 @@
     <print-modal :openModal="openPrintModal" :itemData="basicInfoData" :nowType="nowType" @ok="handleOk" @close="openPrintModal=false" />
     <!-- 打印 -->
     <div id="print"></div>
+    <!-- 导出选择弹框 -->
+    <exportModal :openModal="exportShow" :itemData="basicInfoData" :nowType="nowType" @ok="handlePrint" @close="exportShow=false" />
   </a-modal>
 </template>
 
@@ -160,12 +162,13 @@ import { commonMixin } from '@/utils/mixin'
 import { hdPrint } from '@/libs/JGPrint.js'
 import { STable } from '@/components'
 import printModal from './printModal.vue'
+import exportModal from './exportModal.vue'
 import ProductType from '@/views/common/productType.js'
 import { formatDecimal } from '@/libs/tools'
 import { checkWarehouseDetailList, checkWarehouseDetail, checkWarehouseDetailCount, checkWarehouseDetailExport, checkWarehouseDetailPrint, checkWarehouseWarehouse } from '@/api/checkWarehouse'
 export default {
   name: 'InventoryCheckingDetailModal',
-  components: { STable, ProductType, printModal },
+  components: { STable, ProductType, printModal, exportModal },
   mixins: [commonMixin],
   props: {
     openModal: { //  弹框显示状态
@@ -183,6 +186,7 @@ export default {
       isShow: this.openModal, //  是否打开弹框
       disabled: false,
       advanced: false,
+      exportShow: false,
       queryParam: {
         productName: '',
         productCode: '',
@@ -302,11 +306,15 @@ export default {
         }
       })
     },
+    handleExport () {
+      this.exportShow = true
+    },
     // 打印导出
-    handlePrint (type) {
+    handlePrint (type, data) {
       if (type == 'export') {
+        this.exportShow = false
         this.nowType = type
-        this.handleOk()
+        this.handleOk(data)
       } else {
         this.nowType = type
         this.openPrintModal = true
@@ -318,7 +326,7 @@ export default {
       let url = checkWarehouseDetailPrint //  打印
       if (this.nowType == 'export') { //  导出
         url = checkWarehouseDetailExport
-        params = { checkWarehouseSn: this.itemSn }
+        params = { checkWarehouseSn: this.itemSn, ...objs }
         type = 'export'
       } else { //  打印
         params = JSON.parse(JSON.stringify(objs))

+ 88 - 0
src/views/inventoryManagement/inventoryChecking/exportModal.vue

@@ -0,0 +1,88 @@
+<template>
+  <a-modal
+    v-model="isShow"
+    :footer="null"
+    class="inventoryChecking-print-type-modal"
+    :maskClosable="false"
+    centered
+    title="导出excel"
+    @cancel="isShow=false"
+  >
+    <div style="line-height: 48px;padding: 0 30px;">
+      <div>盘点单号:{{ itemData&&itemData.checkWarehouseNo }}</div>
+      <div>盘点类型:{{ (itemData&&itemData.checkTypeDictValue) || '--' }}
+        <span v-if="itemData&&itemData.checkType=='SELECT'">({{ (itemData&&itemData.warehouseFlagDictValue) || '--' }})</span>
+      </div>
+      <div>产品范围:
+        <a-radio-group v-model="productScopeFlag">
+          <a-radio :value="true">
+            所有盘点产品
+          </a-radio>
+          <a-radio :value="false">
+            有盈亏的产品
+          </a-radio>
+        </a-radio-group>
+      </div>
+      <div class="btn-cont" style="text-align: center;padding-top: 20px;">
+        <a-button id="inventoryChecking-export-save" @click="isShow=false">取消</a-button>
+        <a-button type="primary" id="inventoryChecking-export-back" @click="handleSave()" style="margin-left: 15px;">确定导出</a-button>
+      </div>
+    </div>
+  </a-modal>
+</template>
+
+<script>
+import { commonMixin } from '@/utils/mixin'
+export default {
+  mixins: [commonMixin],
+  props: {
+    openModal: { //  弹框显示状态
+      type: Boolean,
+      default: false
+    },
+    itemData: {
+      type: Object,
+      default: () => {
+        return null
+      }
+    },
+    nowType: {
+      type: String,
+      default: ''
+    }
+  },
+  data () {
+    return {
+      isShow: this.openModal, //  是否打开弹框
+      productScopeFlag: true
+    }
+  },
+  methods: {
+    // 确认
+    handleSave () {
+      this.$emit('ok', 'export', { productScopeFlag: this.productScopeFlag })
+    }
+  },
+  watch: {
+    //  父页面传过来的弹框状态
+    openModal (newValue, oldValue) {
+      this.isShow = newValue
+    },
+    //  重定义的弹框状态
+    isShow (newValue, oldValue) {
+      if (!newValue) {
+        this.$emit('close')
+      }
+    }
+  }
+}
+</script>
+
+<style lang="less">
+  .inventoryChecking-print-type-modal{
+    .btn-cont {
+      text-align: center;
+      margin: 15px 0 10px;
+    }
+  }
+</style>

+ 7 - 36
src/views/inventoryManagement/inventoryChecking/makeInventory.vue

@@ -167,35 +167,7 @@
     <!-- 打印 -->
     <div id="print"></div>
     <!-- 导出选择弹框 -->
-    <a-modal
-      v-model="exportShow"
-      :footer="null"
-      :maskClosable="false"
-      centered
-      title="导出excel"
-      @cancel="exportShow=false"
-    >
-      <div style="line-height: 48px;padding: 0 30px;">
-        <div>盘点单号:{{ basicInfoData&&basicInfoData.checkWarehouseNo }}</div>
-        <div>盘点类型:{{ (basicInfoData&&basicInfoData.checkTypeDictValue) || '--' }}
-          <span v-if="basicInfoData&&basicInfoData.checkType=='SELECT'">({{ (basicInfoData&&basicInfoData.warehouseFlagDictValue) || '--' }})</span>
-        </div>
-        <div>产品范围:
-          <a-radio-group v-model="productScopeFlag">
-            <a-radio :value="true">
-              所有盘点产品
-            </a-radio>
-            <a-radio :value="false">
-              有盈亏的产品
-            </a-radio>
-          </a-radio-group>
-        </div>
-        <div class="btn-cont" style="text-align: center;padding-top: 40px;">
-          <a-button id="inventoryChecking-export-save" @click="exportShow=false">取消</a-button>
-          <a-button type="primary" id="inventoryChecking-export-back" @click="handlePrint('export')" style="margin-left: 15px;">确定导出</a-button>
-        </div>
-      </div>
-    </a-modal>
+    <exportModal :openModal="exportShow" :itemData="basicInfoData" :nowType="nowType" @ok="handlePrint" @close="exportShow=false" />
   </div>
 </template>
 
@@ -204,11 +176,12 @@ import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import ProductType from '@/views/common/productType.js'
 import printModal from './printModal.vue'
+import exportModal from './exportModal.vue'
 import { hdPrint } from '@/libs/JGPrint.js'
 import { checkWarehouseDetailList, checkWarehouseDetailCount, checkWarehouseInventory, checkWarehouseDetail, checkWarehouseDetailSave, checkWarehouseCheckZero, checkWarehouseWarehouse, checkWarehouseDetailExport, checkWarehouseDetailPrint } from '@/api/checkWarehouse'
 export default {
   name: 'MakeInventory',
-  components: { STable, VSelect, ProductType, printModal },
+  components: { STable, VSelect, ProductType, printModal, exportModal },
   mixins: [commonMixin],
   props: {},
   data () {
@@ -253,8 +226,7 @@ export default {
       localDataSource: [],
       openPrintModal: false,
       nowType: null,
-      printerType: 'NEEDLE', //  打印机类型
-      productScopeFlag: true
+      printerType: 'NEEDLE' //  打印机类型
     }
   },
   computed: {
@@ -278,7 +250,6 @@ export default {
   methods: {
     //  重置
     resetSearchForm () {
-      this.productScopeFlag = true
       this.queryParam.productName = ''
       this.queryParam.productCode = ''
       this.queryParam.warehouseSn = undefined
@@ -412,11 +383,11 @@ export default {
       this.exportShow = true
     },
     // 打印导出
-    handlePrint (type) {
+    handlePrint (type, data) {
       if (type == 'export') {
         this.exportShow = false
         this.nowType = type
-        this.handleOk()
+        this.handleOk(data)
       } else {
         this.nowType = type
         this.openPrintModal = true
@@ -429,7 +400,7 @@ export default {
       if (this.nowType == 'export') { //  导出
         url = checkWarehouseDetailExport
         type = 'export'
-        params = { checkWarehouseSn: this.$route.params.sn, productScopeFlag: this.productScopeFlag }
+        params = { checkWarehouseSn: this.$route.params.sn, ...objs }
       } else { //  打印
         params = JSON.parse(JSON.stringify(objs))
         params.printType = this.printerType

+ 3 - 1
src/views/salesManagement/salesQuery/detail.vue

@@ -13,6 +13,7 @@
             @click.stop="handleEdit">编辑</a-button>
         </template>
         <template slot="extra" v-if="outBizSn ? $hasPermissions('B_outboundOrderDetail') : $hasPermissions('B_salesPrint')">
+          <a-checkbox v-model="printAllName" :checked="printAllName" id="salesQuery-printAllName">产品名称全部打印</a-checkbox>
           <a-checkbox v-model="printOrgCode" :checked="printOrgCode" id="salesQuery-printOrgCode">打印原厂编码</a-checkbox>
           <Print :disabled="localDataSource.length==0" @handlePrint="handlePrint"></Print>
         </template>
@@ -147,6 +148,7 @@ export default {
       disabled: false,
       showCost: false,
       printOrgCode: false, // 打印原创编码
+      printAllName: false, // 打印全部名称
       showOutInModal: false,
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
@@ -230,7 +232,7 @@ export default {
       const _this = this
       _this.spinning = true
       let url = salesDetailPrint
-      const params = { sn: this.outBizSn || this.$route.params.sn, printOrgCode: this.printOrgCode ? 1 : 0 }
+      const params = { sn: this.outBizSn || this.$route.params.sn, printOrgCode: this.printOrgCode ? 1 : 0, printAllName: this.printAllName ? 1 : 0 }
       if (type == 'export') { //  导出
         url = salesDetailExport
       }

+ 3 - 1
src/views/salesManagement/salesQuery/edit.vue

@@ -17,6 +17,7 @@
         </template>
         <!-- 操作区,位于 title 行的行尾 -->
         <template slot="extra" v-if="$hasPermissions('B_salesPrint')">
+          <a-checkbox v-model="printAllName" :checked="printAllName" id="salesQuery-printAllName">产品名称全部打印</a-checkbox>
           <a-checkbox v-model="printOrgCode" :checked="printOrgCode" id="salesQuery-printOrgCode">打印原厂编码</a-checkbox>
           <Print :disabled="dataSource.length==0" @handlePrint="handlePrint"></Print>
         </template>
@@ -245,6 +246,7 @@ export default {
       },
       tbForm: [], // 同步操作
       printOrgCode: false, // 打印原创编码
+      printAllName: false, // 打印全部名称
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
@@ -315,7 +317,7 @@ export default {
       const _this = this
       _this.spinning = true
       let url = salesDetailPrint
-      const params = { sn: this.outBizSn || this.$route.params.sn, printOrgCode: this.printOrgCode ? 1 : 0 }
+      const params = { sn: this.outBizSn || this.$route.params.sn, printOrgCode: this.printOrgCode ? 1 : 0, printAllName: this.printAllName ? 1 : 0 }
       if (type == 'export') { //  导出
         url = salesDetailExport
       }

+ 2 - 2
vue.config.js

@@ -211,8 +211,8 @@ const vueConfig = {
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        // target: 'http://192.168.0.182:8503/qpls-md',
-        target: 'http://p.iscm.360arrow.com/qpls-md',
+        target: 'http://192.168.0.182:8503/qpls-md',
+        // target: 'http://p.iscm.360arrow.com/qpls-md',
         // ws: false,
         ws: true,
         changeOrigin: true,