Merge branch 'xiaoqin' into mergeBranch

src/Form/contractManage/add.vue

@@ -1,26 +1,42 @@
 <template>
   <div>
     <el-popover
-    placement="bottom"
-    trigger="hover">
-    <div slot="title">合同类型</div>
-    <div style="display:flex;flex-direction:column">
-      <el-button type="text" size="mini" @click="addBtn">经销商合作协议</el-button>
-      <el-button type="text" size="mini">经销项目协议</el-button>
-      <el-button type="text" size="mini">直销项目协议</el-button>
-      <el-button type="text" size="mini">工具使用协议</el-button>
-      <el-button type="text" size="mini">居间协议</el-button>
-
-    </div>
-    <el-button slot="reference" size="mini" type="primary">新 建</el-button>
-  </el-popover>
+      placement="bottom"
+      trigger="hover">
+      <div slot="title">合同类型</div>
+      <div style="display:flex;flex-direction:column">
+        <el-button type="text" size="mini" @click="addBtn(1)">经销商合作协议</el-button>
+        <el-button type="text" size="mini">经销项目协议</el-button>
+        <el-button type="text" size="mini">直销项目协议</el-button>
+        <el-button type="text" size="mini">工具使用协议</el-button>
+        <el-button type="text" size="mini">居间协议</el-button>
 
+      </div>
+      <el-button slot="reference" size="mini" type="primary">新 建</el-button>
+    </el-popover>
+      <el-drawer
+        title="新建合同"
+        :visible.sync="drawer"
+        size="80%"
+        direction="rtl"
+        append-to-body>
+        <component :is="getComponent"></component>
+    </el-drawer>
   </div>
 </template>
 
 <script>
 export default {
-  components:{},
+  components:{
+    addContractAgent: () => '@/HDrpManagement/contractManage/components/addContract'
+  },
+  computed: {
+    getComponent () {
+      if (this.type == 1) {
+        return () => import('@/HDrpManagement/contractManage/components/addContract')
+      }
+    }
+  },
   data () {
     return {
       form:{
@@ -32,13 +48,18 @@ export default {
           { required: true, message: '请选择企业名称', trigger: 'blur' },
         ],
       },
-      type:''
+      type:'',
+      drawer:false
     }
   },
   methods:{
     addBtn () {
-      this.$store.dispatch('changeDetailDrawer',true)
-      this.$router.push('/addContract')
+      this.type = 1
+      this.drawer = true
+      // return this.tool.dispatchFun('normalTable','upData',this)
+      
+      // this.$store.dispatch('changeDetailDrawer',true)
+      // this.$router.push('/addContract')
     }
   },
   created() {

src/Form/tagManage/add.vue

@@ -53,6 +53,7 @@ export default {
         result:'',
         helptips:'',
         sys_systemtagid:0,
+        sys_systemtagdetailid:0
       },
       result:[],
       rules:{
@@ -76,14 +77,14 @@ export default {
           "version":1,
           "content": this.form
         })
-        this.tool.showMessage(res,()=>{
+        this.tool.showMessage(res, async()=>{
           let mutextags = this.form.result.map(item => {
             return {
               "sys_systemtagdetailid": item,
             }
           })
           if (mutextags.length > 0) {
-            let res2 = this.$api.requested({
+            let res2 = await this.$api.requested({
               "id":20221014122501,
               "content": {
                 "sys_systemtagid": res.data.sys_systemtagid,
@@ -95,7 +96,7 @@ export default {
           this.dialogFormVisible = false
           this.$refs['form'].resetFields();
           this.$emit('onSuccess')
-          console.log(this.dialogFormVisible);
+          console.log(res2);
           
         })
       })

src/HDrpManagement/contractManage/components/addContract.vue

@@ -1,6 +1,6 @@
 <template>
   <div style="height:100vh">
-    <p class="normal-title normal-panel" style="line-height:32px;padding-left:16px;border-bottom:1px solid #eeeeee">新建合同</p>
+    <!-- <p class="normal-title normal-panel" style="line-height:32px;padding-left:16px;border-bottom:1px solid #eeeeee">新建合同</p> -->
     <div class="header_info">
       <el-row>
         <el-form :model="form" :rules="rules" ref="form" label-position="right" label-width="75px" size="small">

src/HDrpManagement/contractManage/components/tab.vue

@@ -32,7 +32,7 @@ export default {
     // this.queryAttments()
   },
   watch: {
-
+    
   },
 }
 

src/HManagement/siteManage/tagManage/components/add.vue

@@ -23,6 +23,7 @@
 </template>
 
 <script>
+import { log } from '@antv/g2plot/lib/utils'
 export default {
   name: "add",
   props:['data'],

src/HManagement/siteManage/tagManage/components/edit.vue

@@ -21,7 +21,7 @@
             <el-form-item label="互斥范围" prop="result">
               <el-select v-model="form.result" multiple placeholder="请选择标签">
                 <el-option
-                  v-for="item in allData()"
+                  v-for="item in allData"
                   :key="item.sys_systemtagdetailid"
                   :label="item.tag"
                   :value="item.sys_systemtagdetailid">
@@ -42,8 +42,8 @@
 <script>
 export default {
   name: "add",
-  props:['data'],
-  inject:['allData','sys_systemtagid'],
+  props:['allData','data'],
+  inject:['sys_systemtagid'],
   data(){
     return {
       dialogFormVisible:false,
@@ -80,14 +80,14 @@ export default {
           "version":1,
           "content": this.form
         })
-        this.tool.showMessage(res,()=>{
+        this.tool.showMessage(res,async()=>{
           let mutextags = this.form.result.map(item => {
             return {
               "sys_systemtagdetailid": item,
             }
           })
           if (mutextags.length > 0) {
-            let res2 = this.$api.requested({
+            let res2 = await this.$api.requested({
               "id":20221014122501,
               "content": {
                 "sys_systemtagid": res.data.sys_systemtagid,
@@ -99,7 +99,6 @@ export default {
           this.dialogFormVisible = false
           this.$refs['form'].resetFields();
           this.$emit('onSuccess')
-          console.log(this.dialogFormVisible);
           
         })
       })

src/HManagement/siteManage/tagManage/index.vue

@@ -41,14 +41,14 @@
         <div v-else>{{scope.data.column.data[scope.data.column.columnname]}}</div>
       </template>
       <template v-slot:tbOpreation="scope">
-        <Edit class="inline-16" v-if="tool.checkAuth($route.name,'update')" @onSuccess="$refs.list.listData()" :data="scope.data.data"/>
-        <mutextage 
+        <Edit class="inline-16" v-if="tool.checkAuth($route.name,'update')" :allData="allData.filter(item=>item.tag!=scope.data.data.tag)" @onSuccess="$refs.basicLayout.listData()" :data="scope.data.data"/>
+        <!-- <mutextage 
           class="inline-16" 
           :tagData="selectTarget" 
           :allData="allData.filter(item=>item.tag!=scope.data.data.tag)" 
           :rowData="scope.data.data"
           @onSuccess="$refs.basicLayout.listData()"
-           v-if="tool.checkAuth($route.name,'update')"/>
+           v-if="tool.checkAuth($route.name,'update')"/> -->
           <el-popconfirm title="确定删除当前数据吗？" @confirm="deleteRow(scope.data.data)">
             <el-button slot="reference" size="mini" type="text" v-if="tool.checkAuth($route.name,'delete') && !scope.data.data.issystem">删 除</el-button>
           </el-popconfirm>

src/components/normal-basic-layout/details/modules/followUp/addLog.vue

@@ -1,10 +1,10 @@
 <template>
   <div>
     <el-button type="default" size="mini" @click="dialogFormVisible = true">新 建</el-button>
-    <el-dialog title="创建跟进日志" width="600px" append-to-body :visible.sync="dialogFormVisible">
+    <el-dialog title="创建跟进动态" width="600px" append-to-body :visible.sync="dialogFormVisible">
       <el-form :model="form" ref="form" label-position="top" label-width="80px">
-        <el-form-item label="跟进日志" prop="content">
-          <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 18 }" v-model="form.content" placeholder="请输入跟进日志" autocomplete="off"></el-input>
+        <el-form-item label="跟进动态" prop="content">
+          <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 18 }" v-model="form.content" placeholder="请输入跟进\动态" autocomplete="off"></el-input>
         </el-form-item>
         <el-form-item>
           <upload

src/components/normal-basic-layout/details/modules/followUp/editLog.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="inline-16">
     <el-button icon="el-icon-edit" type="text" size="mini" @click="onShow(dialogFormVisible = true)">编 辑</el-button>
-    <el-dialog title="编辑跟进日志" width="600px" append-to-body :visible.sync="dialogFormVisible">
+    <el-dialog title="编辑跟进动态" width="600px" append-to-body :visible.sync="dialogFormVisible">
       <el-form :model="form" label-position="top" label-width="80px">
-        <el-form-item label="跟进日志">
-          <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 18 }" v-model="form.content" placeholder="请输入跟进日志" autocomplete="off"></el-input>
+        <el-form-item label="跟进动态">
+          <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 18 }" v-model="form.content" placeholder="请输入跟进动态" autocomplete="off"></el-input>
         </el-form-item>
         <div class="flex-align-center flex-between pionter" v-for="file in data.attinfos" :key="file.index">
           <div class="flex-align-center">

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

@@ -74,6 +74,7 @@
 <script>
 import {mapGetters} from 'vuex'
 export default {
+  componentName:'normalTable',
   props:['tableName','idName','tableData','apiId','formPath','oldFormPath','options','autoQuery','detailPath','customTitle','hidePagination'],
   components:{
     tableTemp: () => import('./modules/table.vue'),

src/utils/tool.js

@@ -123,5 +123,21 @@ export default {
     } else {
       return amountStr.replace(reg, ',')
     }
-  }
+  },
+  /* 给指定组件触发$emit事件 */
+  dispatchFun(componentName, eventName, vm) {
+    var parent = vm.$parent || vm.$root;
+    var name = parent.$options.componentName;
+
+    while (parent && (!name || name !== componentName)) {
+      parent = parent.$parent;
+
+      if (parent) {
+        name = parent.$options.componentName;
+      }
+    }
+    if (parent) {
+      parent.$emit.apply(parent, [eventName]);
+    }
+  },
 }