2022-12-13 13:40

src/HDrpManagement/contractManage/components/contractClause/contractClause.vue

@@ -5,7 +5,7 @@
         <el-input size="small" style="width:200px;margin-right:10px" v-model="params.content.where.condition" placeholder="输入搜索内容" @clear="listData(params.content.pageNumber = 1)" @keyup.native.enter="listData(params.content.pageNumber = 1)" clearable></el-input>
         <slot name="addProduct"/>
         <el-popconfirm title="确定重置当前合同吗？" @confirm="reset()">
-          <el-button size="small" slot="reference" class="inline-16" :disabled="disabled" v-if="tool.checkAuth($route.name,'resetClause')">重 置</el-button>
+          <el-button size="small" slot="reference" class="inline-16" :disabled="disabled" v-if="tool.checkAuth($route.name,'resetContractClaus')">重 置</el-button>
         </el-popconfirm>
       </div>
       <tableLayout :layout="tablecols" :data="list" :opwidth="200" :width="false" height="calc(100vh - 550px)" :custom="true" fixedName="operation" >

src/HDrpManagement/contractManage/components/submitCheck.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="inline-16" v-if="data.status">
     <el-popconfirm v-if="refresh" title="确定提交当前合同吗？" @confirm="submit">
-      <el-button size="mini" slot="reference" v-if="data.status=='新建'">提 交</el-button>
-      <el-button size="mini" slot="reference" v-if="data.status=='已提交'">审 核</el-button>
+      <el-button size="mini" slot="reference" v-if="data.status=='新建' && tool.checkAuth($route.name,'submit')">提 交</el-button>
+      <el-button size="mini" slot="reference" v-if="data.status=='已提交' && tool.checkAuth($route.name,'check')">审 核</el-button>
     </el-popconfirm>
   </div>
 </template>
@@ -20,18 +20,18 @@ export default {
   computed:{
   },
   watch:{
-    data (val) {
-      console.log(val);
-      this.refresh = false
-      setTimeout(() => {
-        this.refresh = !this.refresh
-      },50)
-    }
+
   },
   created() {
     console.log('eeee',this.disabled);
   },
   methods: {
+    refreshFun () {
+      this.refresh = false
+      setTimeout(() => {
+        this.refresh = !this.refresh
+      },50)
+    },
     async submit () {
       if (this.data.status == '新建') {
         let res = await this.$api.requested({

src/HDrpManagement/contractManage/modules/detail.vue

@@ -9,25 +9,25 @@
         turnPageId="20221121201502"
         idname="sa_contractid"
         ownertable="sa_contract"
-        :tabs="mainData.type == '项目' ? ['产品清单','合同条款','角色信息'] : mainData.type == '框架' ? ['产品明细折扣','产品类别折扣','业绩目标'] : mainData.type == '居间' ? null : ['工具清单','合同条款']"
+        :tabs="mainData.type == '项目' ? ['产品清单','合同条款'] : mainData.type == '框架' ? ['产品明细折扣','产品类别折扣','业绩目标'] : mainData.type == '居间' ? null : ['工具清单','合同条款']"
         @pageChange="pageChange"
         @onEditSuccess="queryMainData($route.query.id)">
       <div slot="tags">
       </div>
       <div slot="customOperation" >
         <editBtn :modelList="modelList" v-if="tool.checkAuth($route.name,'update')" :disabled="mainData.status != '新建' || !isLeader" @onSuccess="queryMainData();$refs.billno.listData()" :data="mainData" class="inline-16"/>
-        <submit-check :disabled="!isLeader" :data="mainData" @onSuccess="queryMainData" />
-        <reverseCheck @onSuccess="queryMainData()" :data="mainData" v-if="tool.checkAuth($route.name,'reverseCheck') && mainData.status == '审核'" />
+        <submit-check :disabled="!isLeader" ref="submit" :data="mainData" @onSuccess="queryMainData" />
+        <reverseCheck @onSuccess="queryMainData();$refs.submit.refreshFun()" :data="mainData" v-if="tool.checkAuth($route.name,'reverseCheck') && mainData.status == '审核'" />
         <contractOver v-if="tool.checkAuth($route.name,'contractOver') && mainData.status != '已终止' && mainData.status != '审核' && isLeader" :disabled="!isLeader" :id="mainData.sa_contractid" @onSuccess="queryMainData"/>
         <Del :idName="20221121202502" :id="mainData.sa_contractid" idKey="sa_contractids" class="inline-16" v-if="tool.checkAuth($route.name,'delete') && mainData.type == '新建' && isLeader"/>
       </div>
       <div slot="slot0" >
         <!--产品清单表-->
         <productBillno ref="billno" @priceChange="queryMainData" v-if="mainData.type == '项目'">
-          <addProduct v-if="tool.checkAuth($route.name,'addProduct')" :disabled="mainData.status != '新建' || !isLeader" slot="addProduct" @onSuccess="$refs.billno.listData()"/>
+          <addProduct v-if="tool.checkAuth($route.name,'addProductList')" :disabled="mainData.status != '新建' || !isLeader" slot="addProduct" @onSuccess="$refs.billno.listData()"/>
           <template v-slot:edit="scope">
             <el-button 
-              v-if="tool.checkAuth($route.name,'insert')"
+              v-if="tool.checkAuth($route.name,'editProductList')"
               class="inline-16" 
               :disabled="mainData.status != '新建' || !isLeader" 
               type="text" size="mini" slot="edit" 
@@ -35,15 +35,15 @@
             >编 辑</el-button>
           </template>
           <template v-slot:del="scope">
-            <delete-btn :nameId="20221123164502" :disabled="mainData.status != '新建' || !isLeader" nameKey="sa_contract_itemsids" :id="scope.data.sa_contract_itemsid" @deleteSuccess="$refs.billno.listData()"></delete-btn>
+            <delete-btn v-if="tool.checkAuth($route.name,'delProductList')"  :nameId="20221123164502" :disabled="mainData.status != '新建' || !isLeader" nameKey="sa_contract_itemsids" :id="scope.data.sa_contract_itemsid" @deleteSuccess="$refs.billno.listData()"></delete-btn>
           </template>
         </productBillno>
         <!--产品明细折扣表-->
         <productDetailList ref="productDetailList" v-if="mainData.type == '框架'" @priceChange="queryMainData">
-          <addProductDetail :disabled="mainData.status != '新建' || !isLeader" slot="addProduct" v-if="tool.checkAuth($route.name,'addProductDetail')" @onSuccess="$refs.productDetailList.listData()"/>
+          <addProductDetail :disabled="mainData.status != '新建' || !isLeader" slot="addProduct" v-if="tool.checkAuth($route.name,'addProductDiscount')" @onSuccess="$refs.productDetailList.listData()"/>
           <template v-slot:edit="scope">
             <el-button 
-              v-if="tool.checkAuth($route.name,'update')"
+              v-if="tool.checkAuth($route.name,'editProductDiscount')"
               class="inline-16" 
               :disabled="mainData.status != '新建' || !isLeader" 
               type="text" 
@@ -53,7 +53,7 @@
             >编 辑</el-button>
           </template>
           <template v-slot:del="scope">
-            <delete-btn v-if="tool.checkAuth($route.name,'delete')" :nameId="20221123164502" :disabled="mainData.status != '新建' || !isLeader" nameKey="sa_contract_itemsids" :id="scope.data.sa_contract_itemsid" @deleteSuccess="$refs.productDetailList.listData()"></delete-btn>
+            <delete-btn v-if="tool.checkAuth($route.name,'delProductDiscount')" :nameId="20221123164502" :disabled="mainData.status != '新建' || !isLeader" nameKey="sa_contract_itemsids" :id="scope.data.sa_contract_itemsid" @deleteSuccess="$refs.productDetailList.listData()"></delete-btn>
           </template>
         </productDetailList>
         <!--工具清单-->
@@ -61,7 +61,7 @@
           <addTool v-if="tool.checkAuth($route.name,'addTool')" :disabled="mainData.status != '新建' || !isLeader" slot="addProduct" @onSuccess="$refs.toolList.listData()"/>
           <template v-slot:edit="scope">
             <el-button 
-              v-if="tool.checkAuth($route.name,'update')"
+              v-if="tool.checkAuth($route.name,'editTool')"
               class="inline-16" 
               :disabled="mainData.status != '新建' || !isLeader" 
               type="text" 
@@ -71,17 +71,17 @@
             >编 辑</el-button>
           </template>
           <template v-slot:del="scope">
-            <delete-btn v-if="tool.checkAuth($route.name,'delete')" :nameId="20221123164502" :disabled="mainData.status != '新建' || !isLeader" nameKey="sa_contract_itemsids" :id="scope.data.sa_contract_itemsid" @deleteSuccess="$refs.toolList.listData()"></delete-btn>
+            <delete-btn v-if="tool.checkAuth($route.name,'delTool')" :nameId="20221123164502" :disabled="mainData.status != '新建' || !isLeader" nameKey="sa_contract_itemsids" :id="scope.data.sa_contract_itemsid" @deleteSuccess="$refs.toolList.listData()"></delete-btn>
           </template>
         </toolList>
       </div>
       <div slot="slot1" >
         <!--产品类别折扣表-->
         <productClassList ref="classList" @priceChange="queryMainData" v-if="mainData.type == '框架'">
-          <addClass v-if="tool.checkAuth($route.name,'addClass')" :disabled="mainData.status != '新建' || !isLeader" slot="addProduct" @onSuccess="$refs.classList.listData()"/>
+          <addClass v-if="tool.checkAuth($route.name,'addProductClassDiscount')" :disabled="mainData.status != '新建' || !isLeader" slot="addProduct" @onSuccess="$refs.classList.listData()"/>
           <template v-slot:edit="scope">
             <el-button 
-              v-if="tool.checkAuth($route.name,'update')"
+              v-if="tool.checkAuth($route.name,'editProductClassDiscount')"
               class="inline-16" 
               :disabled="mainData.status != '新建' || !isLeader" 
               type="text" size="mini" slot="edit" 
@@ -89,13 +89,13 @@
             >编 辑</el-button>
           </template>
           <template v-slot:del="scope">
-            <delete-btn v-if="tool.checkAuth($route.name,'delete')" :nameId="20221124111202" :disabled="mainData.status != '新建' || !isLeader" nameKey="sa_contract_itemsaleclassids" :id="scope.data.sa_contract_itemsaleclassid" @deleteSuccess="$refs.classList.listData()"></delete-btn>
+            <delete-btn v-if="tool.checkAuth($route.name,'delProductClassDiscount')" :nameId="20221124111202" :disabled="mainData.status != '新建' || !isLeader" nameKey="sa_contract_itemsaleclassids" :id="scope.data.sa_contract_itemsaleclassid" @deleteSuccess="$refs.classList.listData()"></delete-btn>
           </template>
         </productClassList>
         <!--合同条款-->
         <contractClause :disabled="mainData.status != '新建' || !isLeader" ref="Claus" v-if="mainData.type == '项目' || mainData.type == '工具借用'">
           <el-button 
-            v-if="tool.checkAuth($route.name,'addClaus')"
+            v-if="tool.checkAuth($route.name,'addContractClaus')"
             size="small" 
             type="primary" 
             slot="addProduct" 
@@ -105,7 +105,7 @@
           >添 加</el-button>
           <template v-slot:edit="scope">
             <el-button 
-              v-if="tool.checkAuth($route.name,'update')"
+              v-if="tool.checkAuth($route.name,'editContractClaus')"
               class="inline-16" 
               :disabled="mainData.status != '新建' || scope.data.editable != 1 || !isLeader" 
               type="text" size="mini" slot="edit" 
@@ -125,9 +125,9 @@
       </div>
       <div slot="slot2">
         <!--业绩目标-->
-        <taskTarget ref="taskTarget" v-if="Object.keys(mainData).length > 0" :data="mainData">
+        <taskTarget ref="taskTarget" v-if="Object.keys(mainData).length > 0 && mainData.type == '框架'" :data="mainData">
           <template v-slot:edit="scope">
-            <edit-target :disabled="mainData.status != '新建' || !isLeader" v-if="tool.checkAuth($route.name,'update')" :data="scope.data" :salerId="mainData" @onSuccess="$refs.taskTarget.queryData()"/>
+            <edit-target :disabled="mainData.status != '新建' || !isLeader" v-if="tool.checkAuth($route.name,'editTaskTarget')" :data="scope.data" :salerId="mainData" @onSuccess="$refs.taskTarget.queryData()"/>
           </template>
         </taskTarget>
       </div>

src/HDrpManagement/contractModel/modules/detail.vue

@@ -4,7 +4,7 @@
     <div class="content normal-panel">
       <div class="header container">
         <span class="title">{{type[$route.query.type]}}条款设置</span>
-        <el-button size="small" @click="addClause">添加</el-button>
+        <el-button size="small" v-if="tool.checkAuth($route.name,'addClaue')" @click="addClause">添加</el-button>
       </div>
       <div class="container">
         <tableLayout v-if="show" :layout="tablecols" :data="list" :opwidth="200" :custom="true"  height="calc(100vh - 250px)" >
@@ -43,9 +43,9 @@
                 @click="save(scope.data)" 
                 v-if="scope.data.sa_contract_template_clauseid == 0 || currentEdit.sa_contract_template_clauseid==scope.data.sa_contract_template_clauseid"
               >保 存</el-button>
-              <el-button size="mini" type="text" @click="editBtn(scope.data)" v-else>编 辑</el-button>
+              <el-button size="mini" type="text" @click="editBtn(scope.data)" v-else-if="tool.checkAuth($route.name,'editClaue')">编 辑</el-button>
             </span>
-            <delete-btn nameId="20221125195702" :data="scope.data" @deleteSuccess="onDelete" :id="scope.data.sa_contract_template_clauseid" nameKey="sa_contract_template_clauseids"></delete-btn>
+            <delete-btn v-if="tool.checkAuth($route.name,'delClaue')" nameId="20221125195702" :data="scope.data" @deleteSuccess="onDelete" :id="scope.data.sa_contract_template_clauseid" nameKey="sa_contract_template_clauseids"></delete-btn>
           </template>
         </tableLayout>
         <div style="margin-top:16px;text-align:right">

src/SDrpManagement/QuotedPrice/detail/index.vue

@@ -105,7 +105,7 @@ export default {
       this.queryMainData(id)
     },
     changeDataStructure(){
-
+      let that = this
       this.mainAreaData = [
         {
           label:'客户名称',

src/components/newLayout/modules/menu.vue

@@ -38,8 +38,12 @@ export default {
       }
     },
     setActiveModules (mod,app) {
+      console.log(mod);
+      
       this.$store.dispatch('setActiveApp',{name:app.systemappname,app:app,val:''})
       sessionStorage.setItem('active_modules',JSON.stringify(mod))
+      console.log(JSON.parse(sessionStorage.getItem('active_modules')));
+      
     },
     setDefaultData (mod) {
       let active_modules = JSON.parse(sessionStorage.getItem('active_modules'))