lilei 2 yıl önce
ebeveyn
işleme
5cbbca02e7

+ 8 - 4
src/libs/JGPrint.js

@@ -320,11 +320,15 @@ export const jGPrintPdf = function (data, type, taskName, printLogParams, callba
     }
     // TaskID:任务id,Value:job代码
     LODOP.On_Return = function (TaskID, Value) {
-      console.log(TaskID, Value, printLogParams)
+      console.log(TaskID, Value!=0, printLogParams)
       // 已打印
-      if (Value && printLogParams) {
-        console.log('已打印,统计打印次数')
-        printLog(printLogParams, callback)
+      if (Value!=0) {
+        if(printLogParams){
+          console.log('已打印,统计打印次数')
+          printLog(printLogParams, callback)
+        }else{
+          callback({status:200,message:'打印已完成'})
+        }
       } else {
         callback()
       }

+ 24 - 6
src/views/allocationManagement/matchSendOutOrder/list.vue

@@ -76,7 +76,7 @@
         bordered>
         <!-- 单号 -->
         <template slot="allocateNo" slot-scope="text, record">
-          <span v-if="$hasPermissions('M_mso_detail')" class="link-bule" @click="handleDetail(record)">{{ record.allocateNo }}</span>
+          <span v-if="$hasPermissions('M_transferOut_detail')" class="link-bule" @click="handleDetail(record)">{{ record.allocateNo }}</span>
           <span v-else>{{ record.allocateNo }}</span>
         </template>
         <!-- 操作 -->
@@ -92,6 +92,16 @@
         </template>
       </s-table>
     </a-spin>
+    <!-- 查看详情 -->
+    <commonModal
+      modalTit="调拨单详情"
+      bodyPadding="10px"
+      width="70%"
+      :showFooter="false"
+      :openModal="showDetailModal"
+      @cancel="cancelDetail">
+      <allocationDetailModal v-if="showDetailModal" :outBizSn="bizSn" />
+    </commonModal>
   </a-card>
 </template>
 
@@ -101,12 +111,14 @@ import moment from 'moment'
 import getDate from '@/libs/getDate.js'
 import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
+import commonModal from '@/views/common/commonModal.vue'
 import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
+import allocationDetailModal from '@/views/allocationManagement/transferOut/detail.vue'
 import { allocateBillList, allocateBillCheck } from '@/api/allocateBill'
 export default {
   name: 'MatchSendOutOrderAllocationList',
   mixins: [commonMixin],
-  components: { STable, VSelect, rangeDate, dealerSubareaScopeList },
+  components: { STable, VSelect, rangeDate, dealerSubareaScopeList, commonModal, allocationDetailModal },
   data () {
     return {
       spinning: false,
@@ -126,6 +138,7 @@ export default {
         checkStatus: undefined,
         printState: undefined
       },
+      showDetailModal: false,
       disabled: false, //  查询、重置按钮是否可操作
       exportLoading: false,
       // 加载数据方法 必须为 Promise 对象
@@ -148,6 +161,7 @@ export default {
       },
       visibleAudit: false,
       auditInfo: null,
+      bizSn: '',
       spinningAudit: false,
       openModal: false //  新增编辑  弹框
     }
@@ -218,10 +232,14 @@ export default {
     },
     //  详情
     handleDetail (row) {
-      if (this.$hasPermissions('M_mso_detail')) {
-        this.$store.state.app.curActionPermission = 'M_mso_detail'
-        this.$router.push({ path: `/allocationManagement/transferOut/detail/${row.allocateSn}` })
-      }
+      this.$store.state.app.curActionPermission = 'M_transferOut_detail'
+      this.bizSn = row.allocateSn
+      this.showDetailModal = true
+    },
+    cancelDetail () {
+      this.$store.state.app.curActionPermission = ''
+      this.showDetailModal = false
+      this.bizSn = null
     },
     pageInit () {
       const _this = this

+ 1 - 9
src/views/allocationManagement/transferOut/detail.vue

@@ -208,15 +208,7 @@ export default {
   methods: {
     //  返回列表
     handleBack () {
-      if(this.$store.state.app.curActionPermission == 'M_tfoPrint_detail'){
-        this.$router.push({ name: 'transfersPrintList', query: { closeLastOldTab: true } })
-      }
-      else if(this.$store.state.app.curActionPermission == 'M_mso_detail'){
-        this.$router.push({ name: 'matchSendOutOrderAllocationList', query: { closeLastOldTab: true } })
-      }
-      else{
-        this.$router.push({ name: 'transferOutList', query: { closeLastOldTab: true } })
-      }
+      this.$router.push({ name: 'transferOutList', query: { closeLastOldTab: true } })
     },
     // 基本信息
     getDetail () {

+ 24 - 7
src/views/allocationManagement/transfersPrint/list.vue

@@ -95,7 +95,7 @@
           bordered>
           <!-- 单号 -->
           <template slot="allocateNo" slot-scope="text, record">
-            <span v-if="$hasPermissions('M_tfoPrint_detail')" class="link-bule" @click="handleDetail(record)">{{ record.allocateNo }}</span>
+            <span v-if="$hasPermissions('M_transferOut_detail')" class="link-bule" @click="handleDetail(record)">{{ record.allocateNo }}</span>
             <span v-else>{{ record.allocateNo }}</span>
           </template>
           <!-- 打印状态 -->
@@ -152,6 +152,16 @@
         </div>
       </div>
     </commonModal>
+    <!-- 查看详情 -->
+    <commonModal
+      modalTit="调拨单详情"
+      bodyPadding="10px"
+      width="70%"
+      :showFooter="false"
+      :openModal="showDetailModal"
+      @cancel="cancelDetail">
+      <allocationDetailModal v-if="showDetailModal" :outBizSn="bizSn" />
+    </commonModal>
   </div>
 </template>
 
@@ -165,22 +175,25 @@ import Area from '@/views/common/area.js'
 import rangeDate from '@/views/common/rangeDate.vue'
 import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
 import printModal from '@/views/allocationManagement/transferOut/printModal.vue'
-import recordModal from './recordModal.vue'
 import commonModal from '@/views/common/commonModal.vue'
+import allocationDetailModal from '@/views/allocationManagement/transferOut/detail.vue'
+import recordModal from './recordModal.vue'
 import { allocateBillList, allocateBillDetailPrint, updatePrintState } from '@/api/allocateBill'
 import { printFun } from '@/libs/JGPrint.js'
 export default {
   name: 'TransfersPrintList',
   mixins: [commonMixin],
-  components: { STable, VSelect, rangeDate, dealerSubareaScopeList, printModal, commonModal, recordModal, subarea, Area },
+  components: { STable, VSelect, rangeDate, dealerSubareaScopeList, printModal, commonModal, recordModal, subarea, Area, commonModal, allocationDetailModal },
   data () {
     return {
       spinning: false,
       advanced: true, // 高级搜索 展开/关闭
       tableHeight: 0,
       itemData: null,
+      bizSn: '',
       showRecordModal: false,
       showPrintModal: false,
+      showDetailModal: false,
       time: [
         moment(getDate.getThreeMonthDays().starttime, 'YYYY-MM-DD'),
         moment(getDate.getCurrMonthDays().endtime, 'YYYY-MM-DD')
@@ -336,10 +349,14 @@ export default {
     },
     //  详情
     handleDetail (row) {
-      if (this.$hasPermissions('M_tfoPrint_detail')) {
-        this.$store.state.app.curActionPermission = 'M_tfoPrint_detail'
-        this.$router.push({ path: `/allocationManagement/transferOut/detail/${row.allocateSn}` })
-      }
+      this.$store.state.app.curActionPermission = 'M_transferOut_detail'
+      this.bizSn = row.allocateSn
+      this.showDetailModal = true
+    },
+    cancelDetail () {
+      this.$store.state.app.curActionPermission = ''
+      this.showDetailModal = false
+      this.bizSn = null
     },
     pageInit () {
       const _this = this