Merge branch 'V0.0.2' of http://10.87.10.227:4000/jzyd_yyds/soc_web into V0.0.2

.env.development

@@ -8,12 +8,12 @@ ENV = 'development'
 #测试地址
 #VUE_APP_BASE_API = 'http://10.87.10.91:8080'
 #罗俊
-#VUE_APP_BASE_API = 'http://10.87.10.49:8080'
+VUE_APP_BASE_API = 'http://10.87.10.49:8080'
 #罗伟
 # VUE_APP_BASE_API = 'http://10.87.10.47:8080'
 #高雄
 #VUE_APP_BASE_API = 'http://10.87.11.94:8080'
-VUE_APP_BASE_API = 'http://localhost:8080'
+#VUE_APP_BASE_API = 'http://localhost:8080'
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
 

src/components/orgTree/index.vue

@@ -121,6 +121,7 @@ export default {
     },
     dataFn(arr){
       console.log(arr,'arrr')
+      if(arr.length==0)return
       this.defaultKeys.push(arr[0].id);
       this.$emit("defaultKey", arr[0].id);
       this.$emit("defaultOrg", arr[0]);

src/store/modules/user.js

@@ -44,6 +44,9 @@ const user = {
     SET_ORG_ID: (state, orgId) => {
       state.orgId = orgId
     },
+    SET_ORG_TYPE: (state, orgType) => {
+      state.orgType = orgType
+    },
     SET_PERMISSIONS: (state, permissions) => {
       state.permissions = permissions
     },
@@ -122,6 +125,7 @@ const user = {
           commit('SET_AVATAR', avatar)
           commit('SET_ORG_ID', user.orgId)
           commit('SET_ORG_NAME', user.orgName)
+          commit('SET_ORG_TYPE', user.orgType)
           resolve(res)
         }).catch(error => {
           reject(error)

src/views/core/edu/plan/index.vue

@@ -310,6 +310,7 @@ export default {
       open: false,
       isUnfold: false,
       defaultSelect: [],
+      filterOrtTypeOptions: [],
       orgId: null,
       type: null,
       // 查询参数
@@ -612,6 +613,17 @@ export default {
       //this.form.fileList=this.form.fileList.concat(tempArry);
       this.formFileListDefualtValue =this.form.fileList.concat(tempArry);
     },
+  },
+  mounted() {
+
+  },
+  updated(){
+    this.filterOrtTypeOptions=JSON.parse(JSON.stringify(this.dict.type.sys_org_type)).filter(element => {
+      if(element.value > 3){
+        return JSON.parse(JSON.stringify(element))
+      }
+    });
+    console.log('this.filterOrtTypeOptions',this.filterOrtTypeOptions);
   }
 };
 </script>

src/views/core/knowledge/index.vue

@@ -48,23 +48,22 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['core:knowledge:remove']"
-        >删除</el-button>-->
+        >删除</el-button>
       </el-col>
       <el-col :span="1.5">
-<!--        <el-button
+        <el-button
           type="warning"
           plain
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
           v-hasPermi="['core:knowledge:export']"
-        >导出</el-button>-->
-      </el-col>
+        >导出</el-button>
+      </el-col>-->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="knowledgeList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="名称" align="center" prop="name" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">

src/views/resumption/taskManager/index.vue

@@ -262,7 +262,7 @@
         </el-form>
         <!--    按纽    -->
         <el-row :gutter="10" class="mb8">
-          <!-- <el-col :span="1.5">
+          <el-col :span="1.5">
             <el-button
               type="primary"
               plain
@@ -272,7 +272,7 @@
               v-hasPermi="['resumption:taskManager:export']"
               >导出</el-button
             >
-          </el-col> -->
+          </el-col>
 
           <right-toolbar
             :showSearch.sync="showSearch"
@@ -704,12 +704,7 @@ export default {
       this.loading = true;
       api
         .page(this.queryParams)
-        .then((r) => {
-          r.rows.forEach((i) => {
-            if (i.status == 1 && dayjs(i.planEndTime).isBefore(new Date())) {
-              i.status = 4;
-            }
-          });
+        .then((r) => {          
           this.isTableHaveData = r.rows.length > 0;
           this.pageData = r.rows;
           this.total = r.total;

src/views/system/area/index.vue

@@ -1,22 +1,14 @@
 <template>
   <div class="app-container">
+
+
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
-      <el-form-item label="区域名称" prop="name">
-        <el-input
-          v-model="queryParams.name"
-          placeholder="请输入区域名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-    
-      
       <el-form-item label="机构类型" prop="orgType">
             <el-select
               v-model="queryParams.orgType"
               placeholder="请选择机构类型"
               clearable
-              style="width: 240px"
+              style="width: 100%"
             >
               <el-option
                 v-for="dict in dict.type.sys_org_type"
@@ -26,7 +18,18 @@
               />
             </el-select>
           </el-form-item>
-
+      
+      <el-form-item label="区域名称" prop="name">
+        <el-input
+         style="width: 100%"
+          v-model="queryParams.name"
+          placeholder="请输入区域名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+    
+    
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>

src/views/system/dept/extend.vue

@@ -289,13 +289,14 @@
             <!--                   @change="handleFileChange"-->
             <!--                   style="display: none;"/>-->
           </el-col>
-          <el-col :span="12" :xs="24">
+          <!-- <el-col :span="12" :xs="24">
             <p style="font-size: 12px; color: #999">示例图</p>
             <div style="width: 350px">
               <el-image :src="uplp"></el-image>
             </div>
+          </el-col> -->
             <!--            <el-image class="zoom-image border-color-change" :src="uplp" fit="contain"></el-image>-->
-          </el-col>
+          
         </el-row>
       </div>
     </div>

src/views/system/dict/data.vue

@@ -46,7 +46,7 @@
           v-hasPermi="['system:dict:add']"
         >新增</el-button>
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="success"
           plain
@@ -77,7 +77,7 @@
           @click="handleExport"
           v-hasPermi="['system:dict:export']"
         >导出</el-button>
-      </el-col>
+      </el-col> -->
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -90,8 +90,12 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
+    <el-table
+    border
+    height="700"
+    size="small"
+    v-loading="loading"  :data="dataList" @selection-change="handleSelectionChange">
+      <!-- <el-table-column type="selection" width="55" align="center" /> -->
       <el-table-column label="字典编码" align="center" prop="dictCode" />
       <el-table-column label="字典标签" align="center" prop="dictLabel">
         <template slot-scope="scope">
@@ -120,7 +124,7 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:dict:edit']"
-          >修改</el-button>
+          >编辑</el-button>
           <el-button
             size="mini"
             type="text"
@@ -141,42 +145,71 @@
     />
 
     <!-- 添加或修改参数配置对话框 -->
-    <DialogCom :title="title" :visible.sync="open" width="500px" append-to-body>
+    <DialogCom :title="title" :visible.sync="open" width="700px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="字典类型">
-          <el-input v-model="form.dictType" :disabled="true" />
-        </el-form-item>
-        <el-form-item label="数据标签" prop="dictLabel">
-          <el-input v-model="form.dictLabel" placeholder="请输入数据标签" />
-        </el-form-item>
-        <el-form-item label="数据键值" prop="dictValue">
-          <el-input v-model="form.dictValue" placeholder="请输入数据键值" />
-        </el-form-item>
-        <el-form-item label="样式属性" prop="cssClass">
-          <el-input v-model="form.cssClass" placeholder="请输入样式属性" />
-        </el-form-item>
-        <el-form-item label="显示排序" prop="dictSort">
-          <el-input-number v-model="form.dictSort" controls-position="right" :min="0" />
-        </el-form-item>
-        <el-form-item label="回显样式" prop="listClass">
-          <el-select v-model="form.listClass">
-            <el-option
-              v-for="item in listClassOptions"
-              :key="item.value"
-              :label="item.label + '(' + item.value + ')'"
-              :value="item.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="状态" prop="status">
-          <el-radio-group v-model="form.status">
-            <el-radio
-              v-for="dict in dict.type.sys_normal_disable"
-              :key="dict.value"
-              :label="dict.value"
-            >{{dict.label}}</el-radio>
-          </el-radio-group>
-        </el-form-item>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="字典类型">
+              <el-input v-model="form.dictType" :disabled="true" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="数据标签" prop="dictLabel">
+              <el-input v-model="form.dictLabel" placeholder="请输入数据标签" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="数据键值" prop="dictValue">
+              <el-input v-model="form.dictValue" placeholder="请输入数据键值" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="样式属性" prop="cssClass">
+              <el-input v-model="form.cssClass" placeholder="请输入样式属性" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="显示排序" prop="dictSort">
+              <el-input-number 
+              style="width: 100%;"
+              v-model="form.dictSort" controls-position="right" :min="0" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="回显样式" prop="listClass">
+              <el-select 
+                style="width: 100%;"
+                v-model="form.listClass">
+                <el-option
+                  v-for="item in listClassOptions"
+                  :key="item.value"
+                  :label="item.label + '(' + item.value + ')'"
+                  :value="item.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="状态" prop="status">
+              <el-radio-group v-model="form.status">
+                <el-radio
+                  v-for="dict in dict.type.sys_normal_disable"
+                  :key="dict.value"
+                  :label="dict.value"
+                >{{dict.label}}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        
+        </el-row>
+        
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
         </el-form-item>
@@ -339,7 +372,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加字典数据";
+      this.title = "新增";
       this.form.dictType = this.queryParams.dictType;
     },
     // 多选框选中数据
@@ -355,7 +388,7 @@ export default {
       getData(dictCode).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改字典数据";
+        this.title = "编辑";
       });
     },
     /** 提交按钮 */
@@ -365,14 +398,14 @@ export default {
           if (this.form.dictCode != undefined) {
             updateData(this.form).then(response => {
               this.$store.dispatch('dict/removeDict', this.queryParams.dictType);
-              this.$modal.msgSuccess("修改成功");
+              this.$modal.msgSuccess("处理成功");
               this.open = false;
               this.getList();
             });
           } else {
             addData(this.form).then(response => {
               this.$store.dispatch('dict/removeDict', this.queryParams.dictType);
-              this.$modal.msgSuccess("新增成功");
+              this.$modal.msgSuccess("处理成功");
               this.open = false;
               this.getList();
             });

src/views/system/dict/index.vue

@@ -34,17 +34,6 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="创建时间">
-        <el-date-picker
-          v-model="dateRange"
-          style="width: 240px"
-          value-format="yyyy-MM-dd"
-          type="daterange"
-          range-separator="-"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-        ></el-date-picker>
-      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -62,7 +51,7 @@
           v-hasPermi="['system:dict:add']"
         >新增</el-button>
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="success"
           plain
@@ -83,7 +72,7 @@
           @click="handleDelete"
           v-hasPermi="['system:dict:remove']"
         >删除</el-button>
-      </el-col>
+      </el-col> -->
       <!-- <el-col :span="1.5">
         <el-button
           type="warning"
@@ -107,8 +96,12 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
+    <el-table v-loading="loading"
+    border
+    height="700"
+    size="small"
+     :data="typeList" @selection-change="handleSelectionChange">
+      <!-- <el-table-column type="selection" width="55" align="center" /> -->
       <el-table-column label="字典编号" align="center" prop="dictId" />
       <el-table-column label="字典名称" align="center" prop="dictName" :show-overflow-tooltip="true" />
       <el-table-column label="字典类型" align="center" :show-overflow-tooltip="true">
@@ -133,7 +126,7 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:dict:edit']"
-          >修改</el-button>
+          >编辑</el-button>
           <el-button
             size="mini"
             type="text"
@@ -154,23 +147,33 @@
     />
 
     <!-- 添加或修改参数配置对话框 -->
-    <DialogCom :title="title" :visible.sync="open" width="500px" append-to-body>
+    <DialogCom :title="title" :visible.sync="open" width="650px" append-to-body>
+      
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        
         <el-form-item label="字典名称" prop="dictName">
           <el-input v-model="form.dictName" placeholder="请输入字典名称" />
         </el-form-item>
+          
         <el-form-item label="字典类型" prop="dictType">
           <el-input v-model="form.dictType" placeholder="请输入字典类型" />
         </el-form-item>
-        <el-form-item label="状态" prop="status">
-          <el-radio-group v-model="form.status">
-            <el-radio
-              v-for="dict in dict.type.sys_normal_disable"
-              :key="dict.value"
-              :label="dict.value"
-            >{{dict.label}}</el-radio>
-          </el-radio-group>
-        </el-form-item>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="状态" prop="status">
+              <el-radio-group v-model="form.status">
+                <el-radio
+                  v-for="dict in dict.type.sys_normal_disable"
+                  :key="dict.value"
+                  :label="dict.value"
+                >{{dict.label}}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+       
+        
+        
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
         </el-form-item>
@@ -277,7 +280,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加字典类型";
+      this.title = "新增";
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
@@ -292,7 +295,7 @@ export default {
       getType(dictId).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改字典类型";
+        this.title = "编辑";
       });
     },
     /** 提交按钮 */

src/views/system/menu/index.vue

@@ -77,6 +77,7 @@
 
     <el-table
       v-if="refreshTable"
+      height="700px"
       v-loading="loading"
       :data="menuList"
       row-key="id"
@@ -153,7 +154,7 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:menu:edit']"
-            >修改</el-button
+            >编辑</el-button
           >
           <el-button
             size="mini"
@@ -566,7 +567,7 @@ export default {
       }
       this.open = true;
       this.form.platformType = this.activeName;
-      this.title = "添加菜单";
+      this.title = "新增";
     },
     /** 展开/折叠操作 */
     toggleExpandAll() {
@@ -584,7 +585,7 @@ export default {
         this.form = response.data;
         this.form.platformType = this.activeName;
         this.open = true;
-        this.title = "修改菜单";
+        this.title = "编辑";
       });
     },
     /** 提交按钮 */

src/views/system/user/index.vue

@@ -60,7 +60,7 @@
                 style="width: 200px"
               >
                 <el-option
-                  v-for="dict in dict.type.sys_normal_disable"
+                  v-for="dict in dict.type.sys_user_is_lock"
                   :key="dict.value"
                   :label="dict.label"
                   :value="dict.value"
@@ -194,7 +194,7 @@
             >
               <template slot-scope="scope">
                 <dict-tag
-                  :options="dict.type.sys_normal_disable"
+                  :options="dict.type.sys_user_is_lock"
                   :value="scope.row.isLock"
                 />
               </template>