浏览代码

Merge branch 'develop_yh11' of jianguan-web/jg-ocs-html into develop_yh12

李磊 2 年之前
父节点
当前提交
98cce04fcb
共有 2 个文件被更改,包括 5 次插入5 次删除
  1. 2 2
      src/utils/request.js
  2. 3 3
      src/views/allocationManagement/transferOut/list.vue

+ 2 - 2
src/utils/request.js

@@ -15,7 +15,7 @@ const err = (error) => {
   console.log(error, error.response,error.message,'error')
   const config = error.config
   // 网络连接出错
-  if (error.message.indexOf('Network Error') >= 0 || error.message.indexOf('Request failed') >= 0) {
+  if (error.message.indexOf('Network Error') >= 0) {
     notification.destroy()
     notification.error({
       message: '提示',
@@ -94,7 +94,7 @@ service.interceptors.request.use(config => {
 
 // response interceptor
 service.interceptors.response.use((response) => {
-  // console.log(response, 'response.data.status')
+  console.log(response, 'response.data.status')
   const et = sessionStorage.getItem('errorTips')
   if ((response.data.status == '1001' || response.data.status == '1099') && !et) {
     sessionStorage.setItem('errorTips', 1)

+ 3 - 3
src/views/allocationManagement/transferOut/list.vue

@@ -132,13 +132,13 @@
         </template>
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
-          <a-button
+          <!-- <a-button
             size="small"
             type="link"
-            v-if="record.state == 'WAIT_AUDIT' && record.printState!='UNABLE_PRINT' && $hasPermissions('B_tfo_yxPrint')"
+            v-if="record.state == 'WAIT_AUDIT' && record.printState!='UNABLE_PRINT' && record.printState!='NO_PRINT' && $hasPermissions('B_tfo_yxPrint')"
             class="button-warning"
             @click="handleYxPrint(record)"
-            id="allocateBillList-examine-btn">允许打印</a-button>
+            id="allocateBillList-examine-btn">允许打印</a-button> -->
           <a-button
             size="small"
             type="link"