Merge branch 'master' of http://47.105.205.210/property-platform/property-company

.env.development

 NODE_ENV=development
-VUE_APP_API_BASE_URL='http://192.168.0.118:9999'
+VUE_APP_API_BASE_URL='http://192.168.0.100:9999'
+# VUE_APP_API_BASE_URL='http://220.203.25.212:9999'
 # VUE_APP_API_BASE_URL='http://220.203.25.212:9999'
 VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas
 VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview

src/views/charge/typeSettings/type.vue

@@ -54,29 +54,28 @@
         class="j-table-force-nowrap"
         @change="handleTableChange"
       >
-        <span slot="employeeStatus" slot-scope="text, record">
-          <span :style="{'color': record.employeeStatus === '1' ? 'green' : 'red'}">{{record.employeeStatus === '1' ? '在职' : '离职'}}</span>
-        </span>
         <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)">编辑</a>
+          <a href="javascript:;" @click="handleDetail(record)">详情</a>
 
-          <a-divider type="vertical"/>
-          <a-dropdown>
-            <a class="ant-dropdown-link">
-              更多 <a-icon type="down"/>
-            </a>
-            <a-menu slot="overlay">
-              <a-menu-item>
-                <a href="javascript:;" @click="handleDetail(record)">详情</a>
-              </a-menu-item>
+          <template v-if="!filterHandle(record.typeCode)">
+            <a-divider type="vertical"/>
+            <a-dropdown>
+              <a class="ant-dropdown-link">
+                更多 <a-icon type="down"/>
+              </a>
+              <a-menu slot="overlay">
+                <a-menu-item>
+                  <a href="javascript:;" @click="handleEdit(record)">编辑</a>
+                </a-menu-item>
 
-              <a-menu-item>
-                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)" placement="topLeft">
-                  <a>删除</a>
-                </a-popconfirm>
-              </a-menu-item>
-            </a-menu>
-          </a-dropdown>
+                <a-menu-item>
+                  <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)" placement="topLeft">
+                    <a>删除</a>
+                  </a-popconfirm>
+                </a-menu-item>
+              </a-menu>
+            </a-dropdown>
+          </template>
         </span>
       </a-table>
 
@@ -140,7 +139,12 @@
         }
       }
     },
-    methods: {}
+    methods: {
+      filterHandle(type) {
+        let fixedHandle = ['SFLX00001','SFLX00002','SFLX00003','SFLX00004','SFLX00005']
+        return fixedHandle.includes(type)
+      }
+    }
   }
 </script>
 <style scoped>