From 98aa1626c10f1ef71ed4bbceef6573c6d7c133e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B7=B4=E5=8D=AB?= <14240332@qq.com>
Date: Thu, 2 Mar 2023 17:30:27 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SC-web/src/views/basic/profile/index.vue      |   17 +-
 .../basicInformation/jg_contract/Detail.vue   |   72 +-
 .../scm/basicInformation/jg_contract/Form.vue | 1126 +++++++++--------
 .../basicInformation/jg_contract/index.vue    |   32 +-
 4 files changed, 637 insertions(+), 610 deletions(-)

diff --git a/SC-web/src/views/basic/profile/index.vue b/SC-web/src/views/basic/profile/index.vue
index a5e4587a..e50d45bc 100644
--- a/SC-web/src/views/basic/profile/index.vue
+++ b/SC-web/src/views/basic/profile/index.vue
@@ -2,22 +2,19 @@
   <div class="app-container Profile-container">
     <el-tabs tab-position="left" style="height:100%" v-model="activeTab" class="profile-tabs"
       v-loading="userLoading">
-<!--
       <el-tab-pane label="个人资料" name="user">
         <UserInfo ref="user" :user='user' v-if="visible.user" @updateInfo="getInfo" />
       </el-tab-pane>
       <el-tab-pane label="修改密码" name="password">
         <Password ref="password" v-if="visible.password" />
       </el-tab-pane>
--->
       <el-tab-pane disabled name="line"></el-tab-pane>
-      <el-tab-pane disabled name="line"></el-tab-pane>
-      <el-tab-pane label="个人资料" name="user">
-        <UserInfo ref="user" :user='user' v-if="visible.user" @updateInfo="getInfo" />
-      </el-tab-pane>
-      <el-tab-pane label="修改密码" name="password">
-        <Password ref="password" v-if="visible.password" />
-      </el-tab-pane>
+<!--      <el-tab-pane label="个人资料" name="user">-->
+<!--        <UserInfo ref="user" :user='user' v-if="visible.user" @updateInfo="getInfo"/>-->
+<!--      </el-tab-pane>-->
+<!--      <el-tab-pane label="修改密码" name="password">-->
+<!--        <Password ref="password" v-if="visible.password"/>-->
+<!--      </el-tab-pane>-->
       <el-tab-pane label="我的组织" name="organize">
         <div class="JNPF-common-title mb-10">
           <h2 class="bold">我的组织
@@ -99,7 +96,7 @@
         <div class="avatar-box">
           <el-avatar :size="50" :src="define.comUrl + user.avatar" class="avatar"
             v-if="user.avatar" />
-<!--          <div class="avatar-hover">更换头像</div>-->
+          <div class="avatar-hover">更换头像</div>
         </div>
       </el-upload>
 <!--      <span class="username">{{user.realName}}</span>-->
diff --git a/SC-web/src/views/scm/basicInformation/jg_contract/Detail.vue b/SC-web/src/views/scm/basicInformation/jg_contract/Detail.vue
index 9be12853..8772fdfa 100644
--- a/SC-web/src/views/scm/basicInformation/jg_contract/Detail.vue
+++ b/SC-web/src/views/scm/basicInformation/jg_contract/Detail.vue
@@ -11,178 +11,178 @@
 <el-row :gutter="15" class=" main" :style="{margin: '0 auto',width: '100%'}">
 <el-form ref="elForm" :model="dataForm" size="small" label-width="100px" label-position="right" >
     <template v-if="!loading">
-            <el-col :span="24" >
+            <el-col :span="24"   v-if="jnpf.hasFormP('creatorUserId')"   >
                 <el-form-item  label="创建人id"  
  prop="creatorUserId" >
                         <p>{{dataForm.creatorUserId}}</p>
                 </el-form-item>
             </el-col>
-            <el-col :span="24" >
+            <el-col :span="24"   v-if="jnpf.hasFormP('creatorUserName')"   >
                 <el-form-item  label="创建人名称"  
  prop="creatorUserName" >
                         <p>{{dataForm.creatorUserName}}</p>
                 </el-form-item>
             </el-col>
-            <el-col :span="8" >
+            <el-col :span="8"   v-if="jnpf.hasFormP('contractType')"   >
                 <el-form-item  label="合同类型 "  
  prop="contractType" >
                          <p>{{ dataForm.contractType | dynamicText(contractTypeOptions) }} </p>
                 </el-form-item>
             </el-col>
-            <el-col :span="8" >
+            <el-col :span="8"   v-if="jnpf.hasFormP('contractCode')"   >
                 <el-form-item  label="合同编码"  
  prop="contractCode" >
                         <p>{{dataForm.contractCode}}</p>
                 </el-form-item>
             </el-col>
-            <el-col :span="8" >
+            <el-col :span="8"   v-if="jnpf.hasFormP('contractName')"   >
                 <el-form-item  label="合同名称"  
  prop="contractName" >
                         <p>{{dataForm.contractName}}</p>
                 </el-form-item>
             </el-col>
-            <el-col :span="8" >
+            <el-col :span="8"   v-if="jnpf.hasFormP('status')"   >
                 <el-form-item  label="合同状态"  
  prop="status" >
                         <p>{{dataForm.status}}</p>
                 </el-form-item>
             </el-col>
-            <el-col :span="8" >
+            <el-col :span="8"   v-if="jnpf.hasFormP('bidOpeningDate')"   >
                 <el-form-item  label="开标日期"  
  prop="bidOpeningDate" >
                         <p>{{jnpf.dateFormat(dataForm.bidOpeningDate)}}</p>
                 </el-form-item>
             </el-col>
-            <el-col :span="8" >
+            <el-col :span="8"   v-if="jnpf.hasFormP('startDate')"   >
                 <el-form-item  label="开始日期"  
  prop="startDate" >
                         <p>{{jnpf.dateFormat(dataForm.startDate)}}</p>
                 </el-form-item>
             </el-col>
-            <el-col :span="8" >
+            <el-col :span="8"   v-if="jnpf.hasFormP('auditDate')"   >
                 <el-form-item  label="审核日期"  
  prop="auditDate" >
                         <p>{{jnpf.dateFormat(dataForm.auditDate)}}</p>
                 </el-form-item>
             </el-col>
-            <el-col :span="8" >
+            <el-col :span="8"   v-if="jnpf.hasFormP('completionDate')"   >
                 <el-form-item  label="供货完成日期"  
  prop="completionDate" >
                         <p>{{jnpf.dateFormat(dataForm.completionDate)}}</p>
                 </el-form-item>
             </el-col>
-            <el-col :span="8" >
+            <el-col :span="8"   v-if="jnpf.hasFormP('closingDate')"   >
                 <el-form-item  label="关闭日期"  
  prop="closingDate" >
                         <p>{{jnpf.dateFormat(dataForm.closingDate)}}</p>
                 </el-form-item>
             </el-col>
-            <el-col :span="8" >
+            <el-col :span="8"   v-if="jnpf.hasFormP('collectionCycle')"   >
                 <el-form-item  label="回款周期(日)"  
  prop="collectionCycle" >
                         <p>{{dataForm.collectionCycle}}</p>
                 </el-form-item>
             </el-col>
-            <el-col :span="8" >
+            <el-col :span="8"   v-if="jnpf.hasFormP('signingDate')"   >
                 <el-form-item  label="签订日期"  
  prop="signingDate" >
                         <p>{{jnpf.dateFormat(dataForm.signingDate)}}</p>
                 </el-form-item>
             </el-col>
-            <el-col :span="8" >
+            <el-col :span="8"   v-if="jnpf.hasFormP('endDate')"   >
                 <el-form-item  label="截止日期"  
  prop="endDate" >
                         <p>{{jnpf.dateFormat(dataForm.endDate)}}</p>
                 </el-form-item>
             </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="供应商/客户编"  
+            <el-col :span="8"   v-if="jnpf.hasFormP('code')"   >
+                <el-form-item  label="供应商/客户id"  
  prop="code" >
                         <p>{{dataForm.code}}</p>
                 </el-form-item>
             </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="供应商/客户名"  
+            <el-col :span="8"   v-if="jnpf.hasFormP('name')"   >
+                <el-form-item  label="供应商/客户id"  
  prop="name" >
                         <p>{{dataForm.name}}</p>
                 </el-form-item>
             </el-col>
-            <el-col :span="8" >
+            <el-col :span="8"   v-if="jnpf.hasFormP('contractNo')"   >
                 <el-form-item  label="对方合同号"  
  prop="contractNo" >
                         <p>{{dataForm.contractNo}}</p>
                 </el-form-item>
             </el-col>
-            <el-col :span="8" >
+            <el-col :span="8"   v-if="jnpf.hasFormP('currency')"   >
                 <el-form-item  label="币种 "  
  prop="currency" >
                         <p>{{dataForm.currency}}</p>
                 </el-form-item>
             </el-col>
-            <el-col :span="8" >
+            <el-col :span="8"   v-if="jnpf.hasFormP('num')"   >
                 <el-form-item  label="数量"  
  prop="num" >
                         <p>{{dataForm.num}}</p>
                 </el-form-item>
             </el-col>
-            <el-col :span="8" >
+            <el-col :span="8"   v-if="jnpf.hasFormP('amount')"   >
                 <el-form-item  label="金额"  
  prop="amount" >
                         <p>{{dataForm.amount}}</p>
                 </el-form-item>
             </el-col>
-            <el-col :span="8" >
+            <el-col :span="8"   v-if="jnpf.hasFormP('organization')"   >
                 <el-form-item  label="库存组织"  
  prop="organization" >
                         <p>{{dataForm.organization}}</p>
                 </el-form-item>
             </el-col>
-            <el-col :span="16" >
+            <el-col :span="16"   v-if="jnpf.hasFormP('remark')"   >
                 <el-form-item  label="备注"  
  prop="remark" >
                         <p>{{dataForm.remark}}</p>
                 </el-form-item>
             </el-col>
-            <el-col :span="24" >
+            <el-col :span="24"   v-if="jnpf.hasFormP('classification')"   >
                 <el-form-item  label="合同分类 "  
  prop="classification" >
                         <p>{{dataForm.classification}}</p>
                 </el-form-item>
             </el-col>
-            <el-col :span="24" >
+            <el-col :span="24"   v-if="jnpf.hasFormP('declarationDate')"   >
                 <el-form-item  label="申报日期"  
  prop="declarationDate" >
                         <p>{{dataForm.declarationDate}}</p>
                 </el-form-item>
             </el-col>
-            <el-col :span="24" >
+            <el-col :span="24"   v-if="jnpf.hasFormP('deptCode')"   >
                 <el-form-item  label="部门编码"  
  prop="deptCode" >
                         <p>{{dataForm.deptCode}}</p>
                 </el-form-item>
             </el-col>
-            <el-col :span="24" >
+            <el-col :span="24"   v-if="jnpf.hasFormP('creatorusername')"   >
                 <el-form-item  label="录入人"  
  prop="creatorusername" >
                         <p>{{dataForm.creatorusername}}</p>
                 </el-form-item>
             </el-col>
-            <el-col :span="24" >
+            <el-col :span="24"   v-if="jnpf.hasFormP('deptName')"   >
                 <el-form-item  label="部门名称"  
  prop="deptName" >
                         <p>{{dataForm.deptName}}</p>
                 </el-form-item>
             </el-col>
-            <el-col :span="24" >
+            <el-col :span="24"   v-if="jnpf.hasFormP('approval')"   >
                 <el-form-item  label="集团审批"  
  prop="approval" >
                         <p>{{dataForm.approval}}</p>
                 </el-form-item>
             </el-col>
             <el-col :span="24">
-                <el-tabs  v-model="activenydeop"  tab-position="top" class="mb-20">
+                <el-tabs  v-model="activeayhzdd"  tab-position="top" class="mb-20">
                 <el-tab-pane  label="物料明细">
-    <el-col :span="24"  >
+    <el-col :span="24"   v-if="jnpf.hasFormP('jg_contract_item0List')" >
     <el-form-item label-width="0">
             <div class="JNPF-common-title">
                 <h2></h2>
@@ -249,7 +249,7 @@
     </el-col>
             </el-tab-pane >
                 <el-tab-pane  label="附件详情">
-    <el-col :span="24"  >
+    <el-col :span="24"   v-if="jnpf.hasFormP('jg_contract_item1List')" >
     <el-form-item label-width="0">
             <div class="JNPF-common-title">
                 <h2></h2>
@@ -305,8 +305,8 @@
                             collectionCycle : '',
                             signingDate : '',
                             endDate : '',
-                            code : '',
-                            name : '',
+                            code : "",
+                            name : "",
                             contractNo : '',
                             currency : '',
                             num : '',
@@ -322,7 +322,7 @@
                         jg_contract_item0List:[],
                         jg_contract_item1List:[],
             },
-                            activenydeop:'0',
+                            activeayhzdd:'0',
                                 contractTypeOptions:[{"fullName":"选项一","id":"1"},{"fullName":"选项二","id":"2"}],
 
         }
diff --git a/SC-web/src/views/scm/basicInformation/jg_contract/Form.vue b/SC-web/src/views/scm/basicInformation/jg_contract/Form.vue
index bd718c55..e60ee504 100644
--- a/SC-web/src/views/scm/basicInformation/jg_contract/Form.vue
+++ b/SC-web/src/views/scm/basicInformation/jg_contract/Form.vue
@@ -1,643 +1,673 @@
 <template>
-<transition name="el-zoom-in-center">
-<div class="JNPF-preview-main">
-    <div class="JNPF-common-page-header">
+  <transition name="el-zoom-in-center">
+    <div class="JNPF-preview-main">
+      <div class="JNPF-common-page-header">
         <el-page-header @back="goBack"
                         :content="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'"/>
         <div class="options">
-            <el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail"> 保 存</el-button>
-            <el-button @click="goBack"> 取 消</el-button>
+          <el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail"> 保 存</el-button>
+          <el-button @click="goBack"> 取 消</el-button>
         </div>
-    </div>
-<el-row :gutter="15" class=" main" :style="{margin: '0 auto',width: '100%'}">
-<el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px" label-position="right" >
-    <template v-if="!loading">
-            <el-col :span="24" >
-                <el-form-item  label="创建人id"
- prop="creatorUserId" >
-                    <el-input    v-model="dataForm.creatorUserId"
- placeholder="系统自动生成"  readonly >
+      </div>
+      <el-row :gutter="15" class=" main" :style="{margin: '0 auto',width: '100%'}">
+        <el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px" label-position="right">
+          <template v-if="!loading">
+            <el-col :span="24" v-if="jnpf.hasFormP('creatorUserId')">
+              <el-form-item label="创建人id"
+                            prop="creatorUserId">
+                <el-input v-model="dataForm.creatorUserId"
+                          placeholder="系统自动生成" readonly>
 
                 </el-input>
-                </el-form-item>
+              </el-form-item>
             </el-col>
-            <el-col :span="24" >
-                <el-form-item  label="创建人名称"
- prop="creatorUserName" >
-                    <el-input    v-model="dataForm.creatorUserName"
- placeholder="系统自动生成"  readonly >
+            <el-col :span="24" v-if="jnpf.hasFormP('creatorUserName')">
+              <el-form-item label="创建人名称"
+                            prop="creatorUserName">
+                <el-input v-model="dataForm.creatorUserName"
+                          placeholder="系统自动生成" readonly>
 
                 </el-input>
-                </el-form-item>
+              </el-form-item>
             </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="合同类型 "
- prop="contractType" >
-                    <el-select    v-model="dataForm.contractType"
- placeholder="请选择"  clearable  :style='{"width":"100%"}'>
-                            <el-option v-for="(item, index) in contractTypeOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
+            <el-col :span="8" v-if="jnpf.hasFormP('contractType')">
+              <el-form-item label="合同类型 "
+                            prop="contractType">
+                <el-select v-model="dataForm.contractType"
+                           placeholder="请选择" clearable :style='{"width":"100%"}'>
+                  <el-option v-for="(item, index) in contractTypeOptions" :key="index" :label="item.fullName"
+                             :value="item.id" :disabled="item.disabled"></el-option>
 
                 </el-select>
-                </el-form-item>
+              </el-form-item>
             </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="合同编码"
- prop="contractCode" >
-                    <el-input    v-model="dataForm.contractCode"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+            <el-col :span="8" v-if="jnpf.hasFormP('contractCode')">
+              <el-form-item label="合同编码"
+                            prop="contractCode">
+                <el-input v-model="dataForm.contractCode"
+                          placeholder="请输入" clearable :style='{"width":"100%"}'>
 
                 </el-input>
-                </el-form-item>
+              </el-form-item>
             </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="合同名称"
- prop="contractName" >
-                    <el-input    v-model="dataForm.contractName"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+            <el-col :span="8" v-if="jnpf.hasFormP('contractName')">
+              <el-form-item label="合同名称"
+                            prop="contractName">
+                <el-input v-model="dataForm.contractName"
+                          placeholder="请输入" clearable :style='{"width":"100%"}'>
 
                 </el-input>
-                </el-form-item>
+              </el-form-item>
             </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="合同状态"
- prop="status" >
-                    <el-input    v-model="dataForm.status"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+            <el-col :span="8" v-if="jnpf.hasFormP('status')">
+              <el-form-item label="合同状态"
+                            prop="status">
+                <el-input v-model="dataForm.status"
+                          placeholder="请输入" clearable :style='{"width":"100%"}'>
 
                 </el-input>
-                </el-form-item>
+              </el-form-item>
             </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="开标日期"
- prop="bidOpeningDate" >
-                    <el-date-picker    v-model="dataForm.bidOpeningDate"
- placeholder="请选择"  clearable  :style='{"width":"100%"}' type="date"  format="yyyy-MM-dd"  value-format="timestamp" >
+            <el-col :span="8" v-if="jnpf.hasFormP('bidOpeningDate')">
+              <el-form-item label="开标日期"
+                            prop="bidOpeningDate">
+                <el-date-picker v-model="dataForm.bidOpeningDate"
+                                placeholder="请选择" clearable :style='{"width":"100%"}' type="date" format="yyyy-MM-dd"
+                                value-format="timestamp">
 
                 </el-date-picker>
-                </el-form-item>
+              </el-form-item>
             </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="开始日期"
- prop="startDate" >
-                    <el-date-picker    v-model="dataForm.startDate"
- placeholder="请选择"  clearable  :style='{"width":"100%"}' type="date"  format="yyyy-MM-dd"  value-format="timestamp" >
+            <el-col :span="8" v-if="jnpf.hasFormP('startDate')">
+              <el-form-item label="开始日期"
+                            prop="startDate">
+                <el-date-picker v-model="dataForm.startDate"
+                                placeholder="请选择" clearable :style='{"width":"100%"}' type="date" format="yyyy-MM-dd"
+                                value-format="timestamp">
 
                 </el-date-picker>
-                </el-form-item>
+              </el-form-item>
             </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="审核日期"
- prop="auditDate" >
-                    <el-date-picker    v-model="dataForm.auditDate"
- placeholder="请选择"  clearable  :style='{"width":"100%"}' type="date"  format="yyyy-MM-dd"  value-format="timestamp" >
+            <el-col :span="8" v-if="jnpf.hasFormP('auditDate')">
+              <el-form-item label="审核日期"
+                            prop="auditDate">
+                <el-date-picker v-model="dataForm.auditDate"
+                                placeholder="请选择" clearable :style='{"width":"100%"}' type="date" format="yyyy-MM-dd"
+                                value-format="timestamp">
 
                 </el-date-picker>
-                </el-form-item>
+              </el-form-item>
             </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="供货完成日期"
- prop="completionDate" >
-                    <el-date-picker    v-model="dataForm.completionDate"
- placeholder="请选择"  clearable  :style='{"width":"100%"}' type="date"  format="yyyy-MM-dd"  value-format="timestamp" >
+            <el-col :span="8" v-if="jnpf.hasFormP('completionDate')">
+              <el-form-item label="供货完成日期"
+                            prop="completionDate">
+                <el-date-picker v-model="dataForm.completionDate"
+                                placeholder="请选择" clearable :style='{"width":"100%"}' type="date" format="yyyy-MM-dd"
+                                value-format="timestamp">
 
                 </el-date-picker>
-                </el-form-item>
+              </el-form-item>
             </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="关闭日期"
- prop="closingDate" >
-                    <el-date-picker    v-model="dataForm.closingDate"
- placeholder="请选择"  clearable  :style='{"width":"100%"}' type="date"  format="yyyy-MM-dd"  value-format="timestamp" >
+            <el-col :span="8" v-if="jnpf.hasFormP('closingDate')">
+              <el-form-item label="关闭日期"
+                            prop="closingDate">
+                <el-date-picker v-model="dataForm.closingDate"
+                                placeholder="请选择" clearable :style='{"width":"100%"}' type="date" format="yyyy-MM-dd"
+                                value-format="timestamp">
 
                 </el-date-picker>
-                </el-form-item>
+              </el-form-item>
             </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="回款周期(日)"
- prop="collectionCycle" >
-                    <el-input    v-model="dataForm.collectionCycle"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+            <el-col :span="8" v-if="jnpf.hasFormP('collectionCycle')">
+              <el-form-item label="回款周期(日)"
+                            prop="collectionCycle">
+                <el-input v-model="dataForm.collectionCycle"
+                          placeholder="请输入" clearable :style='{"width":"100%"}'>
 
                 </el-input>
-                </el-form-item>
+              </el-form-item>
             </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="签订日期"
- prop="signingDate" >
-                    <el-date-picker    v-model="dataForm.signingDate"
- placeholder="请选择"  clearable  :style='{"width":"100%"}' type="date"  format="yyyy-MM-dd"  value-format="timestamp" >
+            <el-col :span="8" v-if="jnpf.hasFormP('signingDate')">
+              <el-form-item label="签订日期"
+                            prop="signingDate">
+                <el-date-picker v-model="dataForm.signingDate"
+                                placeholder="请选择" clearable :style='{"width":"100%"}' type="date" format="yyyy-MM-dd"
+                                value-format="timestamp">
 
                 </el-date-picker>
-                </el-form-item>
+              </el-form-item>
             </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="截止日期"
- prop="endDate" >
-                    <el-date-picker    v-model="dataForm.endDate"
- placeholder="请选择"  clearable  :style='{"width":"100%"}' type="date"  format="yyyy-MM-dd"  value-format="timestamp" >
+            <el-col :span="8" v-if="jnpf.hasFormP('endDate')">
+              <el-form-item label="截止日期"
+                            prop="endDate">
+                <el-date-picker v-model="dataForm.endDate"
+                                placeholder="请选择" clearable :style='{"width":"100%"}' type="date" format="yyyy-MM-dd"
+                                value-format="timestamp">
 
                 </el-date-picker>
-                </el-form-item>
+              </el-form-item>
             </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="供应商/客户编"
- prop="code" >
-                    <el-input    v-model="dataForm.code"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+            <el-col :span="8" v-if="jnpf.hasFormP('code')">
+              <el-form-item label="供应商/客户id"
+                            prop="code">
+                <popupSelect v-model="dataForm.code"
+                             placeholder="请选择" clearable field="code" interfaceId="382494924156735557"
+                             :columnOptions="codecolumnOptions" propsValue="id" relationField="fullName"
+                             popupType="dialog"
+                             popupTitle="选择供应商" popupWidth="800px"
+                >
 
-                </el-input>
-                </el-form-item>
+                </popupSelect>
+              </el-form-item>
             </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="供应商/客户名"
- prop="name" >
-                    <el-input    v-model="dataForm.name"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+            <el-col :span="8" v-if="jnpf.hasFormP('name')">
+              <el-form-item label="供应商/客户id"
+                            prop="name">
+                <popupSelect v-model="dataForm.name"
+                             placeholder="请选择" clearable field="name" interfaceId="395936123471343749"
+                             :columnOptions="namecolumnOptions" propsValue="id" relationField="fullName"
+                             popupType="dialog"
+                             popupTitle="选择客户" popupWidth="800px"
+                >
 
-                </el-input>
-                </el-form-item>
+                </popupSelect>
+              </el-form-item>
             </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="对方合同号"
- prop="contractNo" >
-                    <el-input    v-model="dataForm.contractNo"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+            <el-col :span="8" v-if="jnpf.hasFormP('contractNo')">
+              <el-form-item label="对方合同号"
+                            prop="contractNo">
+                <el-input v-model="dataForm.contractNo"
+                          placeholder="请输入" clearable :style='{"width":"100%"}'>
 
                 </el-input>
-                </el-form-item>
+              </el-form-item>
             </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="币种 "
- prop="currency" >
-                    <el-input    v-model="dataForm.currency"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+            <el-col :span="8" v-if="jnpf.hasFormP('currency')">
+              <el-form-item label="币种 "
+                            prop="currency">
+                <el-input v-model="dataForm.currency"
+                          placeholder="请输入" clearable :style='{"width":"100%"}'>
 
                 </el-input>
-                </el-form-item>
+              </el-form-item>
             </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="数量"
- prop="num" >
-                    <el-input    v-model="dataForm.num"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+            <el-col :span="8" v-if="jnpf.hasFormP('num')">
+              <el-form-item label="数量"
+                            prop="num">
+                <el-input v-model="dataForm.num"
+                          placeholder="请输入" clearable :style='{"width":"100%"}'>
 
                 </el-input>
-                </el-form-item>
+              </el-form-item>
             </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="金额"
- prop="amount" >
-                    <el-input    v-model="dataForm.amount"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+            <el-col :span="8" v-if="jnpf.hasFormP('amount')">
+              <el-form-item label="金额"
+                            prop="amount">
+                <el-input v-model="dataForm.amount"
+                          placeholder="请输入" clearable :style='{"width":"100%"}'>
 
                 </el-input>
-                </el-form-item>
+              </el-form-item>
             </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="库存组织"
- prop="organization" >
-                    <el-input    v-model="dataForm.organization"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+            <el-col :span="8" v-if="jnpf.hasFormP('organization')">
+              <el-form-item label="库存组织"
+                            prop="organization">
+                <el-input v-model="dataForm.organization"
+                          placeholder="请输入" clearable :style='{"width":"100%"}'>
 
                 </el-input>
-                </el-form-item>
+              </el-form-item>
             </el-col>
-            <el-col :span="16" >
-                <el-form-item  label="备注"
- prop="remark" >
-                    <el-input    v-model="dataForm.remark"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+            <el-col :span="16" v-if="jnpf.hasFormP('remark')">
+              <el-form-item label="备注"
+                            prop="remark">
+                <el-input v-model="dataForm.remark"
+                          placeholder="请输入" clearable :style='{"width":"100%"}'>
 
                 </el-input>
-                </el-form-item>
+              </el-form-item>
             </el-col>
-            <el-col :span="24" >
-                <el-form-item  label="合同分类 "
- prop="classification" >
-                    <el-input    v-model="dataForm.classification"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+            <el-col :span="24" v-if="jnpf.hasFormP('classification')">
+              <el-form-item label="合同分类 "
+                            prop="classification">
+                <el-input v-model="dataForm.classification"
+                          placeholder="请输入" clearable :style='{"width":"100%"}'>
 
                 </el-input>
-                </el-form-item>
+              </el-form-item>
             </el-col>
-            <el-col :span="24" >
-                <el-form-item  label="申报日期"
- prop="declarationDate" >
-                    <el-input    v-model="dataForm.declarationDate"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+            <el-col :span="24" v-if="jnpf.hasFormP('declarationDate')">
+              <el-form-item label="申报日期"
+                            prop="declarationDate">
+                <el-input v-model="dataForm.declarationDate"
+                          placeholder="请输入" clearable :style='{"width":"100%"}'>
 
                 </el-input>
-                </el-form-item>
+              </el-form-item>
             </el-col>
-            <el-col :span="24" >
-                <el-form-item  label="部门编码"
- prop="deptCode" >
-                    <el-input    v-model="dataForm.deptCode"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+            <el-col :span="24" v-if="jnpf.hasFormP('deptCode')">
+              <el-form-item label="部门编码"
+                            prop="deptCode">
+                <el-input v-model="dataForm.deptCode"
+                          placeholder="请输入" clearable :style='{"width":"100%"}'>
 
                 </el-input>
-                </el-form-item>
+              </el-form-item>
             </el-col>
-            <el-col :span="24" >
-                <el-form-item  label="录入人"
- prop="creatorusername" >
-                    <el-input    v-model="dataForm.creatorusername"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+            <el-col :span="24" v-if="jnpf.hasFormP('creatorusername')">
+              <el-form-item label="录入人"
+                            prop="creatorusername">
+                <el-input v-model="dataForm.creatorusername"
+                          placeholder="请输入" clearable :style='{"width":"100%"}'>
 
                 </el-input>
-                </el-form-item>
+              </el-form-item>
             </el-col>
-            <el-col :span="24" >
-                <el-form-item  label="部门名称"
- prop="deptName" >
-                    <el-input    v-model="dataForm.deptName"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+            <el-col :span="24" v-if="jnpf.hasFormP('deptName')">
+              <el-form-item label="部门名称"
+                            prop="deptName">
+                <el-input v-model="dataForm.deptName"
+                          placeholder="请输入" clearable :style='{"width":"100%"}'>
 
                 </el-input>
-                </el-form-item>
+              </el-form-item>
             </el-col>
-            <el-col :span="24" >
-                <el-form-item  label="集团审批"
- prop="approval" >
-                    <el-switch    v-model="dataForm.approval"
- :active-value="1"  :inactive-value="0" >
+            <el-col :span="24" v-if="jnpf.hasFormP('approval')">
+              <el-form-item label="集团审批"
+                            prop="approval">
+                <el-switch v-model="dataForm.approval"
+                           :active-value="1" :inactive-value="0">
 
                 </el-switch>
-                </el-form-item>
+              </el-form-item>
             </el-col>
             <el-col :span="24">
-                <el-tabs  v-model="activenydeop"  tab-position="top" class="mb-20">
-                <el-tab-pane  label="物料明细">
-    <el-col :span="24"  >
-    <el-form-item label-width="0">
-            <div class="JNPF-common-title">
-                <h2></h2>
-            </div>
-    <el-table :data="dataForm.jg_contract_item0List" size='mini'   >
-        <el-table-column type="index" width="50" label="序号" align="center" />
-            <el-table-column prop="materialCode" label="物料编码">
-                <template slot-scope="scope">
-                    <el-input   v-model="scope.row.materialCode"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-                </el-input>
-            </template>
-        </el-table-column>
-            <el-table-column prop="materialName" label="物料名称">
-                <template slot-scope="scope">
-                    <el-input   v-model="scope.row.materialName"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-                </el-input>
-            </template>
-        </el-table-column>
-            <el-table-column prop="specification" label="规格型号">
-                <template slot-scope="scope">
-                    <el-input   v-model="scope.row.specification"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-                </el-input>
-            </template>
-        </el-table-column>
-            <el-table-column prop="unit" label="单位 ">
-                <template slot-scope="scope">
-                    <el-input   v-model="scope.row.unit"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-                </el-input>
-            </template>
-        </el-table-column>
-            <el-table-column prop="num" label="数量">
-                <template slot-scope="scope">
-                    <el-input   v-model="scope.row.num"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-                </el-input>
-            </template>
-        </el-table-column>
-            <el-table-column prop="price" label="单价">
-                <template slot-scope="scope">
-                    <el-input   v-model="scope.row.price"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-                </el-input>
-            </template>
-        </el-table-column>
-            <el-table-column prop="amount" label="金额">
-                <template slot-scope="scope">
-                    <el-input   v-model="scope.row.amount"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-                </el-input>
-            </template>
-        </el-table-column>
-            <el-table-column prop="rate" label="税率 ">
-                <template slot-scope="scope">
-                    <el-input   v-model="scope.row.rate"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-                </el-input>
-            </template>
-        </el-table-column>
-            <el-table-column prop="notPrice" label="不含税单价">
-                <template slot-scope="scope">
-                    <el-input   v-model="scope.row.notPrice"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-                </el-input>
-            </template>
-        </el-table-column>
-            <el-table-column prop="notAmount" label="不含税金额">
-                <template slot-scope="scope">
-                    <el-input   v-model="scope.row.notAmount"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-                </el-input>
-            </template>
-        </el-table-column>
-            <el-table-column prop="remark" label="备注">
-                <template slot-scope="scope">
-                    <el-input   v-model="scope.row.remark"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-                </el-input>
-            </template>
-        </el-table-column>
-    <el-table-column label="操作" width="50" >
-        <template slot-scope="scope">
-            <el-button size="mini" type="text" class="JNPF-table-delBtn" @click="deljg_contract_item0List(scope.$index)">删除</el-button>
-        </template>
-    </el-table-column>
-    </el-table>
-    <div class="table-actions" @click="addjg_contract_item0List()">
-        <el-button type="text" icon="el-icon-plus">添加</el-button>
-    </div>
-    </el-form-item>
-    </el-col>
-            </el-tab-pane >
-                <el-tab-pane  label="附件详情">
-    <el-col :span="24"  >
-    <el-form-item label-width="0">
-            <div class="JNPF-common-title">
-                <h2></h2>
-            </div>
-    <el-table :data="dataForm.jg_contract_item1List" size='mini'   >
-        <el-table-column type="index" width="50" label="序号" align="center" />
-            <el-table-column prop="enclosure" label="附件内容">
-                <template slot-scope="scope">
-                    <JNPF-UploadFz   v-model="scope.row.enclosure"
- :fileSize="5"    sizeUnit="MB"  :limit="9"  buttonText="点击上传" >
-                </JNPF-UploadFz>
-            </template>
-        </el-table-column>
-    <el-table-column label="操作" width="50" >
-        <template slot-scope="scope">
-            <el-button size="mini" type="text" class="JNPF-table-delBtn" @click="deljg_contract_item1List(scope.$index)">删除</el-button>
-        </template>
-    </el-table-column>
-    </el-table>
-    <div class="table-actions" @click="addjg_contract_item1List()">
-        <el-button type="text" icon="el-icon-plus">添加</el-button>
-    </div>
-    </el-form-item>
-    </el-col>
-            </el-tab-pane >
-            </el-tabs>
-                </el-col>
-    </template>
-</el-form>
-    </el-row>
+              <el-tabs v-model="activeayhzdd" tab-position="top" class="mb-20">
+                <el-tab-pane label="物料明细">
+                  <el-col :span="24" v-if="jnpf.hasFormP('jg_contract_item0List')">
+                    <el-form-item label-width="0">
+                      <div class="JNPF-common-title">
+                        <h2></h2>
+                      </div>
+                      <el-table :data="dataForm.jg_contract_item0List" size='mini'>
+                        <el-table-column type="index" width="50" label="序号" align="center"/>
+                        <el-table-column prop="materialCode" label="物料编码">
+                          <template slot-scope="scope">
+                            <el-input v-model="scope.row.materialCode"
+                                      placeholder="请输入" clearable :style='{"width":"100%"}'>
+                            </el-input>
+                          </template>
+                        </el-table-column>
+                        <el-table-column prop="materialName" label="物料名称">
+                          <template slot-scope="scope">
+                            <el-input v-model="scope.row.materialName"
+                                      placeholder="请输入" clearable :style='{"width":"100%"}'>
+                            </el-input>
+                          </template>
+                        </el-table-column>
+                        <el-table-column prop="specification" label="规格型号">
+                          <template slot-scope="scope">
+                            <el-input v-model="scope.row.specification"
+                                      placeholder="请输入" clearable :style='{"width":"100%"}'>
+                            </el-input>
+                          </template>
+                        </el-table-column>
+                        <el-table-column prop="unit" label="单位 ">
+                          <template slot-scope="scope">
+                            <el-input v-model="scope.row.unit"
+                                      placeholder="请输入" clearable :style='{"width":"100%"}'>
+                            </el-input>
+                          </template>
+                        </el-table-column>
+                        <el-table-column prop="num" label="数量">
+                          <template slot-scope="scope">
+                            <el-input v-model="scope.row.num"
+                                      placeholder="请输入" clearable :style='{"width":"100%"}'>
+                            </el-input>
+                          </template>
+                        </el-table-column>
+                        <el-table-column prop="price" label="单价">
+                          <template slot-scope="scope">
+                            <el-input v-model="scope.row.price"
+                                      placeholder="请输入" clearable :style='{"width":"100%"}'>
+                            </el-input>
+                          </template>
+                        </el-table-column>
+                        <el-table-column prop="amount" label="金额">
+                          <template slot-scope="scope">
+                            <el-input v-model="scope.row.amount"
+                                      placeholder="请输入" clearable :style='{"width":"100%"}'>
+                            </el-input>
+                          </template>
+                        </el-table-column>
+                        <el-table-column prop="rate" label="税率 ">
+                          <template slot-scope="scope">
+                            <el-input v-model="scope.row.rate"
+                                      placeholder="请输入" clearable :style='{"width":"100%"}'>
+                            </el-input>
+                          </template>
+                        </el-table-column>
+                        <el-table-column prop="notPrice" label="不含税单价">
+                          <template slot-scope="scope">
+                            <el-input v-model="scope.row.notPrice"
+                                      placeholder="请输入" clearable :style='{"width":"100%"}'>
+                            </el-input>
+                          </template>
+                        </el-table-column>
+                        <el-table-column prop="notAmount" label="不含税金额">
+                          <template slot-scope="scope">
+                            <el-input v-model="scope.row.notAmount"
+                                      placeholder="请输入" clearable :style='{"width":"100%"}'>
+                            </el-input>
+                          </template>
+                        </el-table-column>
+                        <el-table-column prop="remark" label="备注">
+                          <template slot-scope="scope">
+                            <el-input v-model="scope.row.remark"
+                                      placeholder="请输入" clearable :style='{"width":"100%"}'>
+                            </el-input>
+                          </template>
+                        </el-table-column>
+                        <el-table-column label="操作" width="50">
+                          <template slot-scope="scope">
+                            <el-button size="mini" type="text" class="JNPF-table-delBtn"
+                                       @click="deljg_contract_item0List(scope.$index)">删除
+                            </el-button>
+                          </template>
+                        </el-table-column>
+                      </el-table>
+                      <div class="table-actions" @click="addjg_contract_item0List()">
+                        <el-button type="text" icon="el-icon-plus">添加</el-button>
+                      </div>
+                    </el-form-item>
+                  </el-col>
+                </el-tab-pane>
+                <el-tab-pane label="附件详情">
+                  <el-col :span="24" v-if="jnpf.hasFormP('jg_contract_item1List')">
+                    <el-form-item label-width="0">
+                      <div class="JNPF-common-title">
+                        <h2></h2>
+                      </div>
+                      <el-table :data="dataForm.jg_contract_item1List" size='mini'>
+                        <el-table-column type="index" width="50" label="序号" align="center"/>
+                        <el-table-column prop="enclosure" label="附件内容">
+                          <template slot-scope="scope">
+                            <JNPF-UploadFz v-model="scope.row.enclosure"
+                                           :fileSize="5" sizeUnit="MB" :limit="9" buttonText="点击上传">
+                            </JNPF-UploadFz>
+                          </template>
+                        </el-table-column>
+                        <el-table-column label="操作" width="50">
+                          <template slot-scope="scope">
+                            <el-button size="mini" type="text" class="JNPF-table-delBtn"
+                                       @click="deljg_contract_item1List(scope.$index)">删除
+                            </el-button>
+                          </template>
+                        </el-table-column>
+                      </el-table>
+                      <div class="table-actions" @click="addjg_contract_item1List()">
+                        <el-button type="text" icon="el-icon-plus">添加</el-button>
+                      </div>
+                    </el-form-item>
+                  </el-col>
+                </el-tab-pane>
+              </el-tabs>
+            </el-col>
+          </template>
+        </el-form>
+      </el-row>
     </div>
-</transition>
+  </transition>
 </template>
 <script>
-    import request from '@/utils/request'
-    import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
-    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
-    export default {
-        components: {},
-        props: [],
-        data() {
-            return {
-                visible: false,
-                loading: false,
-                isDetail: false,
-            dataForm: {
-                            creatorUserId : "",
-                            creatorUserName : "",
-                            contractType : "",
-                            contractCode : '',
-                            contractName : '',
-                            status : '',
-                            bidOpeningDate : '',
-                            startDate : '',
-                            auditDate : '',
-                            completionDate : '',
-                            closingDate : '',
-                            collectionCycle : '',
-                            signingDate : '',
-                            endDate : '',
-                            code : '',
-                            name : '',
-                            contractNo : '',
-                            currency : '',
-                            num : '',
-                            amount : '',
-                            organization : '',
-                            remark : '',
-                            classification : '',
-                            declarationDate : '',
-                            deptCode : '',
-                            creatorusername : '',
-                            deptName : '',
-                            approval : 0,
-                        jg_contract_item0List:[],
-                        jg_contract_item1List:[],
-            },
-                            activenydeop:'0',
-            rules:
-            {
-                            contractType: [
-                                {
-                                    required: true,
-                                    message: '请选择',
-                                    trigger: 'change'
-                                },
-                        ],
-                            contractCode: [
-                                {
-                                    required: true,
-                                    message: '请输入',
-                                    trigger: 'blur'
-                                },
-                                        {
-                                            pattern: '',
-                                            message: '',
-                                            trigger: 'blur'
-                                        },
-                        ],
-                            contractName: [
-                                {
-                                    required: true,
-                                    message: '请输入',
-                                    trigger: 'blur'
-                                },
-                        ],
-                            bidOpeningDate: [
-                                {
-                                    required: true,
-                                    message: '请选择',
-                                    trigger: 'change'
-                                },
-                        ],
-            },
-                        contractTypeOptions:[{"fullName":"选项一","id":"1"},{"fullName":"选项二","id":"2"}],
+  import request from '@/utils/request'
+  import {getDataInterfaceRes} from '@/api/systemData/dataInterface'
+  import {getDictionaryDataSelector} from '@/api/systemData/dictionary'
 
-        }
-        },
-        computed: {},
-        watch: {},
-        created() {
-        },
-        mounted() {},
-        methods: {
-				jg_contract_item0Exist() {
-				let isOk = true;
-					for(let i=0;i<this.dataForm.jg_contract_item0List.length;i++){
-						const e = this.dataForm.jg_contract_item0List[i];
-					}
-				return isOk;
-			},
-				jg_contract_item1Exist() {
-				let isOk = true;
-					for(let i=0;i<this.dataForm.jg_contract_item1List.length;i++){
-						const e = this.dataForm.jg_contract_item1List[i];
-					}
-				return isOk;
-			},
-                goBack() {
-                    this.$emit('refresh')
-                },
-            clearData(data){
-                for (let key in data) {
-                    if (data[key] instanceof Array) {
-                        data[key] = [];
-                    } else if (data[key] instanceof Object) {
-                        this.clearData(data[key]);
-                    } else {
-                        data[key] = "";
-                    }
-                }
-            },
-            init(id, isDetail) {
-                this.dataForm.id = id || 0;
-                this.visible = true;
-                this.isDetail = isDetail || false;
-                this.$nextTick(() => {
-                    this.$refs['elForm'].resetFields();
-                    if(this.dataForm.id){
-                        this.loading = true
-                        request({
-                            url: '/api/example/Jg_contract/'+this.dataForm.id,
-                            method: 'get'
-                        }).then(res => {
-                            this.dataInfo(res.data)
-                            this.loading = false
-                        });
-                    }else{
-                       this.clearData(this.dataForm)
-                    }
-                });
-                this.$store.commit('generator/UPDATE_RELATION_DATA', {})
-            },
-            // 表单提交
-            dataFormSubmit() {
-                this.$refs['elForm'].validate((valid) => {
-                    if (valid) {
-                            if (!this.jg_contract_item0Exist()) return
-                            if (!this.jg_contract_item1Exist()) return
-                            this.request()
-                    }
-                })
-            },
-            request() {
-                var _data =this.dataList()
-                if (!this.dataForm.id) {
-                    request({
-                        url: '/api/example/Jg_contract',
-                        method: 'post',
-                        data: _data
-                    }).then((res) => {
-                        this.$message({
-                            message: res.msg,
-                            type: 'success',
-                            duration: 1000,
-                            onClose: () => {
-                                this.visible = false
-                                this.$emit('refresh', true)
-                            }
-                        })
-                    })
-                }else{
-                    request({
-                        url: '/api/example/Jg_contract/'+this.dataForm.id,
-                        method: 'PUT',
-                        data: _data
-                    }).then((res) => {
-                        this.$message({
-                            message: res.msg,
-                            type: 'success',
-                            duration: 1000,
-                            onClose: () => {
-                                this.visible = false
-                                this.$emit('refresh', true)
-                            }
-                        })
-                    })
-                }
-            },
-                addjg_contract_item0List(){
-                    let item = {
-                            materialCode:undefined,
-                            materialName:undefined,
-                            specification:undefined,
-                            unit:undefined,
-                            num:undefined,
-                            price:undefined,
-                            amount:undefined,
-                            rate:undefined,
-                            notPrice:undefined,
-                            notAmount:undefined,
-                            remark:undefined,
-                }
-                    this.dataForm.jg_contract_item0List.push(item)
-                },
-                deljg_contract_item0List(index) {
-                    this.dataForm.jg_contract_item0List.splice(index, 1);
-                },
-                addjg_contract_item1List(){
-                    let item = {
-                            enclosure:undefined,
-                }
-                    this.dataForm.jg_contract_item1List.push(item)
-                },
-                deljg_contract_item1List(index) {
-                    this.dataForm.jg_contract_item1List.splice(index, 1);
-                },
-            dataList(){
-                var _data = JSON.parse(JSON.stringify(this.dataForm));
-                        _data.approval = parseInt(_data.approval)
-                    for(let i=0;i<_data.jg_contract_item0List.length;i++){
-                        var _list = _data.jg_contract_item0List[i];
-                    }
-                    for(let i=0;i<_data.jg_contract_item1List.length;i++){
-                        var _list = _data.jg_contract_item1List[i];
-                                _list.enclosure = JSON.stringify(_list.enclosure)
-                    }
-                return _data;
-            },
-            dataInfo(dataAll){
-                let _dataAll =dataAll
-                        _dataAll.approval = parseInt( _dataAll.approval)
-                    for(let i=0;i<_dataAll.jg_contract_item0List.length;i++){
-                        var _list = _dataAll.jg_contract_item0List[i];
-                    }
-                    for(let i=0;i<_dataAll.jg_contract_item1List.length;i++){
-                        var _list = _dataAll.jg_contract_item1List[i];
-                                _list.enclosure = JSON.parse(_list.enclosure)
-                    }
-                this.dataForm = _dataAll
-            },
+  export default {
+    components: {},
+    props: [],
+    data() {
+      return {
+        visible: false,
+        loading: false,
+        isDetail: false,
+        dataForm: {
+          creatorUserId: "",
+          creatorUserName: "",
+          contractType: "",
+          contractCode: '',
+          contractName: '',
+          status: '',
+          bidOpeningDate: '',
+          startDate: '',
+          auditDate: '',
+          completionDate: '',
+          closingDate: '',
+          collectionCycle: '',
+          signingDate: '',
+          endDate: '',
+          code: "",
+          name: "",
+          contractNo: '',
+          currency: '',
+          num: '',
+          amount: '',
+          organization: '',
+          remark: '',
+          classification: '',
+          declarationDate: '',
+          deptCode: '',
+          creatorusername: '',
+          deptName: '',
+          approval: 0,
+          jg_contract_item0List: [],
+          jg_contract_item1List: [],
         },
-    }
+        activeayhzdd: '0',
+        rules:
+          {
+            contractType: [
+              {
+                required: true,
+                message: '请选择',
+                trigger: 'change'
+              },
+            ],
+            contractCode: [
+              {
+                required: true,
+                message: '请输入',
+                trigger: 'blur'
+              },
+              {
+                pattern: '',
+                message: '',
+                trigger: 'blur'
+              },
+            ],
+            contractName: [
+              {
+                required: true,
+                message: '请输入',
+                trigger: 'blur'
+              },
+            ],
+            bidOpeningDate: [
+              {
+                required: true,
+                message: '请选择',
+                trigger: 'change'
+              },
+            ],
+          },
+        contractTypeOptions: [{"fullName": "选项一", "id": "1"}, {"fullName": "选项二", "id": "2"}],
+        codecolumnOptions: [{"label": "供应商Code", "value": "supplier_code"}, {
+          "label": "供应商",
+          "value": "supplier_name"
+        },],
+        namecolumnOptions: [{"label": "ID", "value": "id"}, {"label": "客户编码", "value": "supplier_cd"}, {
+          "label": "客户名称",
+          "value": "supplier_nm"
+        },],
+
+      }
+    },
+    computed: {},
+    watch: {},
+    created() {
+    },
+    mounted() {
+    },
+    methods: {
+      jg_contract_item0Exist() {
+        let isOk = true;
+        for (let i = 0; i < this.dataForm.jg_contract_item0List.length; i++) {
+          const e = this.dataForm.jg_contract_item0List[i];
+        }
+        return isOk;
+      },
+      jg_contract_item1Exist() {
+        let isOk = true;
+        for (let i = 0; i < this.dataForm.jg_contract_item1List.length; i++) {
+          const e = this.dataForm.jg_contract_item1List[i];
+        }
+        return isOk;
+      },
+      goBack() {
+        this.$emit('refresh')
+      },
+      clearData(data) {
+        for (let key in data) {
+          if (data[key] instanceof Array) {
+            data[key] = [];
+          } else if (data[key] instanceof Object) {
+            this.clearData(data[key]);
+          } else {
+            data[key] = "";
+          }
+        }
+      },
+      init(id, isDetail) {
+        this.dataForm.id = id || 0;
+        this.visible = true;
+        this.isDetail = isDetail || false;
+        this.$nextTick(() => {
+          this.$refs['elForm'].resetFields();
+          if (this.dataForm.id) {
+            this.loading = true
+            request({
+              url: '/api/example/Jg_contract/' + this.dataForm.id,
+              method: 'get'
+            }).then(res => {
+              this.dataInfo(res.data)
+              this.loading = false
+            });
+          } else {
+            this.clearData(this.dataForm)
+          }
+        });
+        this.$store.commit('generator/UPDATE_RELATION_DATA', {})
+      },
+      // 表单提交
+      dataFormSubmit() {
+        this.$refs['elForm'].validate((valid) => {
+          if (valid) {
+            if (!this.jg_contract_item0Exist()) return
+            if (!this.jg_contract_item1Exist()) return
+            this.request()
+          }
+        })
+      },
+      request() {
+        var _data = this.dataList()
+        if (!this.dataForm.id) {
+          request({
+            url: '/api/example/Jg_contract',
+            method: 'post',
+            data: _data
+          }).then((res) => {
+            this.$message({
+              message: res.msg,
+              type: 'success',
+              duration: 1000,
+              onClose: () => {
+                this.visible = false
+                this.$emit('refresh', true)
+              }
+            })
+          })
+        } else {
+          request({
+            url: '/api/example/Jg_contract/' + this.dataForm.id,
+            method: 'PUT',
+            data: _data
+          }).then((res) => {
+            this.$message({
+              message: res.msg,
+              type: 'success',
+              duration: 1000,
+              onClose: () => {
+                this.visible = false
+                this.$emit('refresh', true)
+              }
+            })
+          })
+        }
+      },
+      addjg_contract_item0List() {
+        let item = {
+          materialCode: undefined,
+          materialName: undefined,
+          specification: undefined,
+          unit: undefined,
+          num: undefined,
+          price: undefined,
+          amount: undefined,
+          rate: undefined,
+          notPrice: undefined,
+          notAmount: undefined,
+          remark: undefined,
+        }
+        this.dataForm.jg_contract_item0List.push(item)
+      },
+      deljg_contract_item0List(index) {
+        this.dataForm.jg_contract_item0List.splice(index, 1);
+      },
+      addjg_contract_item1List() {
+        let item = {
+          enclosure: undefined,
+        }
+        this.dataForm.jg_contract_item1List.push(item)
+      },
+      deljg_contract_item1List(index) {
+        this.dataForm.jg_contract_item1List.splice(index, 1);
+      },
+      dataList() {
+        var _data = JSON.parse(JSON.stringify(this.dataForm));
+        _data.approval = parseInt(_data.approval)
+        for (let i = 0; i < _data.jg_contract_item0List.length; i++) {
+          var _list = _data.jg_contract_item0List[i];
+        }
+        for (let i = 0; i < _data.jg_contract_item1List.length; i++) {
+          var _list = _data.jg_contract_item1List[i];
+          _list.enclosure = JSON.stringify(_list.enclosure)
+        }
+        return _data;
+      },
+      dataInfo(dataAll) {
+        let _dataAll = dataAll
+        _dataAll.approval = parseInt(_dataAll.approval)
+        for (let i = 0; i < _dataAll.jg_contract_item0List.length; i++) {
+          var _list = _dataAll.jg_contract_item0List[i];
+        }
+        for (let i = 0; i < _dataAll.jg_contract_item1List.length; i++) {
+          var _list = _dataAll.jg_contract_item1List[i];
+          _list.enclosure = JSON.parse(_list.enclosure)
+        }
+        this.dataForm = _dataAll
+      },
+    },
+  }
 
 </script>
diff --git a/SC-web/src/views/scm/basicInformation/jg_contract/index.vue b/SC-web/src/views/scm/basicInformation/jg_contract/index.vue
index db6d52d8..6efc7801 100644
--- a/SC-web/src/views/scm/basicInformation/jg_contract/index.vue
+++ b/SC-web/src/views/scm/basicInformation/jg_contract/index.vue
@@ -43,37 +43,37 @@
         <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
                     @selection-change="handleSelectionChange">
           <el-table-column prop="contractCode" label="合同编码" width="0" align="left"
-          />
+                           v-if="jnpf.hasP('contractCode')"/>
           <el-table-column prop="contractName" label="合同名称" width="0" align="left"
-          />
+                           v-if="jnpf.hasP('contractName')"/>
           <el-table-column prop="contractNo" label="对方合同号" width="0" align="left"
-          />
+                           v-if="jnpf.hasP('contractNo')"/>
           <el-table-column label="合同类型 " width="0" prop="contractType" algin="left"
-          >
+                           v-if="jnpf.hasP('contractType')">
             <template slot-scope="scope">
               {{ scope.row.contractType | dynamicText(contractTypeOptions) }}
             </template>
           </el-table-column>
           <el-table-column prop="classification" label="合同分类 " width="0" align="left"
-          />
+                           v-if="jnpf.hasP('classification')"/>
           <el-table-column prop="declarationDate" label="申报日期" width="0" align="left"
-          />
-          <el-table-column prop="name" label="供应商/客户名" width="0" align="left"
-          />
+                           v-if="jnpf.hasP('declarationDate')"/>
+          <el-table-column prop="name" label="供应商/客户id" width="0" align="left"
+                           v-if="jnpf.hasP('name')"/>
           <el-table-column prop="num" label="数量" width="0" align="left"
-          />
+                           v-if="jnpf.hasP('num')"/>
           <el-table-column prop="amount" label="金额" width="0" align="left"
-          />
+                           v-if="jnpf.hasP('amount')"/>
           <el-table-column prop="deptName" label="部门名称" width="0" align="left"
-          />
+                           v-if="jnpf.hasP('deptName')"/>
           <el-table-column prop="remark" label="备注" width="0" align="left"
-          />
+                           v-if="jnpf.hasP('remark')"/>
           <el-table-column prop="creatorusername" label="录入人" width="0" align="left"
-          />
+                           v-if="jnpf.hasP('creatorusername')"/>
           <el-table-column prop="status" label="合同状态" width="0" align="left"
-          />
+                           v-if="jnpf.hasP('status')"/>
           <el-table-column prop="approval" label="集团审批" width="0" align="left"
-          />
+                           v-if="jnpf.hasP('approval')"/>
           <el-table-column label="操作" fixed="right"
                            width="150">
             <template slot-scope="scope">
@@ -138,7 +138,7 @@
           {prop: 'contractType', label: '合同类型 '},
           {prop: 'classification', label: '合同分类 '},
           {prop: 'declarationDate', label: '申报日期'},
-          {prop: 'name', label: '供应商/客户名'},
+          {prop: 'name', label: '供应商/客户id'},
           {prop: 'num', label: '数量'},
           {prop: 'amount', label: '金额'},
           {prop: 'deptName', label: '部门名称'},

From 1f7a44639c30041463a03d2925e6b970c2dba794 Mon Sep 17 00:00:00 2001
From: mhsnet <mhsnet@163.com>
Date: Thu, 2 Mar 2023 18:33:37 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E5=A4=B4=E5=83=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SC-web/src/views/basic/profile/index.vue | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/SC-web/src/views/basic/profile/index.vue b/SC-web/src/views/basic/profile/index.vue
index e50d45bc..4d4588a4 100644
--- a/SC-web/src/views/basic/profile/index.vue
+++ b/SC-web/src/views/basic/profile/index.vue
@@ -1,14 +1,16 @@
 <template>
   <div class="app-container Profile-container">
     <el-tabs tab-position="left" style="height:100%" v-model="activeTab" class="profile-tabs"
-      v-loading="userLoading">
+      v-loading="userLoading" z-index="99">
+      <el-tab-pane disabled name="line1"></el-tab-pane>
+      <el-tab-pane disabled name="line2"></el-tab-pane>
       <el-tab-pane label="个人资料" name="user">
         <UserInfo ref="user" :user='user' v-if="visible.user" @updateInfo="getInfo" />
       </el-tab-pane>
       <el-tab-pane label="修改密码" name="password">
         <Password ref="password" v-if="visible.password" />
       </el-tab-pane>
-      <el-tab-pane disabled name="line"></el-tab-pane>
+      <!-- <el-tab-pane disabled name="line"></el-tab-pane> -->
 <!--      <el-tab-pane label="个人资料" name="user">-->
 <!--        <UserInfo ref="user" :user='user' v-if="visible.user" @updateInfo="getInfo"/>-->
 <!--      </el-tab-pane>-->
@@ -89,7 +91,7 @@
         <SysLog ref="sysLog" v-if="visible.sysLog" />
       </el-tab-pane>
     </el-tabs>
-    <div class="head">
+    <div class="head" z-index="999">
       <el-upload class="avatar-uploader" :action="define.comUploadUrl+'/userAvatar'"
         :headers="uploadHeaders" :on-success="handleSuccess" :show-file-list="false"
         accept="image/*">
@@ -292,11 +294,12 @@ export default {
     }
   }
   .head {
+    z-index: 9999;
     position: absolute;
-    left: 10px;
+    left: 24px;
     top: 10px;
-    height: 70px;
-    width: 160px;
+    height: 80px;
+    width: 80px;
     padding-top: 10px;
     >>> .avatar-uploader {
       display: inline-block;

From 0ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf Mon Sep 17 00:00:00 2001
From: mhsnet <mhsnet@163.com>
Date: Thu, 2 Mar 2023 18:38:14 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E5=A4=B4=E5=83=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SC-web/src/views/basic/profile/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SC-web/src/views/basic/profile/index.vue b/SC-web/src/views/basic/profile/index.vue
index 4d4588a4..1cd7efc2 100644
--- a/SC-web/src/views/basic/profile/index.vue
+++ b/SC-web/src/views/basic/profile/index.vue
@@ -296,7 +296,7 @@ export default {
   .head {
     z-index: 9999;
     position: absolute;
-    left: 24px;
+    left: 27px;
     top: 10px;
     height: 80px;
     width: 80px;

From ee2aaf5f56633f61b9c9bb5333f7f1df8a1e2b7b Mon Sep 17 00:00:00 2001
From: bawei <95887577@qq.com>
Date: Fri, 3 Mar 2023 08:11:46 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E6=9D=83=E9=99=90=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/Jg_naturalServiceImpl.java   |   8 +-
 .../service/impl/AreasettingServiceImpl.java  |  16 +-
 .../service/impl/ArinvoicesServiceImpl.java   |  32 +-
 .../service/impl/CollectionServiceImpl.java   |  24 +-
 .../service/impl/CustomerVOServiceImpl.java   |   8 +-
 .../service/impl/InventoryOrgServiceImpl.java |  16 +-
 .../impl/InventoryOrgDetailServiceImpl.java   |  16 +-
 .../service/impl/InvoicesServiceImpl.java     |  32 +-
 .../service/impl/MaterialServiceImpl.java     |  16 +-
 .../impl/MonitoringitemServiceImpl.java       |  16 +-
 .../service/impl/PaymentServiceImpl.java      |  20 +-
 .../service/impl/PaymentdocServiceImpl.java   |  24 +-
 .../service/impl/PoundlistServiceImpl.java    |  16 +-
 .../service/impl/PurchasebackServiceImpl.java |  32 +-
 .../impl/PurchaseorderitemServiceImpl.java    |  56 +--
 .../service/impl/ReceiptinServiceImpl.java    |  24 +-
 .../service/impl/ReceiptoutServiceImpl.java   |  24 +-
 .../impl/ReservoirareaServiceImpl.java        |  16 +-
 .../service/impl/SalebackServiceImpl.java     |  32 +-
 .../impl/SaleorderitemServiceImpl.java        |  64 +--
 .../service/impl/SupplierServiceImpl.java     |  16 +-
 .../service/impl/TradeuploadServiceImpl.java  |  16 +-
 .../service/impl/VehicleServiceImpl.java      |  16 +-
 .../service/impl/WareHouseServiceImpl.java    |  16 +-
 SC-web/src/settings.js                        |   2 +-
 .../basicInformation/areasetting/index.vue    |  14 +-
 .../scm/basicInformation/arinvoices/index.vue |   6 +-
 .../scm/basicInformation/collection/index.vue |  12 +-
 .../scm/basicInformation/customer/index.vue   |  12 +-
 .../basicInformation/inventoryOrd/index.vue   | 407 +++++++++---------
 .../inventoryOrdDetail/index.vue              | 407 +++++++++---------
 .../scm/basicInformation/invoices/index.vue   |  12 +-
 .../scm/basicInformation/material/index.vue   |  12 +-
 .../basicInformation/monitormanage/index.vue  |  14 +-
 .../scm/basicInformation/natural/index.vue    |  12 +-
 .../scm/basicInformation/payment/index.vue    |  12 +-
 .../scm/basicInformation/paymentdoc/index.vue |   8 +-
 .../scm/basicInformation/poundlist/index.vue  |  10 +-
 .../basicInformation/purchaseback/index.vue   |  14 +-
 .../basicInformation/purchaseorder/index.vue  |  12 +-
 .../scm/basicInformation/receiptin/index.vue  |  12 +-
 .../scm/basicInformation/receiptout/index.vue |  12 +-
 .../basicInformation/reservoirarea/index.vue  |  12 +-
 .../scm/basicInformation/saleback/index.vue   |  12 +-
 .../scm/basicInformation/saleorder/index.vue  |  12 +-
 .../scm/basicInformation/supplier/index.vue   |  12 +-
 .../basicInformation/tradeupload/index.vue    |  14 +-
 .../scm/basicInformation/vehicle/index.vue    |  12 +-
 .../scm/basicInformation/warehouse/index.vue  |  20 +-
 49 files changed, 821 insertions(+), 819 deletions(-)

diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/service/impl/Jg_naturalServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/service/impl/Jg_naturalServiceImpl.java
index fbb3a087..0e843c9d 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/service/impl/Jg_naturalServiceImpl.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/service/impl/Jg_naturalServiceImpl.java
@@ -56,8 +56,8 @@ public class Jg_naturalServiceImpl extends ServiceImpl<Jg_naturalMapper, Jg_natu
         int total=0;
 		int jg_naturalNum =0;
         QueryWrapper<Jg_naturalEntity> jg_naturalQueryWrapper=new QueryWrapper<>();
-    boolean pcPermission = false;
-    boolean appPermission = false;
+    boolean pcPermission = true;
+    boolean appPermission = true;
     boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
     if(isPc && pcPermission){
 		if (!userProvider.get().getIsAdministrator()){
@@ -133,8 +133,8 @@ public class Jg_naturalServiceImpl extends ServiceImpl<Jg_naturalMapper, Jg_natu
 		int total=0;
 		int jg_naturalNum =0;
         QueryWrapper<Jg_naturalEntity> jg_naturalQueryWrapper=new QueryWrapper<>();
-    boolean pcPermission = false;
-    boolean appPermission = false;
+    boolean pcPermission = true;
+    boolean appPermission = true;
     boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
     if(isPc && pcPermission){
 		if (!userProvider.get().getIsAdministrator()){
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/areasetting/service/impl/AreasettingServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/areasetting/service/impl/AreasettingServiceImpl.java
index 1417f5ed..d68ce944 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/areasetting/service/impl/AreasettingServiceImpl.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/areasetting/service/impl/AreasettingServiceImpl.java
@@ -61,12 +61,12 @@ public class AreasettingServiceImpl extends ServiceImpl<AreasettingMapper, Areas
         int total=0;
 		int areasettingNum =0;
         QueryWrapper<AreasettingEntity> areasettingQueryWrapper=new QueryWrapper<>();
-    boolean pcPermission = false;
-    boolean appPermission = false;
+    boolean pcPermission = true;
+    boolean appPermission = true;
     boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
     if(isPc && pcPermission){
 		if (!userProvider.get().getIsAdministrator()){
-				Object areasettingObj=authorizeService.getCondition(new AuthorizeConditionModel(areasettingQueryWrapper,areasettingPagination.getMenuId(),"areasetting"));
+				Object areasettingObj=authorizeService.getCondition(new AuthorizeConditionModel(areasettingQueryWrapper,areasettingPagination.getMenuId(),"jg_areasetting"));
             if (ObjectUtil.isEmpty(areasettingObj)){
                 return new ArrayList<>();
             } else {
@@ -77,7 +77,7 @@ public class AreasettingServiceImpl extends ServiceImpl<AreasettingMapper, Areas
     }
     if(!isPc && appPermission){
 		if (!userProvider.get().getIsAdministrator()){
-			Object areasettingObj=authorizeService.getCondition(new AuthorizeConditionModel(areasettingQueryWrapper,areasettingPagination.getMenuId(),"areasetting"));
+			Object areasettingObj=authorizeService.getCondition(new AuthorizeConditionModel(areasettingQueryWrapper,areasettingPagination.getMenuId(),"jg_areasetting"));
             if (ObjectUtil.isEmpty(areasettingObj)){
                 return new ArrayList<>();
             } else {
@@ -127,12 +127,12 @@ public class AreasettingServiceImpl extends ServiceImpl<AreasettingMapper, Areas
 		int total=0;
 		int areasettingNum =0;
         QueryWrapper<AreasettingEntity> areasettingQueryWrapper=new QueryWrapper<>();
-    boolean pcPermission = false;
-    boolean appPermission = false;
+    boolean pcPermission = true;
+    boolean appPermission = true;
     boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
     if(isPc && pcPermission){
 		if (!userProvider.get().getIsAdministrator()){
-				Object areasettingObj=authorizeService.getCondition(new AuthorizeConditionModel(areasettingQueryWrapper,areasettingPagination.getMenuId(),"areasetting"));
+				Object areasettingObj=authorizeService.getCondition(new AuthorizeConditionModel(areasettingQueryWrapper,areasettingPagination.getMenuId(),"jg_areasetting"));
             if (ObjectUtil.isEmpty(areasettingObj)){
                 return new ArrayList<>();
             } else {
@@ -143,7 +143,7 @@ public class AreasettingServiceImpl extends ServiceImpl<AreasettingMapper, Areas
     }
     if(!isPc && appPermission){
 		if (!userProvider.get().getIsAdministrator()){
-			Object areasettingObj=authorizeService.getCondition(new AuthorizeConditionModel(areasettingQueryWrapper,areasettingPagination.getMenuId(),"areasetting"));
+			Object areasettingObj=authorizeService.getCondition(new AuthorizeConditionModel(areasettingQueryWrapper,areasettingPagination.getMenuId(),"jg_areasetting"));
             if (ObjectUtil.isEmpty(areasettingObj)){
                 return new ArrayList<>();
             } else {
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/service/impl/ArinvoicesServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/service/impl/ArinvoicesServiceImpl.java
index 94d90295..2dc90f5c 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/service/impl/ArinvoicesServiceImpl.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/service/impl/ArinvoicesServiceImpl.java
@@ -68,26 +68,26 @@ public class ArinvoicesServiceImpl extends ServiceImpl<ArinvoicesMapper, Arinvoi
         QueryWrapper<Arinvoices_item0Entity> arinvoices_item0QueryWrapper=new QueryWrapper<>();
 		int arinvoices_item1Num =0;
         QueryWrapper<Arinvoices_item1Entity> arinvoices_item1QueryWrapper=new QueryWrapper<>();
-    boolean pcPermission = false;
-    boolean appPermission = false;
+    boolean pcPermission = true;
+    boolean appPermission = true;
     boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
     if(isPc && pcPermission){
 		if (!userProvider.get().getIsAdministrator()){
-				Object arinvoicesObj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoicesQueryWrapper,arinvoicesPagination.getMenuId(),"arinvoices"));
+				Object arinvoicesObj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoicesQueryWrapper,arinvoicesPagination.getMenuId(),"jg_arinvoices"));
             if (ObjectUtil.isEmpty(arinvoicesObj)){
                 return new ArrayList<>();
             } else {
                 arinvoicesQueryWrapper = (QueryWrapper<ArinvoicesEntity>)arinvoicesObj;
                 arinvoicesNum++;
             }
-				Object arinvoices_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item0QueryWrapper,arinvoicesPagination.getMenuId(),"arinvoices_item0"));
+				Object arinvoices_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item0QueryWrapper,arinvoicesPagination.getMenuId(),"jg_arinvoices_item0"));
             if (ObjectUtil.isEmpty(arinvoices_item0Obj)){
                 return new ArrayList<>();
             } else {
                 arinvoices_item0QueryWrapper = (QueryWrapper<Arinvoices_item0Entity>)arinvoices_item0Obj;
                 arinvoices_item0Num++;
             }
-				Object arinvoices_item1Obj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item1QueryWrapper,arinvoicesPagination.getMenuId(),"arinvoices_item1"));
+				Object arinvoices_item1Obj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item1QueryWrapper,arinvoicesPagination.getMenuId(),"jg_arinvoices_item1"));
             if (ObjectUtil.isEmpty(arinvoices_item1Obj)){
                 return new ArrayList<>();
             } else {
@@ -98,7 +98,7 @@ public class ArinvoicesServiceImpl extends ServiceImpl<ArinvoicesMapper, Arinvoi
     }
     if(!isPc && appPermission){
 		if (!userProvider.get().getIsAdministrator()){
-			Object arinvoicesObj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoicesQueryWrapper,arinvoicesPagination.getMenuId(),"arinvoices"));
+			Object arinvoicesObj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoicesQueryWrapper,arinvoicesPagination.getMenuId(),"jg_arinvoices"));
             if (ObjectUtil.isEmpty(arinvoicesObj)){
                 return new ArrayList<>();
             } else {
@@ -107,7 +107,7 @@ public class ArinvoicesServiceImpl extends ServiceImpl<ArinvoicesMapper, Arinvoi
 			}
 
 
-			Object arinvoices_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item0QueryWrapper,arinvoicesPagination.getMenuId(),"arinvoices_item0"));
+			Object arinvoices_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item0QueryWrapper,arinvoicesPagination.getMenuId(),"jg_arinvoices_item0"));
             if (ObjectUtil.isEmpty(arinvoices_item0Obj)){
                 return new ArrayList<>();
             } else {
@@ -116,7 +116,7 @@ public class ArinvoicesServiceImpl extends ServiceImpl<ArinvoicesMapper, Arinvoi
 			}
 
 
-			Object arinvoices_item1Obj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item1QueryWrapper,arinvoicesPagination.getMenuId(),"arinvoices_item1"));
+			Object arinvoices_item1Obj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item1QueryWrapper,arinvoicesPagination.getMenuId(),"jg_arinvoices_item1"));
             if (ObjectUtil.isEmpty(arinvoices_item1Obj)){
                 return new ArrayList<>();
             } else {
@@ -170,26 +170,26 @@ public class ArinvoicesServiceImpl extends ServiceImpl<ArinvoicesMapper, Arinvoi
         QueryWrapper<Arinvoices_item0Entity> arinvoices_item0QueryWrapper=new QueryWrapper<>();
 		int arinvoices_item1Num =0;
         QueryWrapper<Arinvoices_item1Entity> arinvoices_item1QueryWrapper=new QueryWrapper<>();
-    boolean pcPermission = false;
-    boolean appPermission = false;
+    boolean pcPermission = true;
+    boolean appPermission = true;
     boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
     if(isPc && pcPermission){
 		if (!userProvider.get().getIsAdministrator()){
-				Object arinvoicesObj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoicesQueryWrapper,arinvoicesPagination.getMenuId(),"arinvoices"));
+				Object arinvoicesObj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoicesQueryWrapper,arinvoicesPagination.getMenuId(),"jg_arinvoices"));
             if (ObjectUtil.isEmpty(arinvoicesObj)){
                 return new ArrayList<>();
             } else {
                 arinvoicesQueryWrapper = (QueryWrapper<ArinvoicesEntity>)arinvoicesObj;
                 arinvoicesNum++;
             }
-				Object arinvoices_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item0QueryWrapper,arinvoicesPagination.getMenuId(),"arinvoices_item0"));
+				Object arinvoices_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item0QueryWrapper,arinvoicesPagination.getMenuId(),"jg_arinvoices_item0"));
             if (ObjectUtil.isEmpty(arinvoices_item0Obj)){
                 return new ArrayList<>();
             } else {
                 arinvoices_item0QueryWrapper = (QueryWrapper<Arinvoices_item0Entity>)arinvoices_item0Obj;
                 arinvoices_item0Num++;
             }
-				Object arinvoices_item1Obj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item1QueryWrapper,arinvoicesPagination.getMenuId(),"arinvoices_item1"));
+				Object arinvoices_item1Obj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item1QueryWrapper,arinvoicesPagination.getMenuId(),"jg_arinvoices_item1"));
             if (ObjectUtil.isEmpty(arinvoices_item1Obj)){
                 return new ArrayList<>();
             } else {
@@ -200,7 +200,7 @@ public class ArinvoicesServiceImpl extends ServiceImpl<ArinvoicesMapper, Arinvoi
     }
     if(!isPc && appPermission){
 		if (!userProvider.get().getIsAdministrator()){
-			Object arinvoicesObj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoicesQueryWrapper,arinvoicesPagination.getMenuId(),"arinvoices"));
+			Object arinvoicesObj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoicesQueryWrapper,arinvoicesPagination.getMenuId(),"jg_arinvoices"));
             if (ObjectUtil.isEmpty(arinvoicesObj)){
                 return new ArrayList<>();
             } else {
@@ -209,7 +209,7 @@ public class ArinvoicesServiceImpl extends ServiceImpl<ArinvoicesMapper, Arinvoi
 			}
 
 
-			Object arinvoices_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item0QueryWrapper,arinvoicesPagination.getMenuId(),"arinvoices_item0"));
+			Object arinvoices_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item0QueryWrapper,arinvoicesPagination.getMenuId(),"jg_arinvoices_item0"));
             if (ObjectUtil.isEmpty(arinvoices_item0Obj)){
                 return new ArrayList<>();
             } else {
@@ -218,7 +218,7 @@ public class ArinvoicesServiceImpl extends ServiceImpl<ArinvoicesMapper, Arinvoi
 			}
 
 
-			Object arinvoices_item1Obj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item1QueryWrapper,arinvoicesPagination.getMenuId(),"arinvoices_item1"));
+			Object arinvoices_item1Obj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item1QueryWrapper,arinvoicesPagination.getMenuId(),"jg_arinvoices_item1"));
             if (ObjectUtil.isEmpty(arinvoices_item1Obj)){
                 return new ArrayList<>();
             } else {
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/collection/service/impl/CollectionServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/collection/service/impl/CollectionServiceImpl.java
index 585ad368..4fd5d940 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/collection/service/impl/CollectionServiceImpl.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/collection/service/impl/CollectionServiceImpl.java
@@ -66,19 +66,19 @@ public class CollectionServiceImpl extends ServiceImpl<CollectionMapper, Collect
         QueryWrapper<CollectionEntity> collectionQueryWrapper=new QueryWrapper<>();
 		int collection_item0Num =0;
         QueryWrapper<Collection_item0Entity> collection_item0QueryWrapper=new QueryWrapper<>();
-    boolean pcPermission = false;
-    boolean appPermission = false;
+    boolean pcPermission = true;
+    boolean appPermission = true;
     boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
     if(isPc && pcPermission){
 		if (!userProvider.get().getIsAdministrator()){
-				Object collectionObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionQueryWrapper,collectionPagination.getMenuId(),"collection"));
+				Object collectionObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionQueryWrapper,collectionPagination.getMenuId(),"jg_collection"));
             if (ObjectUtil.isEmpty(collectionObj)){
                 return new ArrayList<>();
             } else {
                 collectionQueryWrapper = (QueryWrapper<CollectionEntity>)collectionObj;
                 collectionNum++;
             }
-				Object collection_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(collection_item0QueryWrapper,collectionPagination.getMenuId(),"collection_item0"));
+				Object collection_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(collection_item0QueryWrapper,collectionPagination.getMenuId(),"jg_collection_item0"));
             if (ObjectUtil.isEmpty(collection_item0Obj)){
                 return new ArrayList<>();
             } else {
@@ -89,7 +89,7 @@ public class CollectionServiceImpl extends ServiceImpl<CollectionMapper, Collect
     }
     if(!isPc && appPermission){
 		if (!userProvider.get().getIsAdministrator()){
-			Object collectionObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionQueryWrapper,collectionPagination.getMenuId(),"collection"));
+			Object collectionObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionQueryWrapper,collectionPagination.getMenuId(),"jg_collection"));
             if (ObjectUtil.isEmpty(collectionObj)){
                 return new ArrayList<>();
             } else {
@@ -98,7 +98,7 @@ public class CollectionServiceImpl extends ServiceImpl<CollectionMapper, Collect
 			}
 
 
-			Object collection_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(collection_item0QueryWrapper,collectionPagination.getMenuId(),"collection_item0"));
+			Object collection_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(collection_item0QueryWrapper,collectionPagination.getMenuId(),"jg_collection_item0"));
             if (ObjectUtil.isEmpty(collection_item0Obj)){
                 return new ArrayList<>();
             } else {
@@ -150,19 +150,19 @@ public class CollectionServiceImpl extends ServiceImpl<CollectionMapper, Collect
         QueryWrapper<CollectionEntity> collectionQueryWrapper=new QueryWrapper<>();
 		int collection_item0Num =0;
         QueryWrapper<Collection_item0Entity> collection_item0QueryWrapper=new QueryWrapper<>();
-    boolean pcPermission = false;
-    boolean appPermission = false;
+    boolean pcPermission = true;
+    boolean appPermission = true;
     boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
     if(isPc && pcPermission){
 		if (!userProvider.get().getIsAdministrator()){
-				Object collectionObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionQueryWrapper,collectionPagination.getMenuId(),"collection"));
+				Object collectionObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionQueryWrapper,collectionPagination.getMenuId(),"jg_collection"));
             if (ObjectUtil.isEmpty(collectionObj)){
                 return new ArrayList<>();
             } else {
                 collectionQueryWrapper = (QueryWrapper<CollectionEntity>)collectionObj;
                 collectionNum++;
             }
-				Object collection_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(collection_item0QueryWrapper,collectionPagination.getMenuId(),"collection_item0"));
+				Object collection_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(collection_item0QueryWrapper,collectionPagination.getMenuId(),"jg_collection_item0"));
             if (ObjectUtil.isEmpty(collection_item0Obj)){
                 return new ArrayList<>();
             } else {
@@ -173,7 +173,7 @@ public class CollectionServiceImpl extends ServiceImpl<CollectionMapper, Collect
     }
     if(!isPc && appPermission){
 		if (!userProvider.get().getIsAdministrator()){
-			Object collectionObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionQueryWrapper,collectionPagination.getMenuId(),"collection"));
+			Object collectionObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionQueryWrapper,collectionPagination.getMenuId(),"jg_collection"));
             if (ObjectUtil.isEmpty(collectionObj)){
                 return new ArrayList<>();
             } else {
@@ -182,7 +182,7 @@ public class CollectionServiceImpl extends ServiceImpl<CollectionMapper, Collect
 			}
 
 
-			Object collection_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(collection_item0QueryWrapper,collectionPagination.getMenuId(),"collection_item0"));
+			Object collection_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(collection_item0QueryWrapper,collectionPagination.getMenuId(),"jg_collection_item0"));
             if (ObjectUtil.isEmpty(collection_item0Obj)){
                 return new ArrayList<>();
             } else {
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/customer/service/impl/CustomerVOServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/customer/service/impl/CustomerVOServiceImpl.java
index 70974b7d..c75431f9 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/customer/service/impl/CustomerVOServiceImpl.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/customer/service/impl/CustomerVOServiceImpl.java
@@ -55,8 +55,8 @@ public class CustomerVOServiceImpl extends ServiceImpl<CustomerVMapper, Customer
         int total=0;
 		int customerNum =0;
         QueryWrapper<CustomerEntity> customerQueryWrapper=new QueryWrapper<>();
-    boolean pcPermission = false;
-    boolean appPermission = false;
+    boolean pcPermission = true;
+    boolean appPermission = true;
     boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
     if(isPc && pcPermission){
 		if (!userProvider.get().getIsAdministrator()){
@@ -144,8 +144,8 @@ public class CustomerVOServiceImpl extends ServiceImpl<CustomerVMapper, Customer
 		int total=0;
 		int customerNum =0;
         QueryWrapper<CustomerEntity> customerQueryWrapper=new QueryWrapper<>();
-    boolean pcPermission = false;
-    boolean appPermission = false;
+    boolean pcPermission = true;
+    boolean appPermission = true;
     boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
     if(isPc && pcPermission){
 		if (!userProvider.get().getIsAdministrator()){
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/inventoryOrd/service/impl/InventoryOrgServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/inventoryOrd/service/impl/InventoryOrgServiceImpl.java
index c8e28a49..0b69dd61 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/inventoryOrd/service/impl/InventoryOrgServiceImpl.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/inventoryOrd/service/impl/InventoryOrgServiceImpl.java
@@ -51,12 +51,12 @@ public class InventoryOrgServiceImpl extends ServiceImpl<InventoryOrgMapper, Inv
         int total=0;
 		int inventoryOrgNum =0;
         QueryWrapper<InventoryOrgEntity> inventoryOrgQueryWrapper=new QueryWrapper<>();
-    boolean pcPermission = false;
-    boolean appPermission = false;
+    boolean pcPermission = true;
+    boolean appPermission = true;
     boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
     if(isPc && pcPermission){
 		if (!userProvider.get().getIsAdministrator()){
-				Object inventoryOrgObj=authorizeService.getCondition(new AuthorizeConditionModel(inventoryOrgQueryWrapper,inventoryOrgPagination.getMenuId(),"inventoryOrg"));
+				Object inventoryOrgObj=authorizeService.getCondition(new AuthorizeConditionModel(inventoryOrgQueryWrapper,inventoryOrgPagination.getMenuId(),"jg_inventoryOrg"));
             if (ObjectUtil.isEmpty(inventoryOrgObj)){
                 return new ArrayList<>();
             } else {
@@ -67,7 +67,7 @@ public class InventoryOrgServiceImpl extends ServiceImpl<InventoryOrgMapper, Inv
     }
     if(!isPc && appPermission){
 		if (!userProvider.get().getIsAdministrator()){
-			Object inventoryOrgObj=authorizeService.getCondition(new AuthorizeConditionModel(inventoryOrgQueryWrapper,inventoryOrgPagination.getMenuId(),"inventoryOrg"));
+			Object inventoryOrgObj=authorizeService.getCondition(new AuthorizeConditionModel(inventoryOrgQueryWrapper,inventoryOrgPagination.getMenuId(),"jg_inventoryOrg"));
             if (ObjectUtil.isEmpty(inventoryOrgObj)){
                 return new ArrayList<>();
             } else {
@@ -122,12 +122,12 @@ public class InventoryOrgServiceImpl extends ServiceImpl<InventoryOrgMapper, Inv
 		int total=0;
 		int inventoryOrgNum =0;
         QueryWrapper<InventoryOrgEntity> inventoryOrgQueryWrapper=new QueryWrapper<>();
-    boolean pcPermission = false;
-    boolean appPermission = false;
+    boolean pcPermission = true;
+    boolean appPermission = true;
     boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
     if(isPc && pcPermission){
 		if (!userProvider.get().getIsAdministrator()){
-				Object inventoryOrgObj=authorizeService.getCondition(new AuthorizeConditionModel(inventoryOrgQueryWrapper,inventoryOrgPagination.getMenuId(),"inventoryOrg"));
+				Object inventoryOrgObj=authorizeService.getCondition(new AuthorizeConditionModel(inventoryOrgQueryWrapper,inventoryOrgPagination.getMenuId(),"jg_inventoryOrg"));
             if (ObjectUtil.isEmpty(inventoryOrgObj)){
                 return new ArrayList<>();
             } else {
@@ -138,7 +138,7 @@ public class InventoryOrgServiceImpl extends ServiceImpl<InventoryOrgMapper, Inv
     }
     if(!isPc && appPermission){
 		if (!userProvider.get().getIsAdministrator()){
-			Object inventoryOrgObj=authorizeService.getCondition(new AuthorizeConditionModel(inventoryOrgQueryWrapper,inventoryOrgPagination.getMenuId(),"inventoryOrg"));
+			Object inventoryOrgObj=authorizeService.getCondition(new AuthorizeConditionModel(inventoryOrgQueryWrapper,inventoryOrgPagination.getMenuId(),"jg_inventoryOrg"));
             if (ObjectUtil.isEmpty(inventoryOrgObj)){
                 return new ArrayList<>();
             } else {
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/inventoryOrdDetail/service/impl/InventoryOrgDetailServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/inventoryOrdDetail/service/impl/InventoryOrgDetailServiceImpl.java
index 3636089b..fbd4065b 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/inventoryOrdDetail/service/impl/InventoryOrgDetailServiceImpl.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/inventoryOrdDetail/service/impl/InventoryOrgDetailServiceImpl.java
@@ -51,12 +51,12 @@ public class InventoryOrgDetailServiceImpl extends ServiceImpl<InventoryOrgDetai
         int total=0;
 		int inventoryOrgDetailNum =0;
         QueryWrapper<InventoryOrgDetailEntity> inventoryOrgDetailQueryWrapper=new QueryWrapper<>();
-    boolean pcPermission = false;
-    boolean appPermission = false;
+    boolean pcPermission = true;
+    boolean appPermission = true;
     boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
     if(isPc && pcPermission){
 		if (!userProvider.get().getIsAdministrator()){
-				Object inventoryOrgDetailObj=authorizeService.getCondition(new AuthorizeConditionModel(inventoryOrgDetailQueryWrapper,inventoryOrgDetailPagination.getMenuId(),"inventoryOrgDetail"));
+				Object inventoryOrgDetailObj=authorizeService.getCondition(new AuthorizeConditionModel(inventoryOrgDetailQueryWrapper,inventoryOrgDetailPagination.getMenuId(),"jg_inventoryOrgDetail"));
             if (ObjectUtil.isEmpty(inventoryOrgDetailObj)){
                 return new ArrayList<>();
             } else {
@@ -67,7 +67,7 @@ public class InventoryOrgDetailServiceImpl extends ServiceImpl<InventoryOrgDetai
     }
     if(!isPc && appPermission){
 		if (!userProvider.get().getIsAdministrator()){
-			Object inventoryOrgDetailObj=authorizeService.getCondition(new AuthorizeConditionModel(inventoryOrgDetailQueryWrapper,inventoryOrgDetailPagination.getMenuId(),"inventoryOrgDetail"));
+			Object inventoryOrgDetailObj=authorizeService.getCondition(new AuthorizeConditionModel(inventoryOrgDetailQueryWrapper,inventoryOrgDetailPagination.getMenuId(),"jg_inventoryOrgDetail"));
             if (ObjectUtil.isEmpty(inventoryOrgDetailObj)){
                 return new ArrayList<>();
             } else {
@@ -122,12 +122,12 @@ public class InventoryOrgDetailServiceImpl extends ServiceImpl<InventoryOrgDetai
 		int total=0;
 		int inventoryOrgDetailNum =0;
         QueryWrapper<InventoryOrgDetailEntity> inventoryOrgDetailQueryWrapper=new QueryWrapper<>();
-    boolean pcPermission = false;
-    boolean appPermission = false;
+    boolean pcPermission = true;
+    boolean appPermission = true;
     boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
     if(isPc && pcPermission){
 		if (!userProvider.get().getIsAdministrator()){
-				Object inventoryOrgDetailObj=authorizeService.getCondition(new AuthorizeConditionModel(inventoryOrgDetailQueryWrapper,inventoryOrgDetailPagination.getMenuId(),"inventoryOrgDetail"));
+				Object inventoryOrgDetailObj=authorizeService.getCondition(new AuthorizeConditionModel(inventoryOrgDetailQueryWrapper,inventoryOrgDetailPagination.getMenuId(),"jg_inventoryOrgDetail"));
             if (ObjectUtil.isEmpty(inventoryOrgDetailObj)){
                 return new ArrayList<>();
             } else {
@@ -138,7 +138,7 @@ public class InventoryOrgDetailServiceImpl extends ServiceImpl<InventoryOrgDetai
     }
     if(!isPc && appPermission){
 		if (!userProvider.get().getIsAdministrator()){
-			Object inventoryOrgDetailObj=authorizeService.getCondition(new AuthorizeConditionModel(inventoryOrgDetailQueryWrapper,inventoryOrgDetailPagination.getMenuId(),"inventoryOrgDetail"));
+			Object inventoryOrgDetailObj=authorizeService.getCondition(new AuthorizeConditionModel(inventoryOrgDetailQueryWrapper,inventoryOrgDetailPagination.getMenuId(),"jg_inventoryOrgDetail"));
             if (ObjectUtil.isEmpty(inventoryOrgDetailObj)){
                 return new ArrayList<>();
             } else {
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/invoices/service/impl/InvoicesServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/invoices/service/impl/InvoicesServiceImpl.java
index eba89e2e..3a108ff0 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/invoices/service/impl/InvoicesServiceImpl.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/invoices/service/impl/InvoicesServiceImpl.java
@@ -71,26 +71,26 @@ public class InvoicesServiceImpl extends ServiceImpl<InvoicesMapper, InvoicesEnt
         QueryWrapper<InvoicesItem0Entity> invoicesItem0QueryWrapper=new QueryWrapper<>();
 		int invoicesItem1Num =0;
         QueryWrapper<InvoicesItem1Entity> invoicesItem1QueryWrapper=new QueryWrapper<>();
-    boolean pcPermission = false;
-    boolean appPermission = false;
+    boolean pcPermission = true;
+    boolean appPermission = true;
     boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
     if(isPc && pcPermission){
 		if (!userProvider.get().getIsAdministrator()){
-				Object invoicesObj=authorizeService.getCondition(new AuthorizeConditionModel(invoicesQueryWrapper,invoicesPagination.getMenuId(),"invoices"));
+				Object invoicesObj=authorizeService.getCondition(new AuthorizeConditionModel(invoicesQueryWrapper,invoicesPagination.getMenuId(),"jg_invoices"));
             if (ObjectUtil.isEmpty(invoicesObj)){
                 return new ArrayList<>();
             } else {
                 invoicesQueryWrapper = (QueryWrapper<InvoicesEntity>)invoicesObj;
                 invoicesNum++;
             }
-				Object invoicesItem0Obj=authorizeService.getCondition(new AuthorizeConditionModel(invoicesItem0QueryWrapper,invoicesPagination.getMenuId(),"invoicesItem0"));
+				Object invoicesItem0Obj=authorizeService.getCondition(new AuthorizeConditionModel(invoicesItem0QueryWrapper,invoicesPagination.getMenuId(),"jg_invoicesItem0"));
             if (ObjectUtil.isEmpty(invoicesItem0Obj)){
                 return new ArrayList<>();
             } else {
                 invoicesItem0QueryWrapper = (QueryWrapper<InvoicesItem0Entity>)invoicesItem0Obj;
                 invoicesItem0Num++;
             }
-				Object invoicesItem1Obj=authorizeService.getCondition(new AuthorizeConditionModel(invoicesItem1QueryWrapper,invoicesPagination.getMenuId(),"invoicesItem1"));
+				Object invoicesItem1Obj=authorizeService.getCondition(new AuthorizeConditionModel(invoicesItem1QueryWrapper,invoicesPagination.getMenuId(),"jg_invoicesItem1"));
             if (ObjectUtil.isEmpty(invoicesItem1Obj)){
                 return new ArrayList<>();
             } else {
@@ -101,7 +101,7 @@ public class InvoicesServiceImpl extends ServiceImpl<InvoicesMapper, InvoicesEnt
     }
     if(!isPc && appPermission){
 		if (!userProvider.get().getIsAdministrator()){
-			Object invoicesObj=authorizeService.getCondition(new AuthorizeConditionModel(invoicesQueryWrapper,invoicesPagination.getMenuId(),"invoices"));
+			Object invoicesObj=authorizeService.getCondition(new AuthorizeConditionModel(invoicesQueryWrapper,invoicesPagination.getMenuId(),"jg_invoices"));
             if (ObjectUtil.isEmpty(invoicesObj)){
                 return new ArrayList<>();
             } else {
@@ -110,7 +110,7 @@ public class InvoicesServiceImpl extends ServiceImpl<InvoicesMapper, InvoicesEnt
 			}
 
 
-			Object invoicesItem0Obj=authorizeService.getCondition(new AuthorizeConditionModel(invoicesItem0QueryWrapper,invoicesPagination.getMenuId(),"invoicesItem0"));
+			Object invoicesItem0Obj=authorizeService.getCondition(new AuthorizeConditionModel(invoicesItem0QueryWrapper,invoicesPagination.getMenuId(),"jg_invoicesItem0"));
             if (ObjectUtil.isEmpty(invoicesItem0Obj)){
                 return new ArrayList<>();
             } else {
@@ -119,7 +119,7 @@ public class InvoicesServiceImpl extends ServiceImpl<InvoicesMapper, InvoicesEnt
 			}
 
 
-			Object invoicesItem1Obj=authorizeService.getCondition(new AuthorizeConditionModel(invoicesItem1QueryWrapper,invoicesPagination.getMenuId(),"invoicesItem1"));
+			Object invoicesItem1Obj=authorizeService.getCondition(new AuthorizeConditionModel(invoicesItem1QueryWrapper,invoicesPagination.getMenuId(),"jg_invoicesItem1"));
             if (ObjectUtil.isEmpty(invoicesItem1Obj)){
                 return new ArrayList<>();
             } else {
@@ -173,26 +173,26 @@ public class InvoicesServiceImpl extends ServiceImpl<InvoicesMapper, InvoicesEnt
         QueryWrapper<InvoicesItem0Entity> invoicesItem0QueryWrapper=new QueryWrapper<>();
 		int invoicesItem1Num =0;
         QueryWrapper<InvoicesItem1Entity> invoicesItem1QueryWrapper=new QueryWrapper<>();
-    boolean pcPermission = false;
-    boolean appPermission = false;
+    boolean pcPermission = true;
+    boolean appPermission = true;
     boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
     if(isPc && pcPermission){
 		if (!userProvider.get().getIsAdministrator()){
-				Object invoicesObj=authorizeService.getCondition(new AuthorizeConditionModel(invoicesQueryWrapper,invoicesPagination.getMenuId(),"invoices"));
+				Object invoicesObj=authorizeService.getCondition(new AuthorizeConditionModel(invoicesQueryWrapper,invoicesPagination.getMenuId(),"jg_invoices"));
             if (ObjectUtil.isEmpty(invoicesObj)){
                 return new ArrayList<>();
             } else {
                 invoicesQueryWrapper = (QueryWrapper<InvoicesEntity>)invoicesObj;
                 invoicesNum++;
             }
-				Object invoicesItem0Obj=authorizeService.getCondition(new AuthorizeConditionModel(invoicesItem0QueryWrapper,invoicesPagination.getMenuId(),"invoicesItem0"));
+				Object invoicesItem0Obj=authorizeService.getCondition(new AuthorizeConditionModel(invoicesItem0QueryWrapper,invoicesPagination.getMenuId(),"jg_invoicesItem0"));
             if (ObjectUtil.isEmpty(invoicesItem0Obj)){
                 return new ArrayList<>();
             } else {
                 invoicesItem0QueryWrapper = (QueryWrapper<InvoicesItem0Entity>)invoicesItem0Obj;
                 invoicesItem0Num++;
             }
-				Object invoicesItem1Obj=authorizeService.getCondition(new AuthorizeConditionModel(invoicesItem1QueryWrapper,invoicesPagination.getMenuId(),"invoicesItem1"));
+				Object invoicesItem1Obj=authorizeService.getCondition(new AuthorizeConditionModel(invoicesItem1QueryWrapper,invoicesPagination.getMenuId(),"jg_invoicesItem1"));
             if (ObjectUtil.isEmpty(invoicesItem1Obj)){
                 return new ArrayList<>();
             } else {
@@ -203,7 +203,7 @@ public class InvoicesServiceImpl extends ServiceImpl<InvoicesMapper, InvoicesEnt
     }
     if(!isPc && appPermission){
 		if (!userProvider.get().getIsAdministrator()){
-			Object invoicesObj=authorizeService.getCondition(new AuthorizeConditionModel(invoicesQueryWrapper,invoicesPagination.getMenuId(),"invoices"));
+			Object invoicesObj=authorizeService.getCondition(new AuthorizeConditionModel(invoicesQueryWrapper,invoicesPagination.getMenuId(),"jg_invoices"));
             if (ObjectUtil.isEmpty(invoicesObj)){
                 return new ArrayList<>();
             } else {
@@ -212,7 +212,7 @@ public class InvoicesServiceImpl extends ServiceImpl<InvoicesMapper, InvoicesEnt
 			}
 
 
-			Object invoicesItem0Obj=authorizeService.getCondition(new AuthorizeConditionModel(invoicesItem0QueryWrapper,invoicesPagination.getMenuId(),"invoicesItem0"));
+			Object invoicesItem0Obj=authorizeService.getCondition(new AuthorizeConditionModel(invoicesItem0QueryWrapper,invoicesPagination.getMenuId(),"jg_invoicesItem0"));
             if (ObjectUtil.isEmpty(invoicesItem0Obj)){
                 return new ArrayList<>();
             } else {
@@ -221,7 +221,7 @@ public class InvoicesServiceImpl extends ServiceImpl<InvoicesMapper, InvoicesEnt
 			}
 
 
-			Object invoicesItem1Obj=authorizeService.getCondition(new AuthorizeConditionModel(invoicesItem1QueryWrapper,invoicesPagination.getMenuId(),"invoicesItem1"));
+			Object invoicesItem1Obj=authorizeService.getCondition(new AuthorizeConditionModel(invoicesItem1QueryWrapper,invoicesPagination.getMenuId(),"jg_invoicesItem1"));
             if (ObjectUtil.isEmpty(invoicesItem1Obj)){
                 return new ArrayList<>();
             } else {
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/materialvo/service/impl/MaterialServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/materialvo/service/impl/MaterialServiceImpl.java
index 4827b262..077ce5b9 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/materialvo/service/impl/MaterialServiceImpl.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/materialvo/service/impl/MaterialServiceImpl.java
@@ -67,12 +67,12 @@ public class MaterialServiceImpl extends ServiceImpl<MaterialMapper, MaterialEnt
         int total=0;
 		int materialNum =0;
         QueryWrapper<MaterialEntity> materialQueryWrapper=new QueryWrapper<>();
-    boolean pcPermission = false;
-    boolean appPermission = false;
+    boolean pcPermission = true;
+    boolean appPermission = true;
     boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
     if(isPc && pcPermission){
 		if (!userProvider.get().getIsAdministrator()){
-				Object materialObj=authorizeService.getCondition(new AuthorizeConditionModel(materialQueryWrapper,materialPagination.getMenuId(),"material"));
+				Object materialObj=authorizeService.getCondition(new AuthorizeConditionModel(materialQueryWrapper,materialPagination.getMenuId(),"jg_material"));
             if (ObjectUtil.isEmpty(materialObj)){
                 return new ArrayList<>();
             } else {
@@ -83,7 +83,7 @@ public class MaterialServiceImpl extends ServiceImpl<MaterialMapper, MaterialEnt
     }
     if(!isPc && appPermission){
 		if (!userProvider.get().getIsAdministrator()){
-			Object materialObj=authorizeService.getCondition(new AuthorizeConditionModel(materialQueryWrapper,materialPagination.getMenuId(),"material"));
+			Object materialObj=authorizeService.getCondition(new AuthorizeConditionModel(materialQueryWrapper,materialPagination.getMenuId(),"jg_material"));
             if (ObjectUtil.isEmpty(materialObj)){
                 return new ArrayList<>();
             } else {
@@ -138,12 +138,12 @@ public class MaterialServiceImpl extends ServiceImpl<MaterialMapper, MaterialEnt
 		int total=0;
 		int materialNum =0;
         QueryWrapper<MaterialEntity> materialQueryWrapper=new QueryWrapper<>();
-    boolean pcPermission = false;
-    boolean appPermission = false;
+    boolean pcPermission = true;
+    boolean appPermission = true;
     boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
     if(isPc && pcPermission){
 		if (!userProvider.get().getIsAdministrator()){
-				Object materialObj=authorizeService.getCondition(new AuthorizeConditionModel(materialQueryWrapper,materialPagination.getMenuId(),"material"));
+				Object materialObj=authorizeService.getCondition(new AuthorizeConditionModel(materialQueryWrapper,materialPagination.getMenuId(),"jg_material"));
             if (ObjectUtil.isEmpty(materialObj)){
                 return new ArrayList<>();
             } else {
@@ -154,7 +154,7 @@ public class MaterialServiceImpl extends ServiceImpl<MaterialMapper, MaterialEnt
     }
     if(!isPc && appPermission){
 		if (!userProvider.get().getIsAdministrator()){
-			Object materialObj=authorizeService.getCondition(new AuthorizeConditionModel(materialQueryWrapper,materialPagination.getMenuId(),"material"));
+			Object materialObj=authorizeService.getCondition(new AuthorizeConditionModel(materialQueryWrapper,materialPagination.getMenuId(),"jg_material"));
             if (ObjectUtil.isEmpty(materialObj)){
                 return new ArrayList<>();
             } else {
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/monitoringitem/service/impl/MonitoringitemServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/monitoringitem/service/impl/MonitoringitemServiceImpl.java
index b2ee908b..ef7c9c07 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/monitoringitem/service/impl/MonitoringitemServiceImpl.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/monitoringitem/service/impl/MonitoringitemServiceImpl.java
@@ -54,12 +54,12 @@ public class MonitoringitemServiceImpl extends ServiceImpl<MonitoringitemMapper,
         int total=0;
 		int monitoringitemNum =0;
         QueryWrapper<MonitoringitemEntity> monitoringitemQueryWrapper=new QueryWrapper<>();
-    boolean pcPermission = false;
-    boolean appPermission = false;
+    boolean pcPermission = true;
+    boolean appPermission = true;
     boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
     if(isPc && pcPermission){
 		if (!userProvider.get().getIsAdministrator()){
-				Object monitoringitemObj=authorizeService.getCondition(new AuthorizeConditionModel(monitoringitemQueryWrapper,monitoringitemPagination.getMenuId(),"monitoringitem"));
+				Object monitoringitemObj=authorizeService.getCondition(new AuthorizeConditionModel(monitoringitemQueryWrapper,monitoringitemPagination.getMenuId(),"jg_monitoringitem"));
             if (ObjectUtil.isEmpty(monitoringitemObj)){
                 return new ArrayList<>();
             } else {
@@ -70,7 +70,7 @@ public class MonitoringitemServiceImpl extends ServiceImpl<MonitoringitemMapper,
     }
     if(!isPc && appPermission){
 		if (!userProvider.get().getIsAdministrator()){
-			Object monitoringitemObj=authorizeService.getCondition(new AuthorizeConditionModel(monitoringitemQueryWrapper,monitoringitemPagination.getMenuId(),"monitoringitem"));
+			Object monitoringitemObj=authorizeService.getCondition(new AuthorizeConditionModel(monitoringitemQueryWrapper,monitoringitemPagination.getMenuId(),"jg_monitoringitem"));
             if (ObjectUtil.isEmpty(monitoringitemObj)){
                 return new ArrayList<>();
             } else {
@@ -125,12 +125,12 @@ public class MonitoringitemServiceImpl extends ServiceImpl<MonitoringitemMapper,
 		int total=0;
 		int monitoringitemNum =0;
         QueryWrapper<MonitoringitemEntity> monitoringitemQueryWrapper=new QueryWrapper<>();
-    boolean pcPermission = false;
-    boolean appPermission = false;
+    boolean pcPermission = true;
+    boolean appPermission = true;
     boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
     if(isPc && pcPermission){
 		if (!userProvider.get().getIsAdministrator()){
-				Object monitoringitemObj=authorizeService.getCondition(new AuthorizeConditionModel(monitoringitemQueryWrapper,monitoringitemPagination.getMenuId(),"monitoringitem"));
+				Object monitoringitemObj=authorizeService.getCondition(new AuthorizeConditionModel(monitoringitemQueryWrapper,monitoringitemPagination.getMenuId(),"jg_monitoringitem"));
             if (ObjectUtil.isEmpty(monitoringitemObj)){
                 return new ArrayList<>();
             } else {
@@ -141,7 +141,7 @@ public class MonitoringitemServiceImpl extends ServiceImpl<MonitoringitemMapper,
     }
     if(!isPc && appPermission){
 		if (!userProvider.get().getIsAdministrator()){
-			Object monitoringitemObj=authorizeService.getCondition(new AuthorizeConditionModel(monitoringitemQueryWrapper,monitoringitemPagination.getMenuId(),"monitoringitem"));
+			Object monitoringitemObj=authorizeService.getCondition(new AuthorizeConditionModel(monitoringitemQueryWrapper,monitoringitemPagination.getMenuId(),"jg_monitoringitem"));
             if (ObjectUtil.isEmpty(monitoringitemObj)){
                 return new ArrayList<>();
             } else {
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/payment/service/impl/PaymentServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/payment/service/impl/PaymentServiceImpl.java
index 72cb4645..a24ae171 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/payment/service/impl/PaymentServiceImpl.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/payment/service/impl/PaymentServiceImpl.java
@@ -68,19 +68,19 @@ public class PaymentServiceImpl extends ServiceImpl<PaymentMapper, PaymentEntity
         QueryWrapper<PaymentEntity> paymentQueryWrapper=new QueryWrapper<>();
 		int payment_item0Num =0;
         QueryWrapper<Payment_item0Entity> payment_item0QueryWrapper=new QueryWrapper<>();
-    boolean pcPermission = false;
+    boolean pcPermission = true;
     boolean appPermission = true;
     boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
     if(isPc && pcPermission){
 		if (!userProvider.get().getIsAdministrator()){
-				Object paymentObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentQueryWrapper,paymentPagination.getMenuId(),"payment"));
+				Object paymentObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentQueryWrapper,paymentPagination.getMenuId(),"jg_payment"));
             if (ObjectUtil.isEmpty(paymentObj)){
                 return new ArrayList<>();
             } else {
                 paymentQueryWrapper = (QueryWrapper<PaymentEntity>)paymentObj;
                 paymentNum++;
             }
-				Object payment_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(payment_item0QueryWrapper,paymentPagination.getMenuId(),"payment_item0"));
+				Object payment_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(payment_item0QueryWrapper,paymentPagination.getMenuId(),"jg_payment_item0"));
             if (ObjectUtil.isEmpty(payment_item0Obj)){
                 return new ArrayList<>();
             } else {
@@ -91,7 +91,7 @@ public class PaymentServiceImpl extends ServiceImpl<PaymentMapper, PaymentEntity
     }
     if(!isPc && appPermission){
 		if (!userProvider.get().getIsAdministrator()){
-			Object paymentObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentQueryWrapper,paymentPagination.getMenuId(),"payment"));
+			Object paymentObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentQueryWrapper,paymentPagination.getMenuId(),"jg_payment"));
             if (ObjectUtil.isEmpty(paymentObj)){
                 return new ArrayList<>();
             } else {
@@ -100,7 +100,7 @@ public class PaymentServiceImpl extends ServiceImpl<PaymentMapper, PaymentEntity
 			}
 
 
-			Object payment_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(payment_item0QueryWrapper,paymentPagination.getMenuId(),"payment_item0"));
+			Object payment_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(payment_item0QueryWrapper,paymentPagination.getMenuId(),"jg_payment_item0"));
             if (ObjectUtil.isEmpty(payment_item0Obj)){
                 return new ArrayList<>();
             } else {
@@ -152,19 +152,19 @@ public class PaymentServiceImpl extends ServiceImpl<PaymentMapper, PaymentEntity
         QueryWrapper<PaymentEntity> paymentQueryWrapper=new QueryWrapper<>();
 		int payment_item0Num =0;
         QueryWrapper<Payment_item0Entity> payment_item0QueryWrapper=new QueryWrapper<>();
-    boolean pcPermission = false;
+    boolean pcPermission = true;
     boolean appPermission = true;
     boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
     if(isPc && pcPermission){
 		if (!userProvider.get().getIsAdministrator()){
-				Object paymentObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentQueryWrapper,paymentPagination.getMenuId(),"payment"));
+				Object paymentObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentQueryWrapper,paymentPagination.getMenuId(),"jg_payment"));
             if (ObjectUtil.isEmpty(paymentObj)){
                 return new ArrayList<>();
             } else {
                 paymentQueryWrapper = (QueryWrapper<PaymentEntity>)paymentObj;
                 paymentNum++;
             }
-				Object payment_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(payment_item0QueryWrapper,paymentPagination.getMenuId(),"payment_item0"));
+				Object payment_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(payment_item0QueryWrapper,paymentPagination.getMenuId(),"jg_payment_item0"));
             if (ObjectUtil.isEmpty(payment_item0Obj)){
                 return new ArrayList<>();
             } else {
@@ -175,7 +175,7 @@ public class PaymentServiceImpl extends ServiceImpl<PaymentMapper, PaymentEntity
     }
     if(!isPc && appPermission){
 		if (!userProvider.get().getIsAdministrator()){
-			Object paymentObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentQueryWrapper,paymentPagination.getMenuId(),"payment"));
+			Object paymentObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentQueryWrapper,paymentPagination.getMenuId(),"jg_payment"));
             if (ObjectUtil.isEmpty(paymentObj)){
                 return new ArrayList<>();
             } else {
@@ -184,7 +184,7 @@ public class PaymentServiceImpl extends ServiceImpl<PaymentMapper, PaymentEntity
 			}
 
 
-			Object payment_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(payment_item0QueryWrapper,paymentPagination.getMenuId(),"payment_item0"));
+			Object payment_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(payment_item0QueryWrapper,paymentPagination.getMenuId(),"jg_payment_item0"));
             if (ObjectUtil.isEmpty(payment_item0Obj)){
                 return new ArrayList<>();
             } else {
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/service/impl/PaymentdocServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/service/impl/PaymentdocServiceImpl.java
index 8abb3905..326c69a7 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/service/impl/PaymentdocServiceImpl.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/service/impl/PaymentdocServiceImpl.java
@@ -67,19 +67,19 @@ public class PaymentdocServiceImpl extends ServiceImpl<PaymentdocMapper, Payment
         QueryWrapper<PaymentdocEntity> paymentdocQueryWrapper=new QueryWrapper<>();
         int paymentdocItem0Num =0;
         QueryWrapper<PaymentdocItem0Entity> paymentdocItem0QueryWrapper=new QueryWrapper<>();
-        boolean pcPermission = false;
-        boolean appPermission = false;
+        boolean pcPermission = true;
+        boolean appPermission = true;
         boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
         if(isPc && pcPermission){
             if (!userProvider.get().getIsAdministrator()){
-                Object paymentdocObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocQueryWrapper,paymentdocPagination.getMenuId(),"paymentdoc"));
+                Object paymentdocObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocQueryWrapper,paymentdocPagination.getMenuId(),"jg_paymentdoc"));
                 if (ObjectUtil.isEmpty(paymentdocObj)){
                     return new ArrayList<>();
                 } else {
                     paymentdocQueryWrapper = (QueryWrapper<PaymentdocEntity>)paymentdocObj;
                     paymentdocNum++;
                 }
-                Object paymentdocItem0Obj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocItem0QueryWrapper,paymentdocPagination.getMenuId(),"paymentdocItem0"));
+                Object paymentdocItem0Obj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocItem0QueryWrapper,paymentdocPagination.getMenuId(),"jg_paymentdocItem0"));
                 if (ObjectUtil.isEmpty(paymentdocItem0Obj)){
                     return new ArrayList<>();
                 } else {
@@ -90,14 +90,14 @@ public class PaymentdocServiceImpl extends ServiceImpl<PaymentdocMapper, Payment
         }
         if(!isPc && appPermission){
             if (!userProvider.get().getIsAdministrator()){
-                Object paymentdocObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocQueryWrapper,paymentdocPagination.getMenuId(),"paymentdoc"));
+                Object paymentdocObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocQueryWrapper,paymentdocPagination.getMenuId(),"jg_paymentdoc"));
                 if (ObjectUtil.isEmpty(paymentdocObj)){
                     return new ArrayList<>();
                 } else {
                     paymentdocQueryWrapper = (QueryWrapper<PaymentdocEntity>)paymentdocObj;
                     paymentdocNum++;
                 }
-                Object paymentdocItem0Obj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocItem0QueryWrapper,paymentdocPagination.getMenuId(),"paymentdocItem0"));
+                Object paymentdocItem0Obj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocItem0QueryWrapper,paymentdocPagination.getMenuId(),"jg_paymentdocItem0"));
                 if (ObjectUtil.isEmpty(paymentdocItem0Obj)){
                     return new ArrayList<>();
                 } else {
@@ -147,19 +147,19 @@ public class PaymentdocServiceImpl extends ServiceImpl<PaymentdocMapper, Payment
         QueryWrapper<PaymentdocEntity> paymentdocQueryWrapper=new QueryWrapper<>();
         int paymentdocItem0Num =0;
         QueryWrapper<PaymentdocItem0Entity> paymentdocItem0QueryWrapper=new QueryWrapper<>();
-        boolean pcPermission = false;
-        boolean appPermission = false;
+        boolean pcPermission = true;
+        boolean appPermission = true;
         boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
         if(isPc && pcPermission){
             if (!userProvider.get().getIsAdministrator()){
-                Object paymentdocObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocQueryWrapper,paymentdocPagination.getMenuId(),"paymentdoc"));
+                Object paymentdocObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocQueryWrapper,paymentdocPagination.getMenuId(),"jg_paymentdoc"));
                 if (ObjectUtil.isEmpty(paymentdocObj)){
                     return new ArrayList<>();
                 } else {
                     paymentdocQueryWrapper = (QueryWrapper<PaymentdocEntity>)paymentdocObj;
                     paymentdocNum++;
                 }
-                Object paymentdocItem0Obj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocItem0QueryWrapper,paymentdocPagination.getMenuId(),"paymentdocItem0"));
+                Object paymentdocItem0Obj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocItem0QueryWrapper,paymentdocPagination.getMenuId(),"jg_paymentdocItem0"));
                 if (ObjectUtil.isEmpty(paymentdocItem0Obj)){
                     return new ArrayList<>();
                 } else {
@@ -170,14 +170,14 @@ public class PaymentdocServiceImpl extends ServiceImpl<PaymentdocMapper, Payment
         }
         if(!isPc && appPermission){
             if (!userProvider.get().getIsAdministrator()){
-                Object paymentdocObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocQueryWrapper,paymentdocPagination.getMenuId(),"paymentdoc"));
+                Object paymentdocObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocQueryWrapper,paymentdocPagination.getMenuId(),"jg_paymentdoc"));
                 if (ObjectUtil.isEmpty(paymentdocObj)){
                     return new ArrayList<>();
                 } else {
                     paymentdocQueryWrapper = (QueryWrapper<PaymentdocEntity>)paymentdocObj;
                     paymentdocNum++;
                 }
-                Object paymentdocItem0Obj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocItem0QueryWrapper,paymentdocPagination.getMenuId(),"paymentdocItem0"));
+                Object paymentdocItem0Obj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocItem0QueryWrapper,paymentdocPagination.getMenuId(),"jg_paymentdocItem0"));
                 if (ObjectUtil.isEmpty(paymentdocItem0Obj)){
                     return new ArrayList<>();
                 } else {
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/service/impl/PoundlistServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/service/impl/PoundlistServiceImpl.java
index e38ab8dc..59873971 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/service/impl/PoundlistServiceImpl.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/service/impl/PoundlistServiceImpl.java
@@ -62,12 +62,12 @@ public class PoundlistServiceImpl extends ServiceImpl<PoundlistMapper, Poundlist
 		int poundlistNum =0;
         QueryWrapper<PoundlistEntity> poundlistQueryWrapper=new QueryWrapper<>();
         poundlistQueryWrapper.lambda().eq(PoundlistEntity::getIsExamine,"1");
-    boolean pcPermission = false;
-    boolean appPermission = false;
+    boolean pcPermission = true;
+    boolean appPermission = true;
     boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
     if(isPc && pcPermission){
 		if (!userProvider.get().getIsAdministrator()){
-				Object poundlistObj=authorizeService.getCondition(new AuthorizeConditionModel(poundlistQueryWrapper,poundlistPagination.getMenuId(),"poundlist"));
+				Object poundlistObj=authorizeService.getCondition(new AuthorizeConditionModel(poundlistQueryWrapper,poundlistPagination.getMenuId(),"jg_poundlist"));
             if (ObjectUtil.isEmpty(poundlistObj)){
                 return new ArrayList<>();
             } else {
@@ -78,7 +78,7 @@ public class PoundlistServiceImpl extends ServiceImpl<PoundlistMapper, Poundlist
     }
     if(!isPc && appPermission){
 		if (!userProvider.get().getIsAdministrator()){
-			Object poundlistObj=authorizeService.getCondition(new AuthorizeConditionModel(poundlistQueryWrapper,poundlistPagination.getMenuId(),"poundlist"));
+			Object poundlistObj=authorizeService.getCondition(new AuthorizeConditionModel(poundlistQueryWrapper,poundlistPagination.getMenuId(),"jg_poundlist"));
             if (ObjectUtil.isEmpty(poundlistObj)){
                 return new ArrayList<>();
             } else {
@@ -139,12 +139,12 @@ public class PoundlistServiceImpl extends ServiceImpl<PoundlistMapper, Poundlist
 		int total=0;
 		int poundlistNum =0;
         QueryWrapper<PoundlistEntity> poundlistQueryWrapper=new QueryWrapper<>();
-    boolean pcPermission = false;
-    boolean appPermission = false;
+    boolean pcPermission = true;
+    boolean appPermission = true;
     boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
     if(isPc && pcPermission){
 		if (!userProvider.get().getIsAdministrator()){
-				Object poundlistObj=authorizeService.getCondition(new AuthorizeConditionModel(poundlistQueryWrapper,poundlistPagination.getMenuId(),"poundlist"));
+				Object poundlistObj=authorizeService.getCondition(new AuthorizeConditionModel(poundlistQueryWrapper,poundlistPagination.getMenuId(),"jg_poundlist"));
             if (ObjectUtil.isEmpty(poundlistObj)){
                 return new ArrayList<>();
             } else {
@@ -155,7 +155,7 @@ public class PoundlistServiceImpl extends ServiceImpl<PoundlistMapper, Poundlist
     }
     if(!isPc && appPermission){
 		if (!userProvider.get().getIsAdministrator()){
-			Object poundlistObj=authorizeService.getCondition(new AuthorizeConditionModel(poundlistQueryWrapper,poundlistPagination.getMenuId(),"poundlist"));
+			Object poundlistObj=authorizeService.getCondition(new AuthorizeConditionModel(poundlistQueryWrapper,poundlistPagination.getMenuId(),"jg_poundlist"));
             if (ObjectUtil.isEmpty(poundlistObj)){
                 return new ArrayList<>();
             } else {
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/service/impl/PurchasebackServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/service/impl/PurchasebackServiceImpl.java
index 23c74a0a..5661505e 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/service/impl/PurchasebackServiceImpl.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/service/impl/PurchasebackServiceImpl.java
@@ -70,26 +70,26 @@ public class PurchasebackServiceImpl extends ServiceImpl<PurchasebackMapper, Pur
         QueryWrapper<Purchaseback_item0Entity> purchaseback_item0QueryWrapper=new QueryWrapper<>();
 		int purchaseorderNum =0;
         QueryWrapper<PurchaseorderEntity> purchaseorderQueryWrapper=new QueryWrapper<>();
-    boolean pcPermission = false;
-    boolean appPermission = false;
+    boolean pcPermission = true;
+    boolean appPermission = true;
     boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
     if(isPc && pcPermission){
 		if (!userProvider.get().getIsAdministrator()){
-				Object purchasebackObj=authorizeService.getCondition(new AuthorizeConditionModel(purchasebackQueryWrapper,purchasebackPagination.getMenuId(),"purchaseback"));
+				Object purchasebackObj=authorizeService.getCondition(new AuthorizeConditionModel(purchasebackQueryWrapper,purchasebackPagination.getMenuId(),"jg_purchaseback"));
             if (ObjectUtil.isEmpty(purchasebackObj)){
                 return new ArrayList<>();
             } else {
                 purchasebackQueryWrapper = (QueryWrapper<PurchasebackEntity>)purchasebackObj;
                 purchasebackNum++;
             }
-				Object purchaseback_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseback_item0QueryWrapper,purchasebackPagination.getMenuId(),"purchaseback_item0"));
+				Object purchaseback_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseback_item0QueryWrapper,purchasebackPagination.getMenuId(),"jg_purchaseback_item0"));
             if (ObjectUtil.isEmpty(purchaseback_item0Obj)){
                 return new ArrayList<>();
             } else {
                 purchaseback_item0QueryWrapper = (QueryWrapper<Purchaseback_item0Entity>)purchaseback_item0Obj;
                 purchaseback_item0Num++;
             }
-				Object purchaseorderObj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorderQueryWrapper,purchasebackPagination.getMenuId(),"purchaseorder"));
+				Object purchaseorderObj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorderQueryWrapper,purchasebackPagination.getMenuId(),"jg_purchaseorder"));
             if (ObjectUtil.isEmpty(purchaseorderObj)){
                 return new ArrayList<>();
             } else {
@@ -100,7 +100,7 @@ public class PurchasebackServiceImpl extends ServiceImpl<PurchasebackMapper, Pur
     }
     if(!isPc && appPermission){
 		if (!userProvider.get().getIsAdministrator()){
-			Object purchasebackObj=authorizeService.getCondition(new AuthorizeConditionModel(purchasebackQueryWrapper,purchasebackPagination.getMenuId(),"purchaseback"));
+			Object purchasebackObj=authorizeService.getCondition(new AuthorizeConditionModel(purchasebackQueryWrapper,purchasebackPagination.getMenuId(),"jg_purchaseback"));
             if (ObjectUtil.isEmpty(purchasebackObj)){
                 return new ArrayList<>();
             } else {
@@ -109,7 +109,7 @@ public class PurchasebackServiceImpl extends ServiceImpl<PurchasebackMapper, Pur
 			}
 
 
-			Object purchaseback_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseback_item0QueryWrapper,purchasebackPagination.getMenuId(),"purchaseback_item0"));
+			Object purchaseback_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseback_item0QueryWrapper,purchasebackPagination.getMenuId(),"jg_purchaseback_item0"));
             if (ObjectUtil.isEmpty(purchaseback_item0Obj)){
                 return new ArrayList<>();
             } else {
@@ -118,7 +118,7 @@ public class PurchasebackServiceImpl extends ServiceImpl<PurchasebackMapper, Pur
 			}
 
 
-			Object purchaseorderObj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorderQueryWrapper,purchasebackPagination.getMenuId(),"purchaseorder"));
+			Object purchaseorderObj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorderQueryWrapper,purchasebackPagination.getMenuId(),"jg_purchaseorder"));
             if (ObjectUtil.isEmpty(purchaseorderObj)){
                 return new ArrayList<>();
             } else {
@@ -172,26 +172,26 @@ public class PurchasebackServiceImpl extends ServiceImpl<PurchasebackMapper, Pur
         QueryWrapper<Purchaseback_item0Entity> purchaseback_item0QueryWrapper=new QueryWrapper<>();
 		int purchaseorderNum =0;
         QueryWrapper<PurchaseorderEntity> purchaseorderQueryWrapper=new QueryWrapper<>();
-    boolean pcPermission = false;
-    boolean appPermission = false;
+    boolean pcPermission = true;
+    boolean appPermission = true;
     boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
     if(isPc && pcPermission){
 		if (!userProvider.get().getIsAdministrator()){
-				Object purchasebackObj=authorizeService.getCondition(new AuthorizeConditionModel(purchasebackQueryWrapper,purchasebackPagination.getMenuId(),"purchaseback"));
+				Object purchasebackObj=authorizeService.getCondition(new AuthorizeConditionModel(purchasebackQueryWrapper,purchasebackPagination.getMenuId(),"jg_purchaseback"));
             if (ObjectUtil.isEmpty(purchasebackObj)){
                 return new ArrayList<>();
             } else {
                 purchasebackQueryWrapper = (QueryWrapper<PurchasebackEntity>)purchasebackObj;
                 purchasebackNum++;
             }
-				Object purchaseback_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseback_item0QueryWrapper,purchasebackPagination.getMenuId(),"purchaseback_item0"));
+				Object purchaseback_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseback_item0QueryWrapper,purchasebackPagination.getMenuId(),"jg_purchaseback_item0"));
             if (ObjectUtil.isEmpty(purchaseback_item0Obj)){
                 return new ArrayList<>();
             } else {
                 purchaseback_item0QueryWrapper = (QueryWrapper<Purchaseback_item0Entity>)purchaseback_item0Obj;
                 purchaseback_item0Num++;
             }
-				Object purchaseorderObj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorderQueryWrapper,purchasebackPagination.getMenuId(),"purchaseorder"));
+				Object purchaseorderObj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorderQueryWrapper,purchasebackPagination.getMenuId(),"jg_purchaseorder"));
             if (ObjectUtil.isEmpty(purchaseorderObj)){
                 return new ArrayList<>();
             } else {
@@ -202,7 +202,7 @@ public class PurchasebackServiceImpl extends ServiceImpl<PurchasebackMapper, Pur
     }
     if(!isPc && appPermission){
 		if (!userProvider.get().getIsAdministrator()){
-			Object purchasebackObj=authorizeService.getCondition(new AuthorizeConditionModel(purchasebackQueryWrapper,purchasebackPagination.getMenuId(),"purchaseback"));
+			Object purchasebackObj=authorizeService.getCondition(new AuthorizeConditionModel(purchasebackQueryWrapper,purchasebackPagination.getMenuId(),"jg_purchaseback"));
             if (ObjectUtil.isEmpty(purchasebackObj)){
                 return new ArrayList<>();
             } else {
@@ -211,7 +211,7 @@ public class PurchasebackServiceImpl extends ServiceImpl<PurchasebackMapper, Pur
 			}
 
 
-			Object purchaseback_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseback_item0QueryWrapper,purchasebackPagination.getMenuId(),"purchaseback_item0"));
+			Object purchaseback_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseback_item0QueryWrapper,purchasebackPagination.getMenuId(),"jg_purchaseback_item0"));
             if (ObjectUtil.isEmpty(purchaseback_item0Obj)){
                 return new ArrayList<>();
             } else {
@@ -220,7 +220,7 @@ public class PurchasebackServiceImpl extends ServiceImpl<PurchasebackMapper, Pur
 			}
 
 
-			Object purchaseorderObj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorderQueryWrapper,purchasebackPagination.getMenuId(),"purchaseorder"));
+			Object purchaseorderObj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorderQueryWrapper,purchasebackPagination.getMenuId(),"jg_purchaseorder"));
             if (ObjectUtil.isEmpty(purchaseorderObj)){
                 return new ArrayList<>();
             } else {
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java
index 363e52b3..e0d37d87 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java
@@ -678,47 +678,47 @@ if (pMap!=null&&pMap.size()>0){
         QueryWrapper<PaymentitemEntity> paymentitemQueryWrapper=new QueryWrapper<>();
         int collectionitemNum =0;
         QueryWrapper<CollectionpoEntity> collectionitemQueryWrapper=new QueryWrapper<>();
-    boolean pcPermission = false;
-    boolean appPermission = false;
+    boolean pcPermission = true;
+    boolean appPermission = true;
     boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
     if(isPc && pcPermission){
         if (!userProvider.get().getIsAdministrator()){
-            Object purchaseorderObj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorderQueryWrapper,purchaseorderPagination.getMenuId(),"purchaseorder"));
+            Object purchaseorderObj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorderQueryWrapper,purchaseorderPagination.getMenuId(),"jg_purchaseorder"));
             if (ObjectUtil.isEmpty(purchaseorderObj)){
                 return new ArrayList<>();
             } else {
                 purchaseorderQueryWrapper = (QueryWrapper<PurchaseorderitemEntity>)purchaseorderObj;
                 purchaseorderNum++;
             }
-            Object purchaseorder_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorder_item0QueryWrapper,purchaseorderPagination.getMenuId(),"purchaseorder_item0"));
+            Object purchaseorder_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorder_item0QueryWrapper,purchaseorderPagination.getMenuId(),"jg_purchaseorder_item0"));
             if (ObjectUtil.isEmpty(purchaseorder_item0Obj)){
                 return new ArrayList<>();
             } else {
                 purchaseorder_item0QueryWrapper = (QueryWrapper<Purchaseorder_item0Entity>)purchaseorder_item0Obj;
                 purchaseorder_item0Num++;
             }
-            Object purchasebackitemObj=authorizeService.getCondition(new AuthorizeConditionModel(purchasebackitemQueryWrapper,purchaseorderPagination.getMenuId(),"purchasebackitem"));
+            Object purchasebackitemObj=authorizeService.getCondition(new AuthorizeConditionModel(purchasebackitemQueryWrapper,purchaseorderPagination.getMenuId(),"jg_purchasebackitem"));
             if (ObjectUtil.isEmpty(purchasebackitemObj)){
                 return new ArrayList<>();
             } else {
                 purchasebackitemQueryWrapper = (QueryWrapper<PurchasebackitemEntity>)purchasebackitemObj;
                 purchasebackitemNum++;
             }
-            Object invoices_item0itemObj=authorizeService.getCondition(new AuthorizeConditionModel(invoices_item0itemQueryWrapper,purchaseorderPagination.getMenuId(),"invoices_item0item"));
+            Object invoices_item0itemObj=authorizeService.getCondition(new AuthorizeConditionModel(invoices_item0itemQueryWrapper,purchaseorderPagination.getMenuId(),"jg_invoices_item0item"));
             if (ObjectUtil.isEmpty(invoices_item0itemObj)){
                 return new ArrayList<>();
             } else {
                 invoices_item0itemQueryWrapper = (QueryWrapper<Invoices_item0itemEntity>)invoices_item0itemObj;
                 invoices_item0itemNum++;
             }
-            Object paymentitemObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentitemQueryWrapper,purchaseorderPagination.getMenuId(),"paymentitem"));
+            Object paymentitemObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentitemQueryWrapper,purchaseorderPagination.getMenuId(),"jg_paymentitem"));
             if (ObjectUtil.isEmpty(paymentitemObj)){
                 return new ArrayList<>();
             } else {
                 paymentitemQueryWrapper = (QueryWrapper<PaymentitemEntity>)paymentitemObj;
                 paymentitemNum++;
             }
-            Object collectionitemObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionitemQueryWrapper,purchaseorderPagination.getMenuId(),"collectionitem"));
+            Object collectionitemObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionitemQueryWrapper,purchaseorderPagination.getMenuId(),"jg_collectionitem"));
             if (ObjectUtil.isEmpty(collectionitemObj)){
                 return new ArrayList<>();
             } else {
@@ -729,7 +729,7 @@ if (pMap!=null&&pMap.size()>0){
     }
     if(!isPc && appPermission){
         if (!userProvider.get().getIsAdministrator()){
-            Object purchaseorderObj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorderQueryWrapper,purchaseorderPagination.getMenuId(),"purchaseorder"));
+            Object purchaseorderObj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorderQueryWrapper,purchaseorderPagination.getMenuId(),"jg_purchaseorder"));
             if (ObjectUtil.isEmpty(purchaseorderObj)){
                 return new ArrayList<>();
             } else {
@@ -738,7 +738,7 @@ if (pMap!=null&&pMap.size()>0){
             }
 
 
-            Object purchaseorder_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorder_item0QueryWrapper,purchaseorderPagination.getMenuId(),"purchaseorder_item0"));
+            Object purchaseorder_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorder_item0QueryWrapper,purchaseorderPagination.getMenuId(),"jg_purchaseorder_item0"));
             if (ObjectUtil.isEmpty(purchaseorder_item0Obj)){
                 return new ArrayList<>();
             } else {
@@ -747,7 +747,7 @@ if (pMap!=null&&pMap.size()>0){
             }
 
 
-            Object purchasebackitemObj=authorizeService.getCondition(new AuthorizeConditionModel(purchasebackitemQueryWrapper,purchaseorderPagination.getMenuId(),"purchasebackitem"));
+            Object purchasebackitemObj=authorizeService.getCondition(new AuthorizeConditionModel(purchasebackitemQueryWrapper,purchaseorderPagination.getMenuId(),"jg_purchasebackitem"));
             if (ObjectUtil.isEmpty(purchasebackitemObj)){
                 return new ArrayList<>();
             } else {
@@ -756,7 +756,7 @@ if (pMap!=null&&pMap.size()>0){
             }
 
 
-            Object invoices_item0itemObj=authorizeService.getCondition(new AuthorizeConditionModel(invoices_item0itemQueryWrapper,purchaseorderPagination.getMenuId(),"invoices_item0item"));
+            Object invoices_item0itemObj=authorizeService.getCondition(new AuthorizeConditionModel(invoices_item0itemQueryWrapper,purchaseorderPagination.getMenuId(),"jg_invoices_item0item"));
             if (ObjectUtil.isEmpty(invoices_item0itemObj)){
                 return new ArrayList<>();
             } else {
@@ -765,7 +765,7 @@ if (pMap!=null&&pMap.size()>0){
             }
 
 
-            Object paymentitemObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentitemQueryWrapper,purchaseorderPagination.getMenuId(),"paymentitem"));
+            Object paymentitemObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentitemQueryWrapper,purchaseorderPagination.getMenuId(),"jg_paymentitem"));
             if (ObjectUtil.isEmpty(paymentitemObj)){
                 return new ArrayList<>();
             } else {
@@ -774,7 +774,7 @@ if (pMap!=null&&pMap.size()>0){
             }
 
 
-            Object collectionitemObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionitemQueryWrapper,purchaseorderPagination.getMenuId(),"collectionitem"));
+            Object collectionitemObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionitemQueryWrapper,purchaseorderPagination.getMenuId(),"jg_collectionitem"));
             if (ObjectUtil.isEmpty(collectionitemObj)){
                 return new ArrayList<>();
             } else {
@@ -834,47 +834,47 @@ if (pMap!=null&&pMap.size()>0){
         QueryWrapper<PaymentitemEntity> paymentitemQueryWrapper=new QueryWrapper<>();
         int collectionitemNum =0;
         QueryWrapper<CollectionpoEntity> collectionitemQueryWrapper=new QueryWrapper<>();
-    boolean pcPermission = false;
-    boolean appPermission = false;
+    boolean pcPermission = true;
+    boolean appPermission = true;
     boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
     if(isPc && pcPermission){
         if (!userProvider.get().getIsAdministrator()){
-            Object purchaseorderObj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorderQueryWrapper,purchaseorderPagination.getMenuId(),"purchaseorder"));
+            Object purchaseorderObj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorderQueryWrapper,purchaseorderPagination.getMenuId(),"jg_purchaseorder"));
             if (ObjectUtil.isEmpty(purchaseorderObj)){
                 return new ArrayList<>();
             } else {
                 purchaseorderQueryWrapper = (QueryWrapper<PurchaseorderitemEntity>)purchaseorderObj;
                 purchaseorderNum++;
             }
-            Object purchaseorder_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorder_item0QueryWrapper,purchaseorderPagination.getMenuId(),"purchaseorder_item0"));
+            Object purchaseorder_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorder_item0QueryWrapper,purchaseorderPagination.getMenuId(),"jg_purchaseorder_item0"));
             if (ObjectUtil.isEmpty(purchaseorder_item0Obj)){
                 return new ArrayList<>();
             } else {
                 purchaseorder_item0QueryWrapper = (QueryWrapper<Purchaseorder_item0Entity>)purchaseorder_item0Obj;
                 purchaseorder_item0Num++;
             }
-            Object purchasebackitemObj=authorizeService.getCondition(new AuthorizeConditionModel(purchasebackitemQueryWrapper,purchaseorderPagination.getMenuId(),"purchasebackitem"));
+            Object purchasebackitemObj=authorizeService.getCondition(new AuthorizeConditionModel(purchasebackitemQueryWrapper,purchaseorderPagination.getMenuId(),"jg_purchasebackitem"));
             if (ObjectUtil.isEmpty(purchasebackitemObj)){
                 return new ArrayList<>();
             } else {
                 purchasebackitemQueryWrapper = (QueryWrapper<PurchasebackitemEntity>)purchasebackitemObj;
                 purchasebackitemNum++;
             }
-            Object invoices_item0itemObj=authorizeService.getCondition(new AuthorizeConditionModel(invoices_item0itemQueryWrapper,purchaseorderPagination.getMenuId(),"invoices_item0item"));
+            Object invoices_item0itemObj=authorizeService.getCondition(new AuthorizeConditionModel(invoices_item0itemQueryWrapper,purchaseorderPagination.getMenuId(),"jg_invoices_item0item"));
             if (ObjectUtil.isEmpty(invoices_item0itemObj)){
                 return new ArrayList<>();
             } else {
                 invoices_item0itemQueryWrapper = (QueryWrapper<Invoices_item0itemEntity>)invoices_item0itemObj;
                 invoices_item0itemNum++;
             }
-            Object paymentitemObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentitemQueryWrapper,purchaseorderPagination.getMenuId(),"paymentitem"));
+            Object paymentitemObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentitemQueryWrapper,purchaseorderPagination.getMenuId(),"jg_paymentitem"));
             if (ObjectUtil.isEmpty(paymentitemObj)){
                 return new ArrayList<>();
             } else {
                 paymentitemQueryWrapper = (QueryWrapper<PaymentitemEntity>)paymentitemObj;
                 paymentitemNum++;
             }
-            Object collectionitemObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionitemQueryWrapper,purchaseorderPagination.getMenuId(),"collectionitem"));
+            Object collectionitemObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionitemQueryWrapper,purchaseorderPagination.getMenuId(),"jg_collectionitem"));
             if (ObjectUtil.isEmpty(collectionitemObj)){
                 return new ArrayList<>();
             } else {
@@ -885,7 +885,7 @@ if (pMap!=null&&pMap.size()>0){
     }
     if(!isPc && appPermission){
         if (!userProvider.get().getIsAdministrator()){
-            Object purchaseorderObj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorderQueryWrapper,purchaseorderPagination.getMenuId(),"purchaseorder"));
+            Object purchaseorderObj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorderQueryWrapper,purchaseorderPagination.getMenuId(),"jg_purchaseorder"));
             if (ObjectUtil.isEmpty(purchaseorderObj)){
                 return new ArrayList<>();
             } else {
@@ -894,7 +894,7 @@ if (pMap!=null&&pMap.size()>0){
             }
 
 
-            Object purchaseorder_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorder_item0QueryWrapper,purchaseorderPagination.getMenuId(),"purchaseorder_item0"));
+            Object purchaseorder_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorder_item0QueryWrapper,purchaseorderPagination.getMenuId(),"jg_purchaseorder_item0"));
             if (ObjectUtil.isEmpty(purchaseorder_item0Obj)){
                 return new ArrayList<>();
             } else {
@@ -903,7 +903,7 @@ if (pMap!=null&&pMap.size()>0){
             }
 
 
-            Object purchasebackitemObj=authorizeService.getCondition(new AuthorizeConditionModel(purchasebackitemQueryWrapper,purchaseorderPagination.getMenuId(),"purchasebackitem"));
+            Object purchasebackitemObj=authorizeService.getCondition(new AuthorizeConditionModel(purchasebackitemQueryWrapper,purchaseorderPagination.getMenuId(),"jg_purchasebackitem"));
             if (ObjectUtil.isEmpty(purchasebackitemObj)){
                 return new ArrayList<>();
             } else {
@@ -912,7 +912,7 @@ if (pMap!=null&&pMap.size()>0){
             }
 
 
-            Object invoices_item0itemObj=authorizeService.getCondition(new AuthorizeConditionModel(invoices_item0itemQueryWrapper,purchaseorderPagination.getMenuId(),"invoices_item0item"));
+            Object invoices_item0itemObj=authorizeService.getCondition(new AuthorizeConditionModel(invoices_item0itemQueryWrapper,purchaseorderPagination.getMenuId(),"jg_invoices_item0item"));
             if (ObjectUtil.isEmpty(invoices_item0itemObj)){
                 return new ArrayList<>();
             } else {
@@ -921,7 +921,7 @@ if (pMap!=null&&pMap.size()>0){
             }
 
 
-            Object paymentitemObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentitemQueryWrapper,purchaseorderPagination.getMenuId(),"paymentitem"));
+            Object paymentitemObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentitemQueryWrapper,purchaseorderPagination.getMenuId(),"jg_paymentitem"));
             if (ObjectUtil.isEmpty(paymentitemObj)){
                 return new ArrayList<>();
             } else {
@@ -930,7 +930,7 @@ if (pMap!=null&&pMap.size()>0){
             }
 
 
-            Object collectionitemObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionitemQueryWrapper,purchaseorderPagination.getMenuId(),"collectionitem"));
+            Object collectionitemObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionitemQueryWrapper,purchaseorderPagination.getMenuId(),"jg_collectionitem"));
             if (ObjectUtil.isEmpty(collectionitemObj)){
                 return new ArrayList<>();
             } else {
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/service/impl/ReceiptinServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/service/impl/ReceiptinServiceImpl.java
index 7d8e1229..8fdb50d3 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/service/impl/ReceiptinServiceImpl.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/service/impl/ReceiptinServiceImpl.java
@@ -66,19 +66,19 @@ public class ReceiptinServiceImpl extends ServiceImpl<ReceiptinMapper, Receiptin
         QueryWrapper<ReceiptinEntity> receiptinQueryWrapper=new QueryWrapper<>();
 		int receiptin_item0Num =0;
         QueryWrapper<Receiptin_item0Entity> receiptin_item0QueryWrapper=new QueryWrapper<>();
-    boolean pcPermission = false;
-    boolean appPermission = false;
+    boolean pcPermission = true;
+    boolean appPermission = true;
     boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
     if(isPc && pcPermission){
 		if (!userProvider.get().getIsAdministrator()){
-				Object receiptinObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptinQueryWrapper,receiptinPagination.getMenuId(),"receiptin"));
+				Object receiptinObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptinQueryWrapper,receiptinPagination.getMenuId(),"jg_receiptin"));
             if (ObjectUtil.isEmpty(receiptinObj)){
                 return new ArrayList<>();
             } else {
                 receiptinQueryWrapper = (QueryWrapper<ReceiptinEntity>)receiptinObj;
                 receiptinNum++;
             }
-				Object receiptin_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(receiptin_item0QueryWrapper,receiptinPagination.getMenuId(),"receiptin_item0"));
+				Object receiptin_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(receiptin_item0QueryWrapper,receiptinPagination.getMenuId(),"jg_receiptin_item0"));
             if (ObjectUtil.isEmpty(receiptin_item0Obj)){
                 return new ArrayList<>();
             } else {
@@ -89,7 +89,7 @@ public class ReceiptinServiceImpl extends ServiceImpl<ReceiptinMapper, Receiptin
     }
     if(!isPc && appPermission){
 		if (!userProvider.get().getIsAdministrator()){
-			Object receiptinObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptinQueryWrapper,receiptinPagination.getMenuId(),"receiptin"));
+			Object receiptinObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptinQueryWrapper,receiptinPagination.getMenuId(),"jg_receiptin"));
             if (ObjectUtil.isEmpty(receiptinObj)){
                 return new ArrayList<>();
             } else {
@@ -98,7 +98,7 @@ public class ReceiptinServiceImpl extends ServiceImpl<ReceiptinMapper, Receiptin
 			}
 
 
-			Object receiptin_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(receiptin_item0QueryWrapper,receiptinPagination.getMenuId(),"receiptin_item0"));
+			Object receiptin_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(receiptin_item0QueryWrapper,receiptinPagination.getMenuId(),"jg_receiptin_item0"));
             if (ObjectUtil.isEmpty(receiptin_item0Obj)){
                 return new ArrayList<>();
             } else {
@@ -155,19 +155,19 @@ public class ReceiptinServiceImpl extends ServiceImpl<ReceiptinMapper, Receiptin
         QueryWrapper<ReceiptinEntity> receiptinQueryWrapper=new QueryWrapper<>();
 		int receiptin_item0Num =0;
         QueryWrapper<Receiptin_item0Entity> receiptin_item0QueryWrapper=new QueryWrapper<>();
-    boolean pcPermission = false;
-    boolean appPermission = false;
+    boolean pcPermission = true;
+    boolean appPermission = true;
     boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
     if(isPc && pcPermission){
 		if (!userProvider.get().getIsAdministrator()){
-				Object receiptinObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptinQueryWrapper,receiptinPagination.getMenuId(),"receiptin"));
+				Object receiptinObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptinQueryWrapper,receiptinPagination.getMenuId(),"jg_receiptin"));
             if (ObjectUtil.isEmpty(receiptinObj)){
                 return new ArrayList<>();
             } else {
                 receiptinQueryWrapper = (QueryWrapper<ReceiptinEntity>)receiptinObj;
                 receiptinNum++;
             }
-				Object receiptin_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(receiptin_item0QueryWrapper,receiptinPagination.getMenuId(),"receiptin_item0"));
+				Object receiptin_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(receiptin_item0QueryWrapper,receiptinPagination.getMenuId(),"jg_receiptin_item0"));
             if (ObjectUtil.isEmpty(receiptin_item0Obj)){
                 return new ArrayList<>();
             } else {
@@ -178,7 +178,7 @@ public class ReceiptinServiceImpl extends ServiceImpl<ReceiptinMapper, Receiptin
     }
     if(!isPc && appPermission){
 		if (!userProvider.get().getIsAdministrator()){
-			Object receiptinObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptinQueryWrapper,receiptinPagination.getMenuId(),"receiptin"));
+			Object receiptinObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptinQueryWrapper,receiptinPagination.getMenuId(),"jg_receiptin"));
             if (ObjectUtil.isEmpty(receiptinObj)){
                 return new ArrayList<>();
             } else {
@@ -187,7 +187,7 @@ public class ReceiptinServiceImpl extends ServiceImpl<ReceiptinMapper, Receiptin
 			}
 
 
-			Object receiptin_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(receiptin_item0QueryWrapper,receiptinPagination.getMenuId(),"receiptin_item0"));
+			Object receiptin_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(receiptin_item0QueryWrapper,receiptinPagination.getMenuId(),"jg_receiptin_item0"));
             if (ObjectUtil.isEmpty(receiptin_item0Obj)){
                 return new ArrayList<>();
             } else {
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/service/impl/ReceiptoutServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/service/impl/ReceiptoutServiceImpl.java
index 4f0f11ca..0f2634d5 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/service/impl/ReceiptoutServiceImpl.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/service/impl/ReceiptoutServiceImpl.java
@@ -66,19 +66,19 @@ public class ReceiptoutServiceImpl extends ServiceImpl<ReceiptoutMapper, Receipt
         QueryWrapper<ReceiptoutEntity> receiptoutQueryWrapper=new QueryWrapper<>();
 		int receiptout_item0Num =0;
         QueryWrapper<Receiptout_item0Entity> receiptout_item0QueryWrapper=new QueryWrapper<>();
-    boolean pcPermission = false;
-    boolean appPermission = false;
+    boolean pcPermission = true;
+    boolean appPermission = true;
     boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
     if(isPc && pcPermission){
 		if (!userProvider.get().getIsAdministrator()){
-				Object receiptoutObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptoutQueryWrapper,receiptoutPagination.getMenuId(),"receiptout"));
+				Object receiptoutObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptoutQueryWrapper,receiptoutPagination.getMenuId(),"jg_receiptout"));
             if (ObjectUtil.isEmpty(receiptoutObj)){
                 return new ArrayList<>();
             } else {
                 receiptoutQueryWrapper = (QueryWrapper<ReceiptoutEntity>)receiptoutObj;
                 receiptoutNum++;
             }
-				Object receiptout_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(receiptout_item0QueryWrapper,receiptoutPagination.getMenuId(),"receiptout_item0"));
+				Object receiptout_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(receiptout_item0QueryWrapper,receiptoutPagination.getMenuId(),"jg_receiptout_item0"));
             if (ObjectUtil.isEmpty(receiptout_item0Obj)){
                 return new ArrayList<>();
             } else {
@@ -89,7 +89,7 @@ public class ReceiptoutServiceImpl extends ServiceImpl<ReceiptoutMapper, Receipt
     }
     if(!isPc && appPermission){
 		if (!userProvider.get().getIsAdministrator()){
-			Object receiptoutObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptoutQueryWrapper,receiptoutPagination.getMenuId(),"receiptout"));
+			Object receiptoutObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptoutQueryWrapper,receiptoutPagination.getMenuId(),"jg_receiptout"));
             if (ObjectUtil.isEmpty(receiptoutObj)){
                 return new ArrayList<>();
             } else {
@@ -98,7 +98,7 @@ public class ReceiptoutServiceImpl extends ServiceImpl<ReceiptoutMapper, Receipt
 			}
 
 
-			Object receiptout_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(receiptout_item0QueryWrapper,receiptoutPagination.getMenuId(),"receiptout_item0"));
+			Object receiptout_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(receiptout_item0QueryWrapper,receiptoutPagination.getMenuId(),"jg_receiptout_item0"));
             if (ObjectUtil.isEmpty(receiptout_item0Obj)){
                 return new ArrayList<>();
             } else {
@@ -160,19 +160,19 @@ public class ReceiptoutServiceImpl extends ServiceImpl<ReceiptoutMapper, Receipt
         QueryWrapper<ReceiptoutEntity> receiptoutQueryWrapper=new QueryWrapper<>();
 		int receiptout_item0Num =0;
         QueryWrapper<Receiptout_item0Entity> receiptout_item0QueryWrapper=new QueryWrapper<>();
-    boolean pcPermission = false;
-    boolean appPermission = false;
+    boolean pcPermission = true;
+    boolean appPermission = true;
     boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
     if(isPc && pcPermission){
 		if (!userProvider.get().getIsAdministrator()){
-				Object receiptoutObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptoutQueryWrapper,receiptoutPagination.getMenuId(),"receiptout"));
+				Object receiptoutObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptoutQueryWrapper,receiptoutPagination.getMenuId(),"jg_receiptout"));
             if (ObjectUtil.isEmpty(receiptoutObj)){
                 return new ArrayList<>();
             } else {
                 receiptoutQueryWrapper = (QueryWrapper<ReceiptoutEntity>)receiptoutObj;
                 receiptoutNum++;
             }
-				Object receiptout_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(receiptout_item0QueryWrapper,receiptoutPagination.getMenuId(),"receiptout_item0"));
+				Object receiptout_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(receiptout_item0QueryWrapper,receiptoutPagination.getMenuId(),"jg_receiptout_item0"));
             if (ObjectUtil.isEmpty(receiptout_item0Obj)){
                 return new ArrayList<>();
             } else {
@@ -183,7 +183,7 @@ public class ReceiptoutServiceImpl extends ServiceImpl<ReceiptoutMapper, Receipt
     }
     if(!isPc && appPermission){
 		if (!userProvider.get().getIsAdministrator()){
-			Object receiptoutObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptoutQueryWrapper,receiptoutPagination.getMenuId(),"receiptout"));
+			Object receiptoutObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptoutQueryWrapper,receiptoutPagination.getMenuId(),"jg_receiptout"));
             if (ObjectUtil.isEmpty(receiptoutObj)){
                 return new ArrayList<>();
             } else {
@@ -192,7 +192,7 @@ public class ReceiptoutServiceImpl extends ServiceImpl<ReceiptoutMapper, Receipt
 			}
 
 
-			Object receiptout_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(receiptout_item0QueryWrapper,receiptoutPagination.getMenuId(),"receiptout_item0"));
+			Object receiptout_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(receiptout_item0QueryWrapper,receiptoutPagination.getMenuId(),"jg_receiptout_item0"));
             if (ObjectUtil.isEmpty(receiptout_item0Obj)){
                 return new ArrayList<>();
             } else {
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/reservoirarea/service/impl/ReservoirareaServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/reservoirarea/service/impl/ReservoirareaServiceImpl.java
index fa37c56d..a4072f5e 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/reservoirarea/service/impl/ReservoirareaServiceImpl.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/reservoirarea/service/impl/ReservoirareaServiceImpl.java
@@ -51,12 +51,12 @@ public class ReservoirareaServiceImpl extends ServiceImpl<ReservoirareaMapper, R
         int total=0;
 		int reservoirareaNum =0;
         QueryWrapper<ReservoirareaEntity> reservoirareaQueryWrapper=new QueryWrapper<>();
-    boolean pcPermission = false;
-    boolean appPermission = false;
+    boolean pcPermission = true;
+    boolean appPermission = true;
     boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
     if(isPc && pcPermission){
 		if (!userProvider.get().getIsAdministrator()){
-				Object reservoirareaObj=authorizeService.getCondition(new AuthorizeConditionModel(reservoirareaQueryWrapper,reservoirareaPagination.getMenuId(),"reservoirarea"));
+				Object reservoirareaObj=authorizeService.getCondition(new AuthorizeConditionModel(reservoirareaQueryWrapper,reservoirareaPagination.getMenuId(),"jg_reservoirarea"));
             if (ObjectUtil.isEmpty(reservoirareaObj)){
                 return new ArrayList<>();
             } else {
@@ -67,7 +67,7 @@ public class ReservoirareaServiceImpl extends ServiceImpl<ReservoirareaMapper, R
     }
     if(!isPc && appPermission){
 		if (!userProvider.get().getIsAdministrator()){
-			Object reservoirareaObj=authorizeService.getCondition(new AuthorizeConditionModel(reservoirareaQueryWrapper,reservoirareaPagination.getMenuId(),"reservoirarea"));
+			Object reservoirareaObj=authorizeService.getCondition(new AuthorizeConditionModel(reservoirareaQueryWrapper,reservoirareaPagination.getMenuId(),"jg_reservoirarea"));
             if (ObjectUtil.isEmpty(reservoirareaObj)){
                 return new ArrayList<>();
             } else {
@@ -122,12 +122,12 @@ public class ReservoirareaServiceImpl extends ServiceImpl<ReservoirareaMapper, R
 		int total=0;
 		int reservoirareaNum =0;
         QueryWrapper<ReservoirareaEntity> reservoirareaQueryWrapper=new QueryWrapper<>();
-    boolean pcPermission = false;
-    boolean appPermission = false;
+    boolean pcPermission = true;
+    boolean appPermission = true;
     boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
     if(isPc && pcPermission){
 		if (!userProvider.get().getIsAdministrator()){
-				Object reservoirareaObj=authorizeService.getCondition(new AuthorizeConditionModel(reservoirareaQueryWrapper,reservoirareaPagination.getMenuId(),"reservoirarea"));
+				Object reservoirareaObj=authorizeService.getCondition(new AuthorizeConditionModel(reservoirareaQueryWrapper,reservoirareaPagination.getMenuId(),"jg_reservoirarea"));
             if (ObjectUtil.isEmpty(reservoirareaObj)){
                 return new ArrayList<>();
             } else {
@@ -138,7 +138,7 @@ public class ReservoirareaServiceImpl extends ServiceImpl<ReservoirareaMapper, R
     }
     if(!isPc && appPermission){
 		if (!userProvider.get().getIsAdministrator()){
-			Object reservoirareaObj=authorizeService.getCondition(new AuthorizeConditionModel(reservoirareaQueryWrapper,reservoirareaPagination.getMenuId(),"reservoirarea"));
+			Object reservoirareaObj=authorizeService.getCondition(new AuthorizeConditionModel(reservoirareaQueryWrapper,reservoirareaPagination.getMenuId(),"jg_reservoirarea"));
             if (ObjectUtil.isEmpty(reservoirareaObj)){
                 return new ArrayList<>();
             } else {
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleback/service/impl/SalebackServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/service/impl/SalebackServiceImpl.java
index 0021a57c..8df20a1d 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/saleback/service/impl/SalebackServiceImpl.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/service/impl/SalebackServiceImpl.java
@@ -70,26 +70,26 @@ public class SalebackServiceImpl extends ServiceImpl<SalebackMapper, SalebackEnt
         QueryWrapper<Saleback_item0Entity> saleback_item0QueryWrapper=new QueryWrapper<>();
 		int saleorderNum =0;
         QueryWrapper<SaleorderEntity> saleorderQueryWrapper=new QueryWrapper<>();
-    boolean pcPermission = false;
-    boolean appPermission = false;
+    boolean pcPermission = true;
+    boolean appPermission = true;
     boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
     if(isPc && pcPermission){
 		if (!userProvider.get().getIsAdministrator()){
-				Object salebackObj=authorizeService.getCondition(new AuthorizeConditionModel(salebackQueryWrapper,salebackPagination.getMenuId(),"saleback"));
+				Object salebackObj=authorizeService.getCondition(new AuthorizeConditionModel(salebackQueryWrapper,salebackPagination.getMenuId(),"jg_saleback"));
             if (ObjectUtil.isEmpty(salebackObj)){
                 return new ArrayList<>();
             } else {
                 salebackQueryWrapper = (QueryWrapper<SalebackEntity>)salebackObj;
                 salebackNum++;
             }
-				Object saleback_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(saleback_item0QueryWrapper,salebackPagination.getMenuId(),"saleback_item0"));
+				Object saleback_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(saleback_item0QueryWrapper,salebackPagination.getMenuId(),"jg_saleback_item0"));
             if (ObjectUtil.isEmpty(saleback_item0Obj)){
                 return new ArrayList<>();
             } else {
                 saleback_item0QueryWrapper = (QueryWrapper<Saleback_item0Entity>)saleback_item0Obj;
                 saleback_item0Num++;
             }
-				Object saleorderObj=authorizeService.getCondition(new AuthorizeConditionModel(saleorderQueryWrapper,salebackPagination.getMenuId(),"saleorder"));
+				Object saleorderObj=authorizeService.getCondition(new AuthorizeConditionModel(saleorderQueryWrapper,salebackPagination.getMenuId(),"jg_saleorder"));
             if (ObjectUtil.isEmpty(saleorderObj)){
                 return new ArrayList<>();
             } else {
@@ -100,7 +100,7 @@ public class SalebackServiceImpl extends ServiceImpl<SalebackMapper, SalebackEnt
     }
     if(!isPc && appPermission){
 		if (!userProvider.get().getIsAdministrator()){
-			Object salebackObj=authorizeService.getCondition(new AuthorizeConditionModel(salebackQueryWrapper,salebackPagination.getMenuId(),"saleback"));
+			Object salebackObj=authorizeService.getCondition(new AuthorizeConditionModel(salebackQueryWrapper,salebackPagination.getMenuId(),"jg_saleback"));
             if (ObjectUtil.isEmpty(salebackObj)){
                 return new ArrayList<>();
             } else {
@@ -109,7 +109,7 @@ public class SalebackServiceImpl extends ServiceImpl<SalebackMapper, SalebackEnt
 			}
 
 
-			Object saleback_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(saleback_item0QueryWrapper,salebackPagination.getMenuId(),"saleback_item0"));
+			Object saleback_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(saleback_item0QueryWrapper,salebackPagination.getMenuId(),"jg_saleback_item0"));
             if (ObjectUtil.isEmpty(saleback_item0Obj)){
                 return new ArrayList<>();
             } else {
@@ -118,7 +118,7 @@ public class SalebackServiceImpl extends ServiceImpl<SalebackMapper, SalebackEnt
 			}
 
 
-			Object saleorderObj=authorizeService.getCondition(new AuthorizeConditionModel(saleorderQueryWrapper,salebackPagination.getMenuId(),"saleorder"));
+			Object saleorderObj=authorizeService.getCondition(new AuthorizeConditionModel(saleorderQueryWrapper,salebackPagination.getMenuId(),"jg_saleorder"));
             if (ObjectUtil.isEmpty(saleorderObj)){
                 return new ArrayList<>();
             } else {
@@ -172,26 +172,26 @@ public class SalebackServiceImpl extends ServiceImpl<SalebackMapper, SalebackEnt
         QueryWrapper<Saleback_item0Entity> saleback_item0QueryWrapper=new QueryWrapper<>();
 		int saleorderNum =0;
         QueryWrapper<SaleorderEntity> saleorderQueryWrapper=new QueryWrapper<>();
-    boolean pcPermission = false;
-    boolean appPermission = false;
+    boolean pcPermission = true;
+    boolean appPermission = true;
     boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
     if(isPc && pcPermission){
 		if (!userProvider.get().getIsAdministrator()){
-				Object salebackObj=authorizeService.getCondition(new AuthorizeConditionModel(salebackQueryWrapper,salebackPagination.getMenuId(),"saleback"));
+				Object salebackObj=authorizeService.getCondition(new AuthorizeConditionModel(salebackQueryWrapper,salebackPagination.getMenuId(),"jg_saleback"));
             if (ObjectUtil.isEmpty(salebackObj)){
                 return new ArrayList<>();
             } else {
                 salebackQueryWrapper = (QueryWrapper<SalebackEntity>)salebackObj;
                 salebackNum++;
             }
-				Object saleback_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(saleback_item0QueryWrapper,salebackPagination.getMenuId(),"saleback_item0"));
+				Object saleback_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(saleback_item0QueryWrapper,salebackPagination.getMenuId(),"jg_saleback_item0"));
             if (ObjectUtil.isEmpty(saleback_item0Obj)){
                 return new ArrayList<>();
             } else {
                 saleback_item0QueryWrapper = (QueryWrapper<Saleback_item0Entity>)saleback_item0Obj;
                 saleback_item0Num++;
             }
-				Object saleorderObj=authorizeService.getCondition(new AuthorizeConditionModel(saleorderQueryWrapper,salebackPagination.getMenuId(),"saleorder"));
+				Object saleorderObj=authorizeService.getCondition(new AuthorizeConditionModel(saleorderQueryWrapper,salebackPagination.getMenuId(),"jg_saleorder"));
             if (ObjectUtil.isEmpty(saleorderObj)){
                 return new ArrayList<>();
             } else {
@@ -202,7 +202,7 @@ public class SalebackServiceImpl extends ServiceImpl<SalebackMapper, SalebackEnt
     }
     if(!isPc && appPermission){
 		if (!userProvider.get().getIsAdministrator()){
-			Object salebackObj=authorizeService.getCondition(new AuthorizeConditionModel(salebackQueryWrapper,salebackPagination.getMenuId(),"saleback"));
+			Object salebackObj=authorizeService.getCondition(new AuthorizeConditionModel(salebackQueryWrapper,salebackPagination.getMenuId(),"jg_saleback"));
             if (ObjectUtil.isEmpty(salebackObj)){
                 return new ArrayList<>();
             } else {
@@ -211,7 +211,7 @@ public class SalebackServiceImpl extends ServiceImpl<SalebackMapper, SalebackEnt
 			}
 
 
-			Object saleback_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(saleback_item0QueryWrapper,salebackPagination.getMenuId(),"saleback_item0"));
+			Object saleback_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(saleback_item0QueryWrapper,salebackPagination.getMenuId(),"jg_saleback_item0"));
             if (ObjectUtil.isEmpty(saleback_item0Obj)){
                 return new ArrayList<>();
             } else {
@@ -220,7 +220,7 @@ public class SalebackServiceImpl extends ServiceImpl<SalebackMapper, SalebackEnt
 			}
 
 
-			Object saleorderObj=authorizeService.getCondition(new AuthorizeConditionModel(saleorderQueryWrapper,salebackPagination.getMenuId(),"saleorder"));
+			Object saleorderObj=authorizeService.getCondition(new AuthorizeConditionModel(saleorderQueryWrapper,salebackPagination.getMenuId(),"jg_saleorder"));
             if (ObjectUtil.isEmpty(saleorderObj)){
                 return new ArrayList<>();
             } else {
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/SaleorderitemServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/SaleorderitemServiceImpl.java
index cb5e0321..b39f9232 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/SaleorderitemServiceImpl.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/SaleorderitemServiceImpl.java
@@ -82,54 +82,54 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
         QueryWrapper<PaymentsoitemEntity> paymentsoitemQueryWrapper=new QueryWrapper<>();
 		int arinvoices_item0soitemNum =0;
         QueryWrapper<Arinvoices_item0soitemEntity> arinvoices_item0soitemQueryWrapper=new QueryWrapper<>();
-    boolean pcPermission = false;
-    boolean appPermission = false;
+    boolean pcPermission = true;
+    boolean appPermission = true;
     boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
     if(isPc && pcPermission){
 		if (!userProvider.get().getIsAdministrator()){
-				Object saleorderObj=authorizeService.getCondition(new AuthorizeConditionModel(saleorderQueryWrapper,saleorderPagination.getMenuId(),"saleorder"));
+				Object saleorderObj=authorizeService.getCondition(new AuthorizeConditionModel(saleorderQueryWrapper,saleorderPagination.getMenuId(),"jg_saleorder"));
             if (ObjectUtil.isEmpty(saleorderObj)){
                 return new ArrayList<>();
             } else {
                 saleorderQueryWrapper = (QueryWrapper<SaleorderitemEntity>)saleorderObj;
                 saleorderNum++;
             }
-				Object salesorder_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(salesorder_item0QueryWrapper,saleorderPagination.getMenuId(),"salesorder_item0"));
+				Object salesorder_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(salesorder_item0QueryWrapper,saleorderPagination.getMenuId(),"jg_salesorder_item0"));
             if (ObjectUtil.isEmpty(salesorder_item0Obj)){
                 return new ArrayList<>();
             } else {
                 salesorder_item0QueryWrapper = (QueryWrapper<Salesorder_item0Entity>)salesorder_item0Obj;
                 salesorder_item0Num++;
             }
-				Object receiptoutsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptoutsoitemQueryWrapper,saleorderPagination.getMenuId(),"receiptoutsoitem"));
+				Object receiptoutsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptoutsoitemQueryWrapper,saleorderPagination.getMenuId(),"jg_receiptoutsoitem"));
             if (ObjectUtil.isEmpty(receiptoutsoitemObj)){
                 return new ArrayList<>();
             } else {
                 receiptoutsoitemQueryWrapper = (QueryWrapper<ReceiptoutsoitemEntity>)receiptoutsoitemObj;
                 receiptoutsoitemNum++;
             }
-				Object collectionsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionsoitemQueryWrapper,saleorderPagination.getMenuId(),"collectionsoitem"));
+				Object collectionsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionsoitemQueryWrapper,saleorderPagination.getMenuId(),"jg_collectionsoitem"));
             if (ObjectUtil.isEmpty(collectionsoitemObj)){
                 return new ArrayList<>();
             } else {
                 collectionsoitemQueryWrapper = (QueryWrapper<CollectionsoitemEntity>)collectionsoitemObj;
                 collectionsoitemNum++;
             }
-				Object salesbacksoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(salesbacksoitemQueryWrapper,saleorderPagination.getMenuId(),"salesbacksoitem"));
+				Object salesbacksoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(salesbacksoitemQueryWrapper,saleorderPagination.getMenuId(),"jg_salesbacksoitem"));
             if (ObjectUtil.isEmpty(salesbacksoitemObj)){
                 return new ArrayList<>();
             } else {
                 salesbacksoitemQueryWrapper = (QueryWrapper<SalesbacksoitemEntity>)salesbacksoitemObj;
                 salesbacksoitemNum++;
             }
-				Object paymentsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentsoitemQueryWrapper,saleorderPagination.getMenuId(),"paymentsoitem"));
+				Object paymentsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentsoitemQueryWrapper,saleorderPagination.getMenuId(),"jg_paymentsoitem"));
             if (ObjectUtil.isEmpty(paymentsoitemObj)){
                 return new ArrayList<>();
             } else {
                 paymentsoitemQueryWrapper = (QueryWrapper<PaymentsoitemEntity>)paymentsoitemObj;
                 paymentsoitemNum++;
             }
-				Object arinvoices_item0soitemObj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item0soitemQueryWrapper,saleorderPagination.getMenuId(),"arinvoices_item0soitem"));
+				Object arinvoices_item0soitemObj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item0soitemQueryWrapper,saleorderPagination.getMenuId(),"jg_arinvoices_item0soitem"));
             if (ObjectUtil.isEmpty(arinvoices_item0soitemObj)){
                 return new ArrayList<>();
             } else {
@@ -140,7 +140,7 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
     }
     if(!isPc && appPermission){
 		if (!userProvider.get().getIsAdministrator()){
-			Object saleorderObj=authorizeService.getCondition(new AuthorizeConditionModel(saleorderQueryWrapper,saleorderPagination.getMenuId(),"saleorder"));
+			Object saleorderObj=authorizeService.getCondition(new AuthorizeConditionModel(saleorderQueryWrapper,saleorderPagination.getMenuId(),"jg_saleorder"));
             if (ObjectUtil.isEmpty(saleorderObj)){
                 return new ArrayList<>();
             } else {
@@ -149,7 +149,7 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
 			}
 
 
-			Object salesorder_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(salesorder_item0QueryWrapper,saleorderPagination.getMenuId(),"salesorder_item0"));
+			Object salesorder_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(salesorder_item0QueryWrapper,saleorderPagination.getMenuId(),"jg_salesorder_item0"));
             if (ObjectUtil.isEmpty(salesorder_item0Obj)){
                 return new ArrayList<>();
             } else {
@@ -158,7 +158,7 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
 			}
 
 
-			Object receiptoutsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptoutsoitemQueryWrapper,saleorderPagination.getMenuId(),"receiptoutsoitem"));
+			Object receiptoutsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptoutsoitemQueryWrapper,saleorderPagination.getMenuId(),"jg_receiptoutsoitem"));
             if (ObjectUtil.isEmpty(receiptoutsoitemObj)){
                 return new ArrayList<>();
             } else {
@@ -167,7 +167,7 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
 			}
 
 
-			Object collectionsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionsoitemQueryWrapper,saleorderPagination.getMenuId(),"collectionsoitem"));
+			Object collectionsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionsoitemQueryWrapper,saleorderPagination.getMenuId(),"jg_collectionsoitem"));
             if (ObjectUtil.isEmpty(collectionsoitemObj)){
                 return new ArrayList<>();
             } else {
@@ -176,7 +176,7 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
 			}
 
 
-			Object salesbacksoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(salesbacksoitemQueryWrapper,saleorderPagination.getMenuId(),"salesbacksoitem"));
+			Object salesbacksoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(salesbacksoitemQueryWrapper,saleorderPagination.getMenuId(),"jg_salesbacksoitem"));
             if (ObjectUtil.isEmpty(salesbacksoitemObj)){
                 return new ArrayList<>();
             } else {
@@ -185,7 +185,7 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
 			}
 
 
-			Object paymentsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentsoitemQueryWrapper,saleorderPagination.getMenuId(),"paymentsoitem"));
+			Object paymentsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentsoitemQueryWrapper,saleorderPagination.getMenuId(),"jg_paymentsoitem"));
             if (ObjectUtil.isEmpty(paymentsoitemObj)){
                 return new ArrayList<>();
             } else {
@@ -194,7 +194,7 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
 			}
 
 
-			Object arinvoices_item0soitemObj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item0soitemQueryWrapper,saleorderPagination.getMenuId(),"arinvoices_item0soitem"));
+			Object arinvoices_item0soitemObj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item0soitemQueryWrapper,saleorderPagination.getMenuId(),"jg_arinvoices_item0soitem"));
             if (ObjectUtil.isEmpty(arinvoices_item0soitemObj)){
                 return new ArrayList<>();
             } else {
@@ -261,54 +261,54 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
         QueryWrapper<PaymentsoitemEntity> paymentsoitemQueryWrapper=new QueryWrapper<>();
 		int arinvoices_item0soitemNum =0;
         QueryWrapper<Arinvoices_item0soitemEntity> arinvoices_item0soitemQueryWrapper=new QueryWrapper<>();
-    boolean pcPermission = false;
-    boolean appPermission = false;
+    boolean pcPermission = true;
+    boolean appPermission = true;
     boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
     if(isPc && pcPermission){
 		if (!userProvider.get().getIsAdministrator()){
-				Object saleorderObj=authorizeService.getCondition(new AuthorizeConditionModel(saleorderQueryWrapper,saleorderPagination.getMenuId(),"saleorder"));
+				Object saleorderObj=authorizeService.getCondition(new AuthorizeConditionModel(saleorderQueryWrapper,saleorderPagination.getMenuId(),"jg_saleorder"));
             if (ObjectUtil.isEmpty(saleorderObj)){
                 return new ArrayList<>();
             } else {
                 saleorderQueryWrapper = (QueryWrapper<SaleorderitemEntity>)saleorderObj;
                 saleorderNum++;
             }
-				Object salesorder_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(salesorder_item0QueryWrapper,saleorderPagination.getMenuId(),"salesorder_item0"));
+				Object salesorder_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(salesorder_item0QueryWrapper,saleorderPagination.getMenuId(),"jg_salesorder_item0"));
             if (ObjectUtil.isEmpty(salesorder_item0Obj)){
                 return new ArrayList<>();
             } else {
                 salesorder_item0QueryWrapper = (QueryWrapper<Salesorder_item0Entity>)salesorder_item0Obj;
                 salesorder_item0Num++;
             }
-				Object receiptoutsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptoutsoitemQueryWrapper,saleorderPagination.getMenuId(),"receiptoutsoitem"));
+				Object receiptoutsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptoutsoitemQueryWrapper,saleorderPagination.getMenuId(),"jg_receiptoutsoitem"));
             if (ObjectUtil.isEmpty(receiptoutsoitemObj)){
                 return new ArrayList<>();
             } else {
                 receiptoutsoitemQueryWrapper = (QueryWrapper<ReceiptoutsoitemEntity>)receiptoutsoitemObj;
                 receiptoutsoitemNum++;
             }
-				Object collectionsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionsoitemQueryWrapper,saleorderPagination.getMenuId(),"collectionsoitem"));
+				Object collectionsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionsoitemQueryWrapper,saleorderPagination.getMenuId(),"jg_collectionsoitem"));
             if (ObjectUtil.isEmpty(collectionsoitemObj)){
                 return new ArrayList<>();
             } else {
                 collectionsoitemQueryWrapper = (QueryWrapper<CollectionsoitemEntity>)collectionsoitemObj;
                 collectionsoitemNum++;
             }
-				Object salesbacksoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(salesbacksoitemQueryWrapper,saleorderPagination.getMenuId(),"salesbacksoitem"));
+				Object salesbacksoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(salesbacksoitemQueryWrapper,saleorderPagination.getMenuId(),"jg_salesbacksoitem"));
             if (ObjectUtil.isEmpty(salesbacksoitemObj)){
                 return new ArrayList<>();
             } else {
                 salesbacksoitemQueryWrapper = (QueryWrapper<SalesbacksoitemEntity>)salesbacksoitemObj;
                 salesbacksoitemNum++;
             }
-				Object paymentsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentsoitemQueryWrapper,saleorderPagination.getMenuId(),"paymentsoitem"));
+				Object paymentsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentsoitemQueryWrapper,saleorderPagination.getMenuId(),"jg_paymentsoitem"));
             if (ObjectUtil.isEmpty(paymentsoitemObj)){
                 return new ArrayList<>();
             } else {
                 paymentsoitemQueryWrapper = (QueryWrapper<PaymentsoitemEntity>)paymentsoitemObj;
                 paymentsoitemNum++;
             }
-				Object arinvoices_item0soitemObj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item0soitemQueryWrapper,saleorderPagination.getMenuId(),"arinvoices_item0soitem"));
+				Object arinvoices_item0soitemObj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item0soitemQueryWrapper,saleorderPagination.getMenuId(),"jg_arinvoices_item0soitem"));
             if (ObjectUtil.isEmpty(arinvoices_item0soitemObj)){
                 return new ArrayList<>();
             } else {
@@ -319,7 +319,7 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
     }
     if(!isPc && appPermission){
 		if (!userProvider.get().getIsAdministrator()){
-			Object saleorderObj=authorizeService.getCondition(new AuthorizeConditionModel(saleorderQueryWrapper,saleorderPagination.getMenuId(),"saleorder"));
+			Object saleorderObj=authorizeService.getCondition(new AuthorizeConditionModel(saleorderQueryWrapper,saleorderPagination.getMenuId(),"jg_saleorder"));
             if (ObjectUtil.isEmpty(saleorderObj)){
                 return new ArrayList<>();
             } else {
@@ -328,7 +328,7 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
 			}
 
 
-			Object salesorder_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(salesorder_item0QueryWrapper,saleorderPagination.getMenuId(),"salesorder_item0"));
+			Object salesorder_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(salesorder_item0QueryWrapper,saleorderPagination.getMenuId(),"jg_salesorder_item0"));
             if (ObjectUtil.isEmpty(salesorder_item0Obj)){
                 return new ArrayList<>();
             } else {
@@ -337,7 +337,7 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
 			}
 
 
-			Object receiptoutsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptoutsoitemQueryWrapper,saleorderPagination.getMenuId(),"receiptoutsoitem"));
+			Object receiptoutsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptoutsoitemQueryWrapper,saleorderPagination.getMenuId(),"jg_receiptoutsoitem"));
             if (ObjectUtil.isEmpty(receiptoutsoitemObj)){
                 return new ArrayList<>();
             } else {
@@ -346,7 +346,7 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
 			}
 
 
-			Object collectionsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionsoitemQueryWrapper,saleorderPagination.getMenuId(),"collectionsoitem"));
+			Object collectionsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionsoitemQueryWrapper,saleorderPagination.getMenuId(),"jg_collectionsoitem"));
             if (ObjectUtil.isEmpty(collectionsoitemObj)){
                 return new ArrayList<>();
             } else {
@@ -355,7 +355,7 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
 			}
 
 
-			Object salesbacksoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(salesbacksoitemQueryWrapper,saleorderPagination.getMenuId(),"salesbacksoitem"));
+			Object salesbacksoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(salesbacksoitemQueryWrapper,saleorderPagination.getMenuId(),"jg_salesbacksoitem"));
             if (ObjectUtil.isEmpty(salesbacksoitemObj)){
                 return new ArrayList<>();
             } else {
@@ -364,7 +364,7 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
 			}
 
 
-			Object paymentsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentsoitemQueryWrapper,saleorderPagination.getMenuId(),"paymentsoitem"));
+			Object paymentsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentsoitemQueryWrapper,saleorderPagination.getMenuId(),"jg_paymentsoitem"));
             if (ObjectUtil.isEmpty(paymentsoitemObj)){
                 return new ArrayList<>();
             } else {
@@ -373,7 +373,7 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
 			}
 
 
-			Object arinvoices_item0soitemObj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item0soitemQueryWrapper,saleorderPagination.getMenuId(),"arinvoices_item0soitem"));
+			Object arinvoices_item0soitemObj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item0soitemQueryWrapper,saleorderPagination.getMenuId(),"jg_arinvoices_item0soitem"));
             if (ObjectUtil.isEmpty(arinvoices_item0soitemObj)){
                 return new ArrayList<>();
             } else {
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/supplier/service/impl/SupplierServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/supplier/service/impl/SupplierServiceImpl.java
index 2804e2ea..e0217245 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/supplier/service/impl/SupplierServiceImpl.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/supplier/service/impl/SupplierServiceImpl.java
@@ -55,12 +55,12 @@ public class SupplierServiceImpl extends ServiceImpl<SupplierMapper, SupplierEnt
         int total=0;
 		int supplierNum =0;
         QueryWrapper<SupplierEntity> supplierQueryWrapper=new QueryWrapper<>();
-    boolean pcPermission = false;
-    boolean appPermission = false;
+    boolean pcPermission = true;
+    boolean appPermission = true;
     boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
     if(isPc && pcPermission){
 		if (!userProvider.get().getIsAdministrator()){
-				Object supplierObj=authorizeService.getCondition(new AuthorizeConditionModel(supplierQueryWrapper,supplierPagination.getMenuId(),"supplier"));
+				Object supplierObj=authorizeService.getCondition(new AuthorizeConditionModel(supplierQueryWrapper,supplierPagination.getMenuId(),"jg_supplier"));
             if (ObjectUtil.isEmpty(supplierObj)){
                 return new ArrayList<>();
             } else {
@@ -71,7 +71,7 @@ public class SupplierServiceImpl extends ServiceImpl<SupplierMapper, SupplierEnt
     }
     if(!isPc && appPermission){
 		if (!userProvider.get().getIsAdministrator()){
-			Object supplierObj=authorizeService.getCondition(new AuthorizeConditionModel(supplierQueryWrapper,supplierPagination.getMenuId(),"supplier"));
+			Object supplierObj=authorizeService.getCondition(new AuthorizeConditionModel(supplierQueryWrapper,supplierPagination.getMenuId(),"jg_supplier"));
             if (ObjectUtil.isEmpty(supplierObj)){
                 return new ArrayList<>();
             } else {
@@ -141,12 +141,12 @@ public class SupplierServiceImpl extends ServiceImpl<SupplierMapper, SupplierEnt
 		int total=0;
 		int supplierNum =0;
         QueryWrapper<SupplierEntity> supplierQueryWrapper=new QueryWrapper<>();
-    boolean pcPermission = false;
-    boolean appPermission = false;
+    boolean pcPermission = true;
+    boolean appPermission = true;
     boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
     if(isPc && pcPermission){
 		if (!userProvider.get().getIsAdministrator()){
-				Object supplierObj=authorizeService.getCondition(new AuthorizeConditionModel(supplierQueryWrapper,supplierPagination.getMenuId(),"supplier"));
+				Object supplierObj=authorizeService.getCondition(new AuthorizeConditionModel(supplierQueryWrapper,supplierPagination.getMenuId(),"jg_supplier"));
             if (ObjectUtil.isEmpty(supplierObj)){
                 return new ArrayList<>();
             } else {
@@ -157,7 +157,7 @@ public class SupplierServiceImpl extends ServiceImpl<SupplierMapper, SupplierEnt
     }
     if(!isPc && appPermission){
 		if (!userProvider.get().getIsAdministrator()){
-			Object supplierObj=authorizeService.getCondition(new AuthorizeConditionModel(supplierQueryWrapper,supplierPagination.getMenuId(),"supplier"));
+			Object supplierObj=authorizeService.getCondition(new AuthorizeConditionModel(supplierQueryWrapper,supplierPagination.getMenuId(),"jg_supplier"));
             if (ObjectUtil.isEmpty(supplierObj)){
                 return new ArrayList<>();
             } else {
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/service/impl/TradeuploadServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/service/impl/TradeuploadServiceImpl.java
index 99c705d3..6e82a93b 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/service/impl/TradeuploadServiceImpl.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/service/impl/TradeuploadServiceImpl.java
@@ -68,12 +68,12 @@ public class TradeuploadServiceImpl extends ServiceImpl<TradeuploadMapper, Trade
         QueryWrapper<TradeuploadEntity> tradeuploadQueryWrapper=new QueryWrapper<>();
         tradeuploadQueryWrapper.lambda().eq(TradeuploadEntity::getIsExamine,"0");
         tradeuploadQueryWrapper.lambda().eq(TradeuploadEntity::getPoundType,"0");
-    boolean pcPermission = false;
-    boolean appPermission = false;
+    boolean pcPermission = true;
+    boolean appPermission = true;
     boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
     if(isPc && pcPermission){
 		if (!userProvider.get().getIsAdministrator()){
-				Object tradeuploadObj=authorizeService.getCondition(new AuthorizeConditionModel(tradeuploadQueryWrapper,tradeuploadPagination.getMenuId(),"tradeupload"));
+				Object tradeuploadObj=authorizeService.getCondition(new AuthorizeConditionModel(tradeuploadQueryWrapper,tradeuploadPagination.getMenuId(),"jg_tradeupload"));
             if (ObjectUtil.isEmpty(tradeuploadObj)){
                 return new ArrayList<>();
             } else {
@@ -84,7 +84,7 @@ public class TradeuploadServiceImpl extends ServiceImpl<TradeuploadMapper, Trade
     }
     if(!isPc && appPermission){
 		if (!userProvider.get().getIsAdministrator()){
-			Object tradeuploadObj=authorizeService.getCondition(new AuthorizeConditionModel(tradeuploadQueryWrapper,tradeuploadPagination.getMenuId(),"tradeupload"));
+			Object tradeuploadObj=authorizeService.getCondition(new AuthorizeConditionModel(tradeuploadQueryWrapper,tradeuploadPagination.getMenuId(),"jg_tradeupload"));
             if (ObjectUtil.isEmpty(tradeuploadObj)){
                 return new ArrayList<>();
             } else {
@@ -145,12 +145,12 @@ public class TradeuploadServiceImpl extends ServiceImpl<TradeuploadMapper, Trade
 		int total=0;
 		int tradeuploadNum =0;
         QueryWrapper<TradeuploadEntity> tradeuploadQueryWrapper=new QueryWrapper<>();
-    boolean pcPermission = false;
-    boolean appPermission = false;
+    boolean pcPermission = true;
+    boolean appPermission = true;
     boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
     if(isPc && pcPermission){
 		if (!userProvider.get().getIsAdministrator()){
-				Object tradeuploadObj=authorizeService.getCondition(new AuthorizeConditionModel(tradeuploadQueryWrapper,tradeuploadPagination.getMenuId(),"tradeupload"));
+				Object tradeuploadObj=authorizeService.getCondition(new AuthorizeConditionModel(tradeuploadQueryWrapper,tradeuploadPagination.getMenuId(),"jg_tradeupload"));
             if (ObjectUtil.isEmpty(tradeuploadObj)){
                 return new ArrayList<>();
             } else {
@@ -161,7 +161,7 @@ public class TradeuploadServiceImpl extends ServiceImpl<TradeuploadMapper, Trade
     }
     if(!isPc && appPermission){
 		if (!userProvider.get().getIsAdministrator()){
-			Object tradeuploadObj=authorizeService.getCondition(new AuthorizeConditionModel(tradeuploadQueryWrapper,tradeuploadPagination.getMenuId(),"tradeupload"));
+			Object tradeuploadObj=authorizeService.getCondition(new AuthorizeConditionModel(tradeuploadQueryWrapper,tradeuploadPagination.getMenuId(),"jg_tradeupload"));
             if (ObjectUtil.isEmpty(tradeuploadObj)){
                 return new ArrayList<>();
             } else {
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/vehicle/service/impl/VehicleServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/vehicle/service/impl/VehicleServiceImpl.java
index 86bdbe40..00a71fce 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/vehicle/service/impl/VehicleServiceImpl.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/vehicle/service/impl/VehicleServiceImpl.java
@@ -55,12 +55,12 @@ public class VehicleServiceImpl extends ServiceImpl<VehicleMapper, VehicleEntity
         int total=0;
         int vehicleNum =0;
         QueryWrapper<VehicleEntity> vehicleQueryWrapper=new QueryWrapper<>();
-        boolean pcPermission = false;
-        boolean appPermission = false;
+        boolean pcPermission = true;
+        boolean appPermission = true;
         boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
         if(isPc && pcPermission){
             if (!userProvider.get().getIsAdministrator()){
-                Object vehicleObj=authorizeService.getCondition(new AuthorizeConditionModel(vehicleQueryWrapper,vehiclePagination.getMenuId(),"vehicle"));
+                Object vehicleObj=authorizeService.getCondition(new AuthorizeConditionModel(vehicleQueryWrapper,vehiclePagination.getMenuId(),"jg_vehicle"));
                 if (ObjectUtil.isEmpty(vehicleObj)){
                     return new ArrayList<>();
                 } else {
@@ -71,7 +71,7 @@ public class VehicleServiceImpl extends ServiceImpl<VehicleMapper, VehicleEntity
         }
         if(!isPc && appPermission){
             if (!userProvider.get().getIsAdministrator()){
-                Object vehicleObj=authorizeService.getCondition(new AuthorizeConditionModel(vehicleQueryWrapper,vehiclePagination.getMenuId(),"vehicle"));
+                Object vehicleObj=authorizeService.getCondition(new AuthorizeConditionModel(vehicleQueryWrapper,vehiclePagination.getMenuId(),"jg_vehicle"));
                 if (ObjectUtil.isEmpty(vehicleObj)){
                     return new ArrayList<>();
                 } else {
@@ -136,12 +136,12 @@ public class VehicleServiceImpl extends ServiceImpl<VehicleMapper, VehicleEntity
         int total=0;
         int vehicleNum =0;
         QueryWrapper<VehicleEntity> vehicleQueryWrapper=new QueryWrapper<>();
-        boolean pcPermission = false;
-        boolean appPermission = false;
+        boolean pcPermission = true;
+        boolean appPermission = true;
         boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
         if(isPc && pcPermission){
             if (!userProvider.get().getIsAdministrator()){
-                Object vehicleObj=authorizeService.getCondition(new AuthorizeConditionModel(vehicleQueryWrapper,vehiclePagination.getMenuId(),"vehicle"));
+                Object vehicleObj=authorizeService.getCondition(new AuthorizeConditionModel(vehicleQueryWrapper,vehiclePagination.getMenuId(),"jg_vehicle"));
                 if (ObjectUtil.isEmpty(vehicleObj)){
                     return new ArrayList<>();
                 } else {
@@ -152,7 +152,7 @@ public class VehicleServiceImpl extends ServiceImpl<VehicleMapper, VehicleEntity
         }
         if(!isPc && appPermission){
             if (!userProvider.get().getIsAdministrator()){
-                Object vehicleObj=authorizeService.getCondition(new AuthorizeConditionModel(vehicleQueryWrapper,vehiclePagination.getMenuId(),"vehicle"));
+                Object vehicleObj=authorizeService.getCondition(new AuthorizeConditionModel(vehicleQueryWrapper,vehiclePagination.getMenuId(),"jg_vehicle"));
                 if (ObjectUtil.isEmpty(vehicleObj)){
                     return new ArrayList<>();
                 } else {
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/warehouse/service/impl/WareHouseServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/warehouse/service/impl/WareHouseServiceImpl.java
index 375cc856..74df4519 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/warehouse/service/impl/WareHouseServiceImpl.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/warehouse/service/impl/WareHouseServiceImpl.java
@@ -51,12 +51,12 @@ public class WareHouseServiceImpl extends ServiceImpl<WareHouseMapper, WareHouse
         int total=0;
 		int wareHouseNum =0;
         QueryWrapper<WareHouseEntity> wareHouseQueryWrapper=new QueryWrapper<>();
-    boolean pcPermission = false;
-    boolean appPermission = false;
+    boolean pcPermission = true;
+    boolean appPermission = true;
     boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
     if(isPc && pcPermission){
 		if (!userProvider.get().getIsAdministrator()){
-				Object wareHouseObj=authorizeService.getCondition(new AuthorizeConditionModel(wareHouseQueryWrapper,wareHousePagination.getMenuId(),"wareHouse"));
+				Object wareHouseObj=authorizeService.getCondition(new AuthorizeConditionModel(wareHouseQueryWrapper,wareHousePagination.getMenuId(),"jg_wareHouse"));
             if (ObjectUtil.isEmpty(wareHouseObj)){
                 return new ArrayList<>();
             } else {
@@ -67,7 +67,7 @@ public class WareHouseServiceImpl extends ServiceImpl<WareHouseMapper, WareHouse
     }
     if(!isPc && appPermission){
 		if (!userProvider.get().getIsAdministrator()){
-			Object wareHouseObj=authorizeService.getCondition(new AuthorizeConditionModel(wareHouseQueryWrapper,wareHousePagination.getMenuId(),"wareHouse"));
+			Object wareHouseObj=authorizeService.getCondition(new AuthorizeConditionModel(wareHouseQueryWrapper,wareHousePagination.getMenuId(),"jg_wareHouse"));
             if (ObjectUtil.isEmpty(wareHouseObj)){
                 return new ArrayList<>();
             } else {
@@ -122,12 +122,12 @@ public class WareHouseServiceImpl extends ServiceImpl<WareHouseMapper, WareHouse
 		int total=0;
 		int wareHouseNum =0;
         QueryWrapper<WareHouseEntity> wareHouseQueryWrapper=new QueryWrapper<>();
-    boolean pcPermission = false;
-    boolean appPermission = false;
+    boolean pcPermission = true;
+    boolean appPermission = true;
     boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
     if(isPc && pcPermission){
 		if (!userProvider.get().getIsAdministrator()){
-				Object wareHouseObj=authorizeService.getCondition(new AuthorizeConditionModel(wareHouseQueryWrapper,wareHousePagination.getMenuId(),"wareHouse"));
+				Object wareHouseObj=authorizeService.getCondition(new AuthorizeConditionModel(wareHouseQueryWrapper,wareHousePagination.getMenuId(),"jg_wareHouse"));
             if (ObjectUtil.isEmpty(wareHouseObj)){
                 return new ArrayList<>();
             } else {
@@ -138,7 +138,7 @@ public class WareHouseServiceImpl extends ServiceImpl<WareHouseMapper, WareHouse
     }
     if(!isPc && appPermission){
 		if (!userProvider.get().getIsAdministrator()){
-			Object wareHouseObj=authorizeService.getCondition(new AuthorizeConditionModel(wareHouseQueryWrapper,wareHousePagination.getMenuId(),"wareHouse"));
+			Object wareHouseObj=authorizeService.getCondition(new AuthorizeConditionModel(wareHouseQueryWrapper,wareHousePagination.getMenuId(),"jg_wareHouse"));
             if (ObjectUtil.isEmpty(wareHouseObj)){
                 return new ArrayList<>();
             } else {
diff --git a/SC-web/src/settings.js b/SC-web/src/settings.js
index 9ded260d..262fc615 100644
--- a/SC-web/src/settings.js
+++ b/SC-web/src/settings.js
@@ -1,5 +1,5 @@
 module.exports = {
-  title: 'LINKAGE-快速开发平台',
+  title: '再生资源智慧管家平台',
 
   /**
    * @type {boolean} true | false
diff --git a/SC-web/src/views/scm/basicInformation/areasetting/index.vue b/SC-web/src/views/scm/basicInformation/areasetting/index.vue
index 1a3dcedb..32caab5c 100644
--- a/SC-web/src/views/scm/basicInformation/areasetting/index.vue
+++ b/SC-web/src/views/scm/basicInformation/areasetting/index.vue
@@ -20,15 +20,15 @@
       <div class="JNPF-common-layout-main JNPF-flex-main">
         <div class="JNPF-common-head">
           <div>
-            <el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
+            <el-button type="primary"  icon="el-icon-plus"v-has="'btn_add'"   @click="addOrUpdateHandle()" >新增
             </el-button>
-            <el-button type="text" icon="el-icon-download" @click="exportData()">导出
+            <el-button type="text" icon="el-icon-download" v-has="'btn_download'" @click="exportData()">导出
             </el-button>
-            <el-button type="text" icon="el-icon-download" @click="">导入
+            <el-button type="text" icon="el-icon-download" v-has="'btn_upload'" @click="">导入
             </el-button>
-            <el-button type="text" icon="el-icon-download" @click="">编辑
+            <el-button type="text" icon="el-icon-download"  v-has="'btn_edit'"  @click="">编辑
             </el-button>
-            <el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
+            <el-button type="text" icon="el-icon-delete" v-has="'btn_batchRemove'" @click="handleBatchRemoveDel()">批量删除
             </el-button>
           </div>
           <div class="JNPF-common-head-right">
@@ -49,9 +49,9 @@
           <el-table-column prop="lastmodifyusername" label="修改人名称" width="300"sortable align="center"/>
           <el-table-column label="操作" fixed="right" width="100">
             <template slot-scope="scope">
-              <el-button type="text" @click="addOrUpdateHandle(scope.row.id)">编辑
+              <el-button type="text"  v-has="'btn_edit'" @click="addOrUpdateHandle(scope.row.id)">编辑
               </el-button>
-              <el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
+              <el-button type="text" class="JNPF-table-delBtn" v-has="'btn_remove'"  @click="handleDel(scope.row.id)">删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/SC-web/src/views/scm/basicInformation/arinvoices/index.vue b/SC-web/src/views/scm/basicInformation/arinvoices/index.vue
index 1d33be79..767aa1b2 100644
--- a/SC-web/src/views/scm/basicInformation/arinvoices/index.vue
+++ b/SC-web/src/views/scm/basicInformation/arinvoices/index.vue
@@ -20,13 +20,13 @@
       <div class="JNPF-common-layout-main JNPF-flex-main">
         <div class="JNPF-common-head">
           <div>
-            <el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
+            <el-button type="primary" v-has="'btn_add'"  icon="el-icon-plus" @click="addOrUpdateHandle()">新增
             </el-button>
 <!--            <el-button type="text" icon="el-icon-download" @click="exportData()">导出-->
 <!--            </el-button>-->
 <!--            <el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除-->
 <!--            </el-button>-->
-            <el-button type="text" icon="el-icon-plus" @click="1">编辑
+            <el-button type="text"  v-has="'btn_edit'"  icon="el-icon-plus" @click="1">编辑
             </el-button>
             <el-button type="text" icon="el-icon-plus" @click="1">查看
             </el-button>
@@ -84,7 +84,7 @@
           <el-table-column label="操作" fixed="right" align="center"
                            width="200">
             <template slot-scope="scope">
-              <el-button type="text"
+              <el-button type="text"  v-has="'btn_edit'"
                          @click="addOrUpdateHandle(scope.row.id)">编辑
               </el-button>
 <!--              <el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除-->
diff --git a/SC-web/src/views/scm/basicInformation/collection/index.vue b/SC-web/src/views/scm/basicInformation/collection/index.vue
index 2a9774b6..8210de18 100644
--- a/SC-web/src/views/scm/basicInformation/collection/index.vue
+++ b/SC-web/src/views/scm/basicInformation/collection/index.vue
@@ -20,11 +20,11 @@
       <div class="JNPF-common-layout-main JNPF-flex-main">
         <div class="JNPF-common-head">
           <div>
-            <el-button type="text" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
+            <el-button type="text" icon="el-icon-plus"  v-has="'btn_add'"   @click="addOrUpdateHandle()">新增
             </el-button>
-            <el-button type="text" icon="el-icon-download" @click="exportData()">导出
+            <el-button type="text" icon="el-icon-download" v-has="'btn_download'" @click="exportData()">导出
             </el-button>
-            <el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
+            <el-button type="text" icon="el-icon-delete" v-has="'btn_batchRemove'" @click="handleBatchRemoveDel()">批量删除
             </el-button>
             <el-button type="text" icon="el-icon-check" @click="exportData()">审核
             </el-button>
@@ -73,11 +73,11 @@
           <el-table-column prop="creatorUserName" sortable label="制单人" width="150" align="center" />
           <el-table-column label="操作" fixed="right" width="150">
             <template slot-scope="scope">
-              <el-button type="text" @click="addOrUpdateHandle(scope.row.id)">编辑
+              <el-button type="text"  v-has="'btn_edit'" @click="addOrUpdateHandle(scope.row.id)">编辑
               </el-button>
-              <el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
+              <el-button type="text" class="JNPF-table-delBtn"  v-has="'btn_remove'"  @click="handleDel(scope.row.id)">删除
               </el-button>
-              <el-button type="text" @click="goDetail(scope.row.id)">详情
+              <el-button type="text"   v-has="'btn_detail'"  @click="goDetail(scope.row.id)">详情
               </el-button>
 
               <el-button type="text" @click="">撤回申请</el-button>
diff --git a/SC-web/src/views/scm/basicInformation/customer/index.vue b/SC-web/src/views/scm/basicInformation/customer/index.vue
index 6f986488..e55221e2 100644
--- a/SC-web/src/views/scm/basicInformation/customer/index.vue
+++ b/SC-web/src/views/scm/basicInformation/customer/index.vue
@@ -43,13 +43,13 @@
       <div class="JNPF-common-layout-main JNPF-flex-main">
         <div class="JNPF-common-head">
           <div>
-            <el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
+            <el-button type="primary" v-has="'btn_add'" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
             </el-button>
-            <el-button type="text" icon="el-icon-download" @click="exportData()">导出
+            <el-button type="text" v-has="'btn_download'" icon="el-icon-download" @click="exportData()">导出
             </el-button>
-            <el-button type="text" icon="el-icon-download" @click="">导入
+            <el-button type="text" v-has="'btn_upload'" icon="el-icon-download" @click="">导入
             </el-button>
-            <el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
+            <el-button type="text" v-has="'btn_batchRemove'" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
             </el-button>
           </div>
           <div class="JNPF-common-head-right">
@@ -119,10 +119,10 @@
           <el-table-column label="操作" fixed="right"
                            width="150">
             <template slot-scope="scope">
-              <el-button type="text"
+              <el-button type="text" v-has="'btn_edit'"
                          @click="addOrUpdateHandle(scope.row.id)">编辑
               </el-button>
-              <el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
+              <el-button type="text" v-has="'btn_remove'" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
               </el-button>
               <el-button type="text"
                          @click="goDetail(scope.row.id)">详情
diff --git a/SC-web/src/views/scm/basicInformation/inventoryOrd/index.vue b/SC-web/src/views/scm/basicInformation/inventoryOrd/index.vue
index bc848f1d..9791d743 100644
--- a/SC-web/src/views/scm/basicInformation/inventoryOrd/index.vue
+++ b/SC-web/src/views/scm/basicInformation/inventoryOrd/index.vue
@@ -1,219 +1,220 @@
 <template>
-    <div class="JNPF-common-layout">
+  <div class="JNPF-common-layout">
 
-        <div class="JNPF-common-layout-center">
-            <el-row class="JNPF-common-search-box" :gutter="16">
-                <el-form @submit.native.prevent>
-                                            <el-col :span="6">
-                                <el-form-item label="编码">
-                                        <el-input v-model="query.inventoryOrgCode" placeholder="请输入" clearable>  </el-input>
-                                </el-form-item>
-                            </el-col>
-                        <el-col :span="6">
-                                <el-form-item label="名称">
-                                        <el-input v-model="query.inventoryOrgName" placeholder="请输入" clearable>  </el-input>
-                                </el-form-item>
-                            </el-col>
-                    <el-col :span="6">
-                        <el-form-item>
-                            <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
-                            <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
-                        </el-form-item>
-                    </el-col>
-                </el-form>
-            </el-row>
-            <div class="JNPF-common-layout-main JNPF-flex-main">
-                <div class="JNPF-common-head">
-                    <div>
-                                    <el-button type="primary" icon="el-icon-plus"  @click="addOrUpdateHandle()">新增
-                                    </el-button>
-                    </div>
-                    <div class="JNPF-common-head-right">
-                        <el-tooltip effect="dark" content="刷新" placement="top">
-                            <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
-                                     @click="reset()"/>
-                        </el-tooltip>
-                        <screenfull isContainer/>
-                    </div>
-                </div>
-                <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' >
-                            <el-table-column prop="inventoryOrgCode" label="编码" width="0" align="left"
-/>
-                            <el-table-column prop="inventoryOrgName" label="名称" width="0" align="left"
-/>
-                            <el-table-column prop="creatorTime" label="创建时间" width="0" align="left"
-/>
-                            <el-table-column prop="companyId" label="所属组织" width="0" align="left"
-/>
-                        <el-table-column label="操作" fixed="right"
-                                         width="100" >
-                            <template slot-scope="scope">
-                                        <el-button type="text"
-                                                   @click="addOrUpdateHandle(scope.row.id)" >编辑
-                                        </el-button>
-                                        <el-button type="text" class="JNPF-table-delBtn"  @click="handleDel(scope.row.id)">删除
-                                        </el-button>
-                            </template>
-                        </el-table-column>
-                </JNPF-table>
-                    <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData"/>
-            </div>
+    <div class="JNPF-common-layout-center">
+      <el-row class="JNPF-common-search-box" :gutter="16">
+        <el-form @submit.native.prevent>
+          <el-col :span="6">
+            <el-form-item label="编码">
+              <el-input v-model="query.inventoryOrgCode" placeholder="请输入" clearable></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="名称">
+              <el-input v-model="query.inventoryOrgName" placeholder="请输入" clearable></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item>
+              <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
+              <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+            </el-form-item>
+          </el-col>
+        </el-form>
+      </el-row>
+      <div class="JNPF-common-layout-main JNPF-flex-main">
+        <div class="JNPF-common-head">
+          <div>
+            <el-button type="primary" v-has="'btn_add'"  icon="el-icon-plus" @click="addOrUpdateHandle()">新增
+            </el-button>
+          </div>
+          <div class="JNPF-common-head-right">
+            <el-tooltip effect="dark" content="刷新" placement="top">
+              <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
+                       @click="reset()"/>
+            </el-tooltip>
+            <screenfull isContainer/>
+          </div>
         </div>
-        <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/>
-        <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download"/>
-        <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false"/>
+        <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'>
+          <el-table-column prop="inventoryOrgCode" label="编码" width="0" align="left"
+          />
+          <el-table-column prop="inventoryOrgName" label="名称" width="0" align="left"
+          />
+          <el-table-column prop="creatorTime" label="创建时间" width="0" align="left"
+          />
+          <el-table-column prop="companyId" label="所属组织" width="0" align="left"
+          />
+          <el-table-column label="操作" fixed="right"
+                           width="100">
+            <template slot-scope="scope">
+              <el-button type="text"  v-has="'btn_edit'"
+                         @click="addOrUpdateHandle(scope.row.id)">编辑
+              </el-button>
+              <el-button type="text" v-has="'btn_remove'"  class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </JNPF-table>
+        <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
+                    @pagination="initData"/>
+      </div>
     </div>
+    <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/>
+    <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download"/>
+    <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false"/>
+  </div>
 </template>
 
 <script>
-    import request from '@/utils/request'
-    import {getDictionaryDataSelector} from '@/api/systemData/dictionary'
-    import JNPFForm from './Form'
-    import ExportBox from './ExportBox'
-    import {getDataInterfaceRes} from '@/api/systemData/dataInterface'
-    import Detail from './Detail'
+  import request from '@/utils/request'
+  import {getDictionaryDataSelector} from '@/api/systemData/dictionary'
+  import JNPFForm from './Form'
+  import ExportBox from './ExportBox'
+  import {getDataInterfaceRes} from '@/api/systemData/dataInterface'
+  import Detail from './Detail'
 
-    export default {
-        components: {JNPFForm, ExportBox,Detail},
-        data() {
-            return {
-                detailVisible: false,
-                query: {
-                                inventoryOrgCode:undefined,
-                                inventoryOrgName:undefined,
-                },
-                treeProps: {
-                    children: 'children',
-                    label: 'fullName',
-                    value: 'id'
-                },
-                list: [],
-                listLoading: true,
-                    total: 0,
-                listQuery: {
-                        currentPage: 1,
-                        pageSize: 20,
-                    sort: "desc",
-                    sidx: "creatorTime",
-                },
-                formVisible: false,
-                exportBoxVisible: false,
-                columnList: [
-                    {prop: 'inventoryOrgCode', label: '编码'},
-                    {prop: 'inventoryOrgName', label: '名称'},
-                    {prop: 'creatorTime', label: '创建时间'},
-                    {prop: 'companyId', label: '所属组织'},
-                ],
-                            companyIdOptions:[],
-                            companyIdProps:{"label":"F_FullName","value":"F_Id"},
-            }
+  export default {
+    components: {JNPFForm, ExportBox, Detail},
+    data() {
+      return {
+        detailVisible: false,
+        query: {
+          inventoryOrgCode: undefined,
+          inventoryOrgName: undefined,
         },
-        computed: {
-            menuId() {
-                return this.$route.meta.modelId || ''
-            }
+        treeProps: {
+          children: 'children',
+          label: 'fullName',
+          value: 'id'
         },
-        created() {
-                this.initData()
+        list: [],
+        listLoading: true,
+        total: 0,
+        listQuery: {
+          currentPage: 1,
+          pageSize: 20,
+          sort: "desc",
+          sidx: "creatorTime",
         },
-        methods: {
-            goDetail(id){
-                this.detailVisible = true
-                this.$nextTick(() => {
-                    this.$refs.Detail.init(id)
-                })
-            },
-            sortChange({column, prop, order}) {
-                this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
-                this.listQuery.sidx = !order ? '' : prop
-                this.initData()
-            },
-            initData() {
-                this.listLoading = true;
-                let _query = {
-                    ...this.listQuery,
-                    ...this.query,
-                    menuId:this.menuId
-                };
-                request({
-                    url: `/api/example/InventoryOrg/getList`,
-                    method: 'post',
-                    data: _query
-                }).then(res => {
-                    var _list =[];
-                    for(let i=0;i<res.data.list.length;i++){
-                        let _data = res.data.list[i];
-                        _list.push(_data)
-                    }
-                    this.list = _list
-                        this.total = res.data.pagination.total
+        formVisible: false,
+        exportBoxVisible: false,
+        columnList: [
+          {prop: 'inventoryOrgCode', label: '编码'},
+          {prop: 'inventoryOrgName', label: '名称'},
+          {prop: 'creatorTime', label: '创建时间'},
+          {prop: 'companyId', label: '所属组织'},
+        ],
+        companyIdOptions: [],
+        companyIdProps: {"label": "F_FullName", "value": "F_Id"},
+      }
+    },
+    computed: {
+      menuId() {
+        return this.$route.meta.modelId || ''
+      }
+    },
+    created() {
+      this.initData()
+    },
+    methods: {
+      goDetail(id) {
+        this.detailVisible = true
+        this.$nextTick(() => {
+          this.$refs.Detail.init(id)
+        })
+      },
+      sortChange({column, prop, order}) {
+        this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
+        this.listQuery.sidx = !order ? '' : prop
+        this.initData()
+      },
+      initData() {
+        this.listLoading = true;
+        let _query = {
+          ...this.listQuery,
+          ...this.query,
+          menuId: this.menuId
+        };
+        request({
+          url: `/api/example/InventoryOrg/getList`,
+          method: 'post',
+          data: _query
+        }).then(res => {
+          var _list = [];
+          for (let i = 0; i < res.data.list.length; i++) {
+            let _data = res.data.list[i];
+            _list.push(_data)
+          }
+          this.list = _list
+          this.total = res.data.pagination.total
 
-                    this.listLoading = false
-                })
-            },
-            handleDel(id) {
-                this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
-                    type: 'warning'
-                }).then(() => {
-                    request({
-                        url: `/api/example/InventoryOrg/${id}`,
-                        method: 'DELETE'
-                    }).then(res => {
-                        this.$message({
-                            type: 'success',
-                            message: res.msg,
-                            onClose: () => {
-                                this.initData()
-                            }
-                        });
-                    })
-                }).catch(() => {
-                });
-            },
-            addOrUpdateHandle(id, isDetail) {
-                this.formVisible = true
-                this.$nextTick(() => {
-                    this.$refs.JNPFForm.init(id, isDetail)
-                })
-            },
-            exportData() {
-                this.exportBoxVisible = true
-                this.$nextTick(() => {
-                    this.$refs.ExportBox.init(this.columnList)
-                })
-            },
-            download(data) {
-                let query = {...data, ...this.listQuery, ...this.query,menuId:this.menuId}
-                request({
-                    url: `/api/example/InventoryOrg/Actions/Export`,
-                    method: 'GET',
-                    data: query
-                }).then(res => {
-                    if (!res.data.url) return
-                    this.jnpf.downloadFile(res.data.url)
-                    this.$refs.ExportBox.visible = false
-                    this.exportBoxVisible = false
-                })
-            },
-            search() {
-                this.listQuery = {
-                        currentPage: 1,
-                        pageSize: 20,
-                    sort: "desc",
-                    sidx: "creatorTime",
-                }
+          this.listLoading = false
+        })
+      },
+      handleDel(id) {
+        this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+          type: 'warning'
+        }).then(() => {
+          request({
+            url: `/api/example/InventoryOrg/${id}`,
+            method: 'DELETE'
+          }).then(res => {
+            this.$message({
+              type: 'success',
+              message: res.msg,
+              onClose: () => {
                 this.initData()
-            },
-            refresh(isrRefresh) {
-                this.formVisible = false
-                if (isrRefresh) this.reset()
-            },
-            reset() {
-                for (let key in this.query) {
-                    this.query[key] = undefined
-                }
-                this.search()
-            }
+              }
+            });
+          })
+        }).catch(() => {
+        });
+      },
+      addOrUpdateHandle(id, isDetail) {
+        this.formVisible = true
+        this.$nextTick(() => {
+          this.$refs.JNPFForm.init(id, isDetail)
+        })
+      },
+      exportData() {
+        this.exportBoxVisible = true
+        this.$nextTick(() => {
+          this.$refs.ExportBox.init(this.columnList)
+        })
+      },
+      download(data) {
+        let query = {...data, ...this.listQuery, ...this.query, menuId: this.menuId}
+        request({
+          url: `/api/example/InventoryOrg/Actions/Export`,
+          method: 'GET',
+          data: query
+        }).then(res => {
+          if (!res.data.url) return
+          this.jnpf.downloadFile(res.data.url)
+          this.$refs.ExportBox.visible = false
+          this.exportBoxVisible = false
+        })
+      },
+      search() {
+        this.listQuery = {
+          currentPage: 1,
+          pageSize: 20,
+          sort: "desc",
+          sidx: "creatorTime",
+        }
+        this.initData()
+      },
+      refresh(isrRefresh) {
+        this.formVisible = false
+        if (isrRefresh) this.reset()
+      },
+      reset() {
+        for (let key in this.query) {
+          this.query[key] = undefined
         }
+        this.search()
+      }
     }
+  }
 </script>
diff --git a/SC-web/src/views/scm/basicInformation/inventoryOrdDetail/index.vue b/SC-web/src/views/scm/basicInformation/inventoryOrdDetail/index.vue
index 349a60c1..d1ce3ae4 100644
--- a/SC-web/src/views/scm/basicInformation/inventoryOrdDetail/index.vue
+++ b/SC-web/src/views/scm/basicInformation/inventoryOrdDetail/index.vue
@@ -1,219 +1,220 @@
 <template>
-    <div class="JNPF-common-layout">
+  <div class="JNPF-common-layout">
 
-        <div class="JNPF-common-layout-center">
-            <el-row class="JNPF-common-search-box" :gutter="16">
-                <el-form @submit.native.prevent>
-                                            <el-col :span="6">
-                                <el-form-item label="编码">
-                                        <el-input v-model="query.inventoryOrgDetailCode" placeholder="请输入" clearable>  </el-input>
-                                </el-form-item>
-                            </el-col>
-                        <el-col :span="6">
-                                <el-form-item label="名称">
-                                        <el-input v-model="query.inventoryOrgDetailName" placeholder="请输入" clearable>  </el-input>
-                                </el-form-item>
-                            </el-col>
-                    <el-col :span="6">
-                        <el-form-item>
-                            <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
-                            <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
-                        </el-form-item>
-                    </el-col>
-                </el-form>
-            </el-row>
-            <div class="JNPF-common-layout-main JNPF-flex-main">
-                <div class="JNPF-common-head">
-                    <div>
-                                    <el-button type="primary" icon="el-icon-plus"  @click="addOrUpdateHandle()">新增
-                                    </el-button>
-                                    <el-button type="text" icon="el-icon-download" @click="exportData()" >导出
-                                    </el-button>
-                    </div>
-                    <div class="JNPF-common-head-right">
-                        <el-tooltip effect="dark" content="刷新" placement="top">
-                            <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
-                                     @click="reset()"/>
-                        </el-tooltip>
-                        <screenfull isContainer/>
-                    </div>
-                </div>
-                <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' >
-                            <el-table-column prop="inventoryOrgDetailCode" label="编码" width="0" align="left"
-/>
-                            <el-table-column prop="inventoryOrgDetailName" label="名称" width="0" align="left"
-/>
-                            <el-table-column prop="inventoryId" label="库存组织" width="0" align="left"
-/>
-                            <el-table-column prop="creatorTime" label="创建时间" width="0" align="left"
-/>
-                        <el-table-column label="操作" fixed="right"
-                                         width="100" >
-                            <template slot-scope="scope">
-                                        <el-button type="text"
-                                                   @click="addOrUpdateHandle(scope.row.id)" >编辑
-                                        </el-button>
-                                        <el-button type="text" class="JNPF-table-delBtn"  @click="handleDel(scope.row.id)">删除
-                                        </el-button>
-                            </template>
-                        </el-table-column>
-                </JNPF-table>
-                    <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData"/>
-            </div>
+    <div class="JNPF-common-layout-center">
+      <el-row class="JNPF-common-search-box" :gutter="16">
+        <el-form @submit.native.prevent>
+          <el-col :span="6">
+            <el-form-item label="编码">
+              <el-input v-model="query.inventoryOrgDetailCode" placeholder="请输入" clearable></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="名称">
+              <el-input v-model="query.inventoryOrgDetailName" placeholder="请输入" clearable></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item>
+              <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
+              <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+            </el-form-item>
+          </el-col>
+        </el-form>
+      </el-row>
+      <div class="JNPF-common-layout-main JNPF-flex-main">
+        <div class="JNPF-common-head">
+          <div>
+            <el-button type="primary"  v-has="'btn_add'"   icon="el-icon-plus" @click="addOrUpdateHandle()">新增
+            </el-button>
+            <el-button type="text"  v-has="'btn_download'" icon="el-icon-download" @click="exportData()">导出
+            </el-button>
+          </div>
+          <div class="JNPF-common-head-right">
+            <el-tooltip effect="dark" content="刷新" placement="top">
+              <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
+                       @click="reset()"/>
+            </el-tooltip>
+            <screenfull isContainer/>
+          </div>
         </div>
-        <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/>
-        <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download"/>
-        <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false"/>
+        <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'>
+          <el-table-column prop="inventoryOrgDetailCode" label="编码" width="0" align="left"
+          />
+          <el-table-column prop="inventoryOrgDetailName" label="名称" width="0" align="left"
+          />
+          <el-table-column prop="inventoryId" label="库存组织" width="0" align="left"
+          />
+          <el-table-column prop="creatorTime" label="创建时间" width="0" align="left"
+          />
+          <el-table-column label="操作" fixed="right"
+                           width="100">
+            <template slot-scope="scope">
+              <el-button type="text" v-has="'btn_edit'"
+                         @click="addOrUpdateHandle(scope.row.id)">编辑
+              </el-button>
+              <el-button type="text" v-has="'btn_remove'"  class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </JNPF-table>
+        <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
+                    @pagination="initData"/>
+      </div>
     </div>
+    <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/>
+    <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download"/>
+    <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false"/>
+  </div>
 </template>
 
 <script>
-    import request from '@/utils/request'
-    import {getDictionaryDataSelector} from '@/api/systemData/dictionary'
-    import JNPFForm from './Form'
-    import ExportBox from './ExportBox'
-    import {getDataInterfaceRes} from '@/api/systemData/dataInterface'
-    import Detail from './Detail'
+  import request from '@/utils/request'
+  import {getDictionaryDataSelector} from '@/api/systemData/dictionary'
+  import JNPFForm from './Form'
+  import ExportBox from './ExportBox'
+  import {getDataInterfaceRes} from '@/api/systemData/dataInterface'
+  import Detail from './Detail'
 
-    export default {
-        components: {JNPFForm, ExportBox,Detail},
-        data() {
-            return {
-                detailVisible: false,
-                query: {
-                                inventoryOrgDetailCode:undefined,
-                                inventoryOrgDetailName:undefined,
-                },
-                treeProps: {
-                    children: 'children',
-                    label: 'fullName',
-                    value: 'id'
-                },
-                list: [],
-                listLoading: true,
-                    total: 0,
-                listQuery: {
-                        currentPage: 1,
-                        pageSize: 20,
-                    sort: "desc",
-                    sidx: "creatorTime",
-                },
-                formVisible: false,
-                exportBoxVisible: false,
-                columnList: [
-                    {prop: 'inventoryOrgDetailCode', label: '编码'},
-                    {prop: 'inventoryOrgDetailName', label: '名称'},
-                    {prop: 'inventoryId', label: '库存组织'},
-                    {prop: 'creatorTime', label: '创建时间'},
-                ],
-            }
+  export default {
+    components: {JNPFForm, ExportBox, Detail},
+    data() {
+      return {
+        detailVisible: false,
+        query: {
+          inventoryOrgDetailCode: undefined,
+          inventoryOrgDetailName: undefined,
         },
-        computed: {
-            menuId() {
-                return this.$route.meta.modelId || ''
-            }
+        treeProps: {
+          children: 'children',
+          label: 'fullName',
+          value: 'id'
         },
-        created() {
-                this.initData()
+        list: [],
+        listLoading: true,
+        total: 0,
+        listQuery: {
+          currentPage: 1,
+          pageSize: 20,
+          sort: "desc",
+          sidx: "creatorTime",
         },
-        methods: {
-            goDetail(id){
-                this.detailVisible = true
-                this.$nextTick(() => {
-                    this.$refs.Detail.init(id)
-                })
-            },
-            sortChange({column, prop, order}) {
-                this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
-                this.listQuery.sidx = !order ? '' : prop
-                this.initData()
-            },
-            initData() {
-                this.listLoading = true;
-                let _query = {
-                    ...this.listQuery,
-                    ...this.query,
-                    menuId:this.menuId
-                };
-                request({
-                    url: `/api/example/InventoryOrgDetail/getList`,
-                    method: 'post',
-                    data: _query
-                }).then(res => {
-                    var _list =[];
-                    for(let i=0;i<res.data.list.length;i++){
-                        let _data = res.data.list[i];
-                        _list.push(_data)
-                    }
-                    this.list = _list
-                        this.total = res.data.pagination.total
+        formVisible: false,
+        exportBoxVisible: false,
+        columnList: [
+          {prop: 'inventoryOrgDetailCode', label: '编码'},
+          {prop: 'inventoryOrgDetailName', label: '名称'},
+          {prop: 'inventoryId', label: '库存组织'},
+          {prop: 'creatorTime', label: '创建时间'},
+        ],
+      }
+    },
+    computed: {
+      menuId() {
+        return this.$route.meta.modelId || ''
+      }
+    },
+    created() {
+      this.initData()
+    },
+    methods: {
+      goDetail(id) {
+        this.detailVisible = true
+        this.$nextTick(() => {
+          this.$refs.Detail.init(id)
+        })
+      },
+      sortChange({column, prop, order}) {
+        this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
+        this.listQuery.sidx = !order ? '' : prop
+        this.initData()
+      },
+      initData() {
+        this.listLoading = true;
+        let _query = {
+          ...this.listQuery,
+          ...this.query,
+          menuId: this.menuId
+        };
+        request({
+          url: `/api/example/InventoryOrgDetail/getList`,
+          method: 'post',
+          data: _query
+        }).then(res => {
+          var _list = [];
+          for (let i = 0; i < res.data.list.length; i++) {
+            let _data = res.data.list[i];
+            _list.push(_data)
+          }
+          this.list = _list
+          this.total = res.data.pagination.total
 
-                    this.listLoading = false
-                })
-            },
-            handleDel(id) {
-                this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
-                    type: 'warning'
-                }).then(() => {
-                    request({
-                        url: `/api/example/InventoryOrgDetail/${id}`,
-                        method: 'DELETE'
-                    }).then(res => {
-                        this.$message({
-                            type: 'success',
-                            message: res.msg,
-                            onClose: () => {
-                                this.initData()
-                            }
-                        });
-                    })
-                }).catch(() => {
-                });
-            },
-            addOrUpdateHandle(id, isDetail) {
-                this.formVisible = true
-                this.$nextTick(() => {
-                    this.$refs.JNPFForm.init(id, isDetail)
-                })
-            },
-            exportData() {
-                this.exportBoxVisible = true
-                this.$nextTick(() => {
-                    this.$refs.ExportBox.init(this.columnList)
-                })
-            },
-            download(data) {
-                let query = {...data, ...this.listQuery, ...this.query,menuId:this.menuId}
-                request({
-                    url: `/api/example/InventoryOrgDetail/Actions/Export`,
-                    method: 'GET',
-                    data: query
-                }).then(res => {
-                    if (!res.data.url) return
-                    this.jnpf.downloadFile(res.data.url)
-                    this.$refs.ExportBox.visible = false
-                    this.exportBoxVisible = false
-                })
-            },
-            search() {
-                this.listQuery = {
-                        currentPage: 1,
-                        pageSize: 20,
-                    sort: "desc",
-                    sidx: "creatorTime",
-                }
+          this.listLoading = false
+        })
+      },
+      handleDel(id) {
+        this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+          type: 'warning'
+        }).then(() => {
+          request({
+            url: `/api/example/InventoryOrgDetail/${id}`,
+            method: 'DELETE'
+          }).then(res => {
+            this.$message({
+              type: 'success',
+              message: res.msg,
+              onClose: () => {
                 this.initData()
-            },
-            refresh(isrRefresh) {
-                this.formVisible = false
-                if (isrRefresh) this.reset()
-            },
-            reset() {
-                for (let key in this.query) {
-                    this.query[key] = undefined
-                }
-                this.search()
-            }
+              }
+            });
+          })
+        }).catch(() => {
+        });
+      },
+      addOrUpdateHandle(id, isDetail) {
+        this.formVisible = true
+        this.$nextTick(() => {
+          this.$refs.JNPFForm.init(id, isDetail)
+        })
+      },
+      exportData() {
+        this.exportBoxVisible = true
+        this.$nextTick(() => {
+          this.$refs.ExportBox.init(this.columnList)
+        })
+      },
+      download(data) {
+        let query = {...data, ...this.listQuery, ...this.query, menuId: this.menuId}
+        request({
+          url: `/api/example/InventoryOrgDetail/Actions/Export`,
+          method: 'GET',
+          data: query
+        }).then(res => {
+          if (!res.data.url) return
+          this.jnpf.downloadFile(res.data.url)
+          this.$refs.ExportBox.visible = false
+          this.exportBoxVisible = false
+        })
+      },
+      search() {
+        this.listQuery = {
+          currentPage: 1,
+          pageSize: 20,
+          sort: "desc",
+          sidx: "creatorTime",
+        }
+        this.initData()
+      },
+      refresh(isrRefresh) {
+        this.formVisible = false
+        if (isrRefresh) this.reset()
+      },
+      reset() {
+        for (let key in this.query) {
+          this.query[key] = undefined
         }
+        this.search()
+      }
     }
+  }
 </script>
diff --git a/SC-web/src/views/scm/basicInformation/invoices/index.vue b/SC-web/src/views/scm/basicInformation/invoices/index.vue
index 74c71164..4c1b5b7a 100644
--- a/SC-web/src/views/scm/basicInformation/invoices/index.vue
+++ b/SC-web/src/views/scm/basicInformation/invoices/index.vue
@@ -20,11 +20,11 @@
       <div class="JNPF-common-layout-main JNPF-flex-main">
         <div class="JNPF-common-head">
           <div>
-            <el-button type="text" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
+            <el-button type="text" v-has="'btn_add'"  icon="el-icon-plus" @click="addOrUpdateHandle()">新增
             </el-button>
-            <el-button type="text" icon="el-icon-download" @click="exportData()">导出
+            <el-button type="text" v-has="'btn_download'" icon="el-icon-download" @click="exportData()">导出
             </el-button>
-            <el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
+            <el-button type="text"  v-has="'btn_batchRemove'"  icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
             </el-button>
           </div>
           <div class="JNPF-common-head-right">
@@ -64,11 +64,11 @@
           <el-table-column prop="remark" label="备注" width="150" align="center" sortable="custom" />
           <el-table-column label="操作" fixed="right" width="150" align="center" >
             <template slot-scope="scope">
-              <el-button type="text" @click="addOrUpdateHandle(scope.row)">编辑
+              <el-button type="text" v-has="'btn_edit'"  @click="addOrUpdateHandle(scope.row)">编辑
               </el-button>
-              <el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
+              <el-button type="text" v-has="'btn_remove'"  class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
               </el-button>
-              <el-button type="text" @click="goDetail(scope.row.id)">详情
+              <el-button type="text"  v-has="'btn_detail'" @click="goDetail(scope.row.id)">详情
               </el-button>
             </template>
           </el-table-column>
diff --git a/SC-web/src/views/scm/basicInformation/material/index.vue b/SC-web/src/views/scm/basicInformation/material/index.vue
index d11d2eee..edcf81ea 100644
--- a/SC-web/src/views/scm/basicInformation/material/index.vue
+++ b/SC-web/src/views/scm/basicInformation/material/index.vue
@@ -25,13 +25,13 @@
       <div class="JNPF-common-layout-main JNPF-flex-main">
         <div class="JNPF-common-head">
           <div>
-            <el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
+            <el-button type="primary" v-has="'btn_add'" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
             </el-button>
-            <el-button type="text" icon="el-icon-download" @click="exportData()">导出
+            <el-button type="text" v-has="'btn_download'" icon="el-icon-download" @click="exportData()">导出
             </el-button>
-            <el-button type="text" icon="el-icon-download" @click="">导入
+            <el-button type="text" v-has="'btn_upload'" icon="el-icon-download" @click="">导入
             </el-button>
-            <el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
+            <el-button type="text" v-has="'btn_batchRemove'" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
             </el-button>
           </div>
           <div class="JNPF-common-head-right">
@@ -94,10 +94,10 @@
           <el-table-column label="操作" fixed="right"
                            width="100">
             <template slot-scope="scope">
-              <el-button type="text"
+              <el-button type="text" v-has="'btn_edit'"
                          @click="addOrUpdateHandle(scope.row.id)">编辑
               </el-button>
-              <el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
+              <el-button type="text" v-has="'btn_remove'" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/SC-web/src/views/scm/basicInformation/monitormanage/index.vue b/SC-web/src/views/scm/basicInformation/monitormanage/index.vue
index 872aa239..ca77956a 100644
--- a/SC-web/src/views/scm/basicInformation/monitormanage/index.vue
+++ b/SC-web/src/views/scm/basicInformation/monitormanage/index.vue
@@ -30,15 +30,15 @@
       <div class="JNPF-common-layout-main JNPF-flex-main">
         <div class="JNPF-common-head">
           <div>
-            <el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
+            <el-button type="primary" v-has="'btn_add'" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
             </el-button>
-            <el-button type="text" icon="el-icon-download" @click="exportData()">导出
+            <el-button type="text" v-has="'btn_download'" icon="el-icon-download" @click="exportData()">导出
             </el-button>
-            <el-button type="text" icon="el-icon-download" @click="">导入
+            <el-button type="text" v-has="'btn_upload'" icon="el-icon-download" @click="">导入
             </el-button>
-            <el-button type="text" icon="el-icon-download" @click="">编辑
+            <el-button type="text"  v-has="'btn_edit'"  icon="el-icon-download" @click="">编辑
             </el-button>
-            <el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
+            <el-button type="text" v-has="'btn_batchRemove'" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
             </el-button>
           </div>
           <div class="JNPF-common-head-right">
@@ -77,10 +77,10 @@
           <el-table-column label="操作" fixed="right"
                            width="100">
             <template slot-scope="scope">
-              <el-button type="text"
+              <el-button type="text"   v-has="'btn_edit'"
                          @click="addOrUpdateHandle(scope.row.id)">编辑
               </el-button>
-              <el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
+              <el-button type="text" class="JNPF-table-delBtn"   v-has="'btn_remove'"  @click="handleDel(scope.row.id)">删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/SC-web/src/views/scm/basicInformation/natural/index.vue b/SC-web/src/views/scm/basicInformation/natural/index.vue
index b5011c2f..d53545e1 100644
--- a/SC-web/src/views/scm/basicInformation/natural/index.vue
+++ b/SC-web/src/views/scm/basicInformation/natural/index.vue
@@ -25,13 +25,13 @@
       <div class="JNPF-common-layout-main JNPF-flex-main">
         <div class="JNPF-common-head">
           <div>
-            <el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
+            <el-button type="primary" v-has="'btn_add'" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
             </el-button>
-            <el-button type="text" icon="el-icon-download" @click="exportData()">导出
+            <el-button type="text" icon="el-icon-download" @click="exportData()" v-has="'btn_download'">导出
             </el-button>
-            <el-button type="text" icon="el-icon-download" @click="">导入
+            <el-button type="text" icon="el-icon-download" v-has="'btn_upload'" @click="">导入
             </el-button>
-            <el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
+            <el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()" v-has="'btn_batchRemove'" >批量删除
             </el-button>
           </div>
           <div class="JNPF-common-head-right">
@@ -58,10 +58,10 @@
           <el-table-column label="操作" fixed="right"
                            width="100">
             <template slot-scope="scope">
-              <el-button type="text"
+              <el-button type="text" v-has="'btn_edit'"
                          @click="addOrUpdateHandle(scope.row.id)">编辑
               </el-button>
-              <el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
+              <el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)" v-has="'btn_remove'">删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/SC-web/src/views/scm/basicInformation/payment/index.vue b/SC-web/src/views/scm/basicInformation/payment/index.vue
index 8e114f19..2d33f48c 100644
--- a/SC-web/src/views/scm/basicInformation/payment/index.vue
+++ b/SC-web/src/views/scm/basicInformation/payment/index.vue
@@ -20,11 +20,11 @@
       <div class="JNPF-common-layout-main JNPF-flex-main">
         <div class="JNPF-common-head">
           <div>
-            <el-button type="text" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
+            <el-button type="text" icon="el-icon-plus" v-has="'btn_add'"  @click="addOrUpdateHandle()">新增
             </el-button>
-            <el-button type="text" icon="el-icon-download" @click="exportData()">导出
+            <el-button type="text" icon="el-icon-download"  v-has="'btn_download'" @click="exportData()">导出
             </el-button>
-            <el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
+            <el-button type="text" icon="el-icon-delete" v-has="'btn_batchRemove'" @click="handleBatchRemoveDel()">批量删除
             </el-button>
             <el-button type="text" icon="el-icon-check" @click="submitprice()">提交
             </el-button>
@@ -70,11 +70,11 @@
           </el-table-column>
           <el-table-column label="操作" fixed="right" width="150" align="center" >
             <template slot-scope="scope">
-              <el-button v-if="scope.row.status == 0" type="text" @click="addOrUpdateHandle(scope.row.id)">编辑
+              <el-button v-if="scope.row.status == 0" type="text"   v-has="'btn_edit'"   @click="addOrUpdateHandle(scope.row.id)">编辑
               </el-button>
-              <el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
+              <el-button type="text" class="JNPF-table-delBtn"   v-has="'btn_remove'"  @click="handleDel(scope.row.id)">删除
               </el-button>
-              <el-button type="text" @click="goDetail(scope.row.id)">详情
+              <el-button type="text"  v-has="'btn_detail'"   @click="goDetail(scope.row.id)">详情
               </el-button>
             </template>
           </el-table-column>
diff --git a/SC-web/src/views/scm/basicInformation/paymentdoc/index.vue b/SC-web/src/views/scm/basicInformation/paymentdoc/index.vue
index 415cf521..87821b91 100644
--- a/SC-web/src/views/scm/basicInformation/paymentdoc/index.vue
+++ b/SC-web/src/views/scm/basicInformation/paymentdoc/index.vue
@@ -74,13 +74,13 @@
           </el-table-column>
           <el-table-column label="操作" fixed="right" width="100">
             <template slot-scope="scope">
-              <el-button type="text" :disabled="[1,2,4,5].indexOf(scope.row.flowState)>-1"
+              <el-button  v-has="'btn_edit'" type="text" :disabled="[1,2,4,5].indexOf(scope.row.flowState)>-1"
                 @click="addOrUpdateHandle(scope.row.id)">编辑
               </el-button>
-              <el-button type="text" class="JNPF-table-delBtn" :disabled="!!scope.row.flowState"
+              <el-button type="text"  v-has="'btn_remove'"  class="JNPF-table-delBtn" :disabled="!!scope.row.flowState"
                 @click="handleDel(scope.row.id)">删除
               </el-button>
-              <el-button size="mini" type="text" :disabled="!scope.row.flowState"
+              <el-button size="mini"    v-has="'btn_detail'"   type="text" :disabled="!scope.row.flowState"
                 @click="addOrUpdateHandle(scope.row.id,scope.row.flowState)">详情</el-button>
               <el-button size="mini" type="text" :disabled="!scope.row.flowState"
                 @click="fukuanHandle(scope.row.id,scope.row.flowState)">付款</el-button>
@@ -361,7 +361,7 @@
           });
           return
         }
-        
+
       },
       addOrUpdateHandle(id, flowState) {
         let data = {
diff --git a/SC-web/src/views/scm/basicInformation/poundlist/index.vue b/SC-web/src/views/scm/basicInformation/poundlist/index.vue
index 090f6019..dae52b37 100644
--- a/SC-web/src/views/scm/basicInformation/poundlist/index.vue
+++ b/SC-web/src/views/scm/basicInformation/poundlist/index.vue
@@ -20,11 +20,11 @@
 			<div class="JNPF-common-layout-main JNPF-flex-main">
 				<div class="JNPF-common-head">
 					<div>
-						<el-button type="text" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
+						<el-button type="text" icon="el-icon-plus"  v-has="'btn_add'"  @click="addOrUpdateHandle()">新增
 						</el-button>
-						<el-button type="text" icon="el-icon-download" @click="exportData()">导出
+						<el-button type="text" v-has="'btn_download'" icon="el-icon-download" @click="exportData()">导出
 						</el-button>
-						<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
+						<el-button type="text" v-has="'btn_batchRemove'" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
 						</el-button>
             <el-button type="text" icon="el-icon-check" @click="handleBatchCaigou()">生成采购
             </el-button>
@@ -105,9 +105,9 @@
 					</el-table-column>
 					<el-table-column label="操作" fixed="right" width="100" align="center">
 						<template slot-scope="scope">
-							<el-button type="text" @click="addOrUpdateHandle(scope.row.id)">编辑
+							<el-button type="text" v-has="'btn_edit'"  @click="addOrUpdateHandle(scope.row.id)">编辑
 							</el-button>
-							<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
+							<el-button type="text" v-has="'btn_remove'"  class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
 							</el-button>
 						</template>
 					</el-table-column>
diff --git a/SC-web/src/views/scm/basicInformation/purchaseback/index.vue b/SC-web/src/views/scm/basicInformation/purchaseback/index.vue
index 96667074..520903c4 100644
--- a/SC-web/src/views/scm/basicInformation/purchaseback/index.vue
+++ b/SC-web/src/views/scm/basicInformation/purchaseback/index.vue
@@ -20,15 +20,15 @@
       <div class="JNPF-common-layout-main JNPF-flex-main">
         <div class="JNPF-common-head">
           <div>
-            <el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
+            <el-button type="primary" v-has="'btn_add'" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
             </el-button>
-            <el-button type="text" icon="el-icon-download" @click="">编辑
+            <el-button type="text" v-has="'btn_edit'" icon="el-icon-download" @click="">编辑
             </el-button>
             <el-button type="text" icon="el-icon-download" @click="">查看
             </el-button>
-            <el-button type="text" icon="el-icon-download" @click="exportData()">导出
+            <el-button type="text"  v-has="'btn_download'" icon="el-icon-download" @click="exportData()">导出
             </el-button>
-            <el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
+            <el-button type="text" v-has="'btn_batchRemove'" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
             </el-button>
           </div>
           <div class="JNPF-common-head-right">
@@ -66,11 +66,11 @@
           <el-table-column prop="remark" label="备注" width="0" align="center"sortable/>
           <el-table-column label="操作" fixed="right" width="150">
             <template slot-scope="scope">
-              <el-button type="text" @click="addOrUpdateHandle(scope.row.id)">编辑
+              <el-button type="text" v-has="'btn_edit'" @click="addOrUpdateHandle(scope.row.id)">编辑
               </el-button>
-              <el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
+              <el-button type="text" v-has="'btn_remove'" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
               </el-button>
-              <el-button type="text" @click="goDetail(scope.row.id)">详情
+              <el-button type="text" v-has="'btn_detail'"  @click="goDetail(scope.row.id)">详情
               </el-button>
             </template>
           </el-table-column>
diff --git a/SC-web/src/views/scm/basicInformation/purchaseorder/index.vue b/SC-web/src/views/scm/basicInformation/purchaseorder/index.vue
index e16b97dd..17e78e72 100644
--- a/SC-web/src/views/scm/basicInformation/purchaseorder/index.vue
+++ b/SC-web/src/views/scm/basicInformation/purchaseorder/index.vue
@@ -20,11 +20,11 @@
       <div class="JNPF-common-layout-main JNPF-flex-main">
         <div class="JNPF-common-head">
           <div>
-            <el-button type="text" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
+            <el-button type="text" v-has="'btn_add'" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
             </el-button>
-            <el-button type="text" icon="el-icon-download" @click="exportData()">导出
+            <el-button type="text" v-has="'btn_download'" icon="el-icon-download" @click="exportData()">导出
             </el-button>
-            <el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
+            <el-button type="text" v-has="'btn_batchRemove'" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
             </el-button>
             <el-button type="text" icon="el-icon-delete" @click="fapiaoluruHandle()">发票录入
             </el-button>
@@ -72,11 +72,11 @@
           <el-table-column prop="remark" label="备注信息" width="0" align="center" /> -->
           <el-table-column label="操作" fixed="right" width="100" align="center" >
             <template slot-scope="scope">
-              <el-button type="text" @click="addOrUpdateHandle(scope.row)">编辑
+              <el-button type="text" v-has="'btn_edit'"  @click="addOrUpdateHandle(scope.row)">编辑
               </el-button>
-			<el-button type="text" @click="goDetail(scope.row.id)">详情
+			<el-button type="text"  v-has="'btn_detail'"  @click="goDetail(scope.row.id)">详情
 			</el-button>
-              <el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row)">删除
+              <el-button type="text" v-has="'btn_remove'" class="JNPF-table-delBtn" @click="handleDel(scope.row)">删除
               </el-button>
               <el-button type="text" class="JNPF-table-delBtn" @click="handleTuihuo(scope.row)">退货
               </el-button>
diff --git a/SC-web/src/views/scm/basicInformation/receiptin/index.vue b/SC-web/src/views/scm/basicInformation/receiptin/index.vue
index af783854..522422e3 100644
--- a/SC-web/src/views/scm/basicInformation/receiptin/index.vue
+++ b/SC-web/src/views/scm/basicInformation/receiptin/index.vue
@@ -28,11 +28,11 @@
       <div class="JNPF-common-layout-main JNPF-flex-main">
         <div class="JNPF-common-head">
           <div>
-            <el-button type="text" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
+            <el-button type="text" v-has="'btn_add'" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
             </el-button>
-            <el-button type="text" icon="el-icon-download" @click="exportData()">导出
+            <el-button type="text" v-has="'btn_download'" icon="el-icon-download" @click="exportData()">导出
             </el-button>
-            <el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
+            <el-button type="text" v-has="'btn_batchRemove'" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
             </el-button>
           </div>
           <div class="JNPF-common-head-right">
@@ -71,11 +71,11 @@
           <el-table-column prop="creatorUserName" sortable label="创建人" width="120" align="center" />
           <el-table-column label="操作" fixed="right" width="150" align="center">
             <template slot-scope="scope">
-              <el-button type="text" @click="addOrUpdateHandle(scope.row)">编辑
+              <el-button type="text" v-has="'btn_edit'" @click="addOrUpdateHandle(scope.row)">编辑
               </el-button>
-              <el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
+              <el-button type="text" v-has="'btn_remove'"  class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
               </el-button>
-              <el-button type="text" @click="goDetail(scope.row.id)">详情
+              <el-button type="text" v-has="'btn_detail'" @click="goDetail(scope.row.id)">详情
               </el-button>
             </template>
           </el-table-column>
diff --git a/SC-web/src/views/scm/basicInformation/receiptout/index.vue b/SC-web/src/views/scm/basicInformation/receiptout/index.vue
index 5c14638d..e987a369 100644
--- a/SC-web/src/views/scm/basicInformation/receiptout/index.vue
+++ b/SC-web/src/views/scm/basicInformation/receiptout/index.vue
@@ -33,11 +33,11 @@
       <div class="JNPF-common-layout-main JNPF-flex-main">
         <div class="JNPF-common-head">
           <div>
-            <el-button type="text" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
+            <el-button type="text" v-has="'btn_add'"   icon="el-icon-plus" @click="addOrUpdateHandle()">新增
             </el-button>
-            <el-button type="text" icon="el-icon-download" @click="exportData()">导出
+            <el-button type="text"  v-has="'btn_download'" icon="el-icon-download" @click="exportData()">导出
             </el-button>
-            <el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
+            <el-button type="text" v-has="'btn_batchRemove'" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
             </el-button>
             <el-button type="text" icon="el-icon-check" @click="exportData()">审核
             </el-button>
@@ -80,11 +80,11 @@
           <el-table-column prop="creatorUserName" label="创建人名称" width="120" sortable align="center" />
           <el-table-column label="操作" fixed="right" width="150">
             <template slot-scope="scope">
-              <el-button type="text" @click="addOrUpdateHandle(scope.row.id)">编辑
+              <el-button type="text"  v-has="'btn_edit'"  @click="addOrUpdateHandle(scope.row.id)">编辑
               </el-button>
-              <el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
+              <el-button type="text" v-has="'btn_remove'"  class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
               </el-button>
-              <el-button type="text" @click="goDetail(scope.row.id)">详情
+              <el-button type="text"  v-has="'btn_detail'"  @click="goDetail(scope.row.id)">详情
               </el-button>
             </template>
           </el-table-column>
diff --git a/SC-web/src/views/scm/basicInformation/reservoirarea/index.vue b/SC-web/src/views/scm/basicInformation/reservoirarea/index.vue
index fe44e4c6..29f196a0 100644
--- a/SC-web/src/views/scm/basicInformation/reservoirarea/index.vue
+++ b/SC-web/src/views/scm/basicInformation/reservoirarea/index.vue
@@ -25,15 +25,15 @@
       <div class="JNPF-common-layout-main JNPF-flex-main">
         <div class="JNPF-common-head">
           <div>
-            <el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
+            <el-button type="primary" v-has="'btn_add'" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
             </el-button>
-            <el-button type="text" icon="el-icon-download" @click="exportData()">导出
+            <el-button type="text" v-has="'btn_download'" icon="el-icon-download" @click="exportData()">导出
             </el-button>
 
-            <el-button type="text" icon="el-icon-download" @click="">导入
+            <el-button type="text" v-has="'btn_upload'" icon="el-icon-download" @click="">导入
             </el-button>
 
-            <el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
+            <el-button type="text" v-has="'btn_batchRemove'"  icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
             </el-button>
           </div>
           <div class="JNPF-common-head-right">
@@ -69,10 +69,10 @@
           <el-table-column label="操作" fixed="right"
                            width="100">
             <template slot-scope="scope">
-              <el-button type="text"
+              <el-button type="text" v-has="'btn_edit'"
                          @click="addOrUpdateHandle(scope.row.id)">编辑
               </el-button>
-              <el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
+              <el-button type="text"  v-has="'btn_remove'"  class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/SC-web/src/views/scm/basicInformation/saleback/index.vue b/SC-web/src/views/scm/basicInformation/saleback/index.vue
index 9c0cebb7..4fba8490 100644
--- a/SC-web/src/views/scm/basicInformation/saleback/index.vue
+++ b/SC-web/src/views/scm/basicInformation/saleback/index.vue
@@ -20,11 +20,11 @@
       <div class="JNPF-common-layout-main JNPF-flex-main">
         <div class="JNPF-common-head">
           <div>
-            <el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
+            <el-button type="primary" v-has="'btn_add'" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
             </el-button>
-            <el-button type="text" icon="el-icon-download" @click="exportData()">导出
+            <el-button type="text" v-has="'btn_download'" icon="el-icon-download" @click="exportData()">导出
             </el-button>
-            <el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
+            <el-button type="text" v-has="'btn_batchRemove'" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
             </el-button>
           </div>
           <div class="JNPF-common-head-right">
@@ -75,12 +75,12 @@
           <el-table-column label="操作" fixed="right"
                            width="150">
             <template slot-scope="scope">
-              <el-button type="text"
+              <el-button type="text" v-has="'btn_edit'"
                          @click="addOrUpdateHandle(scope.row.id)">编辑
               </el-button>
-              <el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
+              <el-button type="text"  v-has="'btn_remove'"  class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
               </el-button>
-              <el-button type="text"
+              <el-button type="text"  v-has="'btn_detail'"
                          @click="goDetail(scope.row.id)">详情
               </el-button>
             </template>
diff --git a/SC-web/src/views/scm/basicInformation/saleorder/index.vue b/SC-web/src/views/scm/basicInformation/saleorder/index.vue
index e6ac4555..e9dafd17 100644
--- a/SC-web/src/views/scm/basicInformation/saleorder/index.vue
+++ b/SC-web/src/views/scm/basicInformation/saleorder/index.vue
@@ -28,11 +28,11 @@
       <div class="JNPF-common-layout-main JNPF-flex-main">
         <div class="JNPF-common-head">
           <div>
-            <el-button type="text" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
+            <el-button type="text" v-has="'btn_add'" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
             </el-button>
-            <el-button type="text" icon="el-icon-download" @click="exportData()">导出
+            <el-button type="text" v-has="'btn_download'" icon="el-icon-download" @click="exportData()">导出
             </el-button>
-            <el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
+            <el-button type="text" v-has="'btn_batchRemove'" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
             </el-button>
             <el-button type="text" icon="el-icon-check" @click="exportData()">发货
             </el-button>
@@ -80,11 +80,11 @@
           <el-table-column prop="creatorUserName" label="制单人" sortable width="150" align="center" />
           <el-table-column label="操作" fixed="right" width="150" align="center" >
             <template slot-scope="scope">
-              <el-button type="text" @click="addOrUpdateHandle(scope.row.id)">编辑
+              <el-button type="text" v-has="'btn_edit'" @click="addOrUpdateHandle(scope.row.id)">编辑
               </el-button>
-              <el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
+              <el-button type="text" v-has="'btn_remove'" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
               </el-button>
-              <el-button type="text" @click="goDetail(scope.row.id)">详情
+              <el-button type="text"  v-has="'btn_detail'" @click="goDetail(scope.row.id)">详情
               </el-button>
             </template>
           </el-table-column>
diff --git a/SC-web/src/views/scm/basicInformation/supplier/index.vue b/SC-web/src/views/scm/basicInformation/supplier/index.vue
index 9912de09..aa2fa689 100644
--- a/SC-web/src/views/scm/basicInformation/supplier/index.vue
+++ b/SC-web/src/views/scm/basicInformation/supplier/index.vue
@@ -48,13 +48,13 @@
       <div class="JNPF-common-layout-main JNPF-flex-main">
         <div class="JNPF-common-head">
           <div>
-            <el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
+            <el-button type="primary" v-has="'btn_add'" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
             </el-button>
-            <el-button type="text" icon="el-icon-download" @click="exportData()">导出
+            <el-button type="text" v-has="'btn_download'" icon="el-icon-download" @click="exportData()">导出
             </el-button>
-            <el-button type="text" icon="el-icon-download" @click="">导入
+            <el-button type="text" v-has="'btn_upload'" icon="el-icon-download" @click="">导入
             </el-button>
-            <el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
+            <el-button type="text" v-has="'btn_batchRemove'" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
             </el-button>
           </div>
           <div class="JNPF-common-head-right">
@@ -153,10 +153,10 @@
           <el-table-column label="操作" fixed="right"
                            width="100">
             <template slot-scope="scope">
-              <el-button type="text"
+              <el-button type="text" v-has="'btn_edit'"
                          @click="addOrUpdateHandle(scope.row.id)">编辑
               </el-button>
-              <el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
+              <el-button type="text" v-has="'btn_remove'" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/SC-web/src/views/scm/basicInformation/tradeupload/index.vue b/SC-web/src/views/scm/basicInformation/tradeupload/index.vue
index 6dcd164e..9cfbe33e 100644
--- a/SC-web/src/views/scm/basicInformation/tradeupload/index.vue
+++ b/SC-web/src/views/scm/basicInformation/tradeupload/index.vue
@@ -39,13 +39,13 @@
       <div class="JNPF-common-layout-main JNPF-flex-main">
         <div class="JNPF-common-head">
           <div>
-            <el-button type="text" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
+            <el-button type="text" v-has="'btn_add'"  icon="el-icon-plus" @click="addOrUpdateHandle()">新增
             </el-button>
-            <el-button type="text" icon="el-icon-download" @click="exportData()">导出
+            <el-button type="text" v-has="'btn_download'" icon="el-icon-download" @click="exportData()">导出
             </el-button>
-            <el-button type="text" icon="el-icon-download" @click="">导入
+            <el-button type="text" v-has="'btn_upload'" icon="el-icon-download" @click="">导入
             </el-button>
-            <el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
+            <el-button type="text" v-has="'btn_batchRemove'" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
             </el-button>
           </div>
           <div class="JNPF-common-head-right">
@@ -137,12 +137,12 @@
               <el-button type="text"
                          @click="addOrUpdateHandle2(scope.row.id)">审核
               </el-button>
-              <el-button type="text"
+              <el-button type="text"   v-has="'btn_edit'"
                          @click="addOrUpdateHandle(scope.row.id)">编辑
               </el-button>
-              <el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
+              <el-button type="text" v-has="'btn_remove'"  class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
               </el-button>
-              <el-button type="text"
+              <el-button type="text" v-has="'btn_detail'"
                          @click="goDetail(scope.row.id)">详情
               </el-button>
             </template>
diff --git a/SC-web/src/views/scm/basicInformation/vehicle/index.vue b/SC-web/src/views/scm/basicInformation/vehicle/index.vue
index cc9c733e..093096fb 100644
--- a/SC-web/src/views/scm/basicInformation/vehicle/index.vue
+++ b/SC-web/src/views/scm/basicInformation/vehicle/index.vue
@@ -25,13 +25,13 @@
       <div class="JNPF-common-layout-main JNPF-flex-main">
         <div class="JNPF-common-head">
           <div>
-            <el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
+            <el-button type="primary" v-has="'btn_add'" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
             </el-button>
-            <el-button type="text" icon="el-icon-download" @click="exportData()">导出
+            <el-button type="text" v-has="'btn_download'" icon="el-icon-download" @click="exportData()">导出
             </el-button>
-            <el-button type="text" icon="el-icon-download" @click="">导入
+            <el-button type="text" v-has="'btn_upload'" icon="el-icon-download" @click="">导入
             </el-button>
-            <el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
+            <el-button type="text" v-has="'btn_batchRemove'" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
             </el-button>
           </div>
           <div class="JNPF-common-head-right">
@@ -68,9 +68,9 @@
           <el-table-column prop="creatortime" label="创建时间" width="0" align="center" sortable/>
           <el-table-column label="操作" fixed="right" width="100">
             <template slot-scope="scope">
-              <el-button type="text" @click="addOrUpdateHandle(scope.row.id)">编辑
+              <el-button type="text" v-has="'btn_edit'" @click="addOrUpdateHandle(scope.row.id)">编辑
               </el-button>
-              <el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
+              <el-button type="text" v-has="'btn_remove'" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/SC-web/src/views/scm/basicInformation/warehouse/index.vue b/SC-web/src/views/scm/basicInformation/warehouse/index.vue
index 996b9c22..89b36210 100644
--- a/SC-web/src/views/scm/basicInformation/warehouse/index.vue
+++ b/SC-web/src/views/scm/basicInformation/warehouse/index.vue
@@ -25,14 +25,14 @@
       <div class="JNPF-common-layout-main JNPF-flex-main">
         <div class="JNPF-common-head">
           <div>
-            <el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
-            </el-button>
-            <el-button type="text" icon="el-icon-download" @click="exportData()">导出
-            </el-button>
-            <el-button type="text" icon="el-icon-download" @click="">导入
-            </el-button>
-            <el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
-            </el-button>
+              <el-button type="primary" v-has="'btn_add'" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
+              </el-button>
+              <el-button type="text" v-has="'btn_download'" icon="el-icon-download" @click="exportData()">导出
+              </el-button>
+              <el-button type="text" v-has="'btn_upload'"  icon="el-icon-download" @click="">导入
+              </el-button>
+              <el-button type="text" v-has="'btn_batchRemove'" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
+              </el-button>
           </div>
           <div class="JNPF-common-head-right">
             <el-tooltip effect="dark" content="刷新" placement="top">
@@ -75,10 +75,10 @@
           <el-table-column label="操作" fixed="right"
                            width="100">
             <template slot-scope="scope">
-              <el-button type="text"
+              <el-button type="text" v-has="'btn_edit'"
                          @click="addOrUpdateHandle(scope.row.id)">编辑
               </el-button>
-              <el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
+              <el-button type="text" v-has="'btn_remove'" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
               </el-button>
             </template>
           </el-table-column>