Merge remote-tracking branch 'origin/master'

base-manager-ui/admin/src/pages/basicset/appmarket/components/DataUpdate.vue

@@ -196,7 +196,7 @@ export default {
                 let row = record.appInfoFieldList.find(
                   (item) => item.fieldCode == v.fieldCode
                 );
-                if (row.fieldTypeValue && !row.serviceApiParams) {
+                if (row && row.fieldTypeValue && !row.serviceApiParams) {
                   let fieldTypeValue = JSON.parse(row.fieldTypeValue);
                   return fieldTypeValue[text];
                 } else {

base-manager-ui/admin/src/pages/basicset/business/components/businessTabs2.vue

@@ -13,10 +13,9 @@
                 style="width: 120px"
                 v-model="leftSource"
                 class="select-department"
-                placeholder="事项来源"
+                placeholder="全部来源"
                 :allowClear="true"
               >
-                <a-select-option value=""> 全部来源 </a-select-option>
                 <a-select-option :value="0"> 一体化添加 </a-select-option>
                 <a-select-option :value="1"> 手动添加 </a-select-option>
               </a-select>
@@ -25,13 +24,10 @@
                 style="min-width: 120px"
                 v-model="leftDept"
                 class="select-department"
-                placeholder="部门搜索"
+                placeholder="全部部门"
                 optionFilterProp="label"
                 :allowClear="true"
               >
-                <a-select-option value="" label="全部部门">
-                  全部部门
-                </a-select-option>
                 <a-select-option
                   v-for="v in deptList"
                   :key="v.id"
@@ -149,23 +145,21 @@
                 style="width: 120px"
                 v-model="rightSource"
                 class="select-department"
-                placeholder="事项来源"
+                placeholder="全部来源"
+                allowClear
               >
-                <a-select-option value=""> 全部来源 </a-select-option>
                 <a-select-option :value="0"> 一体化事项 </a-select-option>
                 <a-select-option :value="1"> 自建事项 </a-select-option>
               </a-select>
               <a-select
                 showSearch
+                allowClear
                 style="min-width: 120px"
                 v-model="rightDept"
                 class="select-department"
-                placeholder="部门搜索"
+                placeholder="全部部门"
                 optionFilterProp="label"
               >
-                <a-select-option value="" label="全部部门">
-                  全部部门
-                </a-select-option>
                 <a-select-option
                   v-for="v in deptList"
                   :key="v.id"
@@ -358,10 +352,10 @@ export default {
       rightColumns,
       leftLoading: false,
       rightLoading: false,
-      leftSource: "", // 左边来源
-      leftDept: "", // 左边部门搜索
-      rightDept: "", // 右边部门搜索
-      rightSource: "", // 右边来源
+      leftSource: undefined, // 左边来源
+      leftDept: undefined, // 左边部门搜索
+      rightDept: undefined, // 右边部门搜索
+      rightSource: undefined, // 右边来源
       selectedRowKeys: [],
       matterSiteData: [], // 站点事项
       matterDataList: [], //事项列表数据

base-manager-ui/admin/src/pages/basicset/business/components/businessTabs3.vue

@@ -75,12 +75,10 @@
                 style="min-width: 120px"
                 v-model="deptSearch"
                 class="select-department"
-                placeholder="部门搜索"
+                placeholder="全部部门"
                 optionFilterProp="label"
+                allowClear
               >
-                <a-select-option value="" label="全部部门">
-                  全部部门
-                </a-select-option>
                 <a-select-option
                   v-for="v in deptList"
                   :key="v.id"
@@ -352,7 +350,7 @@ export default {
       Leftloading: false,
       rightloading: false,
       leftSearchVal: "", // 左边搜索
-      deptSearch: "", // 右边
+      deptSearch: undefined, // 右边
       rightSearchVal: "", // 右边搜索
       SiteBusinessData: [], // 站点业务
       SiteMatterData: [], //站点事项
@@ -852,4 +850,4 @@ export default {
 .site-business {
   margin-bottom: 0px !important;
 }
-</style>
\ No newline at end of file
+</style>

base-manager-ui/admin/src/pages/basicset/business/components/businessTabs4.vue

- <template>
+<template>
   <div class="basicset-tab4">
     <div class="left">
       <div class="header">
@@ -13,7 +13,7 @@
                 allowClear
                 v-model="dept"
                 class="select-department"
-                placeholder="部门搜索"
+                placeholder="全部部门"
                 optionFilterProp="label"
               >
                 <a-select-option
@@ -30,7 +30,7 @@
                 allowClear
                 v-model="source"
                 class="select-department"
-                placeholder="事项来源"
+                placeholder="全部来源"
               >
                 <a-select-option :value="0"> 一体化添加 </a-select-option>
                 <a-select-option :value="1"> 手动添加 </a-select-option>