lilei 2 年之前
父節點
當前提交
733397dd6d

+ 7 - 7
src/config/router.config.js

@@ -510,7 +510,7 @@ export const asyncRouterMap = [
         meta: {
         meta: {
           title: '销售退货',
           title: '销售退货',
           icon: 'export',
           icon: 'export',
-          // permission: 'M_salesReturnManagement'
+          permission: 'M_salesReturnManagement'
         },
         },
         children: [
         children: [
            {
            {
@@ -577,7 +577,7 @@ export const asyncRouterMap = [
              meta: {
              meta: {
                title: '提货单列表',
                title: '提货单列表',
                icon: 'fund',
                icon: 'fund',
-               // permission: 'M_billOfLadingList'
+               permission: 'M_billOfLadingList'
              },
              },
              hideChildrenInMenu: true,
              hideChildrenInMenu: true,
              children: [
              children: [
@@ -589,7 +589,7 @@ export const asyncRouterMap = [
                    title: '提货单列表',
                    title: '提货单列表',
                    icon: 'fund',
                    icon: 'fund',
                    hidden: true,
                    hidden: true,
-                   // permission: 'M_billOfLadingList'
+                   permission: 'M_billOfLadingList'
                  }
                  }
                },
                },
                {
                {
@@ -632,7 +632,7 @@ export const asyncRouterMap = [
              meta: {
              meta: {
                title: '仓库提货',
                title: '仓库提货',
                icon: 'fund',
                icon: 'fund',
-               // permission: 'M_pickUpList'
+               permission: 'M_pickUpList'
              },
              },
              hideChildrenInMenu: true,
              hideChildrenInMenu: true,
              children: [
              children: [
@@ -644,7 +644,7 @@ export const asyncRouterMap = [
                    title: '仓库提货列表',
                    title: '仓库提货列表',
                    icon: 'fund',
                    icon: 'fund',
                    hidden: true,
                    hidden: true,
-                   // permission: 'M_pickUpList'
+                   permission: 'M_pickUpList'
                  }
                  }
                },
                },
              ]
              ]
@@ -657,7 +657,7 @@ export const asyncRouterMap = [
              meta: {
              meta: {
                title: '收货品检',
                title: '收货品检',
                icon: 'fund',
                icon: 'fund',
-               // permission: 'M_receiveCheckist'
+               permission: 'M_receiveCheckList'
              },
              },
              hideChildrenInMenu: true,
              hideChildrenInMenu: true,
              children: [
              children: [
@@ -669,7 +669,7 @@ export const asyncRouterMap = [
                    title: '收货品检列表',
                    title: '收货品检列表',
                    icon: 'fund',
                    icon: 'fund',
                    hidden: true,
                    hidden: true,
-                   // permission: 'M_receiveCheckList'
+                   permission: 'M_receiveCheckList'
                  }
                  }
                },
                },
                {
                {

+ 14 - 0
src/views/bnSetting/menu/adminMenus.vue

@@ -50,6 +50,19 @@
               <a-icon type="pushpin" style="margin-right: 10px;" /><span >操作按钮</span>
               <a-icon type="pushpin" style="margin-right: 10px;" /><span >操作按钮</span>
             </div>
             </div>
           </a-form-item>
           </a-form-item>
+          <a-form-item label="ID" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
+            {{ formData.id }}
+          </a-form-item>
+          <a-form-item label="父节点ID" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
+            <a-input
+              placeholder="请输入父节点ID(最多50个字符)"
+              :maxLength="50"
+              v-decorator="['formData.parentId', {
+                initialValue: formData.parentId,
+                getValueFromEvent: $filterEmpty,
+                rules: [{ required: true, message: '请输入父节点ID!' }] }]"
+            />
+          </a-form-item>
           <!-- 名称 -->
           <!-- 名称 -->
           <a-form-item label="名称" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
           <a-form-item label="名称" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
             <a-input
             <a-input
@@ -250,6 +263,7 @@ export default {
         // this.formData = Object.assign({}, this.formData, info.selectedNodes[0].data.props)
         // this.formData = Object.assign({}, this.formData, info.selectedNodes[0].data.props)
         this.formData = {
         this.formData = {
           id: data.id,
           id: data.id,
+          parentId: data.parentId,
           name: data.name,
           name: data.name,
           routePath: data.routePath,
           routePath: data.routePath,
           icon: data.icon,
           icon: data.icon,

+ 4 - 1
src/views/salesReturnManagement/billOfLading/detail.vue

@@ -12,12 +12,14 @@
             key="3"
             key="3"
             type="default"
             type="default"
             class="button-info"
             class="button-info"
+            v-if="$hasPermissions('B_printPickUp')"
             id="billOfLadingDetail-preview-btn"
             id="billOfLadingDetail-preview-btn"
             @click="handlePrint('preview')">打印预览</a-button>
             @click="handlePrint('preview')">打印预览</a-button>
           <a-button
           <a-button
             key="2"
             key="2"
             type="primary"
             type="primary"
             class="button-info"
             class="button-info"
+            v-if="$hasPermissions('B_printPickUp')"
             id="billOfLadingDetail-print-btn"
             id="billOfLadingDetail-print-btn"
             @click="handlePrint('print')">快捷打印</a-button>
             @click="handlePrint('print')">快捷打印</a-button>
           <a-divider type="vertical" />
           <a-divider type="vertical" />
@@ -25,6 +27,7 @@
             key="1"
             key="1"
             type="primary"
             type="primary"
             class="button-warning"
             class="button-warning"
+            v-if="$hasPermissions('B_exportPickUp')"
             id="billOfLadingDetail-export-btn"
             id="billOfLadingDetail-export-btn"
             @click="handlePrint('export')">导出Excel</a-button>
             @click="handlePrint('export')">导出Excel</a-button>
         </template>
         </template>
@@ -112,7 +115,7 @@
                 </a-table>
                 </a-table>
               </a-form-model-item>
               </a-form-model-item>
             </a-col>
             </a-col>
-            <a-col :spna="24">
+            <a-col :spna="24" v-if="$hasPermissions('B_auditPickUp')">
               <a-form-model-item label="审核进度" :label-col="{span:2}" :wrapper-col="{span:20}">
               <a-form-model-item label="审核进度" :label-col="{span:2}" :wrapper-col="{span:20}">
                 <div>以下信息来自钉钉</div>
                 <div>以下信息来自钉钉</div>
                 <s-table
                 <s-table

+ 6 - 6
src/views/salesReturnManagement/billOfLading/list.vue

@@ -68,7 +68,7 @@
       </div>
       </div>
       <!-- 操作按钮 -->
       <!-- 操作按钮 -->
       <div class="table-operator">
       <div class="table-operator">
-        <a-button type="primary" class="button-error" v-if="$hasPermissions('B_salesReturnNew')" @click="handleAdd">新增</a-button>
+        <a-button type="primary" class="button-error" v-if="$hasPermissions('B_newPickUp')" @click="handleAdd">新增</a-button>
       </div>
       </div>
       <!-- 列表 -->
       <!-- 列表 -->
       <s-table
       <s-table
@@ -84,7 +84,7 @@
         bordered>
         bordered>
         <!-- 单号 -->
         <!-- 单号 -->
         <template slot="pickUpNo" slot-scope="text, record">
         <template slot="pickUpNo" slot-scope="text, record">
-          <div v-if="$hasPermissions('B_salesReturnDetail')">
+          <div v-if="$hasPermissions('M_detailPickUp')">
             <span class="link-bule" @click="handleDetail(record)">{{ record.pickUpNo }}</span>
             <span class="link-bule" @click="handleDetail(record)">{{ record.pickUpNo }}</span>
           </div>
           </div>
           <div v-else>{{ record.pickUpNo }}</div>
           <div v-else>{{ record.pickUpNo }}</div>
@@ -99,26 +99,26 @@
             size="small"
             size="small"
             type="link"
             type="link"
             class="button-warning"
             class="button-warning"
-            v-if="record.state == 'WAIT_AUDIT'"
+            v-if="record.state == 'WAIT_AUDIT'&&$hasPermissions('B_auditPickUp')"
             @click="handleEexamine(record)"
             @click="handleEexamine(record)"
             id="billOfLading-eexamine-btn">审核进度</a-button>
             id="billOfLading-eexamine-btn">审核进度</a-button>
           <a-button
           <a-button
             size="small"
             size="small"
             type="link"
             type="link"
             class="button-warning"
             class="button-warning"
-            v-if="record.state == 'AUDIT_REJECT'"
+            v-if="record.state == 'AUDIT_REJECT'&&$hasPermissions('B_asginEditPickUp')"
             @click="handleAginEdit(record)"
             @click="handleAginEdit(record)"
             id="billOfLading-eexamine-btn">再次编辑</a-button>
             id="billOfLading-eexamine-btn">再次编辑</a-button>
           <a-button
           <a-button
             size="small"
             size="small"
-            v-if="record.state == 'WAIT_SUBMIT'"
+            v-if="record.state == 'WAIT_SUBMIT'&&$hasPermissions('B_editPickUp')"
             type="link"
             type="link"
             class="button-info"
             class="button-info"
             @click="handleEdit(record)"
             @click="handleEdit(record)"
             id="billOfLading-edit-btn">编辑</a-button>
             id="billOfLading-edit-btn">编辑</a-button>
           <a-button
           <a-button
             size="small"
             size="small"
-            v-if="record.state == 'WAIT_SUBMIT'"
+            v-if="record.state == 'WAIT_SUBMIT'&&$hasPermissions('B_delPickUp')"
             type="link"
             type="link"
             class="button-error"
             class="button-error"
             @click="handleDel(record)"
             @click="handleDel(record)"

+ 2 - 2
src/views/salesReturnManagement/pickUp/list.vue

@@ -64,7 +64,7 @@
         bordered>
         bordered>
         <!-- 单号 -->
         <!-- 单号 -->
         <template slot="pickUpNo" slot-scope="text, record">
         <template slot="pickUpNo" slot-scope="text, record">
-          <div v-if="$hasPermissions('B_salesReturnDetail')">
+          <div v-if="$hasPermissions('M_detailPickUp')">
             <span class="link-bule" @click="handleDetail(record)">{{ record.pickUpNo }}</span>
             <span class="link-bule" @click="handleDetail(record)">{{ record.pickUpNo }}</span>
           </div>
           </div>
           <div v-else>{{ record.pickUpNo }}</div>
           <div v-else>{{ record.pickUpNo }}</div>
@@ -79,7 +79,7 @@
             size="small"
             size="small"
             type="link"
             type="link"
             class="button-info"
             class="button-info"
-            v-if="record.state == 'AUDIT_PASS'"
+            v-if="record.state == 'AUDIT_PASS'&&$hasPermissions('M_detailPickUp')"
             @click="handleDetail(record)"
             @click="handleDetail(record)"
             id="pickUp-detail-btn">详情</a-button>
             id="pickUp-detail-btn">详情</a-button>
         </template>
         </template>

+ 2 - 2
src/views/salesReturnManagement/receiveCheck/list.vue

@@ -66,14 +66,14 @@
               size="small"
               size="small"
               type="link"
               type="link"
               class="button-info"
               class="button-info"
-              v-if="record.billStatus == 'WAIT_RECEIVE'"
+              v-if="record.billStatus == 'WAIT_RECEIVE'&&$hasPermissions('B_salesReturnReceiving')"
               @click="handleReceiving(record)"
               @click="handleReceiving(record)"
               id="receiveCheck-detail-btn">收货</a-button>
               id="receiveCheck-detail-btn">收货</a-button>
             <a-button
             <a-button
               size="small"
               size="small"
               type="link"
               type="link"
               class="button-warning"
               class="button-warning"
-              v-if="record.billStatus == 'WAIT_CHECK'"
+              v-if="record.billStatus == 'WAIT_CHECK'&&$hasPermissions('B_salesReturnCheck')"
               @click="handleCheck(record)"
               @click="handleCheck(record)"
               id="salesReturn-eexamine-btn">品检</a-button>
               id="salesReturn-eexamine-btn">品检</a-button>
           </div>
           </div>

+ 2 - 1
src/views/salesReturnManagement/salesReturn/detail.vue

@@ -100,7 +100,8 @@
               bordered></s-table>
               bordered></s-table>
           </a-tab-pane>
           </a-tab-pane>
           <a-tab-pane key="2" tab="审核进度" >
           <a-tab-pane key="2" tab="审核进度" >
-            <auditDetail ref="auditDetail" businessType="SALES_RETURN" :itemSn="$route.params.sn"></auditDetail>
+            <auditDetail v-if="$hasPermissions('B_salesReturnAudit')" ref="auditDetail" businessType="SALES_RETURN" :itemSn="$route.params.sn"></auditDetail>
+            <span v-else>您没有权限查看审核进度</span>
           </a-tab-pane>
           </a-tab-pane>
           <a-tab-pane key="3" tab="操作记录">
           <a-tab-pane key="3" tab="操作记录">
             <s-table
             <s-table

+ 6 - 6
src/views/salesReturnManagement/salesReturn/list.vue

@@ -125,14 +125,14 @@
               size="small"
               size="small"
               type="link"
               type="link"
               class="button-warning"
               class="button-warning"
-              v-if="record.billStatus == 'WAIT_AUDIT'"
+              v-if="record.billStatus == 'WAIT_AUDIT'&&$hasPermissions('B_salesReturnAudit')"
               @click="handleEexamine(record)"
               @click="handleEexamine(record)"
               id="salesReturn-eexamine-btn">审核进度</a-button>
               id="salesReturn-eexamine-btn">审核进度</a-button>
             <a-button
             <a-button
               size="small"
               size="small"
               type="link"
               type="link"
               class="button-warning"
               class="button-warning"
-              v-if="record.salesReturnBillSource != 'SALES'&&record.billStatus == 'WAIT_SUBMIT'"
+              v-if="record.salesReturnBillSource != 'SALES'&&record.billStatus == 'WAIT_SUBMIT'&&$hasPermissions('B_salseReturnSubmit')"
               @click="beforeSubmit(record)"
               @click="beforeSubmit(record)"
               id="salesReturn-eexamine-btn">提交</a-button>
               id="salesReturn-eexamine-btn">提交</a-button>
             <a-button
             <a-button
@@ -144,7 +144,7 @@
               id="salesReturn-edit-btn">{{ record.salesReturnBillSource == 'SALES' ? '编辑' : '改单' }}</a-button>
               id="salesReturn-edit-btn">{{ record.salesReturnBillSource == 'SALES' ? '编辑' : '改单' }}</a-button>
             <a-button
             <a-button
               size="small"
               size="small"
-              v-if="record.billStatus == 'WAIT_SUBMIT' && $hasPermissions('B_salesReturnEdit')"
+              v-if="record.billStatus == 'WAIT_SUBMIT' && $hasPermissions('B_salesReturnDel')"
               type="link"
               type="link"
               class="button-error"
               class="button-error"
               @click="handleDel(record)"
               @click="handleDel(record)"
@@ -153,21 +153,21 @@
               size="small"
               size="small"
               type="link"
               type="link"
               class="button-info"
               class="button-info"
-              v-if="record.salesReturnBillSource == 'SALES'&&record.billStatus == 'AUDIT_REJECT'"
+              v-if="record.salesReturnBillSource == 'SALES'&&record.billStatus == 'AUDIT_REJECT'&& $hasPermissions('B_salesReturnAgainEdit')"
               @click="handleAgainEdit(record)"
               @click="handleAgainEdit(record)"
               id="salesReturn-edit-btn">再次编辑</a-button>
               id="salesReturn-edit-btn">再次编辑</a-button>
             <a-button
             <a-button
               size="small"
               size="small"
               type="link"
               type="link"
               class="button-info"
               class="button-info"
-              v-if="record.billStatus == 'WAIT_RECEIVE'"
+              v-if="record.billStatus == 'WAIT_RECEIVE'&& $hasPermissions('B_salesReturnPickUp')"
               @click="handlePickUp(record)"
               @click="handlePickUp(record)"
               id="salesReturn-edit-btn">申请提货</a-button>
               id="salesReturn-edit-btn">申请提货</a-button>
             <a-button
             <a-button
               size="small"
               size="small"
               type="link"
               type="link"
               class="button-info"
               class="button-info"
-              v-if="record.billStatus == 'FINANCIAL_REJECT'||record.billStatus == 'WAIT_CUSTOMER_SERVICE_CONFIRM'"
+              v-if="(record.billStatus == 'FINANCIAL_REJECT'||record.billStatus == 'WAIT_CUSTOMER_SERVICE_CONFIRM')&& $hasPermissions('B_salesReturnConfirm')"
               @click="handleConfirm(record)"
               @click="handleConfirm(record)"
               id="salesReturn-edit-btn">客服确认</a-button>
               id="salesReturn-edit-btn">客服确认</a-button>
           </div>
           </div>

+ 2 - 2
vue.config.js

@@ -107,9 +107,9 @@ 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.183:8602/ocs-admin',
+        // target: 'http://192.168.0.183:8602/ocs-admin',
         // target: 'https://t.ocs.360arrow.com/ocs-admin', //  Á·Ï°
         // target: 'https://t.ocs.360arrow.com/ocs-admin', //  Á·Ï°
-        // target: 'http://p.ocs.360arrow.com/ocs-admin', //  Ô¤·¢²¼
+        target: 'http://p.ocs.360arrow.com/ocs-admin', //  Ô¤·¢²¼
         ws: false,
         ws: false,
         changeOrigin: true,
         changeOrigin: true,
         pathRewrite: {
         pathRewrite: {