Merge branch 'dev' of http://10.87.10.227:4000/jzyd_yyds/soc_web into dev

src/views/resumption/taskManager/index.vue

@@ -358,9 +358,14 @@
             v-if="columns[9].visible"
           >
             <template slot-scope="r">
-              <ul :style="statusStyle(r.row.status)"><li>{{ getLabel(dict.type.resumption_status, r.row.status) }}</li>
-                </ul
-              >
+              <span>
+                <i class="circle" :style="statusColor(r.row.status,true)" />
+                <label :style="statusColor(r.row.status,false)">
+                  {{
+                    getLabel(dict.type.resumption_status, r.row.status)
+                  }}</label
+                >
+              </span>
             </template>
           </el-table-column>
           <el-table-column label="操作" min-width="13%">
@@ -700,7 +705,7 @@ export default {
       api
         .getRoles({
           orgId: this.queryParams.orgId,
-          planCycle: this.queryParams.executeCycle
+          planCycle: this.queryParams.executeCycle,
         })
         .then((r) => (this.roleList = r.data));
     },
@@ -709,7 +714,7 @@ export default {
       api
         .getPlans({
           orgId: this.queryParams.orgId,
-          planCycle: this.queryParams.executeCycle
+          planCycle: this.queryParams.executeCycle,
         })
         .then((r) => {
           this.planList = r.data;
@@ -964,20 +969,29 @@ export default {
         this.queryParams.range = this.$dateRange.before(0);
       }
     },
-    statusStyle(status) {
+    statusColor(status,isBackground) {
       let color = "";
       switch (status) {
         case "1":
           color = "#BFBFBF";
+          break;
         case "2":
-          color = "1890FF";
+          color = "#1890FF";
+          break;
         case "3":
-          color = "52C41A";
+          color = "#52C41A";
+          break;
         case "4":
-          color = "F5222D";
+          color = "#F5222D";
+          break;
       }
 
-      return "list-style-type:disc;padding-left:10px;color:" + color;
+      if(isBackground){
+        return "background-color:" + color;
+      }else{
+        return "color:" + color;
+      }
+      
     },
   },
   async mounted() {

src/views/system/dept/index.vue

@@ -181,7 +181,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="机构状态">
+            <el-form-item label="机构状态" prop="isLock">
               <el-radio-group v-model="form.isLock">
                 <el-radio
                   v-for="dict in dict.type.sys_normal_disable"
@@ -262,6 +262,9 @@ export default {
         orderNum: [
           { required: true, message: "显示排序不能为空", trigger: "blur" }
         ],
+        isLock:[
+        { required: true, message: "状态不能为空", trigger: "blur" }
+        ],
         email: [
           {
             type: "email",

src/views/system/role/index.vue

@@ -5,10 +5,7 @@
         <el-input v-model="queryParams.roleName" placeholder="请输入角色名称" clearable style="width: 240px"
           @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <!-- <el-form-item label="权限字符" prop="roleKey">
-        <el-input v-model="queryParams.roleKey" placeholder="请输入权限字符" clearable style="width: 240px"
-          @keyup.enter.native="handleQuery" />
-      </el-form-item> -->
+
       <el-form-item label="状态" prop="status">
         <el-select v-model="queryParams.status" placeholder="角色状态" clearable style="width: 240px">
           <el-option v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.label"

src/views/system/user/index.vue

@@ -352,6 +352,7 @@ export default {
       deptOptions:[],
     };
   },
+
   created() {
     this.getDeptTree();
     // this.getConfigKey("sys.user.initPassword").then(response => {
@@ -389,6 +390,19 @@ export default {
         children: node.children
       }
     },
+
+   /** 搜索按钮操作 */
+   handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+      /** 重置按钮操作 */
+      resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    
+    },
+
     /** 查询列表 */
     getList() {
       this.loading = true;