lilei 2 years ago
parent
commit
56c32c9520

+ 1 - 1
public/version.json

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

+ 0 - 2
src/config/router.config.js

@@ -784,7 +784,6 @@ export const asyncRouterMap = [
                   title: '编辑采购退货申请单',
                   title: '编辑采购退货申请单',
                   icon: 'money-collect',
                   icon: 'money-collect',
                   hidden: true,
                   hidden: true,
-                  // permission: 'B_purchaseReturnApplyFormEdit'
                 }
                 }
               },
               },
               {
               {
@@ -795,7 +794,6 @@ export const asyncRouterMap = [
                   title: '采购退货申请单详情',
                   title: '采购退货申请单详情',
                   icon: 'money-collect',
                   icon: 'money-collect',
                   hidden: true,
                   hidden: true,
-                  // permission: 'B_purchaseReturnApplyFormDetail'
                 }
                 }
               }
               }
             ]
             ]

+ 1 - 1
src/views/purchasingManagement/purchaseReturnApplyForm/detail.vue

@@ -7,7 +7,7 @@
           <a id="purchaseReturnDetail-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
           <a id="purchaseReturnDetail-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
         </template>
         </template>
         <!-- 操作区,位于 title 行的行尾 -->
         <!-- 操作区,位于 title 行的行尾 -->
-        <template slot="extra">
+        <template slot="extra" v-if="$hasPermissions('B_purchaseReturnApplyPrint')">
           <Print :disabled="dataSource.length==0" @handlePrint="handlePrint"></Print>
           <Print :disabled="dataSource.length==0" @handlePrint="handlePrint"></Print>
         </template>
         </template>
       </a-page-header>
       </a-page-header>

+ 1 - 1
src/views/purchasingManagement/purchaseReturnApplyForm/edit.vue

@@ -8,7 +8,7 @@
           <span style="margin: 0 15px;color: #666;">供应商名称:箭冠营销中心</span>
           <span style="margin: 0 15px;color: #666;">供应商名称:箭冠营销中心</span>
         </template>
         </template>
         <!-- 操作区,位于 title 行的行尾 -->
         <!-- 操作区,位于 title 行的行尾 -->
-        <template slot="extra">
+        <template slot="extra" v-if="$hasPermissions('B_purchaseReturnApplyPrint')">
           <Print :disabled="dataSource.length==0" @handlePrint="handlePrint"></Print>
           <Print :disabled="dataSource.length==0" @handlePrint="handlePrint"></Print>
         </template>
         </template>
       </a-page-header>
       </a-page-header>

+ 6 - 6
src/views/purchasingManagement/purchaseReturnApplyForm/list.vue

@@ -57,7 +57,7 @@
         </a-form>
         </a-form>
       </div>
       </div>
       <!-- 操作按钮 -->
       <!-- 操作按钮 -->
-      <div class="table-operator">
+      <div class="table-operator" v-if="$hasPermissions('B_purchaseReturnApplyNew')">
         <a-button id="purchaseReturnList-add" type="primary" class="button-error" @click="handleEdit()">新增</a-button>
         <a-button id="purchaseReturnList-add" type="primary" class="button-error" @click="handleEdit()">新增</a-button>
       </div>
       </div>
       <!-- 列表 -->
       <!-- 列表 -->
@@ -74,7 +74,7 @@
         bordered>
         bordered>
         <!-- 采退单号 -->
         <!-- 采退单号 -->
         <template slot="purchaseReturnApplyNo" slot-scope="text, record">
         <template slot="purchaseReturnApplyNo" slot-scope="text, record">
-          <span class="table-td-link" v-if="!$hasPermissions('B_purchaseReturnDetail')" @click="handleDetail(record)">{{ record.purchaseReturnApplyNo }}</span>
+          <span class="table-td-link" v-if="$hasPermissions('B_purchaseReturnApplyDetail')" @click="handleDetail(record)">{{ record.purchaseReturnApplyNo }}</span>
           <span v-else>{{ record.purchaseReturnApplyNo }}</span>
           <span v-else>{{ record.purchaseReturnApplyNo }}</span>
           <a-badge count="改" :offset="[10,0]" v-if="record.state=='HQ_CHANGE'"></a-badge>
           <a-badge count="改" :offset="[10,0]" v-if="record.state=='HQ_CHANGE'"></a-badge>
         </template>
         </template>
@@ -85,27 +85,27 @@
               size="small"
               size="small"
               type="link"
               type="link"
               class="button-primary"
               class="button-primary"
-              v-if="record.billStatus == 'WAIT_SUBMIT'"
+              v-if="record.billStatus == 'WAIT_SUBMIT'&&$hasPermissions('B_purchaseReturnApplyEdit')"
               @click="handleEdit(record)"
               @click="handleEdit(record)"
             >编辑</a-button>
             >编辑</a-button>
             <a-button
             <a-button
               size="small"
               size="small"
               type="link"
               type="link"
               class="button-error"
               class="button-error"
-              v-if="record.billStatus == 'WAIT_SUBMIT'"
+              v-if="record.billStatus == 'WAIT_SUBMIT'&&$hasPermissions('B_purchaseReturnApplyDel')"
               @click="handleDel(record)"
               @click="handleDel(record)"
             >删除</a-button>
             >删除</a-button>
             <a-button
             <a-button
               size="small"
               size="small"
               type="link"
               type="link"
-              v-if="record.billStatus == 'FINISH'"
+              v-if="record.billStatus == 'FINISH'&&$hasPermissions('B_purchaseReturnApplyCreat')"
               @click="handleWarehouse(record)"
               @click="handleWarehouse(record)"
               class="button-primary"
               class="button-primary"
             >生成采购退货单</a-button>
             >生成采购退货单</a-button>
             <a-button
             <a-button
               size="small"
               size="small"
               type="link"
               type="link"
-              v-if="record.billStatus == 'CANCEL'||record.billStatus == 'AUDIT_REJECT'"
+              v-if="(record.billStatus == 'CANCEL'||record.billStatus == 'AUDIT_REJECT')&&$hasPermissions('B_purchaseReturnApplyAsignEdit')"
               @click="handleFinishBill(record)"
               @click="handleFinishBill(record)"
               class="button-primary"
               class="button-primary"
             >再次编辑</a-button>
             >再次编辑</a-button>

+ 2 - 2
vue.config.js

@@ -211,8 +211,8 @@ const vueConfig = {
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
     proxy: {
       '/api': {
       '/api': {
-        target: 'http://192.168.0.215:8076/qpls-md',
-        // target: 'http://p.iscm.360arrow.com/qpls-md',
+        // target: 'http://192.168.0.215:8076/qpls-md',
+        target: 'http://p.iscm.360arrow.com/qpls-md',
         // ws: false,
         // ws: false,
         ws: true,
         ws: true,
         changeOrigin: true,
         changeOrigin: true,