Merge branch 'mergeBranch' of http://124.70.211.186:3000/zhangqi/yos_web into mergeBranch

src/HDrpManagement/contractManage/modules/detail.vue

@@ -81,7 +81,7 @@
             @onSuccess="bindImportOrder"
           ></importFile>
           <template v-slot:cooperate="scope">
-            <el-button class="inline-16" :disabled="mainData.status !== '新建'" size="small" :type="mainData.status === '新建'?'primary':''" @click="cooperateVisible = true" v-if="tool.checkAuth($route.name,'productBillManage') && isLeader && mainData.type == '居间'">同步协议</el-button>
+            <el-button class="inline-16" :disabled="mainData.status !== '新建'" size="small" :type="mainData.status === '新建'?'primary':''" @click="cooperateVisible = true" v-if="tool.checkAuth($route.name,'productDetailManage') && isLeader && mainData.type == '居间'">同步协议</el-button>
             <el-dialog title="同步协议" :visible.sync="cooperateVisible" append-to-body width="703px" center>
               <span style="font-size: 14px;color: #8C8C8C;margin: 20px 0 0 22px;padding-top: 20px">
                 是否添加关联的项目或客户合同中的产品明细同步更新到列表
@@ -108,7 +108,7 @@
           <template v-slot:edit="scope">
           </template>
           <template v-slot:cooperate="scope">
-            <el-button class="inline-16" :disabled="mainData.status !== '新建'" size="small" :type="mainData.status === '新建'?'primary':''" @click="cooperateVisible = true" v-if="tool.checkAuth($route.name,'productBillManage') && isLeader && mainData.type == '居间'">同步协议</el-button>
+            <el-button class="inline-16" :disabled="mainData.status !== '新建'" size="small" :type="mainData.status === '新建'?'primary':''" @click="cooperateVisible = true" v-if="tool.checkAuth($route.name,'productClassManage') && isLeader && mainData.type == '居间'">同步协议</el-button>
             <el-dialog title="同步协议" :visible.sync="cooperateVisible" append-to-body width="703px" center>
               <span style="font-size: 14px;color: #8C8C8C;margin: 20px 0 0 22px;padding-top: 20px">
                 是否添加关联的项目或客户合同中的产品类别同步更新到列表
@@ -123,7 +123,7 @@
         <!--    产品类别折扣    -->
         <itemClass ref="itemClass" :data="mainData" v-if="mainData.type == '项目'" :isLeader="isLeader" >
           <template v-slot:cooperate="scope">
-            <el-button :disabled="mainData.status !== '新建'" size="small" :type="mainData.status === '新建'?'primary':''" @click="cooperateVisible = true" v-if="tool.checkAuth($route.name,'productBillManage') && isLeader">同步合作协议</el-button>
+            <el-button :disabled="mainData.status !== '新建'" size="small" :type="mainData.status === '新建'?'primary':''" @click="cooperateVisible = true" v-if="tool.checkAuth($route.name,'productClassManage') && isLeader">同步合作协议</el-button>
             <el-dialog title="同步合作协议" :visible.sync="cooperateVisible" append-to-body width="703px">
               <span style="color: #8C8C8C;font-size: 14px">请选择同步更新经销商/直销客户合作协议产品类别的方式：</span>
               <el-form :model="cooperateForm" style="margin-top: 20px">

src/HDrpManagement/projectChange/modules/modules/quotation/modules/add.vue

@@ -349,13 +349,8 @@ export default {
   },
   methods:{
     onShow(){
-
-      if (this.flagTag != 2){
-        this.$message.error('当前项目报备审核未通过，不可创建报价单');
-      }else {
-        this.dialogFormVisible = true
-        this.queryID()
-      }
+      this.dialogFormVisible = true
+      this.queryID()
     },
     onClose(){
       this.dialogFormVisible = false

src/components/normal-basic-layout/index.vue

@@ -15,7 +15,7 @@
 
             <div class="flex-align-center flex-wrap" style="line-height: 40px;">
               <div v-if="oldFormPath || formPath">
-                <cpAdd v-if="tool.checkAuth($route.name,'insert')" :formPath="formPath" :oldFormPath="oldFormPath" @onAddSuccess="listData(param.content.pageNumber = 1)"></cpAdd>
+                <cpAdd v-show="tool.checkAuth($route.name,'insert')" :formPath="formPath" :oldFormPath="oldFormPath" @onAddSuccess="listData(param.content.pageNumber = 1)"></cpAdd>
               </div>
               <slot name="titleLight"></slot>
               <!-- <el-button-group v-if="tool.checkAuth($route.name,'delete')" class="inline-16">