Merge remote-tracking branch 'origin/master'

smart-office-manager-ui/admin/src/components/Table.vue

@@ -12,6 +12,7 @@
           <slot name="table-head-left"></slot>
           <slot name="table-head-center">
             <el-button
+              v-show="isshowadd"
               v-if="isShowButton('notAdd')"
               type="primary"
               icon="el-icon-plus"
@@ -284,6 +285,7 @@ export default {
       loading: this.config.loading,
       showSearch: this.isShowSearch(this.$route.query),
       showType: "table",
+      isshowadd:true
     };
   },
 };

smart-office-manager-ui/admin/src/views/basic/set/drawershow.vue

@@ -109,7 +109,11 @@
           >
         </el-col>
       </el-row>
-
+      <el-row>
+        <div class="tishi">
+          提示：设置状态应中文名在前，英文名在后，用“_”隔开。例如:在线_online
+        </div>
+      </el-row>
       <el-table
         :data="basicStatusList"
         :row-class-name="rowBasicStatusIndex"
@@ -128,6 +132,14 @@
             />
           </template>
         </el-table-column>
+        <el-table-column label="自定义颜色" prop="statusColor">
+          <template slot-scope="scope">
+            <el-input
+              v-model="scope.row.statusColor"
+              placeholder="请输入状态颜色值"
+            />
+          </template>
+        </el-table-column>
         <el-table-column label="状态颜色值" prop="statusColor">
           <template slot-scope="scope">
             <el-color-picker
@@ -146,7 +158,6 @@
     </el-form>
   </el-drawer>
 </template>
-
 <script>
 import form from "@/assets/mixins/formdialog";
 export default {
@@ -300,3 +311,9 @@ export default {
   },
 };
 </script>
+
+<style scoped>
+.tishi{
+  padding: 10px;
+}
+</style>
\ No newline at end of file

smart-office-manager-ui/admin/src/views/basic/set/list.vue

 <template>
     <div class="page">
-        <LayoutTable :data="tableData" :config="tableConfig">
+        <LayoutTable :data="tableData" :config="tableConfig" ref="layoutTable">
                     </LayoutTable>
 
 
@@ -52,6 +52,18 @@
                 this.$refs.drawerform.view(row);
             },
 
+        },
+        watch:{
+          'tableData'(newval){
+            if (newval.data && newval.data.length>0) {
+              this.$refs.layoutTable.isshowadd=false
+              this.$forceUpdate()
+            }else{
+              this.$refs.layoutTable.isshowadd=true
+            }
+          },
+          deep:true,
+          
         },
         data() {
             return {