qymljy 2 years ago
parent
commit
0a3138c41f

+ 18 - 6
src/Form/projectTask/add.vue

@@ -1,13 +1,14 @@
 <template>
   <div>
-    <el-button size="small" type="primary" @click="(drawer = true)">新 建</el-button>
+    <el-button size="small" type="primary" @click="onShow">新 建</el-button>
     <el-drawer
       title="新建项目评估工作"
       :visible.sync="drawer"
       direction="rtl"
       append-to-body
       :show-close="false"
-      size="80%">
+      size="80%"
+      @close="onClose">
       <div class="drawer__panel">
         <el-row :gutter="20">
           <el-form :model="form" ref="form" :rules="rules" class="demo-form-inline" size="small" label-position="rigth" label-width="90px">
@@ -167,10 +168,14 @@
       
     },
     methods:{
+      onShow(){
+        this.drawer = true
+      },
       selectFormObject(val) {
         this.partiesType = val
 
         this.selectObject(val);
+
       },
       selectFormStage(val) {
         this.projectStage = val
@@ -178,7 +183,7 @@
       },
       // 选择客户对象
       selectObject (val) {
-
+        console.log("选择客户对象",val)
         this.objects = new Map()
         val.forEach(v => this.objects.set(v.partiestype, v))
         console.log('try calculate')
@@ -254,6 +259,8 @@
       },
       // 勾选对象状态
       onPartiesChange(val) {
+        console.log(val,'勾选对象状态')
+        console.log(this.optionscore)
         val?this.$refs['onparties'].drawer = true:''
 
         this.selectObject(val ? this.partiesType : [])
@@ -316,12 +323,15 @@
             this.partiesType=[]
             this.projectStage=[]
             this.drawer = false
-            this.$refs.onparties.$refs.projectType.$refs.tables.clearSelection()
+            this.act_projtask = null
+            this.$refs.onparties.$refs.customerType.$refs.tables.clearSelection()
             this.$refs.onstage.$refs.projectType.$refs.tables.clearSelection()
           })
         })
       },
       onClose(){
+        this.$refs.onparties.$refs.customerType.$refs.tables.clearSelection()
+        this.$refs.onstage.$refs.projectType.$refs.tables.clearSelection()
         this.drawer = false
         this.form = {
           "sa_projtaskmagid": 0,
@@ -335,8 +345,10 @@
         this.optionscore=[]
         this.partiesType=[]
         this.projectStage=[]
-        this.$refs.onparties.$refs.projectType.$refs.tables.clearSelection()
-        this.$refs.onstage.$refs.projectType.$refs.tables.clearSelection()
+        this.act_projtask = null
+        this.relateForm = []
+        /*this.$refs.onparties.$refs.projectType.$refs.tables.clearSelection()*/
+
       }
     }
   }

+ 1 - 1
src/HDrpManagement/projectTask/modules/AssociateCustomerObject.vue

@@ -10,7 +10,7 @@
         :show-close="false"
         @close="onClose">
       <div class="drawer__panel" style="margin-bottom: 0px;padding-bottom: 0px">
-        <layoutTable ref="projectType" :layout="tablecols" :data="list"  :custom="true" :checkbox="true" @checkboxCallBack="checkboxCallBack">
+        <layoutTable ref="customerType" :layout="tablecols" :data="list"  :custom="true" :checkbox="true" @checkboxCallBack="checkboxCallBack">
           <template v-slot:customcol="scope">
             <p>{{scope.column.data[scope.column.columnname]}}</p>
           </template>

+ 2 - 2
vue.config.js

@@ -14,8 +14,8 @@ module.exports = {
       port: 8000,
       proxy: {
         '/apis': {
-          // target: 'http://61.164.207.46:8000',  // target host*/
-          target: 'https://oms.idcgroup.com.cn:8079/',  // target host
+          target: 'http://61.164.207.46:8000',  // target host*/
+          // target: 'https://oms.idcgroup.com.cn:8079/',  // target host
           // target: 'localhost:8080',  // target host
           ws: true,  // proxy websockets 
           changeOrigin: true,  // needed for virtual hosted sites