lilei 3 years ago
parent
commit
b99b966fd0

+ 1 - 1
public/version.json

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

+ 1 - 0
src/libs/JGPrint.js

@@ -233,6 +233,7 @@ export const pdfPrint = function (data,index){
  }
 // 打印控件
 export const jGPrint = function (data, type, printerType, taskName) {
+  console.log(data,taskName)
   if (!data) {
     return
   }

+ 1 - 1
src/views/allocationManagement/chainTransferIn/detail.vue

@@ -158,7 +158,7 @@ export default {
       const url = allocLinkagePutDetailPrint
       const params = { sn: this.$route.params.sn, type: printerType, showFlag: this.$hasPermissions('M_ShowAllCost') ? 1 : 0 }
       // 打印或导出
-      hdPrint(printerType, type, url, params, '', function () {
+      hdPrint(printerType, type, url, params, '连锁调入单', function () {
         _this.spinning = false
       })
     }

+ 1 - 1
src/views/allocationManagement/chainTransferIn/edit.vue

@@ -329,7 +329,7 @@ export default {
       const url = allocLinkagePutDetailPrint
       const params = { sn: this.$route.params.sn, type: printerType, showFlag: this.$hasPermissions('M_ShowAllCost') ? 1 : 0 }
       // 打印或导出
-      hdPrint(printerType, type, url, params, '', function () {
+      hdPrint(printerType, type, url, params, '连锁调入单', function () {
         _this.spinning = false
       })
     },

+ 1 - 1
src/views/allocationManagement/chainTransferOut/detail.vue

@@ -168,7 +168,7 @@ export default {
       const url = allocLinkageOutDetailPrint
       const params = { sn: this.outBizSn || this.$route.params.sn, type: printerType, showFlag: this.$hasPermissions('M_ShowAllCost') ? 1 : 0 }
       // 打印或导出
-      hdPrint(printerType, type, url, params, '', function () {
+      hdPrint(printerType, type, url, params, '连锁调出单', function () {
         _this.spinning = false
       })
     }

+ 1 - 1
src/views/allocationManagement/chainTransferOut/edit.vue

@@ -465,7 +465,7 @@ export default {
       const url = allocLinkageOutDetailPrint
       const params = { sn: this.$route.params.sn, type: printerType, showFlag: this.$hasPermissions('M_ShowAllCost') ? 1 : 0 }
       // 打印或导出
-      hdPrint(printerType, type, url, params, '', function () {
+      hdPrint(printerType, type, url, params, '连锁调出单', function () {
         _this.spinning = false
       })
     },

+ 11 - 6
src/views/allocationManagement/chainTransferOut/list.vue

@@ -5,12 +5,17 @@
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
           <a-row :gutter="15">
-            <a-col :md="6" :sm="24">
-              <a-form-item label="创建时间">
+            <a-col :md="5" :sm="24">
+              <a-form-item label="审核时间">
                 <rangeDate ref="rangeDate" :value="time" @change="dateChange" />
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24">
+            <a-col :md="5" :sm="24">
+              <a-form-item label="出库时间">
+                <rangeDate ref="rangeDate" :value="time" @change="dateChange" />
+              </a-form-item>
+            </a-col>
+            <a-col :md="4" :sm="24">
               <a-form-item label="调往对象">
                 <a-select
                   placeholder="请选择调往对象"
@@ -24,7 +29,7 @@
                 </a-select>
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24">
+            <a-col :md="4" :sm="24">
               <a-form-item label="调出产品类型">
                 <v-select
                   v-model="queryParam.allocationType"
@@ -36,7 +41,7 @@
               </a-form-item>
             </a-col>
             <template v-if="advanced">
-              <a-col :md="6" :sm="24">
+              <a-col :md="4" :sm="24">
                 <a-form-item label="业务状态">
                   <v-select
                     v-model="queryParam.state"
@@ -47,7 +52,7 @@
                     allowClear></v-select>
                 </a-form-item>
               </a-col>
-              <a-col :md="6" :sm="24">
+              <a-col :md="4" :sm="24">
                 <a-form-item label="财务状态">
                   <v-select
                     v-model="queryParam.settleState"

+ 1 - 1
src/views/allocationManagement/storeTransferOut/detail.vue

@@ -160,7 +160,7 @@ export default {
         costFlag: this.printCostChecked && this.$hasPermissions('M_ShowAllCost') ? '1' : '0'
       }
       // 打印或导出
-      hdPrint(printerType, type, url, params, '', function () {
+      hdPrint(printerType, type, url, params, '店内调出单', function () {
         _this.spinning = false
       })
     },

+ 1 - 1
src/views/allocationManagement/storeTransferOut/edit.vue

@@ -348,7 +348,7 @@ export default {
       const url = storeCallOutDetailPrint
       const params = { sn: this.$route.params.sn, type: printerType, costFlag: this.printCostChecked && this.$hasPermissions('M_ShowAllCost') ? '1' : '0' }
       // 打印或导出
-      hdPrint(printerType, type, url, params, '', function () {
+      hdPrint(printerType, type, url, params, '店内调出单', function () {
         _this.spinning = false
       })
     },