lilei 2 سال پیش
والد
کامیت
24f2cc1f11

+ 26 - 6
src/views/salesManagement/matchSendOutOrder/list.vue

@@ -133,6 +133,17 @@
         </s-table>
       </a-spin>
     </a-card>
+    <!-- 查看销售单或备货单详情 -->
+    <commonModal
+      :modalTit="detailType?'备货单详情':'销售单详情'"
+      bodyPadding="10px"
+      width="70%"
+      :showFooter="false"
+      :openModal="showDetailModal"
+      @cancel="cancelDetail">
+      <salesDetail v-if="detailType==0" ref="salesDetail" :bizSn="bizSn"></salesDetail>
+      <dispatchDetail v-if="detailType==1" ref="dispatchDetail" :bizSn="bizSn"></dispatchDetail>
+    </commonModal>
   </div>
 </template>
 
@@ -144,15 +155,21 @@ import subarea from '@/views/common/subarea.js'
 import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
 import Area from '@/views/common/area.js'
 import { dispatchlList, dispatchCheck } from '@/api/dispatch'
+import commonModal from '@/views/common/commonModal.vue'
+import salesDetail from '@/views/salesManagement/salesQuery/detail.vue'
+import dispatchDetail from '@/views/salesManagement/pushOrderManagement/detail.vue'
 export default {
   name: 'MatchSendOutOrderList',
   mixins: [commonMixin],
-  components: { STable, VSelect, dealerSubareaScopeList, rangeDate, subarea, Area },
+  components: { STable, VSelect, dealerSubareaScopeList, rangeDate, subarea, Area, commonModal, salesDetail, dispatchDetail },
   data () {
     return {
       spinning: false,
       advanced: true, // 高级搜索 展开/关闭
       disabled: false, //  查询、重置按钮是否可操作
+      showDetailModal: false,
+      detailType: 2,
+      bizSn: null,
       tableHeight: 0,
       time: [],
       checktime: [],
@@ -236,11 +253,14 @@ export default {
     },
     // 详情
     handleDetail (row, type) {
-      if (type == 0) {
-        this.$router.push({ name: 'salesDetail', params: { sn: row.salesBillSn, type: 'pushOrder' } })
-      } else {
-        this.$router.push({ name: 'pushOrderDetail', params: { sn: row.dispatchBillSn, type: 'pushOrder' } })
-      }
+      this.detailType = type
+      this.bizSn = type == 0 ? row.salesBillSn : row.dispatchBillSn
+      this.showDetailModal = true
+    },
+    cancelDetail () {
+      this.showDetailModal = false
+      this.detailType = 2
+      this.bizSn = null
     },
     // 对单
     handleAudit (row) {

+ 16 - 2
src/views/salesManagement/pushOrderManagement/list.vue

@@ -144,6 +144,16 @@
           </div>
         </div>
       </commonModal>
+      <!-- 查看销售单或备货单详情 -->
+      <commonModal
+        modalTit="销售单详情"
+        bodyPadding="10px"
+        width="70%"
+        :showFooter="false"
+        :openModal="showDetailModal"
+        @cancel="showDetailModal = false">
+        <salesDetail v-if="showDetailModal" ref="salesDetail" :bizSn="bizSn"></salesDetail>
+      </commonModal>
     </a-spin>
   </a-card>
 </template>
@@ -158,16 +168,19 @@ import subarea from '@/views/common/subarea.js'
 import Area from '@/views/common/area.js'
 import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
 import commonModal from '@/views/common/commonModal.vue'
+import salesDetail from '@/views/salesManagement/salesQuery/detail.vue'
 import { dispatchlList, dispatchQueryCount, dispatchPrintStatus } from '@/api/dispatch'
 export default {
   name: 'PushOrderManagementList',
   mixins: [commonMixin],
-  components: { STable, VSelect, dealerSubareaScopeList, rangeDate, subarea, commonModal, Area },
+  components: { STable, VSelect, dealerSubareaScopeList, rangeDate, subarea, commonModal, Area, salesDetail },
   data () {
     return {
       spinning: false,
       advanced: true, // 高级搜索 展开/关闭
       disabled: false, //  查询、重置按钮是否可操作
+      showDetailModal: false,
+      bizSn: null,
       tableHeight: 0,
       time: [
         moment(getDate.getThreeMonthDays().starttime, 'YYYY-MM-DD'),
@@ -262,7 +275,8 @@ export default {
     // 详情
     handleDetail (row, type) {
       if (type == 0) {
-        this.$router.push({ name: 'salesDetail', params: { sn: row.salesBillSn, type: 'pushOrder' } })
+        this.bizSn = row.salesBillSn
+        this.showDetailModal = true
       } else {
         this.$router.push({ name: 'pushOrderDetail', params: { sn: row.dispatchBillSn, type: 'pushOrder' } })
       }

+ 27 - 10
src/views/salesManagement/receiptPrint/list.vue

@@ -118,12 +118,12 @@
           bordered>
           <!-- 单号 -->
           <template slot="bizNo" slot-scope="text, record">
-            <span v-if="$hasPermissions('B_salesDetail')" class="link-bule" @click="handleDetail(record)">{{ record.bizNo }}</span>
+            <span v-if="$hasPermissions('B_salesDetail')" class="link-bule" @click="handleDetail(record,0)">{{ record.bizNo }}</span>
             <span v-else>{{ record.bizNo }}</span>
           </template>
           <!-- 下推单号 -->
           <template slot="dispatchBillNo" slot-scope="text, record">
-            <span v-if="$hasPermissions('B_dispatchDetail')" class="link-bule" @click="handleBhDetail(record)">{{ record.dispatchBillNo }}</span>
+            <span v-if="$hasPermissions('B_dispatchDetail')" class="link-bule" @click="handleDetail(record,1)">{{ record.dispatchBillNo }}</span>
             <span v-else>{{ record.dispatchBillNo || '--' }}</span>
           </template>
           <!-- 操作 -->
@@ -156,9 +156,19 @@
           @cancel="showTipModal=false">
           <printModel ref="printModel" @cancel="showTipModal=false" @printOk="printOk"></printModel>
         </commonModal>
-
         <!-- 打印记录 -->
         <recordModal ref="recordModal" modalTit="打印记录" :openModal="showRecordModal" @cancel="showRecordModal=false"></recordModal>
+        <!-- 查看销售单或备货单详情 -->
+        <commonModal
+          :modalTit="detailType?'备货单详情':'销售单详情'"
+          bodyPadding="10px"
+          width="70%"
+          :showFooter="false"
+          :openModal="showDetailModal"
+          @cancel="cancelDetail">
+          <salesDetail v-if="detailType==0" ref="salesDetail" :bizSn="bizSn"></salesDetail>
+          <dispatchDetail v-if="detailType==1" ref="dispatchDetail" :bizSn="bizSn"></dispatchDetail>
+        </commonModal>
       </a-spin>
     </a-card>
   </div>
@@ -172,18 +182,23 @@ import subarea from '@/views/common/subarea.js'
 import Area from '@/views/common/area.js'
 import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
 import commonModal from '@/views/common/commonModal.vue'
+import salesDetail from '@/views/salesManagement/salesQuery/detail.vue'
+import dispatchDetail from '@/views/salesManagement/pushOrderManagement/detail.vue'
 import recordModal from './recordModal.vue'
 import printModel from './printModel.vue'
 import { settleReceiptList } from '@/api/settleReceipt'
 export default {
   name: 'ReceiptPrintList',
   mixins: [commonMixin],
-  components: { STable, VSelect, dealerSubareaScopeList, rangeDate, subarea, commonModal, recordModal, Area, printModel },
+  components: { STable, VSelect, dealerSubareaScopeList, rangeDate, subarea, commonModal, recordModal, Area, printModel, salesDetail, dispatchDetail },
   data () {
     return {
       spinning: false,
       advanced: true, // 高级搜索 展开/关闭
       disabled: false, //  查询、重置按钮是否可操作
+      showDetailModal: false,
+      detailType: 2,
+      bizSn: null,
       tableHeight: 0,
       time: [],
       currentTab: 2,
@@ -271,13 +286,15 @@ export default {
     receiverChange (val) {
       this.queryParam.receiverName = val.name
     },
-    // 销售单详情
-    handleDetail (row) {
-      this.$router.push({ name: 'salesDetail', params: { sn: row.bizSn, type: 'salesCollection' } })
+    handleDetail (row, type) {
+      this.detailType = type
+      this.bizSn = type == 0 ? row.bizSn : row.dispatchBillSn
+      this.showDetailModal = true
     },
-    // 备货单号
-    handleBhDetail (row) {
-      this.$router.push({ name: 'pushOrderDetail', params: { sn: row.dispatchBillSn, type: 'salesCollection' } })
+    cancelDetail () {
+      this.showDetailModal = false
+      this.detailType = 2
+      this.bizSn = null
     },
     // 收款打印
     handlePrint (row) {

+ 28 - 9
src/views/salesManagement/salesCollection/list.vue

@@ -142,12 +142,12 @@
         bordered>
         <!-- 单号 -->
         <template slot="bizNo" slot-scope="text, record">
-          <span v-if="$hasPermissions('B_salesDetail')" class="link-bule" @click="handleDetail(record)">{{ record.bizNo }}</span>
+          <span v-if="$hasPermissions('B_salesDetail')" class="link-bule" @click="handleDetail(record,0)">{{ record.bizNo }}</span>
           <span v-else>{{ record.bizNo }}</span>
         </template>
         <!-- 下推单号 -->
         <template slot="dispatchBillNo" slot-scope="text, record">
-          <span v-if="$hasPermissions('B_dispatchDetail')" class="link-bule" @click="handleBhDetail(record)">{{ record.dispatchBillNo }}</span>
+          <span v-if="$hasPermissions('B_dispatchDetail')" class="link-bule" @click="handleDetail(record,1)">{{ record.dispatchBillNo }}</span>
           <span v-else>{{ record.dispatchBillNo || '--' }}</span>
         </template>
         <!-- 操作 -->
@@ -197,6 +197,18 @@
           </div>
         </div>
       </commonModal>
+
+      <!-- 查看销售单或备货单详情 -->
+      <commonModal
+        :modalTit="detailType?'备货单详情':'销售单详情'"
+        bodyPadding="10px"
+        width="70%"
+        :showFooter="false"
+        :openModal="showDetailModal"
+        @cancel="cancelDetail">
+        <salesDetail v-if="detailType==0" ref="salesDetail" :bizSn="bizSn"></salesDetail>
+        <dispatchDetail v-if="detailType==1" ref="dispatchDetail" :bizSn="bizSn"></dispatchDetail>
+      </commonModal>
     </a-spin>
   </a-card>
 </template>
@@ -208,6 +220,8 @@ import rangeDate from '@/views/common/rangeDate.vue'
 import subarea from '@/views/common/subarea.js'
 import Area from '@/views/common/area.js'
 import commonModal from '@/views/common/commonModal.vue'
+import salesDetail from '@/views/salesManagement/salesQuery/detail.vue'
+import dispatchDetail from '@/views/salesManagement/pushOrderManagement/detail.vue'
 import detailModal from './detailModal.vue'
 import voucherModal from './voucherModal.vue'
 import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
@@ -216,13 +230,16 @@ import { settleReceiptList, settleReceiptBatch } from '@/api/settleReceipt'
 export default {
   name: 'SalesCollectionList',
   mixins: [commonMixin],
-  components: { STable, VSelect, subarea, rangeDate, commonModal, detailModal, Area, voucherModal, dealerSubareaScopeList },
+  components: { STable, VSelect, subarea, rangeDate, commonModal, detailModal, Area, voucherModal, dealerSubareaScopeList, salesDetail, dispatchDetail },
   data () {
     return {
       spinning: false,
       showDetail: false,
       showSkModal: false,
       showVoucher: false,
+      showDetailModal: false,
+      detailType: 2,
+      bizSn: null,
       tableHeight: 0,
       queryParam: { //  查询条件
         beginDate: '',
@@ -368,13 +385,15 @@ export default {
       this.$refs.table.refresh(true)
       this.$refs.table.clearSelected()
     },
-    // 销售单详情
-    handleDetail (row) {
-      this.$router.push({ name: 'salesDetail', params: { sn: row.bizSn, type: 'salesCollection' } })
+    handleDetail (row, type) {
+      this.detailType = type
+      this.bizSn = type == 0 ? row.bizSn : row.dispatchBillSn
+      this.showDetailModal = true
     },
-    // 备货单号
-    handleBhDetail (row) {
-      this.$router.push({ name: 'pushOrderDetail', params: { sn: row.dispatchBillSn, type: 'salesCollection' } })
+    cancelDetail () {
+      this.showDetailModal = false
+      this.detailType = 2
+      this.bizSn = null
     },
     // 点击批量收款
     handlePlColle () {

+ 26 - 7
src/views/salesManagement/stockPrint/list.vue

@@ -152,6 +152,17 @@
         <sendTypeModal ref="typePrint" :openModal="showTipModal" @ok="handlePrintOk" @close="showTipModal=false" />
         <!-- 打印记录 -->
         <recordModal ref="recordModal" modalTit="打印记录" :openModal="showRecordModal" @cancel="showRecordModal=false"></recordModal>
+        <!-- 查看销售单或备货单详情 -->
+        <commonModal
+          :modalTit="detailType?'备货单详情':'销售单详情'"
+          bodyPadding="10px"
+          width="70%"
+          :showFooter="false"
+          :openModal="showDetailModal"
+          @cancel="cancelDetail">
+          <salesDetail v-if="detailType==0" ref="salesDetail" :bizSn="bizSn"></salesDetail>
+          <dispatchDetail v-if="detailType==1" ref="dispatchDetail" :bizSn="bizSn"></dispatchDetail>
+        </commonModal>
       </a-spin>
     </a-card>
   </div>
@@ -166,17 +177,23 @@ import Area from '@/views/common/area.js'
 import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
 import sendTypeModal from '@/views/salesManagement/pushOrderManagement/sendTypeModal.vue'
 import recordModal from './recordModal.vue'
+import commonModal from '@/views/common/commonModal.vue'
+import salesDetail from '@/views/salesManagement/salesQuery/detail.vue'
+import dispatchDetail from '@/views/salesManagement/pushOrderManagement/detail.vue'
 import { dispatchlList, dispatchDetailPrint } from '@/api/dispatch'
 import { printFun } from '@/libs/JGPrint.js'
 export default {
   name: 'StockPrintList',
   mixins: [commonMixin],
-  components: { STable, VSelect, dealerSubareaScopeList, rangeDate, subarea, sendTypeModal, recordModal, Area },
+  components: { STable, VSelect, dealerSubareaScopeList, rangeDate, subarea, sendTypeModal, recordModal, Area, commonModal, salesDetail, dispatchDetail },
   data () {
     return {
       spinning: false,
       advanced: true, // 高级搜索 展开/关闭
       disabled: false, //  查询、重置按钮是否可操作
+      showDetailModal: false,
+      detailType: 2,
+      bizSn: null,
       tableHeight: 0,
       time: [],
       currentTab: 2,
@@ -263,13 +280,15 @@ export default {
     shcustChange (val) {
       this.queryParam.receiverSn = val.key
     },
-    // 详情
     handleDetail (row, type) {
-      if (type == 0) {
-        this.$router.push({ name: 'salesDetail', params: { sn: row.salesBillSn, type: 'pushOrder' } })
-      } else {
-        this.$router.push({ name: 'pushOrderDetail', params: { sn: row.dispatchBillSn, type: 'pushOrder' } })
-      }
+      this.detailType = type
+      this.bizSn = type == 0 ? row.salesBillSn : row.dispatchBillSn
+      this.showDetailModal = true
+    },
+    cancelDetail () {
+      this.showDetailModal = false
+      this.detailType = 2
+      this.bizSn = null
     },
     // 发货分类打印
     handlePrint (row) {