lk 5 years ago
parent
commit
cfc6fe0da4
71 changed files with 152 additions and 140 deletions
  1. 2 2
      dist/200.html
  2. 1 0
      dist/_nuxt/04028dde304314bc77d5.css
  3. 1 1
      dist/_nuxt/9136bfbf6afb18bd967a.js
  4. 1 0
      dist/_nuxt/63cffbdefd0909b1cb72.js
  5. 0 1
      dist/_nuxt/668b0ec768805c408f81.css
  6. 1 0
      dist/_nuxt/c0dae88b059d0d7d5cd2.js
  7. 0 1
      dist/_nuxt/ef875949355c6fe0cc5c.js
  8. 0 1
      dist/_nuxt/f42df1c43780eec0daa4.js
  9. 2 2
      dist/index.html
  10. 2 2
      dist/login/index.html
  11. 2 2
      dist/main/404/index.html
  12. 2 2
      dist/main/account_manager/index.html
  13. 2 2
      dist/main/artificial_order/index.html
  14. 2 2
      dist/main/artificial_orders/index.html
  15. 2 2
      dist/main/balance_change/index.html
  16. 2 2
      dist/main/cancel_account/index.html
  17. 2 2
      dist/main/cash_form/index.html
  18. 2 2
      dist/main/cats/index.html
  19. 2 2
      dist/main/cert_check/index.html
  20. 2 2
      dist/main/cert_edit/index.html
  21. 2 2
      dist/main/cert_pro/index.html
  22. 2 2
      dist/main/chat_users/index.html
  23. 2 2
      dist/main/cloud_balance/index.html
  24. 2 2
      dist/main/cloud_developer/index.html
  25. 2 2
      dist/main/cloud_job/index.html
  26. 2 2
      dist/main/cps_manage/index.html
  27. 2 2
      dist/main/dev_check/index.html
  28. 2 2
      dist/main/dev_check_detail/index.html
  29. 2 2
      dist/main/dev_show/index.html
  30. 2 2
      dist/main/gongmall/index.html
  31. 2 2
      dist/main/group_list/index.html
  32. 2 2
      dist/main/index.html
  33. 2 2
      dist/main/invoice_audit/index.html
  34. 2 2
      dist/main/jishuquan/index.html
  35. 2 2
      dist/main/job/index.html
  36. 2 2
      dist/main/jobs/index.html
  37. 2 2
      dist/main/jobs_behalf_post/index.html
  38. 2 2
      dist/main/jobs_publish_company/index.html
  39. 2 2
      dist/main/kaifabao/index.html
  40. 2 2
      dist/main/kaifawu_contact/index.html
  41. 2 2
      dist/main/orders/index.html
  42. 2 2
      dist/main/orders_detail/index.html
  43. 2 2
      dist/main/orders_frozen/index.html
  44. 2 2
      dist/main/outsource_bill/index.html
  45. 2 2
      dist/main/persona/index.html
  46. 2 2
      dist/main/present_job_apply/index.html
  47. 2 2
      dist/main/project_form/index.html
  48. 2 2
      dist/main/publish_present/index.html
  49. 2 2
      dist/main/qingtuanbao/index.html
  50. 2 2
      dist/main/remark_list/index.html
  51. 2 2
      dist/main/report_business/index.html
  52. 2 2
      dist/main/report_cash/index.html
  53. 2 2
      dist/main/solution/index.html
  54. 2 2
      dist/main/solution_detail/index.html
  55. 2 2
      dist/main/solution_manage/index.html
  56. 2 2
      dist/main/user_bills/index.html
  57. 2 2
      dist/main/user_cards_list/index.html
  58. 2 2
      dist/main/user_credit_item/index.html
  59. 2 2
      dist/main/user_credit_list/index.html
  60. 2 2
      dist/main/user_credit_setting/index.html
  61. 2 2
      dist/main/user_workfile_list/index.html
  62. 2 2
      dist/main/vip_manager/index.html
  63. 2 2
      dist/main/vip_order/index.html
  64. 2 2
      dist/main/vip_setting/index.html
  65. 2 2
      dist/main/wage_details/index.html
  66. 2 2
      dist/main/wage_settlement/index.html
  67. 2 2
      dist/main/wait_expend/index.html
  68. 2 2
      dist/main/withdraw/index.html
  69. 2 2
      dist/main/work_bill/index.html
  70. 22 10
      pages/main/index/account_manager.vue
  71. 2 2
      pages/main/index/remark_list.vue

File diff suppressed because it is too large
+ 2 - 2
dist/200.html


+ 1 - 0
dist/_nuxt/04028dde304314bc77d5.css

@@ -0,0 +1 @@
+.page[data-v-19c3763f]{margin-top:10px}

File diff suppressed because it is too large
+ 1 - 1
dist/_nuxt/9136bfbf6afb18bd967a.js


File diff suppressed because it is too large
+ 1 - 0
dist/_nuxt/63cffbdefd0909b1cb72.js


+ 0 - 1
dist/_nuxt/668b0ec768805c408f81.css

@@ -1 +0,0 @@
-.page[data-v-6b53f436]{margin-top:10px}

File diff suppressed because it is too large
+ 1 - 0
dist/_nuxt/c0dae88b059d0d7d5cd2.js


File diff suppressed because it is too large
+ 0 - 1
dist/_nuxt/ef875949355c6fe0cc5c.js


File diff suppressed because it is too large
+ 0 - 1
dist/_nuxt/f42df1c43780eec0daa4.js


File diff suppressed because it is too large
+ 2 - 2
dist/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/login/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/404/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/account_manager/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/artificial_order/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/artificial_orders/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/balance_change/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/cancel_account/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/cash_form/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/cats/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/cert_check/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/cert_edit/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/cert_pro/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/chat_users/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/cloud_balance/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/cloud_developer/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/cloud_job/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/cps_manage/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/dev_check/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/dev_check_detail/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/dev_show/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/gongmall/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/group_list/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/invoice_audit/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/jishuquan/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/job/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/jobs/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/jobs_behalf_post/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/jobs_publish_company/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/kaifabao/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/kaifawu_contact/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/orders/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/orders_detail/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/orders_frozen/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/outsource_bill/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/persona/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/present_job_apply/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/project_form/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/publish_present/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/qingtuanbao/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/remark_list/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/report_business/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/report_cash/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/solution/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/solution_detail/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/solution_manage/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/user_bills/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/user_cards_list/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/user_credit_item/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/user_credit_list/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/user_credit_setting/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/user_workfile_list/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/vip_manager/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/vip_order/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/vip_setting/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/wage_details/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/wage_settlement/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/wait_expend/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/withdraw/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/work_bill/index.html


+ 22 - 10
pages/main/index/account_manager.vue

@@ -31,17 +31,17 @@
               label="评价等级">
               <template slot-scope="scope">
                 <span class="lblue point">
-                   <el-rate  :value="scope.row.grade" disabled></el-rate>
+                   <el-rate :value="scope.row.grade" disabled></el-rate>
                 </span>
                 <span>
-                  {{scope.row.grade_name}}
+                  {{ scope.row.grade_name }}
                 </span>
               </template>
             </el-table-column>
             <el-table-column prop="create_time" label="评价标签">
               <template slot-scope="scope">
                 <span v-for="item in scope.row.labels" style="margin-left: 5px">
-                  <el-tag size="mini" type="info">{{item}}</el-tag>
+                  <el-tag size="mini" type="info">{{ item }}</el-tag>
                 </span>
               </template>
             </el-table-column>
@@ -70,10 +70,11 @@
               label="原客户经理">
               <template slot-scope="scope">
           <span class="lblue point">
-            <a target="_blank" :href="scope.row.host+'/rooter/user/'+scope.row.before_uid" v-if="scope.row.before_uid != '0'">{{
+            <a target="_blank" :href="scope.row.host+'/rooter/user/'+scope.row.before_uid"
+               v-if="scope.row.before_uid != '0'">{{
                 scope.row.before_uid_name + '(' + scope.row.before_uid + ')'
               }}</a>
-            <a href="javascript:;"  v-else>-</a>
+            <a href="javascript:;" v-else>-</a>
           </span>
               </template>
             </el-table-column>
@@ -82,10 +83,11 @@
               label="更换后客户经理">
               <template slot-scope="scope">
           <span class="lblue point">
-            <a target="_blank" :href="scope.row.host+'/rooter/user/'+scope.row.this_uid" v-if="scope.row.this_uid != '0'">{{
+            <a target="_blank" :href="scope.row.host+'/rooter/user/'+scope.row.this_uid"
+               v-if="scope.row.this_uid != '0'">{{
                 scope.row.this_uid_name + '(' + scope.row.this_uid + ')'
               }}</a>
-             <a href="javascript:;"  v-else>-</a>
+             <a href="javascript:;" v-else>-</a>
           </span>
               </template>
             </el-table-column>
@@ -103,13 +105,15 @@
             </el-table-column>
             <el-table-column label="备注">
               <template slot-scope="scope">
-                <span>{{ scope.row.remark_text }}</span>
+                <div>{{ scope.row.remark_text }}</div>
+                <el-button type="text" @click="onToList(scope.row)">查看备注({{ scope.row.remark_num }})</el-button>
               </template>
             </el-table-column>
             <el-table-column label="操作">
               <template slot-scope="scope">
                 <el-button type="text" @click="onRemark(scope.row)">添加备注</el-button>
-                <el-button type="text" v-if="scope.row.status === '0'" @click="onUpdateManager(scope.row)">立即处理</el-button>
+                <el-button type="text" v-if="scope.row.status === '0'" @click="onUpdateManager(scope.row)">立即处理
+                </el-button>
                 <el-button type="text" v-else disabled>已处理</el-button>
 
               </template>
@@ -203,9 +207,16 @@ export default {
     },
     onRemark(row) {
       this.remarkData.id = row.id;
-      this.remarkData.content = row.remark || '';
+      // this.remarkData.content = row.remark || '';
       this.remarkModel = true;
     },
+    onToList(row) {
+      let data = {
+        obj_id: row.id,
+        type: 3
+      }
+      this.$router.push({path: '/main/remark_list', query: data});
+    },
     async onRemarkSave() {
       this.loading = true;
       if (this.remarkData.content === '' || this.remarkData.id === '0') {
@@ -213,6 +224,7 @@ export default {
         this.loading = false
         return false
       }
+
       let data = {content: this.remarkData.content, id: this.remarkData.id}
       let res = await this.$post("/api/admin/accountManager/saveRemark", data);
       if (res && res.status === 1) {

+ 2 - 2
pages/main/index/remark_list.vue

@@ -68,16 +68,16 @@ export default {
         return;
       }
       this.formData.obj_id = query.obj_id || 0;
+      this.formData.type = query.type || 2;
       this.getDatas();
     },
     async getDatas() {
       const res = await this.$post("/api/admin/kaifawu/remarkList", {
-        type: 2,
+        type: this.formData.type,
         obj_id: this.formData.obj_id,
         page: this.pageInfo.page,
       });
       let data = res.data;
-      debugger;
       this.tableData = data.list;
       this.pageInfo.total = Number(data.total);
       this.pageInfo.page = data.totalPage;