调接口

.idea/workspace.xml

@@ -4,6 +4,9 @@
     <list default="true" id="f876064f-ad38-46e7-bf7d-9df623a9178f" name="Changes" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/project/src/assets/config/interface_api.js" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/assets/config/interface_api.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/project/src/components/marketingGuest/batchAddFriend/addFriend/dialogPublic.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/marketingGuest/batchAddFriend/addFriend/dialogPublic.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/project/src/components/marketingGuest/batchAddFriend/addFriend/importCustomer.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/marketingGuest/batchAddFriend/addFriend/importCustomer.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/project/src/components/marketingGuest/batchAddFriend/addFriend/importRecordDetial.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/marketingGuest/batchAddFriend/addFriend/importRecordDetial.vue" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/project/src/components/marketingGuest/batchAddFriend/addFriend/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/marketingGuest/batchAddFriend/addFriend/index.vue" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/project/src/components/marketingGuest/batchAddFriend/addFriend/setting.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/marketingGuest/batchAddFriend/addFriend/setting.vue" afterDir="false" />
     </list>
@@ -25,7 +28,7 @@
     <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
     <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/qwh5" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../data_center" />
     <property name="nodejs_package_manager_path" value="npm" />
     <property name="settings.editor.selected.configurable" value="editor.reader.mode" />
     <property name="vue.rearranger.settings.migration" value="true" />
@@ -53,6 +56,7 @@
       <workItem from="1653986566612" duration="2107000" />
       <workItem from="1654070934388" duration="14000" />
       <workItem from="1654573024055" duration="23176000" />
+      <workItem from="1654653264438" duration="18173000" />
     </task>
     <servers />
   </component>

project/src/assets/config/interface_api.js

@@ -147,6 +147,7 @@ var api = {
   record_delete: "/api/customer/deleteRecord",
   batchRemind: "/api/customer/batchRemind",
   setting_rebackInfo: "/api/BatchAddCustomer/configInfo",
+  batchDistributionCustomer: "/api/customer/batchDistributionCustomer",
 
 
 };

project/src/components/marketingGuest/batchAddFriend/addFriend/dialogPublic.vue

@@ -30,10 +30,27 @@ export default {
   },
   methods:{
     save(){
-      if(this.type == 'addCustomer'){
+      if(this.type == 'remindSingle'){
         this.addCustomer_notice()
+      }else if(this.type == 'allotSingle'){
+        if(this.user_id_list && this.user_id_list.length==0){
+          this.$message({
+            message: '分配人员不能为空',
+            type: "warning"
+          })
+          return
+        }
+        this.$parent.dialogPublic_allot_single()
+      }else if(this.type == 'allotMultiple'){
+        if(this.user_id_list && this.user_id_list.length==0){
+          this.$message({
+            message: '分配人员不能为空',
+            type: "warning"
+          })
+          return
+        }
+        this.$parent.dialogPublic_allot_multiple()
       }
-
     },
     addCustomer_notice(){
       this.loading = true
@@ -45,11 +62,13 @@ export default {
           message: res.err,
           type: "warning"
         })
-        this.dialogVisible = false
         this.loading = false
-        this.$parent.init(1)
-        this.$parent.clearuser_ids()
         this.$loading(this.$loadingConfig).close();
+        if(res&&res.errno==0){
+          this.dialogVisible = false
+          this.$parent.clearuser_ids()
+          this.$parent.init(1)
+        }
       }).catch((err) => {
         this.loading = false
         this.$message({
@@ -57,7 +76,8 @@ export default {
           type: "warning"
         })
       });
-    }
+    },
+
   }
 }
 </script>

project/src/components/marketingGuest/batchAddFriend/addFriend/importCustomer.vue

@@ -13,14 +13,16 @@
             <!--:data="xlsxData"-->
             <el-upload
               class="upload-demo"
-              action="https://jsonplaceholder.typicode.com/posts/"
+              action="buchuan"
               accept=".xlsx,.xls"
               :limit="1"
+              :auto-upload="false"
               :before-upload="beforeUploadUpload"
               :on-success="uploadSuccess"
               :on-error='uploadFail'
               :on-remove="uploadRemove"
               :on-exceed="uploadExceed"
+              :on-change="changeFile"
             >
               <el-button size="small" type="primary">点击上传</el-button>
             </el-upload>
@@ -68,32 +70,82 @@ export default {
       afferent_tag_obj: {
         tag_id_list: []
       },
-      xlsxData:{
-        admin_id: this.$cookie.getCookie('admin_id'),
-        ttl: this.$cookie.getCookie('ttl'),
-        sign: this.$cookie.getCookie('sign'),
-        corpid: this.$localSelfStore.getLocal('defaultCorp') && this.$localSelfStore.getLocal('defaultCorp') != 'undefined' ? JSON.parse(this.$localSelfStore.getLocal('defaultCorp')).corpid : '',
-        type: 1,//素材类型。1图片 2语音 3视频
-      },
-      repeatNum:0
+      repeatNum:0,
+      fileUpload: null
     }
   },
   methods:{
+    changeFile(file,fileList){
+      console.log(file);
+      let test = new FormData()
+      test.append('file',file.raw)
+      this.fileUpload={
+        file:test
+      }
+      if(file.status == 'ready'){
+        // this.fileUpload.append('file',file.raw)
+      }else if(file.status == 'fail'){
+        this.$message({
+          message: '文件上传出错,请重新尝试',
+          type: "warning"
+        })
+      }
+    },
     save(){
-      // this.dialogVisible = false
+      if(!this.fileUpload){
+        this.$message({
+          message: '表格不能为空',
+          type: "warning"
+        })
+        return
+      }
+      if(this.user_id_list&&this.user_id_list.length==0){
+        this.$message({
+          message: '员工不能为空',
+          type: "warning"
+        })
+        return
+      }
+      this.$loading(this.$loadingConfig)
+      let data = {
+        user_id_list:this.user_id_list,
+        file:this.fileUpload.file,
+        customer_tag_list:this.afferent_tag_obj.tag_id_list
+      }
+      console.log(data);
+      this.$axios.post(this.URL.BASEURL + this.URL.batchAddCustomerImport, data).then((res) => {
+        var res = res.data
+        this.$message({
+          message: res.err,
+          type: "warning"
+        })
+        if(res&&res.errno==0){
+          this.dialogVisible = false
+        }
 
-      this.$nextTick(()=>{
-        this.$refs.dialogPublic.dialogVisible = true
-        this.dialogTitle = '提醒'
-        this.dialogMsg = `系统检测到导入客户列表中，与已导入客户列表有${this.repeatNum}个重复客户，是否跳过重复客户继续导入？`
+        this.$loading(this.$loadingConfig).close();
+      }).catch((err) => {
+        this.$loading(this.$loadingConfig).close();
+        this.$message({
+          message: err,
+          type: "warning"
+        })
+      });
+    },
+    save_bf(){
+      // this.dialogVisible = false
 
-      })
+      // this.$nextTick(()=>{
+      //   this.$refs.dialogPublic.dialogVisible = true
+      //   this.dialogTitle = '提醒'
+      //   this.dialogMsg = `系统检测到导入客户列表中，与已导入客户列表有${this.repeatNum}个重复客户，是否跳过重复客户继续导入？`
+      // })
     },
     tagDefine (data) {//标签选择回调
       if (data.tag_id_list && data.tag_id_list.length != 0) {
-        this.tag_info = data.tag_id_list
+        this.afferent_tag_obj.tag_id_list = data.tag_id_list
       } else {
-        this.tag_info = []
+        this.afferent_tag_obj.tag_id_list = []
       }
     },
     uploadRemove(file, fileList){
@@ -110,7 +162,7 @@ export default {
       })
     },
     uploadSuccess (res, file, fileList) {
-      console.log(res, file, fileList)
+      // console.log(res, file, fileList)
       this.$loading(this.$loadingConfig).close()
 
       // if (res.errno == 0) {

project/src/components/marketingGuest/batchAddFriend/addFriend/importRecordDetial.vue

@@ -9,7 +9,7 @@
     </div>
 
     <div class="flex-align-center">
-      <div>
+      <div style="padding-left: 20px">
         <span class="fWeight600 c-000 f14">共{{allNum?allNum:'0'}}个客户</span>
         <span class="c-666 lMar10 f14">已添加{{addedNum?addedNum:'0'}}个客户</span>
       </div>
@@ -126,7 +126,6 @@ export default {
     init (page, type) {
       this.page = page ? page : this.page;
       this.loading = true
-      console.log(this.$route.params.id);
       this.$axios.get(this.URL.BASEURL + this.URL.batchAddCustomerRecordDetail, {
         params: {
           record_id:this.$route.params.id,
@@ -139,7 +138,9 @@ export default {
         var res = res.data
         this.loading = false
         if (res && res.errno == 0) {
-          this.tableData = res.rst.data;
+          this.tableData = res.rst.data.list;
+          this.allNum = res.rst.data.total
+            this.addedNum = res.rst.data.complete_total
           this.total = res.rst.pageInfo.total;
           this.pages = res.rst.pageInfo.pages;
         } else if (res.errno != 4002) {

project/src/components/marketingGuest/batchAddFriend/addFriend/index.vue

@@ -8,7 +8,7 @@
         <self-input :hasLabel="false" label_name="电话/备注名" @inputChange='(val)=>{input_keyword = val;init(1)}'></self-input>
         <el-button class="lMar10" type="primary" plain size="small" @click="$refs.importCustomerRef.dialogVisible = true">导入客户</el-button>
         <el-button type="primary" plain size="small" @click="$router.push('/importRecord')">导入记录</el-button>
-        <el-button type="primary" plain size="small" @click="$refs.settingRef.dialogVisible = true">设置</el-button>
+        <el-button type="primary" plain size="small" @click="$refs.settingRef.dialogVisible = true,$refs.settingRef.rebackInfo()">设置</el-button>
 
         <el-button v-if="status!==0" type="primary" plain size="small" @click="batchDele()">批量删除</el-button>
         <el-button v-if="status==1 || status==2" type="primary" plain size="small" @click="batchRemind()">批量提醒</el-button>
@@ -22,10 +22,11 @@
               :data="tableData"
               tooltip-effect="dark"
               style="width: 100%"
+              @select="rowSelectClick"
               @selection-change="handleSelectionChange"
               v-loading="loading">
       <el-table-column width="30px" type="selection" v-if="status!==0"></el-table-column>
-      <el-table-column label="电话号码" align="center" show-overflow-tooltip>
+      <el-table-column label="电话号码" align="center" show-overflow-tooltip min-width="120">
         <template #header v-if="status!==0">
           <div class="customTitle" slot="reference">{{pageOptionValue==0?'选择当前页面客户':'选择全部客户'}}<i class="el-icon-arrow-down"></i>
 <!--            @visible-change="pageOptionValue=''"-->
@@ -103,9 +104,9 @@
       <el-table-column label="操作" align="center">
         <template slot-scope="scope">
           <div style="display: flex;align-items: center;justify-content: center;flex-wrap: wrap">
-            <div class="c-00B38A pointer" @click="goDetail(scope.row.id)">详情</div>
+            <div v-if="scope.row.add_status==3" class="c-00B38A pointer"  @click="goDetail(scope.row.id)">详情</div>
             <div class="c-00B38A pointer lMar10" @click="deleCustomer(scope.row.id)">删除</div>
-            <div v-if="scope.row.add_status==4" class="lMar10" :class="scope.row.add_status==4 ? 'c-00B38A pointer' : 'c-999 pointer-drop' " @click="scope.row.add_status==4 && allotCustomer(scope.row.id)">分配</div>
+            <div v-if="scope.row.add_status==4" class="lMar10" :class="scope.row.add_status==4 ? 'c-00B38A pointer' : 'c-999 pointer-drop' " @click="allotCustomer(scope.row.id)">分配</div>
             <div v-if="scope.row.add_status==1||scope.row.add_status==2" class="c-00B38A pointer lMar10" @click="remindCustomer(scope.row.user_id,scope.row.add_status)">提醒</div>
           </div>
         </template>
@@ -117,7 +118,7 @@
     </div>
 
 <!--    提醒分配等公共弹框-->
-    <dialogPublic ref="dialogPublic" :dialogTitle="dialogTitle" :dialogMsg="dialogMsg" type="addCustomer" :user_ids="user_ids"></dialogPublic>
+    <dialogPublic ref="dialogPublic" :dialogTitle="dialogTitle" :dialogMsg="dialogMsg" :type="dialogType" :user_ids="user_ids"></dialogPublic>
     <!--    设置-->
     <setting ref="settingRef"></setting>
     <!--    导入客户-->
@@ -170,16 +171,19 @@ export default {
       page_size: 20,
       dialogTitle:'',
       dialogMsg:'',
+      dialogType:'',
       user_id_list:[],
       noChooseFlag:false,//是否选中电话号码,true,表示没有人
       time:[],
-      user_ids:[],//批量选中的人
-      exclude_id_list:[],//批量选中后,删除的人
+      user_ids:[],//批量选中的人,user_id
+      select_id_list:[],//批量选中的人,id
+      exclude_id_list:[],//批量选中后,删除的人,id
       pageOptionValue:0,
       pageOptions: [
         { name: '全部', id: 1 },
         { name: '当前页面', id: 0 },
       ],
+      allotId:''
     }
   },
   watch:{
@@ -196,34 +200,28 @@ export default {
 
     this.height = document.documentElement.clientHeight - 250 > 400 ? document.documentElement.clientHeight - 250 : 400
     this.init(1)
-    this.$nextTick(()=>{
-      this.$refs.settingRef.dialogVisible = true
-    })
   },
   methods:{
     pageOptionSelect (val) {//选择
       this.pageOptionValue = val
-      console.log(this.pageOptionValue);
-      // if (val && val != '') {
-      //   this.old_pageOptionValue = val;
-      // }
-      // this.exclude_multiple_selection = {}
+
       if (this.pageOptionValue == 1) {
-        // this.isAll = true
+        this.$nextTick(()=>{
+          this.tableData.forEach((row) => {
+            this.$refs.multipleTable.toggleRowSelection(row, true);
+          })
+        })
+
       } else {//选择当前页面
-        // this.isAll = false
-        // let current_page_data = this.multipleSelection[this.page];
-        // this.multipleSelection = {};
-        // this.multipleSelection[this.page] = current_page_data ? current_page_data : null;
+        this.$nextTick(()=>{
+          this.tableData.forEach((row) => {
+            this.$refs.multipleTable.toggleRowSelection(row, false);
+          })
+        })
+
       }
-      // this.tableData.forEach((row) => {
-      //   this.$refs.multipleTable.toggleRowSelection(row, true);
-      // });
 
     },
-    clearuser_ids(){ //清空批量选中的人
-      this.user_ids = []
-    },
     noChooseCustomeTips(){//没有选择客户提示
       this.noChooseFlag = false
       if( this.user_ids&& this.user_ids.length==0){
@@ -234,29 +232,42 @@ export default {
         this.noChooseFlag = true
       }
     },
+    rowSelectClick(selection, row){
+     if(this.pageOptionValue==1){
+       this.exclude_id_list.push(row.id)
+     }
+    },
     handleSelectionChange(val){//列表选择人员
-      console.log(val);
       this.user_ids = []
+      this.select_id_list = []
       val.forEach(item=>{
         this.user_ids.push(item.user_id)
+        this.select_id_list.push(item.id)
       })
-
     },
     batchDele(){//批量删除
       this.noChooseCustomeTips()
       if(this.noChooseFlag){
         return
       }
-      this.$alert('确定删除选择的客户?', '提示', {
+      this.$alert(`确定删除选择的${this.select_id_list&&this.select_id_list.length}个客户?`, '提示', {
         cancelButtonText: '取消',
         confirmButtonText: '确定',
       }).then(()=>{
-        this.$message({
-          type: 'success',
-          message: '删除成功!'
-        });
+        this.allot_dele_remind_pack('dele',this.pageOptionValue,this.select_id_list,this.exclude_id_list)
       })
     },
+    deleCustomer(id){//单个删除
+      this.$alert('是否确定删除此客户', '提示', {
+        cancelButtonText: '取消',
+        confirmButtonText: '确定',
+      }).then(()=>{
+        let ids = []
+        ids.push(id)
+        this.allot_dele_remind_pack('dele',0,ids)
+      })
+    },
+
     batchRemind(){//批量提醒
       this.noChooseCustomeTips()
       if(this.noChooseFlag){
@@ -266,73 +277,73 @@ export default {
         cancelButtonText: '取消',
         confirmButtonText: '确定',
       }).then(()=>{
-        this.$axios.post(this.URL.BASEURL + this.URL.batchRemind, {
-          add_status:this.status==0?'':this.status,
-          keyword:this.input_keyword,
-          start_time: this.time[0],
-          end_time: this.time[1],
-          select_all:this.pageOptionValue,
-          select_id_list:this.user_ids,
-          exclude_id_list:this.exclude_id_list
-        }).then((res) => {
-          var res = res.data
-          this.$message({
-            message: res.err,
-            type: "warning"
-          })
-
-        }).catch((err) => {
-          this.loading = false
-          this.$message({
-            message: err,
-            type: "warning"
-          })
-        });
+        this.allot_dele_remind_pack('remind',this.pageOptionValue,this.select_id_list,this.exclude_id_list)
+      })
+    },
+    remindCustomer(user_id,status){//单个提醒,走的接口二
+      this.$nextTick(()=>{
+        this.$refs.dialogPublic.dialogVisible = true
+        this.dialogType = 'remindSingle'
+        this.dialogTitle = '提醒'
+        this.dialogMsg = `如果员工长时间未${status == 1 ? '添加客户' : '通过好友申请可再次添加'}，可通过企微助手再次提醒员工${status == 1 ? '添加' : '跟进'}客户，是否确认发送？`
+        this.user_ids = []
+        this.user_ids.push(user_id)
       })
     },
-    batchAllot(){//批量分配
+
+    batchAllot(){//批量分配,单个分配
       this.noChooseCustomeTips()
       if(this.noChooseFlag){
         return
       }
       this.$nextTick(()=>{
         this.$refs.dialogPublic.dialogVisible = true
+        this.dialogType = 'allotMultiple'
         this.dialogTitle = '分配'
         this.dialogMsg = ''
+        this.user_id_list = []
       })
 
     },
-    goDetail(){
-
-    },
-    allotCustomer(){//单个分配
+    allotCustomer(id){//单个分配
       this.$nextTick(()=>{
         this.$refs.dialogPublic.dialogVisible = true
+        this.dialogType = 'allotSingle'
         this.dialogTitle = '分配'
         this.dialogMsg = ''
         this.user_id_list = []
+        this.allotId = id
       })
+    },
 
+    dialogPublic_allot_single(){//单个分配
+      let ids = []
+      ids.push(this.allotId)
+      this.allot_dele_remind_pack('allot',0,ids)
     },
-    remindCustomer(user_id,status){//单个提醒
-      this.$nextTick(()=>{
-        this.$refs.dialogPublic.dialogVisible = true
-        this.dialogTitle = '提醒'
-        this.dialogMsg = `如果员工长时间未${status == 1 ? '添加客户' : '通过好友申请可再次添加'}，可通过企微助手再次提醒员工${status == 1 ? '添加' : '跟进'}客户，是否确认发送？`
-        this.user_ids = []
-        this.user_ids.push(user_id)
-      })
+    dialogPublic_allot_multiple(){//多选分配
+      this.allot_dele_remind_pack('allot',this.pageOptionValue,this.select_id_list,this.exclude_id_list)
     },
-    delePack(select_id_list,exclude_id_list){
+
+    allot_dele_remind_pack(type,select_all,select_id_list,exclude_id_list){//分配,删除,提醒,多选及单个
       this.loading=true
-      this.$axios.post(this.URL.BASEURL + this.URL.batchAddCustomer_delete, {
+      let api = ''
+      if(type == 'allot'){
+        api=this.URL.batchDistributionCustomer
+      }else if(type == 'dele'){
+        api=this.URL.batchAddCustomer_delete
+      }else if(type == 'remind'){
+        api=this.URL.batchRemind
+      }
+      this.$axios.post(this.URL.BASEURL + api, {
         add_status:this.status==0?'':this.status,
         keyword:this.input_keyword,
         start_time: this.time[0],
         end_time: this.time[1],
-        select_all:0,
+        select_all:select_all,
         select_id_list:select_id_list,
-        exclude_id_list:exclude_id_list?exclude_id_list:[]
+        exclude_id_list:exclude_id_list?exclude_id_list:[],
+        user_id_list:this.$refs.dialogPublic.user_id_list
       }).then((res) => {
         this.loading = false
         var res = res.data
@@ -351,16 +362,11 @@ export default {
         })
       });
     },
-    deleCustomer(id){//单个删除
-      this.$alert('是否确定删除此客户', '提示', {
-        cancelButtonText: '取消',
-        confirmButtonText: '确定',
-      }).then(()=>{
-        let ids = []
-        ids.push(id)
-        this.delePack(ids)
-      })
+
+    goDetail(){
+
     },
+
     init (page, type) {
       this.page = page ? page : this.page;
       this.loading = true
@@ -380,6 +386,20 @@ export default {
           this.tableData = res.rst.data;
           this.total = res.rst.pageInfo.total;
           this.pages = res.rst.pageInfo.pages;
+
+          //重置
+          this.user_ids=[]
+          this.select_id_list=[]
+          this.exclude_id_list=[]
+
+          if(this.pageOptionValue == 1){
+            this.$nextTick(() => {
+              this.tableData.forEach((row) => {
+                this.$refs.multipleTable.toggleRowSelection(row, true);
+              })
+            })
+          }
+
         } else if (res.errno != 4002) {
           this.$message({
             message: res.err,

project/src/components/marketingGuest/batchAddFriend/addFriend/setting.vue

@@ -2,11 +2,10 @@
     <div class="friend_setting">
       <el-dialog
         title="设置"
-        v-loading="loading"
         :visible.sync="dialogVisible"
         width="40%">
 
-        <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
+        <el-tabs v-model="activeName" type="card" @tab-click="handleClick" v-loading="loading">
           <el-tab-pane label="自动提醒" name="first">
 <!--      未分配提醒      -->
             <template>
@@ -106,7 +105,7 @@ export default {
       loading:false,
       config_list:{
         assigned:{//未分配配置
-          config_id:0,
+          config_id:'',
           type:1,
           threshold:1,
           action_time:'09:00:00',
@@ -114,30 +113,28 @@ export default {
           enable:0
         },
         charged:{//未跟进配置
-          config_id:0,
+          config_id:'',
           type:2,
           threshold:1,
           action_time:"09:00:00",
           enable:0
         },
         auto_recycle:{//未通过提醒
-          config_id:0,
+          config_id:'',
           type:3,
           threshold:1,
           enable:0
         }
-      },
+      }
     }
   },
   watch:{
     user_id_list(){
-      console.log(this.user_id_list);
       this.config_list.assigned.notice_users = this.user_id_list&&this.user_id_list.length>0 ? (this.user_id_list.length==1?this.user_id_list[0]:this.user_id_list.join()) : ''
-      console.log(this.config_list.assigned.notice_users);
     }
   },
   created(){
-    this.rebackInfo()
+
   },
   methods:{
     handleClick(){
@@ -155,11 +152,14 @@ export default {
     },
 
     newSetting(){
-      this.$loading(this.$loadingConfig)
+      this.loading=true
+      // this.$loading(this.$loadingConfig)
       let config_list_finally=[]
+      this.config_list.assigned.threshold = this.config_list.assigned.threshold*60
+      this.config_list.charged.threshold = this.config_list.charged.threshold*60
+      this.config_list.auto_recycle.threshold = this.config_list.auto_recycle.threshold*60
       config_list_finally.push(this.config_list.assigned,this.config_list.charged,this.config_list.auto_recycle)
       this.$axios.post(this.URL.BASEURL + this.URL.editConfig, {
-        config_id:'',
         sys_group_id:this.$cookie.getCookie('isSuperManage') == 1 ? sessionStorage.getItem('company_session_defaultCorp_level_1').toString() : '',
         config_list:config_list_finally
       }).then((res) => {
@@ -168,10 +168,11 @@ export default {
           message: res.err,
           type: "warning"
         })
-        this.$loading(this.$loadingConfig).close()
+        // this.$loading(this.$loadingConfig).close()
+        this.loading=false
         this.dialogVisible = false
       }).catch((err) => {
-        this.$loading(this.$loadingConfig).close()
+        this.loading=false
         this.$message({
           message: err,
           type: "warning"
@@ -180,15 +181,50 @@ export default {
     },
     rebackInfo(){
       this.loading = true
-      this.$axios.post(this.URL.BASEURL + this.URL.editConfig, {
-        sys_group_id:this.$cookie.getCookie('isSuperManage') == 1 ? Number(sessionStorage.getItem('company_session_defaultCorp_level_1')) : '',
+      this.$axios.get(this.URL.BASEURL + this.URL.setting_rebackInfo, {
+        params:{
+          sys_group_id:this.$cookie.getCookie('isSuperManage') == 1 ? Number(sessionStorage.getItem('company_session_defaultCorp_level_1')) : '',
+        }
       }).then((res) => {
-        this.loading = false
         var res = res.data
         if(res&&res.errno==0){
-          this.config_list = res.rst
-          // this.user_id_list = res.rst.assigned.notice_users.split(',')
+          let configData = this.config_list
+          configData.assigned = res.rst.assigned
+          configData.charged = res.rst.charged
+          configData.auto_recycle = res.rst.auto_recycle
+
+
+          if(res.rst.assigned.enable == 1){
+            configData.assigned.enable = true
+            configData.assigned.threshold = res.rst.assigned.threshold/60
+            let users = configData.assigned.notice_users
+            if(users.split(',')){
+              this.user_id_list = users.split(',')
+            }else{
+              this.user_id_list.push(users)
+            }
+          }else{
+            configData.assigned.enable = false
+          }
+
+          if(res.rst.charged.enable == 1){
+            configData.charged.enable = true
+            configData.charged.threshold = res.rst.charged.threshold/60
+          }else{
+            configData.charged.enable = false
+          }
+
+          if(res.rst.auto_recycle.enable == 1){
+            configData.auto_recycle.enable = true
+            configData.auto_recycle.threshold = res.rst.auto_recycle.threshold/60
+          }else{
+            configData.auto_recycle.enable = false
+          }
+
+          this.loading = false
+
         }else{
+          this.loading=false
           this.$message({
             message: res.err,
             type: "warning"
@@ -228,7 +264,7 @@ export default {
 <style lang="scss" scoped>
 .splitLine{
   width: 100%;
-  border: 1px solid #ddd;
+  border-top: 1px solid #ddd;
   margin: 20px 0;
 }
 </style>