Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

public/index.html

@@ -11,8 +11,10 @@
   <link rel="icon" href="<%= BASE_URL %>/logo.ico">
   <!-- 强制Chromium内核，作用于其他双核浏览器 -->
   <meta name="force-rendering" content="webkit" />
-  <!-- 自动将HTTP请求升级成安全的HTTPS请求 -->
+  <% if (process.env.NODE_ENV === 'production') { %>
+    <!-- 自动将HTTP请求升级成安全的HTTPS请求 -->
   <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
+  <% } %>
   <!-- 如果有安装 Google Chrome Frame 插件则强制为Chromium内核，否则强制本机支持的最高版本IE内核，作用于IE浏览器 -->
   <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1" />
   <link rel="manifest" href="<%= BASE_URL %>/manifest.json" />

src/notification.js

@@ -8,7 +8,7 @@ export default {
   // 初始化
   init (vue, sessionId) {
     this.vue = vue;
-    this.url = `${process.env.VUE_APP_BASE_API}/ws`
+    this.url = `${process.env.VUE_APP_BASE_API}/wss`
     this.sessionId = sessionId;
 
     this.sock = undefined;

src/views/houseSelfCollect/acquisitionManagement.vue

@@ -106,7 +106,7 @@
     },
     methods: {
       getUserJurisdiction(){
-        let userJurisdiction = getHp('acquisitionManagement.acquisition.allow')
+         this.userJurisdiction = getHp('acquisitionManagement.acquisition.allow')
       },
       handleSizeChange(val) {
         console.log(`每页 ${val} 条`)

src/views/houseSelfCollect/paymentManagement.vue

@@ -144,7 +144,7 @@
         <el-button type="danger" v-if='!scope.row.approveStatus&&scope.row.status!="已驳回"' @click="del(scope.row)">删除</el-button>
         <el-button v-if='!scope.row.approveStatus&&scope.row.status!="已驳回"' @click="settlement(1,scope.row)">结算</el-button>
         <el-button v-if='scope.row.approveStatus||scope.row.status=="已驳回"' @click="settlement(2,scope.row)">查看</el-button>
-        <el-button v-if='scope.row.approveStatus||scope.row.status=="已驳回"' @click='print(scope.row)'>打印</el-button>
+        <el-button v-if='scope.row.approveStatus||scope.row.status=="已驳回"||userJurisdiction' @click='print(scope.row)'>打印</el-button>
       </template>
       </el-table-column>
     </el-table>
@@ -203,6 +203,7 @@
 import {getpayment,selectWarehouseSelf,delpayment,auditpayment,getpaymentexamine} from '@/model/houseSelfCollect/index'
 import { posthandle } from '@/model/purchasingManagement/index'
 import paymentPrint from './component/paymentPrint.vue'
+  import { getHp } from '@/utils/getHasPermission'
 export default {
   components: {paymentPrint},
   watch: {},
@@ -227,9 +228,11 @@ export default {
       warehouse:[],
       value1: '', //付款日期
       modification: [],
+      userJurisdiction:true
     }
   },
   activated() {
+         this.userJurisdiction = getHp('acquisitionManagement.acquisitionPay.print')
      selectWarehouseSelf({
         compId: sessionStorage.getItem('ws-pf_compId'),
         personCharge: sessionStorage.getItem('ws-pf_staffName'),
@@ -391,9 +394,6 @@ export default {
           this.printData =response
           console.log("printData",response)
         })
-
-      // 打印价格对照表
-        // window.location.href="../../../static/payprint.html?data="+JSON.stringify(row)
       },
     examine() {
       if (this.modification.length == 0) {