Merge branch 'blueBranch' into allTestUrgent

src/Form/marketing2/agent/edit.vue

@@ -10,7 +10,8 @@
           </el-col>
           <el-col :span="12">
             <el-form-item :label="$t(`企业名称`)+':'" prop="enterprisename">
-              <enterprise ref="ent" @rowClick="chooseEnterprise" type="3"></enterprise>
+<!--              <enterprise ref="ent" @rowClick="chooseEnterprise" type="3"></enterprise>-->
+              <el-input v-model="enterprise.enterprisename" disabled></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -188,7 +189,6 @@
 </template>
 
 <script>
-import enterprise from '@/template/enterprise/index.vue'
 import selectAgent from '@/components/selectAgent/index.vue'
 
 export default {
@@ -263,11 +263,12 @@ export default {
       timer:0,
       radio:-1,
       title:'选择上级合作伙伴',
-      value:''
+      value:'',
+      loading:false
     }
   },
   components:{
-    selectAgent,enterprise
+    selectAgent
   },
   methods:{
     onShow () {
@@ -312,7 +313,6 @@ export default {
           this.radio = 1
           break;
       }
-      this.$refs.ent.form.enterprisename = res.data.enterprisename
     },
     async queryEnterpriseArchives () {
       const res = await this.$api.requested({
@@ -443,6 +443,9 @@ export default {
 
       return _isSame
     },
+    onClose(){
+      this.dialogVisible = false
+    }
 
   },
 

src/HDrpManagement/projectChange/modules/detail.vue

@@ -8,6 +8,7 @@
     :mainAreaData="mainAreaData"
     :turnPageId="20221020143502"
     idname="sa_projectid"
+    ownertable="sa_project"
     typeTask="项目商机"
     :tags="[]"
     :tabs="tool.checkAuth($route.name,'productSetQuery')?['报价单','合同','详细信息','关联客户','联系人','产品配置单','关联线索','报备进度','竞争对手','项目评估']:['报价单','合同','详细信息','关联客户','联系人','关联线索','报备进度','竞争对手','项目评估']"