2022-11-22 11:30

src/Form/contractManage/add.vue

@@ -6,7 +6,7 @@
       <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" @click="addBtn(2)">经销项目协议</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>
@@ -21,6 +21,10 @@
         direction="rtl"
         append-to-body>
         <component :is="getComponent"></component>
+        <div class="fixed__btn__panel">
+          <el-button size="small" @click="drawer=false" class="normal-btn-width">取 消</el-button>
+          <el-button size="small" type="warning" @click="onSubmit" class="normal-btn-width btn-warning">确 定</el-button>
+        </div>
     </el-drawer>
   </div>
 </template>
@@ -34,6 +38,8 @@ export default {
     getComponent () {
       if (this.type == 1) {
         return () => import('@/HDrpManagement/contractManage/components/addContract')
+      } else {
+        return () => import('@/HDrpManagement/contractManage/components/addContractProject')
       }
     }
   },
@@ -53,13 +59,16 @@ export default {
     }
   },
   methods:{
-    addBtn () {
-      this.type = 1
+    addBtn (num) {
+      this.type = num
       this.drawer = true
       // return this.tool.dispatchFun('normalTable','upData',this)
       
       // this.$store.dispatch('changeDetailDrawer',true)
       // this.$router.push('/addContract')
+    },
+    onSubmit () {
+
     }
   },
   created() {

src/Form/tagManage/add.vue

@@ -96,8 +96,6 @@ export default {
           this.dialogFormVisible = false
           this.$refs['form'].resetFields();
           this.$emit('onSuccess')
-          console.log(res2);
-          
         })
       })
     }

src/HDrpManagement/contractManage/components/addContract.vue

@@ -1,5 +1,5 @@
 <template>
-  <div style="height:100vh">
+  <div>
     <!-- <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>
@@ -11,7 +11,9 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="合同模板" prop="hrid">
-              <el-input type="text" size="small" v-model="form"></el-input>
+              <el-select>
+                <el-option label="一一一"></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -31,17 +33,29 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="生效日期" prop="hrid">
-              <el-input type="text" size="small" v-model="form"></el-input>
+              <el-date-picker
+                v-model="value1"
+                type="date"
+                placeholder="选择日期">
+              </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="截止日期" prop="hrid">
-              <el-input type="text" size="small" v-model="form"></el-input>
+              <el-date-picker
+                v-model="value1"
+                type="date"
+                placeholder="选择日期">
+              </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="签约日期" prop="hrid">
-              <el-input type="text" size="small" v-model="form"></el-input>
+              <el-date-picker
+                v-model="value1"
+                type="date"
+                placeholder="选择日期">
+              </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -55,10 +69,6 @@
     <Tabs :tabs="['产品清单','合同条款','业务关联']">
       <div slot="slot0">1111111111111</div>
     </Tabs>
-    <div class="fixed__btn__panel">
-      <el-button size="small" class="normal-btn-width">取 消</el-button>
-      <el-button size="small" type="warning" @click="onSubmit" class="normal-btn-width btn-warning">确 定</el-button>
-    </div>
   </div>
 </template>
 

src/HDrpManagement/contractManage/components/addContractProject.vue

@@ -0,0 +1,104 @@
+<template>
+  <div style="height:100vh">
+    <!-- <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">
+          <el-col :span="6">
+            <el-form-item label="合同编号" prop="hrid">
+              <el-input type="text" size="small" v-model="form"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="合同模板" prop="hrid">
+              <el-input type="text" size="small" v-model="form"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="经销商" prop="hrid">
+              <el-input type="text" size="small" v-model="form"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="项目名称" prop="hrid">
+              <el-input type="text" size="small" v-model="form"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="业务员" prop="hrid">
+              <el-input type="text" size="small" v-model="form"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="生效日期" prop="hrid">
+              <el-input type="text" size="small" v-model="form"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="截止日期" prop="hrid">
+              <el-input type="text" size="small" v-model="form"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="签约日期" prop="hrid">
+              <el-input type="text" size="small" v-model="form"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="合同描述" prop="hrid">
+              <el-input type="textarea" size="small" v-model="form"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-form>
+      </el-row>
+    </div>
+    <Tabs :tabs="['产品清单','合同条款','业务关联']">
+      <div slot="slot0">1111111111111</div>
+    </Tabs>
+    
+  </div>
+</template>
+
+<script>
+import Tabs from './tab'
+export default {
+  name: '',
+  components:{Tabs},
+  data () {
+    return {
+      form: {},
+      rules: {
+        sys_enterpriseid: [
+          { required: true, message: '请选择企业名称', trigger: 'blur' },
+        ],
+        sa_accountclassid: [
+          { required: true, message: '请选择账户类型', trigger: 'blur' },
+        ],
+        creditquota: [
+          { required: true, message: '请填写信用额度', trigger: 'change' },
+        ],
+      }
+    };
+  },
+  computed: {
+  },
+  watch: {
+  },
+  methods: {
+    onSubmit () {
+
+    }
+  },
+};
+</script>
+
+<style scoped>
+* {
+  box-sizing: border-box;
+}
+.header_info {
+  background: #ffffff;
+  padding: 16px 16px 0 16px;
+  margin-bottom: 16px;
+}
+</style>

src/HDrpManagement/contractManage/index.vue

@@ -9,7 +9,7 @@
       :apiId="{query:20221031141102,del:20221031141202}"
       :options="options"
       :detailPath="{
-        path:'/account_details'
+        path:'/contractDetail'
       }">
       <div slot="custom" style="display:flex">
         <div class="label_center">

src/HDrpManagement/contractManage/modules/detail.vue

@@ -0,0 +1,22 @@
+<template>
+  <div></div>
+</template>
+
+<script>
+export default {
+  name: '',
+  data() {
+    return {
+    };
+  },
+  computed:{
+  },
+  watch:{
+  },
+  methods: {},
+};
+</script>
+
+<style scoped>
+
+</style>

src/HManagement/addressList/mycontact/index.vue

@@ -2,7 +2,7 @@
   <div>
     <div class="flex-align-stretch">
       <group ref="grouplist" @setGroupData="setGroupData" @clickGroup="clickGroup">
-        <add-contact v-if="tool.checkAuth($route.name,'addContact')" slot="addContact" :group="group" @onAddSuccess="onAddSuccess"></add-contact>
+        <add-contact :tagList="tagList" v-if="tool.checkAuth($route.name,'addContact')" slot="addContact" :group="group" @onAddSuccess="onAddSuccess"></add-contact>
         <add-group v-if="tool.checkAuth($route.name,'addGroup')" slot="addGroup" @onSuccess="onAddSuccess"></add-group>
         <template v-slot:edit="scope">
           <editGroup v-if="tool.checkAuth($route.name,'editGroup')" :data="scope.data" @onSuccess="onAddSuccess"></editGroup>
@@ -14,7 +14,7 @@
       <contacts style="flex:1 0 auto" :data="activeGroupData" @clickContacts="clickContacts" @filtetContacts="filtetContacts"></contacts>
       <detail :activeContactsData="activeContactsData">
         <template v-slot:edit="data">
-          <edit v-if="tool.checkAuth($route.name,'update')" :data="data" :group="group" @onEditSuccess="onEditSuccess"></edit>
+          <edit :tagList="tagList" v-if="tool.checkAuth($route.name,'update')" :data="data" :group="group" @onEditSuccess="onEditSuccess"></edit>
         </template>
         <template v-slot:del="data">
           <ondel v-if="tool.checkAuth($route.name,'delete')" :data="data" @onDelSuccess="onDelSuccess"></ondel>
@@ -53,7 +53,8 @@ export default {
     return {
       group:[],
       activeGroupData:[],
-      activeContactsData:null
+      activeContactsData:null,
+      tagList:[]
     }
   },
   methods:{
@@ -104,9 +105,23 @@ export default {
       } else {
         this.onAddSuccess()
       }
+      
+    },
+    async getTagList () {
+      let res = await this.$api.requested({
+        "id": 20220929085401,
+        "content": {
+            "ownertable":"sys_phonebook",
+            "ownerid":102
+        }
+      })
+      this.tagList = res.data.option
+      console.log(this.tagList);
+      
     }
   },
   mounted () {
+    this.getTagList()
   }
 }
 

src/HManagement/addressList/mycontact/modules/addContact.vue

@@ -71,8 +71,8 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="标签">
-              <el-select v-model="form.tag" style="width:100%" multiple>
-                <el-option v-for="item in tags" :key="item.index" :value="item" :label="item"></el-option>
+              <el-select v-model="tags" style="width:100%" multiple>
+                <el-option v-for="item in tagList" :key="item.index" :value="item.tag" :label="item.tag"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -102,7 +102,7 @@
 import {mapGetters} from 'vuex'
 
 export default {
-  props:['group'],
+  props:['group','tagList'],
   data () {
     return {
       dialogFormVisible:false,
@@ -121,14 +121,12 @@ export default {
         "remarks": "",
         "tag": []
       },
-      tags:[
-        '关键决策人','支持者','反对者'
-      ]
+      tags:[]
     }
   },
   watch: {
     dialogFormVisible (val) {
-     !val && this.$refs.form.resetFields()
+     !val && this.$refs.form.resetFields();this.tags=[]
     }
   },
   computed:{
@@ -147,32 +145,20 @@ export default {
           "version":1,
           "content": this.form
         })
-        this.tool.showMessage(res,()=>{
+        this.tool.showMessage(res,async()=>{
+          let res2 = await this.$api.requested({
+            "id": 20220929090901,
+            "content": {
+                "ownertable":"sys_phonebook",
+                "ownerid":res.data.sys_phonebookid,
+                "datatag": this.tags
+            }
+          })
           this.dialogFormVisible = false
           this.$emit('onAddSuccess')
-          this.refresh()
-          this.dialogFormVisible = false
-
         })
       });
     },
-    refresh () {
-      this.form = {
-        "sys_phonebookid":0,     //sys_phonebookid<=0时 为新增
-        "sys_phonebookgroupid":"",
-        "name": "",
-        "phonenumber": "",
-        "company": "",
-        "depname": "",
-        "position": "",
-        "email": "",
-        "sex": "男",
-        "birthday": (new Date()).toLocaleDateString(),
-        "homeaddress": "",
-        "remarks": "",
-        "tag": []
-      }
-    }
   },
   mounted () {
     this.$store.dispatch('optiontypeselect','sex')

src/HManagement/addressList/mycontact/modules/edit.vue

@@ -72,7 +72,7 @@
           <el-col :span="12">
             <el-form-item label="标签">
               <el-select v-model="form.tag" style="width:100%" multiple>
-                <el-option v-for="item in tags" :key="item.index" :value="item" :label="item"></el-option>
+                <el-option v-for="item in tagList" :key="item.index" :value="item.tag" :label="item.tag"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -102,7 +102,7 @@
 import {mapGetters} from 'vuex'
 
 export default {
-  props:['group','data'],
+  props:['group','data','tagList'],
   data () {
     return {
       dialogFormVisible:false,
@@ -121,9 +121,7 @@ export default {
         "remarks": "",
         "tag": []
       },
-      tags:[
-        '关键决策人','支持者','反对者'
-      ]
+      tags:[]
     }
   },
   computed:{
@@ -138,12 +136,22 @@ export default {
     addGroup () {
       this.$refs['form'].validate(async (valid) => {
         if (!valid)  return false;
-        const res = this.$api.requested({
+        this.tags = this.form.tag
+        this.form.tag = []
+        const res = await this.$api.requested({
           "id": "20220831164503",
           "version":1,
           "content": this.form
         })
-        this.tool.showMessage(res,()=>{
+        this.tool.showMessage(res,async()=>{
+          let res2 = await this.$api.requested({
+            "id": 20220929090901,
+            "content": {
+                "ownertable":"sys_phonebook",
+                "ownerid":res.data.sys_phonebookid,
+                "datatag": this.tags
+            }
+          })
           this.$emit('onEditSuccess',this.form)
           this.dialogFormVisible = false
         })

src/HManagement/addressList/mycontact/modules/group.vue

@@ -73,6 +73,8 @@ export default {
         if(e.sys_phonebookgroupid !== 0)
           return e
       })
+      console.log(this.sysGroup);
+      
       this.$emit('setGroupData',this.myGroup)
       fn?fn():this.clickGroup(this.sysGroup[0])
     },

src/router/HDrpManagement.js

@@ -333,14 +333,14 @@ const HDrpManagement = [
     component: () => import(/* webpackChunkName: "about" */ '@/HDrpManagement/contractManage/index'),
     children:[
       {
-        path: '/addContract',
+        path: '/contractDetail',
         name: 'contract',
         meta: {
-          title: '商品调整单详情',
+          title: '合同详情',
           ast_nav:true,
           keeproute: true
         },
-        component: () => import(/* webpackChunkName: "about" */ '@/HDrpManagement/contractManage/components/addContract')
+        component: () => import(/* webpackChunkName: "about" */ '@/HDrpManagement/contractManage/modules/detail')
       }
     ]
   },