Merge branch 'V0.0.4' of http://10.87.21.221:8000/jzyd_yyds/soc_web into V0.0.4

.env.development

@@ -17,7 +17,7 @@ ENV = 'development'
 # VUE_APP_BASE_API = 'http://10.87.11.173:8080'
 #VUE_APP_BASE_API = 'http://localhost:8080'
 # 55环境
-VUE_APP_BASE_API = 'http://10.87.21.103:8080'
+VUE_APP_BASE_API = 'http://10.87.21.107:8080'
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
 

src/views/check/index.vue

@@ -28,7 +28,7 @@
               v-show="showSearch"
             >
               <el-row>
-                <el-form-item label="行社名称" prop="orgId">
+                <el-form-item label="行社名称">
                   <org-tree
                     v-model="queryParams.orgId"
                     @defaultKey="getDefaultKey"
@@ -253,6 +253,7 @@
               align="center"
               width="180px"
               label="检查主体"
+              v-if="columns[5].visible"
             >
               <template slot-scope="r"
                 >{{ getLabel(dict.type.sys_org_type, `${r.row.execOrgType}`) }}
@@ -264,6 +265,7 @@
               align="center"
               width="180px"
               label="受检机构"
+              v-if="columns[6].visible"
             >
               <!-- <template slot-scope="r"
                 >{{ getLabel(dict.type.sys_org_type, `${r.row.checkOrgType}`) }}
@@ -275,7 +277,7 @@
               align="center"
               width="180px"
               label="检查人员"
-              v-if="columns[6].visible"
+              v-if="columns[7].visible"
             >
               <template slot-scope="scope">
                 <template v-for="item in splitRoleNames(scope.row.roleNames)">
@@ -288,7 +290,7 @@
               label="任务周期"
               align="center"
               width="180px"
-              v-if="columns[6].visible"
+              v-if="columns[8].visible"
             >
               <template slot-scope="r"
                 >{{ getLabel(dict.type.check_cycle, `${r.row.planCycle}`) }}
@@ -300,7 +302,7 @@
               label="任务次数"
               align="center"
               width="180px"
-              v-if="columns[6].visible"
+              v-if="columns[9].visible"
             ></el-table-column>
 
             <el-table-column
@@ -308,7 +310,7 @@
               label="任务状态"
               align="center"
               width="180px"
-              v-if="columns[6].visible"
+              v-if="columns[10].visible"
             >
               <template slot-scope="r"
                 >{{ getLabel(dict.type.check_status, `${r.row.planStatus}`) }}
@@ -467,17 +469,16 @@ export default {
       // 列信息
       columns: [
         { key: 0, label: `序号`, visible: true },
-        { key: 1, label: `计划名称`, visible: true },
-        { key: 2, label: `计划类型`, visible: true },
-        { key: 3, label: `计划创建机构`, visible: true },
-        { key: 4, label: `计划所属机构`, visible: true },
-        { key: 5, label: `履职机构类型`, visible: true },
-        { key: 6, label: `履职角色`, visible: true },
-        { key: 7, label: `履职周期`, visible: true },
-        { key: 8, label: `履职次数`, visible: true },
-        { key: 9, label: `履职时间`, visible: true },
-        { key: 10, label: `修改人`, visible: true },
-        { key: 11, label: `计划状态`, visible: true },
+        { key: 1, label: `任务名称`, visible: true },
+        { key: 2, label: `任务类型`, visible: true },
+        { key: 3, label: `创建机构`, visible: true },
+        { key: 4, label: `行社名称`, visible: true },
+        { key: 5, label: `检查主体`, visible: true },
+        { key: 6, label: `受检机构`, visible: true },
+        { key: 7, label: `检查人员`, visible: true },
+        { key: 8, label: `任务周期`, visible: true },
+        { key: 9, label: `任务次数`, visible: true },
+        { key: 10, label: `任务状态`, visible: true },
       ],
     };
   },

src/views/core/accessPlan/index.vue

@@ -11,7 +11,7 @@
         <div class="main-right-box">
           <div class="main-search-box">
             <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
-              <el-form-item label="创建机构" prop="orgId">
+              <el-form-item label="创建机构">
                 <org-tree
                 v-model="queryParams.orgId" @defaultKey="getDefaultKey" @defaultOrg="getDefaultOrg" @checkChange="checkChange"
                 @click="clickTreeNode" :defaultCheckSub="false" hangsheTree

src/views/core/drill/drillDictionary/index.vue

@@ -20,7 +20,7 @@
             <el-input v-model="queryParams.id" placeholder="请输入编号" clearable
                       @keyup.enter.native="handleQuery"/>
           </el-form-item> -->
-              <el-form-item label="机构名称" prop="orgId">
+              <el-form-item label="机构名称">
                 <org-tree
                   v-model="queryParams.orgId"
                   @defaultKey="getDefaultKey"

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

@@ -17,7 +17,7 @@
               :inline="true"
               v-show="showSearch"
             >
-              <el-form-item label="创建机构" prop="orgId">
+              <el-form-item label="创建机构">
                 <org-tree
                   v-model="queryParams.belongOrgId"
                   @defaultKey="getDefaultKey"

src/views/core/drill/task/dialog.evaluate.vue

@@ -211,7 +211,6 @@ export default {
         this.$emit("success", this.formData);
         this.onHide();
         this.$modal.msgSuccess("演练登记评价成功");
-        this.getList();
       });
     },
     async refresh(id, other) {

src/views/core/drill/task/index.vue

@@ -15,7 +15,7 @@
               :inline="true"
               v-show="showSearch"
             >
-              <el-form-item label="演练机构" prop="orgId">
+              <el-form-item label="演练机构"">
                 <org-tree
                   v-model="queryParams.orgId"
                   @defaultOrg="getDefaultOrg"
@@ -397,6 +397,7 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
+      console.log('11111111111')
       this.queryParams.pageNum = 1;
       this.getList();
     },
@@ -406,6 +407,7 @@ export default {
       this.handleQuery();
     },
     clearQueryForm() {
+      this.queryParams.title=null;
       this.queryParams.type = null;
       this.queryParams.status = null;
       this.queryParams.range = [];

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

@@ -23,7 +23,7 @@
               :inline="true"
               v-show="showSearch"
             >
-              <el-form-item label="行社名称" prop="orgId">
+              <el-form-item label="行社名称">
                 <org-tree
                   v-model="queryParams.belongOrgId"
                   @defaultKey="getDefaultKey"

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

@@ -15,7 +15,7 @@
               :inline="true"
               v-show="showSearch"
             >
-              <el-form-item label="受训机构" prop="orgId">
+              <el-form-item label="受训机构">
                 <org-tree
                   v-model="queryParams.orgId"
                   @defaultOrg="getDefaultOrg"

src/views/core/materials/index.vue

@@ -11,7 +11,7 @@
         <div class="main-right-box">
           <div class="main-search-box">
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
-          <el-form-item label="创建机构" prop="orgId">
+          <el-form-item label="创建机构">
             <org-tree v-model="queryParams.orgId" @defaultKey="getDefaultKey" @checkChange="checkChange"
                   @click="clickTreeNode" wholeTree></org-tree>
           </el-form-item>

src/views/core/message/index.vue

@@ -9,7 +9,7 @@
       <div class="main-right-box">
         <div class="main-search-box">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
-        <el-form-item label="创建机构" prop="orgId">
+        <el-form-item label="创建机构">
           <org-tree v-model="queryParams.orgId" @defaultKey="getDefaultKey"  @checkChange="checkChange"
                 @click="clickTreeNode"></org-tree>
         </el-form-item>

src/views/core/outIn/outInLog/index.vue

@@ -30,7 +30,7 @@
                   @keyup.enter.native="handleQuery"
                 />
               </el-form-item> -->
-              <el-form-item label="接待机构" prop="orgId">
+              <el-form-item label="接待机构">
                 <org-tree
                   v-model="queryParams.orgId"
                   @defaultKey="getDefaultKey"

src/views/core/task/index.vue

@@ -21,7 +21,7 @@
               :inline="true"
               v-show="showSearch"
             >
-              <el-form-item label="调阅机构" prop="orgId">
+              <el-form-item label="调阅机构">
                 <org-tree
                   v-model="queryParams.orgId"
                   @defaultKey="getDefaultKey"

src/views/question/list/index.vue

@@ -21,7 +21,7 @@
               v-show="showSearch"
               label-width="80px"
             >
-              <el-form-item label="机构名称" prop="orgId">
+              <el-form-item label="机构名称">
                 <org-tree
                   v-model="queryParams.orgId"
                   @defaultOrg="getDefaultOrg"

src/views/question/reform/index.vue

@@ -21,7 +21,7 @@
               v-show="showSearch"
               label-width="80px"
             >
-              <el-form-item label="机构名称" prop="orgId">
+              <el-form-item label="机构名称">
                 <org-tree
                   v-model="queryParams.orgId"
                   @defaultOrg="getDefaultOrg"

src/views/registerBook/index.vue

@@ -17,7 +17,7 @@
               :inline="true"
               v-show="showSearch"
             >
-              <el-form-item label="所属机构" prop="orgId">
+              <el-form-item label="所属机构">
                 <org-tree
                   v-model="queryParams.belongOrgId"
                   @defaultKey="getDefaultKey"

src/views/resumption/plan/index.vue

@@ -26,7 +26,7 @@
               label-width="90px"
             >
               <el-row>
-                <el-form-item label="行社名称" prop="orgId">
+                <el-form-item label="行社名称">
                   <org-tree
                     v-model="queryParams.orgId"
                     @defaultKey="getDefaultKey"
@@ -694,7 +694,6 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("search");
-      this.queryParams.orgId = undefined;
       // this.$refs.tree.setCurrentKey(null);
       this.getList();
     },

src/views/resumption/protection/index.vue

@@ -22,7 +22,7 @@
               :inline="true"
               v-show="showSearch"
             >
-              <el-form-item label="所属机构" prop="orgId">
+              <el-form-item label="所属机构">
                 <org-tree
                   v-model="queryParams.orgId"
                   @defaultOrg="getDefaultOrg"

src/views/resumption/rule/index.vue

@@ -24,7 +24,7 @@
               :inline="true"
               v-show="showSearch"
             >
-              <el-form-item label="发布机构" prop="orgId">
+              <el-form-item label="发布机构">
                 <org-tree
                   v-model="queryParams.orgId"
                   @defaultKey="getDefaultKey"

src/views/resumption/taskManager/index.vue

@@ -21,7 +21,7 @@
               :inline="true"
               v-show="showSearch"
             >
-              <el-form-item label="履职机构" prop="orgId">                
+              <el-form-item label="履职机构">                
                   <org-tree
                     v-model="queryParams.orgId"
                     @defaultOrg="getDefaultOrg"

src/views/resumptionEvaluate/evaluate/editDialog.vue

@@ -85,8 +85,9 @@
                 </el-select>
               </el-form-item>
             </el-col>
+           
             <el-col :span="4">
-              <el-form-item prop="buildTaskNow" label="立即生效:" v-if="!id">
+              <el-form-item prop="buildTaskNow" label="立即生效:" v-if="!(id&&(isDistribute==1))">
                 <el-checkbox v-model="formData.buildTaskNow" size="medium"
                   >勾选后当前周期开始生效</el-checkbox
                 >
@@ -155,6 +156,7 @@ export default {
   dicts: ["evaluate_cycle", "sys_org_type"],
   data() {
     return {
+      isDistribute:0,
       selectedValues: [],
       resumptionRoles: [],
       evaluateName: null,
@@ -261,8 +263,9 @@ export default {
     onOrgTypeChanged() {
       this.getRolesByOrg(1);
     },
-    async show(id = "", other = {}) {
+    async show(id = "", isDistribute=0) {
       this.id = id;
+      this.isDistribute=isDistribute
       this.tableData = [
         {
           contentType: "1",

src/views/resumptionEvaluate/evaluate/index.vue

@@ -22,7 +22,7 @@
               :inline="true"
               v-show="showSearch"
             >
-              <el-form-item label="创建机构" prop="orgId">
+              <el-form-item label="创建机构">
                 <org-tree
                   v-model="queryParams.orgId"
                   @defaultKey="getDefaultKey"
@@ -283,7 +283,7 @@ export default {
       list(this.queryParams).then((res) => {
         this.dataList = res?.data.rows || [];
         this.isEdit = res?.isEdit;
-        this.total = res?.total || [];
+        this.total = res.data.total || [];
         this.loading = false;
       });
     },
@@ -294,7 +294,7 @@ export default {
       this.$refs.Evaluate.show();
     },
     editHandler(row) {
-      this.$refs.Evaluate.show(row.id);
+      this.$refs.Evaluate.show(row.id,row.isDistribute);
     },
     //发布
     publishHandler(row) {

src/views/resumptionEvaluate/evaluatePlan/index.vue

@@ -22,7 +22,7 @@
               :inline="true"
               v-show="showSearch"
             >
-              <el-form-item label="评价机构" prop="orgId">
+              <el-form-item label="评价机构">
                 <org-tree
                   v-model="queryParams.orgId"
                   @defaultKey="getDefaultKey"

src/views/safetycheck/rule/index.vue

@@ -23,7 +23,7 @@
               :inline="true"
               v-show="showSearch"
             >
-              <el-form-item label="发布机构" prop="orgId">
+              <el-form-item label="发布机构">
                 <org-tree
                   v-model="queryParams.orgId"
                   @defaultKey="getDefaultKey"

src/views/safetycheck/task/index.vue

@@ -21,7 +21,7 @@
               :inline="true"
               v-show="showSearch"
             >
-              <el-form-item label="检查机构" prop="orgId">
+              <el-form-item label="检查机构">
                 <org-tree
                   v-model="queryParams.orgId"
                   @defaultKey="getDefaultKey"
@@ -225,7 +225,7 @@
               prop="checkOrgName"
               label="检查主体"
               width="180px"
-              v-if="columns[5].visible"
+              v-if="columns[2].visible"
             >
             </el-table-column>
             <el-table-column
@@ -233,7 +233,7 @@
               label="检查人员"
               align="center"
               width="180px"
-              v-if="columns[6].visible"
+              v-if="columns[3].visible"
             >
               <template slot-scope="r">
                 {{
@@ -248,7 +248,7 @@
               label="任务进度"
               align="center"
               width="120px"
-              v-if="columns[10].visible"
+              v-if="columns[4].visible"
             >
               <template slot-scope="r">
                 <span>
@@ -267,7 +267,7 @@
               label="受检机构"
               header-align="center"
               width="180px"
-              v-if="columns[4].visible"
+              v-if="columns[5].visible"
             >
             </el-table-column>
 
@@ -276,7 +276,7 @@
               label="任务时间"
               header-align="center"
               width="300px"
-              v-if="columns[2].visible"
+              v-if="columns[6].visible"
               ><template slot-scope="r">
                 {{
                   r.row.planStartTime
@@ -321,7 +321,7 @@
               prop="exceptionCount"
               label="隐患问题数"
               width="120px"
-              v-if="columns[9].visible"
+              v-if="columns[7].visible"
             >
             </el-table-column>
             <el-table-column
@@ -462,16 +462,13 @@ export default {
       pageData: [],
       columns: [
         { key: 0, label: `序号`, visible: true },
-        { key: 1, label: `计划名称`, visible: true },
-        { key: 2, label: `开始时间`, visible: true },
-        { key: 3, label: `结束时间`, visible: true },
-        { key: 4, label: `上级机构`, visible: true },
-        { key: 5, label: `检查机构`, visible: true },
-        { key: 6, label: `检查角色`, visible: true },
-        { key: 7, label: `提交人`, visible: true },
-        { key: 8, label: `提交时间`, visible: true },
-        { key: 9, label: `异常个数`, visible: true },
-        { key: 10, label: `任务状态`, visible: true },
+        { key: 1, label: `任务名称`, visible: true },
+        { key: 2, label: `检查主体`, visible: true },
+        { key: 3, label: `检查人员`, visible: true },
+        { key: 4, label: `任务进度`, visible: true },
+        { key: 5, label: `受检机构`, visible: true },
+        { key: 6, label: `任务时间`, visible: true },
+        { key: 7, label: `隐患问题数`, visible: true },
       ],
     };
   },
@@ -668,7 +665,7 @@ export default {
           ...this.queryParams,
         },
         `${
-          this.orgName +
+          this.selectedOrgName +
           "-检查登记跟踪-" +
           this.formatTime(new Date(), "YYYYMMDD")
         }.xlsx`

src/views/system/bind/index.vue

@@ -22,7 +22,7 @@
               :inline="true"
               v-show="showSearch"
             >
-              <el-form-item label="机构名称" prop="orgId">
+              <el-form-item label="机构名称">
                 <org-tree
                   v-model="queryParams.orgId"
                   @defaultKey="getDefaultKey"

src/views/system/workTimeSet/dialog.add.vue

@@ -293,7 +293,7 @@ export default {
             ])
         ) {
           this.$message.error(
-              `${ds}：请按照（上班时间<=营业时间<=营业结束<=下班时间）顺序配置`
+              `${ds}：请按照（上班时间<营业时间<营业结束<下班时间）顺序配置`
           );
           return false;
         }

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

@@ -215,7 +215,7 @@ export default {
           ])
         ) {
           this.$message.error(
-            `请按照（上班时间<=营业时间<=营业结束<=下班时间）顺序配置`
+            `请按照（上班时间<营业时间<营业结束<下班时间）顺序配置`
           );
           return false;
         }

src/views/system/workTimeSet/dialog.template.vue

@@ -288,7 +288,7 @@ export default {
       let arr = [dayOfWeek.workTime ,dayOfWeek.openTime,dayOfWeek.closeTime,dayOfWeek.workOffTime];
       if (!timeCheck(arr)) {
 
-        this.$message.error(`${dayOfWeek.dayOfWeekText}：请按照（上班时间<=营业时间<=营业结束<=下班时间）顺序配置`);
+        this.$message.error(`${dayOfWeek.dayOfWeekText}：请按照（上班时间<营业时间<营业结束<下班时间）顺序配置`);
         return false;
       }
       return true;

src/views/system/workTimeSet/workTime.vue

@@ -22,7 +22,7 @@
               :inline="true"
               v-show="showSearch"
             >
-              <el-form-item label="机构名称" prop="orgId">
+              <el-form-item label="机构名称">
                 <org-tree
                   v-model="queryParams.orgId"
                   @defaultKey="getDefaultKey"

src/views/system/workTimeSet/workTimeWeek.vue

@@ -16,7 +16,7 @@
           <!--    搜索条件    -->
           <div class="main-search-box">
             <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
-              <el-form-item label="机构名称" prop="orgId">
+              <el-form-item label="机构名称">
                 <org-tree
                 v-model="queryParams.orgId"
                 @defaultKey="getDefaultKey"