Merge remote-tracking branch 'origin/dev' into dev

src/views/manage/servicewaycontent/index.vue

@@ -210,6 +210,7 @@
           @selection-change="handleSelectionChange"
         >
           <el-table-column width="55" align="center" />
+          <el-table-column label="序号" align="center" prop="id" type="index" />
 
           <el-table-column
             label="服务内容"

src/views/system/agencyCategory/index.vue

@@ -331,9 +331,8 @@ export default {
     },
     change(e) {
       console.log(e, "9");
-      if(e){
+      if (e) {
         this.form.parentCategoryId = e[e.length - 1];
-
       }
     },
     /** 查询机构类别列表 */
@@ -409,7 +408,7 @@ export default {
               this.open = false;
               ++this.isResouceShow;
               this.getList();
-              this.gettreelistitem()
+              this.gettreelistitem();
             });
           } else {
             addAgencyCategory(this.form).then((response) => {
@@ -417,7 +416,7 @@ export default {
               this.open = false;
               ++this.isResouceShow;
               this.getList();
-              this.gettreelistitem()
+              this.gettreelistitem();
             });
           }
         }
@@ -450,3 +449,8 @@ export default {
   },
 };
 </script>
+<style lang="scss">
+.el-cascader .el-input input::-webkit-input-placeholder {
+  color: #CCCFD6;
+}
+</style>

src/views/system/department/index.vue

@@ -1005,3 +1005,8 @@ export default {
   margin: 22px;
 }
 </style>
+<style lang="scss">
+.el-cascader .el-input input::-webkit-input-placeholder {
+  color: #686a6d;
+}
+</style>