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

src/assets/styles/ruoyi.scss

@@ -351,3 +351,7 @@
  .el-table--small .el-table__cell{
    padding: 10px 0!important;
  }
+
+ .el-collapse-item__header{
+   font-size: 16px!important;
+ }

src/components/orgTree/index.vue

@@ -16,25 +16,29 @@
         <el-checkbox v-model="checkSub" @change="changeCheckBox"
           >关联所有下级数据</el-checkbox>
       </div>
-      <el-tree
-        :data="treeList"
-        :props="defaultProps"
-        :expand-on-click-node="false"
-        :filter-node-method="filterNode"
-        ref="tree"
-        node-key="id"
-        class="el-tree-ex"
-        :default-expanded-keys="defaultKeys"
-        :default-checked-keys="defaultKeys"
-        @node-click="handleNodeClick"
-        v-bind="$attrs"
-      >
-        <span class="custom-tree-node" slot-scope="{ node, data }">
+      <el-collapse v-model="activeNames" @change="handleChange">
+        <el-collapse-item title="福建农信" name="1">
+          <el-tree
+            :data="treeList"
+            :props="defaultProps"
+            :expand-on-click-node="false"
+            :filter-node-method="filterNode"
+            ref="tree"
+            node-key="id"
+            class="el-tree-ex"
+            :default-expanded-keys="defaultKeys"
+            :default-checked-keys="defaultKeys"
+            @node-click="handleNodeClick"
+            v-bind="$attrs"
+          >
+            <span class="custom-tree-node" slot-scope="{ node, data }">
 
-            <span>{{ node.label }}</span>
+                <span>{{ node.label }}</span>
 
-        </span>
-      </el-tree>
+            </span>
+          </el-tree>
+        </el-collapse-item>
+      </el-collapse>
     </div>
   </div>
 </template>
@@ -46,6 +50,7 @@ export default {
   data() {
     return {
       //过滤信息
+      activeNames: ["1"],
       deptName: "",
       // 机构树列表
       treeList: [],

src/views/check/dialog.edit.vue

@@ -465,7 +465,7 @@ export default {
     },
     NowBuild() {
       //如果新增或者是草稿状态的立即生效的编辑
-      if ((this.id==null||this.id==undefined)||(this.defbuildTaskNow &&this.formData.planStatus==0)) return true;
+      if ((this.formData.planCycle!=6)&&((this.id==null||this.id==undefined)||(this.defbuildTaskNow &&this.formData.planStatus==0))) return true;
       else return false;
     },
     getLabel(options, value) {
@@ -672,6 +672,9 @@ export default {
         this.formData.roleIds =
           this.selectedValues.length == 0 ? null : this.selectedValues;
           this.loading = true;
+          if(this.formData.planCycle==6){
+            this.formData.buildTaskNow = true;
+          }
         await api.add(this.formData).then(data=>{
           this.loading = false;
           this.$emit("success");

src/views/core/reportForms/monitorAccessReport.vue

@@ -188,9 +188,9 @@
         getList() {
           this.loading = true;
           listReport(this.queryParams).then(response => {
-            this.checkList = response.data.rows;
+            this.checkList = response.data;
             this.title=response.title;
-            this.total = response.data.total;
+            // this.total = response.data.total;
             this.loading = false;
           });
         },

src/views/evaluationRule/addEvaluate.vue

@@ -5,7 +5,7 @@
       :width="'500px'"
       :title="`${id ? '编辑' : '新增'}扣分规则`"
       @close="closeHandler"
-      destroy-on-close
+      
     >
       <el-form
         :model="ruleForm"
@@ -110,6 +110,11 @@ export default {
       this.isShow = false;
     },
     closeHandler() {
+      if(this.$refs.ruleForm){
+
+       
+        this.$refs.ruleForm.resetFields()
+      }
       this.ruleForm = {};
     },
 

src/views/resumptionEvaluate/evaluate/addEvaluate.vue

@@ -5,8 +5,6 @@
       :width="'500px'"
       :title="`${id ? '编辑' : '新增'}外包履职评价计划`"
       @close="closeHandler"
-      
-      destroy-on-close
     >
       <el-form
         :model="ruleForm"
@@ -16,7 +14,10 @@
         class="demo-ruleForm"
       >
         <el-form-item label="评价类型" prop="contentType">
-          <el-select v-model="ruleForm.contentType" placeholder="请选择评价类型">
+          <el-select
+            v-model="ruleForm.contentType"
+            placeholder="请选择评价类型"
+          >
             <el-option
               v-for="item in dict.type.evaluate_type"
               :key="item.value"
@@ -34,7 +35,6 @@
         </el-form-item>
 
         <el-form-item>
-          
           <el-button type="primary" @click="submitForm('ruleForm')"
             >确定</el-button
           >
@@ -75,9 +75,11 @@ export default {
       this.isShow = false;
     },
     closeHandler() {
+      if (this.$refs.ruleForm) {
+        this.$refs.ruleForm.resetFields();
+      }
       this.ruleForm = {};
     },
-  
 
     submitForm(formName) {
       this.$refs[formName].validate((valid) => {

src/views/scorestatistics/scorestatisticsDialog.vue

@@ -5,7 +5,7 @@
       title="查看"
       :visible.sync="isShow"
       width="1400px"
-      destroy-on-close
+     
       @open="openHandler"
     >
       <div class="pageNum-body">

src/views/system/user/extend.vue

@@ -40,16 +40,25 @@
 
               <el-form-item label="持证上岗未通过原因" v-if="formData.certificateWork == 0" label-width="240"
                             prop="certificateFailReason">
-                <el-select style="width: 280px;" v-model="formData.certificateFailReason" placeholder="请选择未通过原因">
+                <el-select style="width: 225px;" v-model="formData.certificateFailReason" placeholder="请选择未通过原因">
                   <el-option v-for="dict in dict.type.post_no_pass" :key="dict.value" :label="dict.label"
                              :value="dict.value" />
                 </el-select>
               </el-form-item>
             </el-col>
 
+            <el-col :xs="24" :sm="12" :md="8" :lg="8">
+              <el-form-item label="专业技术职业资格" v-if="formData.certificateWork != 0" label-width="240"
+                            prop="professionalQualifications">
+                <el-input style="width: 240px;" maxlength="50" v-model="formData.professionalQualifications"
+                          placeholder="请输入初级以上证书名称">
+                </el-input>
+              </el-form-item>
+            </el-col>
 
           </el-row>
           <el-row>
+     
 
             <el-col :xs="24" :sm="12" :md="8" :lg="6">
               <el-form-item label="所属部门" prop="deptId">
@@ -71,7 +80,7 @@
 
             <el-col :xs="24" :sm="12" :md="8" :lg="6">
               <el-form-item prop="entryTime" label="现任职日期">
-                <el-date-picker v-model="formData.entryTime"  align="right"
+                <el-date-picker style="width: 270px;" v-model="formData.entryTime"  align="right"
                                 type="date" placeholder="选择现任职日期">
                 </el-date-picker>
               </el-form-item>
@@ -100,19 +109,13 @@
 
             <el-col :xs="24" :sm="12" :md="8" :lg="6">
               <el-form-item label="最高学历" prop="highestEducation">
-                <el-select style="width: 217px;" v-model="formData.highestEducation" placeholder="请选择最高学历">
+                <el-select style="width: 270px;" v-model="formData.highestEducation" placeholder="请选择最高学历">
                   <el-option v-for="dict in dict.type.sys_highest_education" :key="dict.value" :label="dict.label"
                              :value="dict.value" />
                 </el-select>
               </el-form-item>
             </el-col>
-            <!-- <el-col :xs="24" :sm="12" :md="8" :lg="8">
-              <el-form-item label="初级以上相关专业技术职业资格" v-if="formData.certificateWork != 0" label-width="240" prop="professionalQualifications">
-                <el-input style="width: 280px;" maxlength="50" v-model="formData.professionalQualifications"
-                  placeholder="请输入初级以上相关专业技术职业资格">
-                </el-input>
-              </el-form-item>
-            </el-col> -->
+        
           </el-row>
           <el-row>
 
@@ -132,12 +135,11 @@
             </el-col>
             <el-col :xs="24" :sm="12" :md="8" :lg="6">
               <el-form-item label="身份证号码" prop="idCard">
-                <el-input maxlength="18" style="width: 217px;" v-model="formData.idCard"
+                <el-input maxlength="18" style="width: 270px;" v-model="formData.idCard"
                           placeholder="请输入身份证号码">
                 </el-input>
               </el-form-item>
             </el-col>
-            <!-- :picker-options="endDatepickerOptions" -->
 
 
           </el-row>
@@ -157,29 +159,31 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :xs="24" :sm="12" :md="8" :lg="8">
+            <!-- <el-col :xs="24" :sm="12" :md="8" :lg="8">
               <el-form-item label="专业技术职业资格" v-if="formData.certificateWork != 0" label-width="240"
                             prop="professionalQualifications">
                 <el-input style="width: 280px;" maxlength="50" v-model="formData.professionalQualifications"
                           placeholder="请输入初级以上证书名称">
                 </el-input>
               </el-form-item>
+            </el-col> -->
+
+            <el-col :xs="24" :sm="12" :md="8" :lg="8">
+              <el-form-item label="金融安全防范工程专家" prop="financialExperts" label-width="240">
+                <el-select style="width: 210px;" v-model="formData.financialExperts" placeholder="请选择金融安全防范工程专家">
+                  <el-option v-for="dict in dict.type.administrative_level" :key="dict.value" :label="dict.label"
+                             :value="dict.value" />
+                </el-select>
+              </el-form-item>
             </el-col>
           </el-row>
-          <el-row>
+          <!-- <el-row>
             <el-col :xs="24" :sm="24" :md="24" :lg="24">
               <el-form-item v-if="formData.certificateWork != 0" label="上传初级以上专业技术职业资格证书">
                 <imgs-upload :limit="5" v-model="formData.qualificationCertificateUrl" :fileSize="2"></imgs-upload>
               </el-form-item>
             </el-col>
-            <!--<el-col :xs="24" :sm="12" :md="8" :lg="6">
-              <el-form-item label="示例图">
-                <div style="width: 280px;">
-                  <el-image :src="uplp"></el-image>
-                </div>
-              </el-form-item>
-            </el-col>-->
-          </el-row>
+          </el-row> -->
         </el-form>
       </div>
       <div style="padding-top: 10px; margin-left: 42%">
@@ -204,7 +208,7 @@ import { extendUserInformation } from "@/api/system/information";
 export default {
   props: [],
   components: { TreeSelect ,ImgsUpload},
-  dicts: ['sys_yes_no','sys_highest_education', "sys_work_type", "sys_duties", "sys_education_type", 'sys_department_type', 'post_no_pass', 'current_position','department_name'],
+  dicts: ['administrative_level','sys_yes_no','sys_highest_education', "sys_work_type", "sys_duties", "sys_education_type", 'sys_department_type', 'post_no_pass', 'current_position','department_name'],
   data() {
     return {
       startDatepickerOptions: {
@@ -248,6 +252,12 @@ export default {
         userId: null,
       },
       rules: {
+        financialExperts:[
+          { required: true, message: '请选择金融安全防范工程专家级别', trigger: 'blur'}
+        ],
+        idCard:[
+          { required: true, message: '请输入身份证号码', trigger: 'change'}
+        ],
         deptId: [
           { required: true, message: '请选择所属部门', trigger: 'blur' },
         ],