feat:表单select搜索优化

assets/canteenApi-H_Rt3CAo.js

@@ -1 +1 @@
-import{f as t}from"./index-JmypXowy.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-CqEtSlNP.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-CrAqAqdl.js

@@ -1 +1 @@
-import{f as t}from"./index-JmypXowy.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-CqEtSlNP.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-DuHPEUoi.js

@@ -1 +1 @@
-import{f as t}from"./index-JmypXowy.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-CqEtSlNP.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-BdfDfmwt.js

@@ -1 +1 @@
-import{_ as t}from"./user-dialog.vue_vue_type_script_setup_true_lang-DIPDsYkI.js";import"./index-JmypXowy.js";import"./vendor-CnLKbIcc.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-Da5w4yr6.js";import"./index-CqEtSlNP.js";import"./vendor-CnLKbIcc.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-RTgS3D4l.js

@@ -1 +1 @@
-import{_ as t}from"./user-dialog.vue_vue_type_script_setup_true_lang-DElV7b-x.js";import"./index-JmypXowy.js";import"./vendor-CnLKbIcc.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-DwOgA-m_.js";import"./index-CqEtSlNP.js";import"./vendor-CnLKbIcc.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-UEDbxbrR.js

@@ -1 +1 @@
-import{_ as t}from"./user-dialog.vue_vue_type_script_setup_true_lang-Dm1AWBa0.js";import"./index-JmypXowy.js";import"./vendor-CnLKbIcc.js";/* empty css                   *//* empty css                  *//* empty css                *//* empty css               *//* empty css                  *//* empty css                     */import"./el-form-item-l0sNRNKZ.js";/* empty css                 */import"./city-DG57VSK2.js";export{t as default};
+import{_ as t}from"./user-dialog.vue_vue_type_script_setup_true_lang-WVJ1ny4a.js";import"./index-CqEtSlNP.js";import"./vendor-CnLKbIcc.js";/* empty css                   *//* empty css                  *//* empty css                *//* empty css               *//* empty css                  *//* empty css                     */import"./el-form-item-l0sNRNKZ.js";/* empty css                 */import"./city-DG57VSK2.js";export{t as default};

assets/user-search-BBuLet1r.js

@@ -1 +0,0 @@
-import{_ as e}from"./user-search.vue_vue_type_script_setup_true_lang-DM9d7sZi.js";import"./index-B52Acv3o.js";import"./index-JmypXowy.js";import"./vendor-CnLKbIcc.js";/* empty css                 */import"./index-BEo46_Zr.js";import"./_plugin-vue_export-helper-BCo6x5W8.js";export{e as default};

assets/user-search-BC8c_1yd.js

@@ -1 +0,0 @@
-import{_ as e}from"./user-search.vue_vue_type_script_setup_true_lang-3SRrVOHG.js";import"./index-B52Acv3o.js";import"./index-JmypXowy.js";import"./vendor-CnLKbIcc.js";/* empty css                 */import"./index-BEo46_Zr.js";import"./_plugin-vue_export-helper-BCo6x5W8.js";export{e as default};

assets/user-search-BZvYDjkO.js

@@ -1 +0,0 @@
-import{_ as e}from"./user-search.vue_vue_type_script_setup_true_lang-CUr1GymI.js";import"./index-B52Acv3o.js";import"./index-JmypXowy.js";import"./vendor-CnLKbIcc.js";/* empty css                 */import"./index-BEo46_Zr.js";import"./_plugin-vue_export-helper-BCo6x5W8.js";export{e as default};

assets/user-search-B_Dl0E62.js

@@ -0,0 +1 @@
+import{_ as e}from"./user-search.vue_vue_type_script_setup_true_lang-BPWo4xbK.js";import"./index-BHtNbhVB.js";import"./index-CqEtSlNP.js";import"./vendor-CnLKbIcc.js";/* empty css                 */import"./index-DyDYe-q7.js";import"./_plugin-vue_export-helper-BCo6x5W8.js";import"./city-DG57VSK2.js";export{e as default};

assets/user-search-Bys_woQh.js

@@ -0,0 +1 @@
+import{_ as e}from"./user-search.vue_vue_type_script_setup_true_lang-CmBQEzO5.js";import"./index-BHtNbhVB.js";import"./index-CqEtSlNP.js";import"./vendor-CnLKbIcc.js";/* empty css                 */import"./index-DyDYe-q7.js";import"./_plugin-vue_export-helper-BCo6x5W8.js";import"./city-DG57VSK2.js";export{e as default};

assets/user-search-C75Sev9W.js

@@ -0,0 +1 @@
+import{_ as e}from"./user-search.vue_vue_type_script_setup_true_lang-Ckq1GazG.js";import"./index-BHtNbhVB.js";import"./index-CqEtSlNP.js";import"./vendor-CnLKbIcc.js";/* empty css                 */import"./index-DyDYe-q7.js";import"./_plugin-vue_export-helper-BCo6x5W8.js";export{e as default};

assets/user-search-C9pgtjjm.js

@@ -1 +0,0 @@
-import{_ as e}from"./user-search.vue_vue_type_script_setup_true_lang-BpPQuc8-.js";import"./index-B52Acv3o.js";import"./index-JmypXowy.js";import"./vendor-CnLKbIcc.js";/* empty css                 */import"./index-BEo46_Zr.js";import"./_plugin-vue_export-helper-BCo6x5W8.js";export{e as default};

assets/user-search-CCjxVOT1.js

@@ -0,0 +1 @@
+import{_ as e}from"./user-search.vue_vue_type_script_setup_true_lang-DQWOrnDW.js";import"./index-BHtNbhVB.js";import"./index-CqEtSlNP.js";import"./vendor-CnLKbIcc.js";/* empty css                 */import"./index-DyDYe-q7.js";import"./_plugin-vue_export-helper-BCo6x5W8.js";export{e as default};

assets/user-search-CNBswYrG.js

@@ -1 +0,0 @@
-import{_ as e}from"./user-search.vue_vue_type_script_setup_true_lang-POFKRTIk.js";import"./index-B52Acv3o.js";import"./index-JmypXowy.js";import"./vendor-CnLKbIcc.js";/* empty css                 */import"./index-BEo46_Zr.js";import"./_plugin-vue_export-helper-BCo6x5W8.js";export{e as default};

assets/user-search-CShf4BWB.js

@@ -1 +0,0 @@
-import{_ as e}from"./user-search.vue_vue_type_script_setup_true_lang-dOUP4pqV.js";import"./index-B52Acv3o.js";import"./index-JmypXowy.js";import"./vendor-CnLKbIcc.js";/* empty css                 */import"./index-BEo46_Zr.js";import"./_plugin-vue_export-helper-BCo6x5W8.js";export{e as default};

assets/user-search-CwhZxp__.js

@@ -0,0 +1 @@
+import{_ as e}from"./user-search.vue_vue_type_script_setup_true_lang-DK3wKI7D.js";import"./index-BHtNbhVB.js";import"./index-CqEtSlNP.js";import"./vendor-CnLKbIcc.js";/* empty css                 */import"./index-DyDYe-q7.js";import"./_plugin-vue_export-helper-BCo6x5W8.js";export{e as default};

assets/user-search-D7eazeti.js

@@ -0,0 +1 @@
+import{_ as e}from"./user-search.vue_vue_type_script_setup_true_lang-Dol858IA.js";import"./index-BHtNbhVB.js";import"./index-CqEtSlNP.js";import"./vendor-CnLKbIcc.js";/* empty css                 */import"./index-DyDYe-q7.js";import"./_plugin-vue_export-helper-BCo6x5W8.js";export{e as default};

assets/user-search-DDMVvi_S.js

@@ -0,0 +1 @@
+import{_ as e}from"./user-search.vue_vue_type_script_setup_true_lang-CeEQ8381.js";import"./index-BHtNbhVB.js";import"./index-CqEtSlNP.js";import"./vendor-CnLKbIcc.js";/* empty css                 */import"./index-DyDYe-q7.js";import"./_plugin-vue_export-helper-BCo6x5W8.js";export{e as default};

assets/user-search-DWgXouLp.js

@@ -0,0 +1 @@
+import{_ as e}from"./user-search.vue_vue_type_script_setup_true_lang-CNX1pyg4.js";import"./index-BHtNbhVB.js";import"./index-CqEtSlNP.js";import"./vendor-CnLKbIcc.js";/* empty css                 */import"./index-DyDYe-q7.js";import"./_plugin-vue_export-helper-BCo6x5W8.js";export{e as default};

assets/user-search-DYl4xCc3.js

@@ -0,0 +1 @@
+import{_ as e}from"./user-search.vue_vue_type_script_setup_true_lang-BmdswaIv.js";import"./index-BHtNbhVB.js";import"./index-CqEtSlNP.js";import"./vendor-CnLKbIcc.js";/* empty css                 */import"./index-DyDYe-q7.js";import"./_plugin-vue_export-helper-BCo6x5W8.js";export{e as default};

assets/user-search-DqjhkPFm.js

@@ -1 +0,0 @@
-import{_ as e}from"./user-search.vue_vue_type_script_setup_true_lang-B3-fQ46C.js";import"./index-B52Acv3o.js";import"./index-JmypXowy.js";import"./vendor-CnLKbIcc.js";/* empty css                 */import"./index-BEo46_Zr.js";import"./_plugin-vue_export-helper-BCo6x5W8.js";import"./city-DG57VSK2.js";export{e as default};

assets/user-search-ZOEOKAB6.js

@@ -1 +0,0 @@
-import{_ as e}from"./user-search.vue_vue_type_script_setup_true_lang-KL7giSTv.js";import"./index-B52Acv3o.js";import"./index-JmypXowy.js";import"./vendor-CnLKbIcc.js";/* empty css                 */import"./index-BEo46_Zr.js";import"./_plugin-vue_export-helper-BCo6x5W8.js";import"./city-DG57VSK2.js";export{e as default};

assets/user-search-slGMhAzs.js

@@ -1 +0,0 @@
-import{_ as e}from"./user-search.vue_vue_type_script_setup_true_lang-B66MEm6W.js";import"./index-B52Acv3o.js";import"./index-JmypXowy.js";import"./vendor-CnLKbIcc.js";/* empty css                 */import"./index-BEo46_Zr.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-JmypXowy.js"></script>
+    <script type="module" crossorigin src="/assets/index-CqEtSlNP.js"></script>
     <link rel="modulepreload" crossorigin href="/assets/vendor-CnLKbIcc.js">
     <link rel="stylesheet" crossorigin href="/assets/index-D4NieZRy.css">
   </head>

protected/controllers/CanteenController.php

@@ -45,6 +45,10 @@ class CanteenController extends Controller
         if ($name = Helper::getPostString('name')) {
             $filter['t.name'] = '%' . $name;
         }
+        $id_direct = Helper::getPostInt('is_direct', -1);
+        if ($id_direct != -1) {
+            $filter['t.is_direct'] = $id_direct;
+        }
         if ($last_user_id = Helper::getPostInt('last_user_id')) {
             $filter['t.last_user_id'] = $last_user_id;
         }

protected/controllers/SchoolController.php

@@ -53,7 +53,7 @@ class SchoolController extends Controller
             $filter['t.name'] = '%' . $name;
         }
         foreach (['is_cooperate', 'is_eleme_in_school', 'is_eleme_out_school', 'is_meituan_in_school', 'is_meituan_out_school', 'can_go_upstairs', 'can_ride'] as $item) {
-            $v = Helper::getPostInt($item);
+            $v = Helper::getPostInt($item, -1);
             if ($v != -1) {
                 $filter['t.' . $item] = $v;
             }

web/src/views/canteen/follow/index.vue

@@ -116,7 +116,7 @@
         { prop:'phone', label:'手机号' },
         { prop:'weixin', label:'微信号' },
         { prop:'chat_imgs', label:'微信聊天记录', formatter: (row) => {
-            return h(ElImage, {
+            return row.chat_imgs.length ? h(ElImage, {
               src: row.chat_imgs[0] + '!max100',
               previewSrcList: row.chat_imgs,
               showProgress: true,
@@ -125,7 +125,7 @@
               style: {"max-width": "50px", "max-height": "50px"},
               // 图片预览是否插入至 body 元素上，用于解决表格内部图片预览样式异常
               previewTeleported: true
-            })
+            }) : ''
           }
         },
         { prop:'user_name', label:'跟进人员' },

web/src/views/canteen/follow/modules/user-search.vue

@@ -71,10 +71,11 @@ const formItems = computed(() => [
     label: '跟进人',
     key: 'user_id',
     type: 'select',
-    filterable: true,
     props: {
       emptyValues:[0],
       valueOnClear:0,
+      filterable: true,
+      clearable: true,
       options: props.userList.map((item) => ({
         label: item.name,
         value: item.id

web/src/views/canteen/list/user-search.vue

@@ -70,8 +70,10 @@
       label: '学校',
       key: 'school_id',
       type: 'select',
-      filterable: true,
       props: {
+        filterable: true,
+        placeholder: '可搜索',
+        clearable: true,
         options: props.schoolList.map((item) => ({
           label: item.name,
           value: item.id
@@ -79,6 +81,19 @@
       }
     },
     {
+      label: '是否直营',
+      key: 'is_direct',
+      type: 'select',
+      filterable: true,
+      props: {
+        options: [
+          { label: '全部', value: -1 },
+          { label: '直营', value: 1 },
+          { label: '非直营', value: 0 }
+        ]
+      }
+    },
+    {
       label: '手机号',
       key: 'phone',
       type: 'input',

web/src/views/company/follow/modules/user-search.vue

@@ -78,10 +78,11 @@ const formItems = computed(() => [
     label: '跟进人',
     key: 'user_id',
     type: 'select',
-    filterable: true,
     props: {
       emptyValues:[0],
       valueOnClear:0,
+      filterable: true,
+      clearable: true,
       options: props.userList.map((item) => ({
         label: item.name,
         value: item.id

web/src/views/company/relation/modules/user-search.vue

@@ -58,6 +58,8 @@
       type: 'select',
       props: {
         placeholder: '请选择',
+        filterable: true,
+        clearable: true,
         options: props.selectList.map((item) => ({
           label: item.name,
           value: item.id
@@ -70,10 +72,11 @@
       type: 'select',
       labelWidth: '90px',
       span:6,
-      filterable: true,
       props: {
         emptyValues:[0],
         valueOnClear:0,
+        filterable: true,
+        clearable: true,
         options: props.userList.map((item) => ({
           label: item.name,
           value: item.id

web/src/views/school/follow/modules/user-search.vue

@@ -78,10 +78,11 @@ const formItems = computed(() => [
     label: '跟进人',
     key: 'user_id',
     type: 'select',
-    filterable: true,
     props: {
       emptyValues:[0],
       valueOnClear:0,
+      filterable: true,
+      clearable: true,
       options: props.userList.map((item) => ({
         label: item.name,
         value: item.id