lilei 3 vuotta sitten
vanhempi
commit
b324c063ac

+ 10 - 10
package-lock.json

@@ -12524,10 +12524,10 @@
         "sha.js": "^2.4.8"
       }
     },
-    "pdfjs-dist": {
-      "version": "2.6.347",
-      "resolved": "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-2.6.347.tgz",
-      "integrity": "sha512-QC+h7hG2su9v/nU1wEI3SnpPIrqJODL7GTDFvR74ANKGq1AFJW16PH8VWnhpiTi9YcLSFV9xLeWSgq+ckHLdVQ=="
+    "pdfjs-dist-sign": {
+      "version": "2.5.208",
+      "resolved": "https://registry.npmjs.org/pdfjs-dist-sign/-/pdfjs-dist-sign-2.5.208.tgz",
+      "integrity": "sha512-/bOZqdVkq1vQzCJY0qH/d6vO739VJ6X9mF7UWEWJ2WoZJij1+NOl+qTQxNgpXACp07/fhxC3GE/1+IgeDq40kQ=="
     },
     "performance-now": {
       "version": "2.1.0",
@@ -16677,15 +16677,15 @@
       "resolved": "https://registry.npm.taobao.org/vue-ls/download/vue-ls-3.2.1.tgz",
       "integrity": "sha1-JdHHWzpRwXAYEp3mB7RLsSCjOFo="
     },
-    "vue-pdf": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/vue-pdf/-/vue-pdf-4.3.0.tgz",
-      "integrity": "sha512-zd3lJj6CbtrawgaaDDciTDjkJMUKiLWtbEmBg5CvFn9Noe9oAO/GNy/fc5c59qGuFCJ14ibIV1baw4S07e5bSQ==",
+    "vue-pdf-signature": {
+      "version": "4.2.6",
+      "resolved": "https://registry.npmjs.org/vue-pdf-signature/-/vue-pdf-signature-4.2.6.tgz",
+      "integrity": "sha512-+KgBtyXd3phu6qCkGyPfrHtH7gq3xz9+a6KT965fZCexGE53FK3NtwaOXJpBs/wlh0L2pYjD7jqTPYYUWzvVfA==",
       "requires": {
         "babel-plugin-syntax-dynamic-import": "^6.18.0",
         "loader-utils": "^1.4.0",
-        "pdfjs-dist": "2.6.347",
-        "raw-loader": "^4.0.2",
+        "pdfjs-dist-sign": "^2.5.208",
+        "raw-loader": "^4.0.1",
         "vue-resize-sensor": "^2.0.0",
         "worker-loader": "^2.0.0"
       },

+ 1 - 1
package.json

@@ -34,7 +34,7 @@
     "vue-cookies": "^1.6.1",
     "vue-cropper": "0.4.9",
     "vue-ls": "^3.2.1",
-    "vue-pdf": "^4.3.0",
+    "vue-pdf-signature": "^4.2.6",
     "vue-qr": "^3.2.2",
     "vue-quill-editor": "^3.0.6",
     "vue-router": "^3.1.2",

+ 1 - 1
src/components/tools/UserMenu.vue

@@ -47,7 +47,7 @@
           </a-form-model>
         </div>
         <span class="skin">
-          <a-icon style="font-size: 15px; padding: 0 3px 0 0" type="skin" />
+          <a-icon style="font-size: 15px; padding: 0 3px 0 0" type="setting" />
           设置
         </span>
       </a-popover>

+ 3 - 4
src/layouts/BasicLayout.vue

@@ -224,8 +224,8 @@ export default {
     this.collapsed = !this.sidebarOpened
     this.$store.dispatch('ToggleMultiTab', true)
     this.$store.dispatch('ToggleColor', '#2A86F4')
-    this.$store.dispatch('ToggleTheme', localStorage.getItem('DEFAULT_THEME'))
-    this.$store.dispatch('ToggleFontSize', localStorage.getItem('DEFAULT_FONT_SIZE'))
+    this.$store.dispatch('ToggleTheme', localStorage.getItem('DEFAULT_THEME') || 'dark')
+    this.$store.dispatch('ToggleFontSize', localStorage.getItem('DEFAULT_FONT_SIZE') || 'small')
     // 判断是否是当月25日后
     this.$store.state.app.isLastDayForMonth = moment().date() >= 25
     if (this.$store.state.app.isLastDayForMonth && this.$hasPermissions('M_mothEndTips')) {
@@ -235,11 +235,10 @@ export default {
       })
     }
     // 打印设置
-	console.log('0-0')
     this.$store.commit('SET_pdfPrintList', [])
     this.$store.commit('SET_showPdfPrint', false)
     this.$store.commit('SET_showSelectPrint', false)
-    this.$store.commit('SET_printUseDefault', localStorage.getItem('DEFAULT_PRINT') || '0')
+    this.$store.commit('SET_printUseDefault', localStorage.getItem('DEFAULT_PRINT') || '1')
   },
   mounted () {
     const userAgent = navigator.userAgent

+ 1 - 1
src/libs/JGPrint.js

@@ -214,7 +214,7 @@ export const pdfPrint = function (data,index){
            if(isExist != '0'){
              confirm({
                title: '提示',
-               content: h => <div style='font-size:14px;'><div>打印机正在打印中...</div><div>有未完成的打印任务</div><div>是否继续添加打印任务?</div></div>,
+               content: h => <div style='font-size:14px;'><div>打印机正在打印中或有未完成的打印任务</div><div>是否继续添加打印任务?</div></div>,
                okText: '继续打印',
                okType: 'danger',
                cancelText: '取消',

+ 1 - 1
src/store/modules/app.js

@@ -43,7 +43,7 @@ const app = {
     printTaskName: '', // 打印任务名称
     printTaskID: '', // 打印任务id列表
     printLoading: false, // 正在打印中
-    printUseDefault: '0', // 是否始终使用默认打印机打印
+    printUseDefault: '1', // 是否始终使用默认打印机打印
   },
   mutations: {
     SET_SIDEBAR_TYPE: (state, type) => {

+ 1 - 1
src/views/bulkManagement/bulkWarehousingOrder/edit.vue

@@ -456,7 +456,7 @@ export default {
       const url = sparePartsPurDetailPrint
       const params = { sn: this.$route.params.sn, type: printerType }
       // 打印或导出
-      hdPrint(printerType, type, url, params, '', function () {
+      hdPrint(printerType, type, url, params, '散件入库', function () {
         _this.spinning = false
       })
     },

+ 1 - 1
src/views/common/pdfViewModal.vue

@@ -20,7 +20,7 @@
             ref="pdf"
             v-for="(item,index) in pdfList"
             :key="'pdf-'+index"
-            style="width: 100%;border: 1px solid #eee;margin-bottom: 10px;"
+            style="width: 100%;"
             :src="getUrl('data:application/pdf;base64,' + item)"
             :page="page"
             :rotate="rotate"

+ 5 - 3
src/views/common/selectPrint.vue

@@ -11,16 +11,19 @@
     @cancel="handleCommonCancel"
     :width="416">
     <a-spin :spinning="spinning" tip="Loading...">
-      <div class="common-main">
+      <div class="common-main" v-if="printList&&printList.length">
         <a-select v-model="printIndex" @change="changePrint" style="width: 100%" placeholder="选择打印机">
           <a-select-option v-for="item in printList" :key="'print-'+item.value" :value="item.value">
             {{ item.name }}
           </a-select-option>
         </a-select>
       </div>
+      <div v-else class="common-main">
+        <p>暂未发现打印机,请检查您的打印机是否连接正常</p>
+      </div>
       <div class="btn-box">
         <a-button type="default" style="margin-right:20px;" @click="handleCommonCancel" v-if="isCancel">{{ cancelText }}</a-button>
-        <a-button type="primary" class="button-error" @click="handleCommonOk">{{ okText }}</a-button>
+        <a-button type="primary" v-if="printList&&printList.length" class="button-error" @click="handleCommonOk">{{ okText }}</a-button>
       </div>
     </a-spin>
   </a-modal>
@@ -84,7 +87,6 @@ export default {
     // 取消
     handleCommonCancel () {
       this.$emit('cancel')
-	  console.log('5-5-5')
       this.$store.commit('SET_pdfPrintList', [])
       this.$store.commit('SET_showSelectPrint', false)
     },

+ 1 - 1
src/views/salesManagement/salesReturn/list.vue

@@ -339,7 +339,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 270
+      this.tableHeight = window.innerHeight - tableSearchH - 275
     }
   },
   watch: {

+ 1 - 1
vue.config.js

@@ -199,7 +199,7 @@ const vueConfig = {
     proxy: {
       '/api': {
         // target: 'http://192.168.16.151:8503/qpls-md',
-        target: 'http://p.iscm.360arrow.com/qpls-md',
+        target: 'https://t.iscm.360arrow.com/qpls-md',
         // ws: false,
         ws: true,
         changeOrigin: true,