2022-12-22 9:30

src/HDrpManagement/contractManage/components/addContract.vue

@@ -37,7 +37,7 @@
             <el-col :span="24">
               <el-form-item label="合同有效期:" prop="begdate">
                 <el-input style="display:none" v-model="form.begdate"></el-input>
-              <time-select class="inline-16" @clearSelect="clearTime" @timeChange="timeChange"></time-select>
+              <time-select ref="timeSelect" class="inline-16" @clearSelect="clearTime" @timeChange="timeChange"></time-select>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -102,7 +102,7 @@
             <el-col :span="24">
               <el-form-item label="合同有效期:" prop="begdate">
                 <input type="text" style="display:none" v-model="form.begdate">
-              <time-select class="inline-16" @clearSelect="clearTime" @timeChange="timeChange"></time-select>
+              <time-select ref="timeSelect" class="inline-16" @clearSelect="clearTime" @timeChange="timeChange"></time-select>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -172,7 +172,7 @@
             <el-col :span="24">
               <el-form-item label="合同有效期:" prop="begdate">
                 <input type="text" style="display:none" v-model="form.begdate">
-              <time-select class="inline-16" @clearSelect="clearTime" @timeChange="timeChange"></time-select>
+              <time-select ref="timeSelect" class="inline-16" @clearSelect="clearTime" @timeChange="timeChange"></time-select>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -230,7 +230,7 @@
             <el-col :span="24">
               <el-form-item label="合同有效期:" prop="begdate">
                 <input type="text" style="display:none" v-model="form.begdate">
-              <time-select class="inline-16" @clearSelect="clearTime" @timeChange="timeChange"></time-select>
+              <time-select ref="timeSelect" class="inline-16" @clearSelect="clearTime" @timeChange="timeChange"></time-select>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -275,7 +275,7 @@
                   trigger="manual"
                   v-model="agentVisible"
                   width="400">
-                  <selectAgent ref="member" :param="agentListPrams" :radio="true" @onSelect="centerChange" @onCancel="agentVisible = false"></selectAgent>
+                  <selectAgent ref="member" :type="false" :param="agentListPrams" :radio="true" @onSelect="centerChange" @onCancel="agentVisible = false"></selectAgent>
                   <el-input readonly type="text" slot="reference" size="small" @focus="showChange('agentVisible')" v-model="form.enterprisename"></el-input>
                 </el-popover>
               </el-form-item>
@@ -305,7 +305,7 @@
             <el-col :span="24">
               <el-form-item label="合同有效期:" prop="begdate">
                 <input type="text" style="display:none" v-model="form.begdate">
-              <time-select class="inline-16" @clearSelect="clearTime" @timeChange="timeChange"></time-select>
+              <time-select ref="timeSelect" class="inline-16" @clearSelect="clearTime" @timeChange="timeChange"></time-select>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -484,21 +484,10 @@ export default {
           "pageSize": 20,
           "where": {
               "condition": "",
-              "type":1,
+              "type":'',
           }
         }
       },
-      accountListPrams: {
-        "id": 20220920083901,
-        "content": {
-          "pageNumber": 1,
-          "pageSize": 20,
-          "where": {
-              "condition": "",
-              "type":2,
-          }
-        }
-      }
     };
   },
   computed: {
@@ -512,7 +501,11 @@ export default {
         if (!val) {
           this.showChange(false)
           if (this.$refs.form) this.$refs.form.resetFields()
+          this.$refs.timeSelect.time = ''
+          
+          
         } else {
+          if(this.$refs.member) this.$refs.member.listData()
           if(this.$refs.project) {
             this.$refs.project.params.content.type = this.$route.query.type == '经销项目' ? '2' : '1'
             console.log(this.$refs.project.params.content.type,'项目类型');
@@ -657,7 +650,8 @@ export default {
       this.modelVisible = false
     },
     clearTime () {
-
+      this.form.begdate = ''
+      this.form.enddate = ''
     },
     timeChange (time) {
       this.form.begdate = time[0]

src/HDrpManagement/contractManage/components/editContract.vue

@@ -674,7 +674,8 @@ export default {
       this.concratVisible = false
     },
     clearTime () {
-
+      this.form.begdate = ''
+      this.form.enddate = ''
     },
     timeChange (time) {
       this.form.begdate = time[0]

src/HDrpManagement/contractManage/components/selectAgent.vue

@@ -51,7 +51,7 @@
 
 <script>
 export default {
-	props:['param','radio','checked'],
+	props:['param','radio','checked','type'],
   data () {
     return {
       search:'',
@@ -65,6 +65,7 @@ export default {
   },
   methods:{
     async listData () {
+      if(!this.type) this.param.content.type = ''
 			this.param.content.where.condition = this.search
       const res = await this.$api.requested(this.param)
       this.tableData = res.data

src/HDrpManagement/contractManage/components/toolList/addTool.vue

@@ -83,6 +83,11 @@ export default {
   computed:{
   },
   watch:{
+    drawer (val) {
+      if (!val) {
+        this.$refs.table.allArr = []
+      }
+    }
   },
   created () {
     this.tablecols = this.tool.tabelCol(this.$route.name)['productTable'].tablecols

src/HManagement/clueManage/clue_import/detailPage/modules/add.vue

@@ -6,7 +6,8 @@
       :visible.sync="drawer"
       size="800px"
       direction="rtl"
-      append-to-body>
+      append-to-body
+      :show-close="false">
       <div class="drawer__panel">
         <el-form :model="form" :rules="rule" ref="form" label-position="right" label-width="80px" size="small">
           <el-form-item label="企业名称" prop="enterprisename">

src/HManagement/clueManage/clue_import/detailPage/modules/edit.vue

@@ -6,7 +6,8 @@
       :visible.sync="drawer"
       size="800px"
       direction="rtl"
-      append-to-body>
+      append-to-body
+      :show-close="false">
       <div class="drawer__panel">
         <el-form :model="form" :rules="rule" ref="form" label-width="90px" label-position="right" size="small">
           <el-col :span="20">

src/HManagement/clueManage/clue_private/modules/edit.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-button size="mini" type="primary" @click="onShow">编 辑</el-button>
-    <el-drawer title="编辑线索" append-to-body :visible.sync="dialogFormVisible" size="600px">
+    <el-drawer title="编辑线索" :show-close="false" append-to-body :visible.sync="dialogFormVisible" size="600px">
       <div class="drawer__panel">
         <el-row :gutter="10">
           <el-form :model="form" :rules="rules" label-position="right" label-width="80px" size="small">

src/HManagement/clueManage/m_activity/modules/add.vue

@@ -7,7 +7,8 @@
       size="800px"
       direction="rtl"
       append-to-body
-      @close="onClose">
+      @close="onClose"
+      :show-close="false">
       <div class="drawer__panel">
         <el-form :model="form" :rules="rules" ref="form" label-width="100px" size="small">
           <el-form-item label="活动名称" prop="name">

src/HManagement/clueManage/m_activity/modules/detailTable.vue

@@ -18,11 +18,11 @@
             {{scope.column.data.province}}-{{scope.column.data.city}}-{{scope.column.data.county}}
           </span>
           <div v-else-if="scope.column.columnname == 'status'">
-            <span style="color:#cccccc" v-if="scope.column.data[[scope.column.columnname]] == '已过期'">{{scope.column.data[[scope.column.columnname]]}}</span>
-            <span style="color:#52C41A" v-else-if="scope.column.data[[scope.column.columnname]] == '跟进中'">{{scope.column.data[[scope.column.columnname]]}}</span>
-            <span style="color:#FA8C16" v-else-if="scope.column.data[[scope.column.columnname]] == '待跟进'">{{scope.column.data[[scope.column.columnname]]}}</span>
-            <span style="color:#F60909" v-else-if="scope.column.data[[scope.column.columnname]] == '已成交'">{{scope.column.data[[scope.column.columnname]]}}</span>
-            <span style="color:#BBBBBB" v-else-if="scope.column.data[[scope.column.columnname]] == '无效'">{{scope.column.data[[scope.column.columnname]]}}</span>
+            <span style="color:#999999" v-if="scope.column.data[[scope.column.columnname]] == '已过期'">{{scope.column.data[[scope.column.columnname]]}}</span>
+          <span style="color:#52c41a" v-else-if="scope.column.data[[scope.column.columnname]] == '跟进中'">{{scope.column.data[[scope.column.columnname]]}}</span>
+          <span style="color:#3874f6" v-else-if="scope.column.data[[scope.column.columnname]] == '待跟进'">{{scope.column.data[[scope.column.columnname]]}}</span>
+          <span style="color:#333333" v-else-if="scope.column.data[[scope.column.columnname]] == '已无效'">{{scope.column.data[[scope.column.columnname]]}}</span>
+          <span style="color:#fa8c16" v-else-if="scope.column.data[[scope.column.columnname]] == '已转化'">{{scope.column.data[[scope.column.columnname]]}}</span>
           </div>
           <span v-else-if="scope.column.columnname != 'operation' && !scope.column.data[scope.column.columnname]">--</span>
           <span v-else>{{scope.column.data[scope.column.columnname]}}</span>

src/HManagement/clueManage/m_activity/modules/edit.vue

@@ -6,7 +6,8 @@
       :visible.sync="drawer"
       size="800px"
       direction="rtl"
-      append-to-body>
+      append-to-body
+      :show-close="false">
       <div class="drawer__panel">
         <el-form :model="form" :rules="rules" ref="form" label-width="100px" size="small">
         <el-form-item label="活动名称" prop="name">

src/HManagement/personalTarget/target/modules/edit/components/table.vue

@@ -303,5 +303,8 @@ export default {
 }
 
 </script>
-<style>
+<style scoped>
+/deep/.el-table__body-wrapper {
+  z-index: 2;
+}
 </style>

src/HManagement/projectTarget/target/modules/edit/components/table.vue

@@ -328,5 +328,8 @@ export default {
 }
 
 </script>
-<style>
+<style scoped>
+/deep/.el-table__body-wrapper {
+  z-index: 2;
+}
 </style>