fix:列表跟进显示

assets/canteenApi-DPwCClX9.js

@@ -1 +1 @@
-import{f as t}from"./index-CIWM2cOp.js";class a{static list(a){return t.post({url:"canteen/list",params:a})}static info(a){return t.post({url:"canteen/info",params:{id:a}})}static add(a){return t.post({url:"canteen/add",params:a})}static updateAttr(a){return t.post({url:"canteen/updateAttr",params:a})}static edit(a){return t.post({url:"canteen/edit",params:a})}static delete(a){return t.post({url:"canteen/delete",params:a})}}export{a as c};
+import{f as t}from"./index-BTnKsnNs.js";class a{static list(a){return t.post({url:"canteen/list",params:a})}static info(a){return t.post({url:"canteen/info",params:{id:a}})}static add(a){return t.post({url:"canteen/add",params:a})}static updateAttr(a){return t.post({url:"canteen/updateAttr",params:a})}static edit(a){return t.post({url:"canteen/edit",params:a})}static delete(a){return t.post({url:"canteen/delete",params:a})}}export{a as c};

assets/companyApi-DPOTpcoM.js

@@ -1 +1 @@
-import{f as t}from"./index-CIWM2cOp.js";class a{static list(a){return t.post({url:"company/list",params:a})}static info(a){return t.post({url:"company/info",params:{id:a}})}static add(a){return t.post({url:"company/add",params:a})}static updateAttr(a){return t.post({url:"company/updateAttr",params:a})}static edit(a){return t.post({url:"company/edit",params:a})}static delete(a){return t.post({url:"company/delete",params:a})}}export{a as c};
+import{f as t}from"./index-BTnKsnNs.js";class a{static list(a){return t.post({url:"company/list",params:a})}static info(a){return t.post({url:"company/info",params:{id:a}})}static add(a){return t.post({url:"company/add",params:a})}static updateAttr(a){return t.post({url:"company/updateAttr",params:a})}static edit(a){return t.post({url:"company/edit",params:a})}static delete(a){return t.post({url:"company/delete",params:a})}}export{a as c};

assets/schoolApi-Dcq1ai6W.js

@@ -1 +1 @@
-import{f as t}from"./index-CIWM2cOp.js";class s{static list(s){return t.post({url:"school/list",params:s})}static info(s){return t.post({url:"school/info",params:{id:s}})}static add(s){return t.post({url:"school/add",params:s})}static updateAttr(s){return t.post({url:"school/updateAttr",params:s})}static edit(s){return t.post({url:"school/edit",params:s})}static delete(s){return t.post({url:"school/delete",params:s})}}export{s};
+import{f as t}from"./index-BTnKsnNs.js";class s{static list(s){return t.post({url:"school/list",params:s})}static info(s){return t.post({url:"school/info",params:{id:s}})}static add(s){return t.post({url:"school/add",params:s})}static updateAttr(s){return t.post({url:"school/updateAttr",params:s})}static edit(s){return t.post({url:"school/edit",params:s})}static delete(s){return t.post({url:"school/delete",params:s})}}export{s};

assets/user-dialog-BMi9CeRp.js

@@ -1 +1 @@
-import{_ as t}from"./user-dialog.vue_vue_type_script_setup_true_lang-DKx3zhmh.js";import"./index-CIWM2cOp.js";import"./vendor-PYYQvXwe.js";/* empty css                   *//* empty css                  *//* empty css                *//* empty css               *//* empty css                  *//* empty css                     */import"./el-form-item-l0sNRNKZ.js";/* empty css                 */import"./city-DliyaBYD.js";export{t as default};
+import{_ as t}from"./user-dialog.vue_vue_type_script_setup_true_lang-98m29iwd.js";import"./index-BTnKsnNs.js";import"./vendor-PYYQvXwe.js";/* empty css                   *//* empty css                  *//* empty css                *//* empty css               *//* empty css                  *//* empty css                     */import"./el-form-item-l0sNRNKZ.js";/* empty css                 */import"./city-DliyaBYD.js";export{t as default};

assets/user-dialog-C2mqfj7x.js

@@ -1 +1 @@
-import{_ as t}from"./user-dialog.vue_vue_type_script_setup_true_lang-CO9w9l6U.js";import"./index-CIWM2cOp.js";import"./vendor-PYYQvXwe.js";/* empty css                   *//* empty css                  *//* empty css                *//* empty css               *//* empty css                  *//* empty css                     */import"./el-form-item-l0sNRNKZ.js";/* empty css                 */export{t as default};
+import{_ as t}from"./user-dialog.vue_vue_type_script_setup_true_lang-Ut1sPQt_.js";import"./index-BTnKsnNs.js";import"./vendor-PYYQvXwe.js";/* empty css                   *//* empty css                  *//* empty css                *//* empty css               *//* empty css                  *//* empty css                     */import"./el-form-item-l0sNRNKZ.js";/* empty css                 */export{t as default};

assets/user-dialog-DqOlOP9l.js

@@ -1 +1 @@
-import{_ as t}from"./user-dialog.vue_vue_type_script_setup_true_lang-cpX9jAAm.js";import"./index-CIWM2cOp.js";import"./vendor-PYYQvXwe.js";/* empty css                   *//* empty css                  *//* empty css                *//* empty css               *//* empty css                  *//* empty css                     */import"./el-form-item-l0sNRNKZ.js";/* empty css                 */export{t as default};
+import{_ as t}from"./user-dialog.vue_vue_type_script_setup_true_lang-DMJiKQ9N.js";import"./index-BTnKsnNs.js";import"./vendor-PYYQvXwe.js";/* empty css                   *//* empty css                  *//* empty css                *//* empty css               *//* empty css                  *//* empty css                     */import"./el-form-item-l0sNRNKZ.js";/* empty css                 */export{t as default};

assets/user-search-BHdIv42V.js

@@ -1 +0,0 @@
-import{_ as e}from"./user-search.vue_vue_type_script_setup_true_lang-B-CaguHV.js";import"./index-B9brkbRe.js";import"./index-CIWM2cOp.js";import"./vendor-PYYQvXwe.js";/* empty css                 */import"./index-DLvUmASb.js";import"./_plugin-vue_export-helper-BCo6x5W8.js";export{e as default};

assets/user-search-Bll9yrXu.js

@@ -0,0 +1 @@
+import{_ as e}from"./user-search.vue_vue_type_script_setup_true_lang-D0cI3QTV.js";import"./index-BP_2F9i_.js";import"./index-BTnKsnNs.js";import"./vendor-PYYQvXwe.js";/* empty css                 */import"./index-GhWOHfEJ.js";import"./_plugin-vue_export-helper-BCo6x5W8.js";export{e as default};

assets/user-search-C-ZAK4vl.js

@@ -0,0 +1 @@
+import{_ as e}from"./user-search.vue_vue_type_script_setup_true_lang-B7pL6jVu.js";import"./index-BP_2F9i_.js";import"./index-BTnKsnNs.js";import"./vendor-PYYQvXwe.js";/* empty css                 */import"./index-GhWOHfEJ.js";import"./_plugin-vue_export-helper-BCo6x5W8.js";export{e as default};

assets/user-search-COictrhF.js

@@ -0,0 +1 @@
+import{_ as e}from"./user-search.vue_vue_type_script_setup_true_lang-B2mM_abv.js";import"./index-BP_2F9i_.js";import"./index-BTnKsnNs.js";import"./vendor-PYYQvXwe.js";/* empty css                 */import"./index-GhWOHfEJ.js";import"./_plugin-vue_export-helper-BCo6x5W8.js";import"./city-DliyaBYD.js";export{e as default};

assets/user-search-CT2LC1DW.js

@@ -0,0 +1 @@
+import{_ as e}from"./user-search.vue_vue_type_script_setup_true_lang-B7CM89cJ.js";import"./index-BP_2F9i_.js";import"./index-BTnKsnNs.js";import"./vendor-PYYQvXwe.js";/* empty css                 */import"./index-GhWOHfEJ.js";import"./_plugin-vue_export-helper-BCo6x5W8.js";export{e as default};

assets/user-search-CiCXXIES.js

@@ -1 +0,0 @@
-import{_ as e}from"./user-search.vue_vue_type_script_setup_true_lang-DcL6WiAt.js";import"./index-B9brkbRe.js";import"./index-CIWM2cOp.js";import"./vendor-PYYQvXwe.js";/* empty css                 */import"./index-DLvUmASb.js";import"./_plugin-vue_export-helper-BCo6x5W8.js";export{e as default};

assets/user-search-CsI-3A3M.js

@@ -1 +0,0 @@
-import{_ as e}from"./user-search.vue_vue_type_script_setup_true_lang--uQx5H4z.js";import"./index-B9brkbRe.js";import"./index-CIWM2cOp.js";import"./vendor-PYYQvXwe.js";/* empty css                 */import"./index-DLvUmASb.js";import"./_plugin-vue_export-helper-BCo6x5W8.js";export{e as default};

assets/user-search-D4UXmssM.js

@@ -0,0 +1 @@
+import{_ as e}from"./user-search.vue_vue_type_script_setup_true_lang-DAUDPhFh.js";import"./index-BP_2F9i_.js";import"./index-BTnKsnNs.js";import"./vendor-PYYQvXwe.js";/* empty css                 */import"./index-GhWOHfEJ.js";import"./_plugin-vue_export-helper-BCo6x5W8.js";export{e as default};

assets/user-search-DEEApJnp.js

@@ -1 +0,0 @@
-import{_ as e}from"./user-search.vue_vue_type_script_setup_true_lang-CbkCXkIy.js";import"./index-B9brkbRe.js";import"./index-CIWM2cOp.js";import"./vendor-PYYQvXwe.js";/* empty css                 */import"./index-DLvUmASb.js";import"./_plugin-vue_export-helper-BCo6x5W8.js";export{e as default};

assets/user-search-DJdYeqZn.js

@@ -1 +0,0 @@
-import{_ as e}from"./user-search.vue_vue_type_script_setup_true_lang-v7TXZ467.js";import"./index-B9brkbRe.js";import"./index-CIWM2cOp.js";import"./vendor-PYYQvXwe.js";/* empty css                 */import"./index-DLvUmASb.js";import"./_plugin-vue_export-helper-BCo6x5W8.js";import"./city-DliyaBYD.js";export{e as default};

assets/user-search-DREyot72.js

@@ -1 +0,0 @@
-import{_ as e}from"./user-search.vue_vue_type_script_setup_true_lang-r4MIBZj_.js";import"./index-B9brkbRe.js";import"./index-CIWM2cOp.js";import"./vendor-PYYQvXwe.js";/* empty css                 */import"./index-DLvUmASb.js";import"./_plugin-vue_export-helper-BCo6x5W8.js";export{e as default};

assets/user-search-DUt0EPwF.js

@@ -0,0 +1 @@
+import{_ as e}from"./user-search.vue_vue_type_script_setup_true_lang-D3A7UG0d.js";import"./index-BP_2F9i_.js";import"./index-BTnKsnNs.js";import"./vendor-PYYQvXwe.js";/* empty css                 */import"./index-GhWOHfEJ.js";import"./_plugin-vue_export-helper-BCo6x5W8.js";export{e as default};

assets/user-search-Dg2Ymh2n.js

@@ -0,0 +1 @@
+import{_ as e}from"./user-search.vue_vue_type_script_setup_true_lang-BcIYMrPc.js";import"./index-BP_2F9i_.js";import"./index-BTnKsnNs.js";import"./vendor-PYYQvXwe.js";/* empty css                 */import"./index-GhWOHfEJ.js";import"./_plugin-vue_export-helper-BCo6x5W8.js";export{e as default};

assets/user-search-DwfveflZ.js

@@ -1 +0,0 @@
-import{_ as e}from"./user-search.vue_vue_type_script_setup_true_lang-BOzsTx34.js";import"./index-B9brkbRe.js";import"./index-CIWM2cOp.js";import"./vendor-PYYQvXwe.js";/* empty css                 */import"./index-DLvUmASb.js";import"./_plugin-vue_export-helper-BCo6x5W8.js";export{e as default};

assets/user-search-ZJvjiQ8x.js

@@ -0,0 +1 @@
+import{_ as e}from"./user-search.vue_vue_type_script_setup_true_lang-DOPMHTON.js";import"./index-BP_2F9i_.js";import"./index-BTnKsnNs.js";import"./vendor-PYYQvXwe.js";/* empty css                 */import"./index-GhWOHfEJ.js";import"./_plugin-vue_export-helper-BCo6x5W8.js";import"./city-DliyaBYD.js";export{e as default};

assets/user-search-hJkfll4T.js

@@ -1 +0,0 @@
-import{_ as e}from"./user-search.vue_vue_type_script_setup_true_lang-CZ2xifcK.js";import"./index-B9brkbRe.js";import"./index-CIWM2cOp.js";import"./vendor-PYYQvXwe.js";/* empty css                 */import"./index-DLvUmASb.js";import"./_plugin-vue_export-helper-BCo6x5W8.js";import"./city-DliyaBYD.js";export{e as default};

assets/user-search-mP5tleHo.js

@@ -1 +0,0 @@
-import{_ as e}from"./user-search.vue_vue_type_script_setup_true_lang-Bv2ZQ5lu.js";import"./index-B9brkbRe.js";import"./index-CIWM2cOp.js";import"./vendor-PYYQvXwe.js";/* empty css                 */import"./index-DLvUmASb.js";import"./_plugin-vue_export-helper-BCo6x5W8.js";export{e as default};

assets/user-search-mpd-dRtP.js

@@ -0,0 +1 @@
+import{_ as e}from"./user-search.vue_vue_type_script_setup_true_lang-QQWoVg1H.js";import"./index-BP_2F9i_.js";import"./index-BTnKsnNs.js";import"./vendor-PYYQvXwe.js";/* empty css                 */import"./index-GhWOHfEJ.js";import"./_plugin-vue_export-helper-BCo6x5W8.js";export{e as default};

index.html

@@ -9,7 +9,7 @@
       content="逐趣CRM"
     />
     <link rel="shortcut icon" type="image/x-icon" href="/assets/favicon-B33nFcrs.ico" />
-    <script type="module" crossorigin src="/assets/index-CIWM2cOp.js"></script>
+    <script type="module" crossorigin src="/assets/index-BTnKsnNs.js"></script>
     <link rel="modulepreload" crossorigin href="/assets/vendor-PYYQvXwe.js">
     <link rel="stylesheet" crossorigin href="/assets/index-D4NieZRy.css">
   </head>

protected/controllers/CompanyRelationController.php

@@ -43,7 +43,7 @@ class CompanyRelationController extends Controller
             ->setAlias('r')
             ->setSelect('r.*, s.name as company_name, group_concat(sf.id) AS follow_ids')
             ->setJoin('LEFT JOIN wx_company s ON s.id=r.company_id')
-            ->addJoin('LEFT JOIN wx_school_follow AS sf ON sf.school_id = r.id')
+            ->addJoin('LEFT JOIN wx_company_follow AS sf ON sf.contact_id = r.id')
             ->setGroup('r.id')
             ->setOrder('r.id desc');
         if ($date = Helper::getPostDate('date')) {

protected/controllers/FollowController.php

@@ -139,9 +139,9 @@ class FollowController extends Controller
         $criteria = DbCriteria::simpleCompare($filter)->setOrder('id desc');
         $criteria->setAlias('t1')->addCondition('t2.id > 0');
         if ($this->type == 'canteen') {
-            $criteria->setSelect('t1.*,t2.name,t2.weixin,t2.phone');
+            $criteria->setSelect('t1.*,t2.name as second_name,t2.weixin,t2.phone');
         } else {
-            $criteria->setSelect('t1.*,t2.name,t2.weixin,t2.phone,t2.position');
+            $criteria->setSelect('t1.*,t2.name as second_name,t2.weixin,t2.phone,t2.position');
         }
         $criteria->join = "left join {$this->tableArr['table2']} t2 on t2.id = t1.{$this->tableArr['second_id']} and t2.is_del = 0";
         $data = DB::getListWithCriteria($this->tableArr['table'], $criteria);

protected/controllers/SchoolRelationController.php

@@ -43,7 +43,7 @@ class SchoolRelationController extends Controller
             ->setAlias('r')
             ->setSelect('r.*, s.name as school_name, group_concat(sf.id) AS follow_ids')
             ->setJoin('LEFT JOIN wx_school s ON s.id=r.school_id')
-            ->addJoin('LEFT JOIN wx_school_follow AS sf ON sf.school_id = r.id')
+            ->addJoin('LEFT JOIN wx_school_follow AS sf ON sf.contact_id = r.id')
             ->setGroup('r.id')
             ->setOrder('r.id desc');
         if ($date = Helper::getPostDate('date')) {
@@ -52,13 +52,13 @@ class SchoolRelationController extends Controller
         $data = DB::getListWithCriteria($this->table, $cri);
         if (!empty($data['records'])) {
             $users = Helper::arrayColumn(
-                DB::getListWithCriteria('useradmin', DbCriteria::simpleCompare([])->setSelect('id, username')),
-                'username',
+                DB::getListWithCriteria('useradmin', DbCriteria::simpleCompare([])->setSelect('id, username,avatar')),
+                null,
                 'id'
             );
             $data['records'] = FollowSrv::formatWithFollowList($data['records'], 'wx_school_follow');
             $data['records'] = array_map(function ($item) use ($users) {
-                $item['last_user_name'] = $users[$item['last_user_id']] ?? '-';
+                $item['last_user_name'] = $users[$item['last_user_id']]['username'] ?? '-';
                 return $item;
             }, $data['records']);
         }

web/src/views/school/list/index.vue

@@ -260,17 +260,18 @@ const {
     excludeParams: [],
     columnsFactory: () => [
       {
-        prop: 'name', label: '学校（校区）', showOverflowTooltip: true, formatter: (row) => {
+        prop: 'name', label: '学校（校区）', width: 150, showOverflowTooltip: true, formatter: (row) => {
           return h(ElButton, {
             type: 'primary',
             link: true,
+            size: 'small',
             onClick: () => showDrawer(row),
             style: {"text-decoration": 'underline'}
           }, () => row.name)
         }
       },
-      {prop: 'area', label: '地区', formatter: (row) => row.province + row.city + row.area},
-      {prop: 'address', label: '详细地址'},
+      {prop: 'area', label: '地区', width: 150, formatter: (row) => row.province + row.city + row.area},
+      {prop: 'address', width: 150, label: '详细地址'},
       {
         prop: 'canteen',
         label: '关联食堂',
@@ -349,10 +350,10 @@ const {
         }
       },
       {prop: 'follow_list', label: '跟进记录', useSlot: true, width: 400},
-      { prop: 'dormitory_distribution', label: '宿舍分布情况', showOverflowTooltip: true },
-      { prop: 'qucan_station_distribution', label: '校门口取餐点离宿舍情况', showOverflowTooltip: true },
-      {prop: 'out_business_description', label: '校外商圈情况', showOverflowTooltip: true},
-      {prop: 'memo', label: '备注', showOverflowTooltip: true},
+      { prop: 'dormitory_distribution', width: 250, label: '宿舍分布情况', showOverflowTooltip: true },
+      { prop: 'qucan_station_distribution', width: 250, label: '校门口取餐点离宿舍情况', showOverflowTooltip: true },
+      {prop: 'out_business_description', width: 250, label: '校外商圈情况', showOverflowTooltip: true},
+      {prop: 'memo', label: '备注', width: 250, showOverflowTooltip: true},
       {
         prop: 'operation',
         label: '操作',