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

# Conflicts:
#	src/components/orgTree/index.vue

src/api/resumption/configuration.js

@@ -7,4 +7,13 @@ export function insertConfiguration(data) {
       method: 'post',
       data: data
     })
-  }
+  }
+
+  // 回显【请填写功能名称】
+export function getInfo() {
+  return request({
+    url: '/core/configuration',
+    method: 'get',
+  
+  })
+}

src/components/orgTree/index.vue

@@ -125,6 +125,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/information/configuration/index.vue

@@ -144,13 +144,13 @@
 </template>
 
 <script>
-import { insertConfiguration } from "@/api/resumption/configuration";
+import { insertConfiguration ,getInfo} from "@/api/resumption/configuration";
 export default {
   props: [],
   components: {},
   data() {
     return {
-
+      coreResumptionConfigurationDTO:[],
       num: 1,
       day: {
         resumptionCycle: 1,
@@ -252,20 +252,23 @@ export default {
   watch: {},
   computed: {},
   beforeCreate() { },
-  created() { },
+
   beforeMount() { },
   mounted() { },
   beforeUpdate() { },
   updated() { },
   destroyed() { },
-
+  created() {
+    this.selectInfo();
+  },
   methods: {
     request() { },
     handleChange(value) { },
-    hello() {
-      alert("来自预设逻辑代码的问候")
+    selectInfo(){
+      getInfo().then(response=>{
+        this.coreResumptionConfigurationDTO = response.rows;
+      })
     },
-
     checkForm(form) {
       let val
       this.$refs[form].validate(valid => {

src/views/system/dept/dialog.edit.vue

@@ -44,7 +44,7 @@
                 <el-input
                   v-model="form.managerPhone"
                   placeholder="请输入联系电话"
-                  maxlength="11"
+                  maxlength="16"
                 />
               </el-form-item>
             </el-col>
@@ -336,13 +336,13 @@ export default {
         name: [
           { required: true, message: "机构名称不能为空", trigger: "blur" },
         ],
-        managerPhone: [
-          {
-            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
-            message: "请输入正确的手机号码",
-            trigger: "blur",
-          },
-        ],
+        // managerPhone: [
+        //   {
+        //     pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+        //     message: "请输入正确的手机号码",
+        //     trigger: "blur",
+        //   },
+        // ],
       },
       orgopen: false,
       orgtitle: "",

src/views/system/dept/index.vue

@@ -247,7 +247,7 @@
       @close="closeHandler"
       append-to-body
     >
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="90px">
         <el-row>
           <el-col :span="24">
             <el-form-item
@@ -309,11 +309,11 @@
 
         <el-row>
           <el-col :span="12">
-            <el-form-item label="联系电话" prop="phone">
+            <el-form-item label="负责人电话" prop="managerPhone">
               <el-input
-                v-model="form.phone"
-                placeholder="请输入联系电话"
-                maxlength="11"
+                v-model="form.managerPhone"
+                placeholder="请输入负责人电话"
+                maxlength="16"
                 :readonly="form.source == 1"
               />
             </el-form-item>
@@ -452,13 +452,14 @@ export default {
             trigger: ["blur", "change"],
           },
         ],
-        phone: [
-          {
-            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
-            message: "请输入正确的手机号码",
-            trigger: "blur",
-          },
-        ],
+        // 同步过来的机构存在座机号的情况
+        // phone: [
+        //   {
+        //     pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+        //     message: "请输入正确的手机号码",
+        //     trigger: "blur",
+        //   },
+        // ],
       },
       //默认选中节点
       defaultKeys: [],