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

src/components/orgTreeSelect/index.vue

@@ -1,6 +1,6 @@
 <template>
   <!--  弹出框  -->
-  <el-popover placement="bottom-start" :disabled="disabled" v-model="visible">
+  <el-popover placement="bottom-start" :trigger="trigger" :disabled="disabled" v-model="visible">
     <!--  tag盒子  -->
     <div slot="reference" class="tags-box" :class="{'tags-box-disabled':!disabled,'tags-box-mini':size === 'mini'}">
       <span v-show="sNodeList.length > 0" class="tags-num">{{sNodeList.length}}</span>
@@ -65,6 +65,10 @@ export default {
       type: String,
       default: 'small',
     },
+    trigger:{
+      type: String,
+      default: 'click',
+    },
     //组件禁用
     disabled: {
       type: Boolean,

src/views/core/accessPlan/index.vue

@@ -748,7 +748,7 @@ export default {
 
               })
               }else{
-                msg =  "因不存在已完成任务，本次修改内容将立即生效";
+                msg = "因存在已完成任务，本次修改内容将下周期生效";
                 this.$modal
               .confirm(msg)
               .then(function () {
@@ -765,8 +765,9 @@ export default {
               }
               
               }else{
-                msg = "因存在已完成任务，本次修改内容将下周期生效";
-                this.$modal
+                if (request.isHaveTask==false) {
+                  msg = "是否确认修改?";
+              this.$modal
               .confirm(msg)
               .then(function () {
                 return updatePlan(request);
@@ -779,6 +780,24 @@ export default {
               })
               .catch(() => {
               });
+                }else{
+                  msg =  "因不存在已完成任务，本次修改内容将立即生效";
+              
+              this.$modal
+            .confirm(msg)
+            .then(function () {
+              return updatePlan(request);
+            })
+            .then(() => {
+              this.$modal.msgSuccess("编辑成功");
+              this.open = false;
+              this.getList();
+
+            })
+            .catch(() => {
+            });
+                }
+             
               }
               
             }else{

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

@@ -669,7 +669,6 @@ export default {
     },
     //所属机构为当前用户登录机构时才显示 “编辑、删除”按钮
     checkCanEdit(row) {
-      console.log("checkCanEdit", this.$store.getters.orgId, row.belongOrgId)
       return (
         row.belongOrgId == this.$store.getters.orgId && row.createOrgId == this.$store.getters.orgId
       );
@@ -741,6 +740,7 @@ export default {
         category: null,
         checkSub: true,
         done: null,
+        hasTask: null,
       };
       this.resetForm("form");
     },
@@ -833,7 +833,6 @@ export default {
       this.$refs["form"].validate((valid) => {
         if (valid) {
           let request = {...this.form};
-          console.log("request", request);
           if (this.form.planExecOrgIdList) {
             const list = Array.isArray(this.form.planExecOrgIdList)
               ? this.form.planExecOrgIdList
@@ -845,10 +844,14 @@ export default {
           if (request.id != null) {
             let msg = "";
             if (this.form.planStatus == 1) {
-              if (this.form.done == 1) {
-                msg = "因存在已完成任务，本次修改内容将从下周期生效";
+              if (this.form.hasTask != 1) {
+                msg = "是否确认修改?";
               } else {
-                msg = "因不存在已完成任务，本次修改内容将立即生效";
+                if (this.form.done == 1) {
+                  msg = "因存在已完成任务，本次修改内容将从下周期生效";
+                } else {
+                  msg = "因不存在已完成任务，本次修改内容将立即生效";
+                }
               }
             } else {
               msg = "是否确认修改?";

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

@@ -919,10 +919,14 @@ export default {
           if (request.id != null) {
             let msg = "";
             if (this.form.planStatus == 1) {
-              if (this.form.done == 1) {
-                msg = "因存在已完成任务，本次修改内容将从下周期生效";
+              if (this.form.hasTask != 1) {
+                msg = "是否确认修改?";
               } else {
-                msg = "因不存在已完成任务，本次修改内容将立即生效";
+                if (this.form.done == 1) {
+                  msg = "因存在已完成任务，本次修改内容将从下周期生效";
+                } else {
+                  msg = "因不存在已完成任务，本次修改内容将立即生效";
+                }
               }
             } else {
               msg = "是否确认修改?";

src/views/core/message/index.vue

@@ -325,6 +325,7 @@
           <!--          <org-tree-select :queryData="form.tagOrgType" ref="orgTreeSelect" @selectNode="queryNode"
                            :placeholder="'请选择目标机构'" :disable="true"></org-tree-select>-->
           <org-tree-select
+            trigger="hover"
             v-model="form.tagOrgIds"
             :queryData="parseInt(form.tagOrgType)"
             ref="orgTreeSelect"

src/views/index.vue

@@ -45,7 +45,8 @@
       <el-col :xs="24" :sm="12" :md="15"  :lg="15">
         <el-card class="chart-wrapper">
           <el-tabs type="border-card">
-            <el-tab-pane label="通知公告">
+            <el-tab-pane>
+              <span slot="label" class="tab_font">通知公告</span>
               <div class="tab-panel">
                 <div v-if="msgsList && msgsList.length > 0" class="msg-item" v-for="(v,i) in msgsList" :key="v.id" @click="showMsg(v)">
                     <span class="item-title">{{v.title}}</span>
@@ -55,6 +56,7 @@
               </div>
             </el-tab-pane>
             <el-tab-pane label="知识库">
+              <span slot="label" class="tab_font">知识库</span>
               <div class="tab-panel">
                 <div class="file-item" v-for="(v,i) in fileList" :key="i">
                   <a :href="imageUrl(v.url)" target="_blank">
@@ -231,6 +233,10 @@ export default {
 }
 </style>
 <style lang="scss" scoped>
+.tab_font{
+  font-size: 16px;
+  font-weight: bold;
+}
 .home-container {
   padding: 20px;
   background-color: rgb(240, 242, 245);
@@ -338,6 +344,7 @@ export default {
     .card-panel-icon-wrapper {
       height: 120px;
       margin: 10px;
+      margin-left: 15%;
       padding: 10px;
       transition: all 0.38s ease-out;
       border-radius: 6px;
@@ -364,6 +371,7 @@ export default {
       justify-content: center;
       font-weight: bold;
       margin: 10px;
+      margin-right: 18%;
       .card-panel-text {
         text-align: center;
         line-height: 18px;

src/views/resumptionEvaluate/evaluate/addEvaluate.vue

@@ -3,7 +3,7 @@
     <DialogCom
       :visible.sync="isShow"
       :width="'500px'"
-      :title="`${id ? '编辑' : '新增'}外包履职评价计划`"
+      :title="`${id ? '编辑' : '新增'}外包履职评价任务`"
       @close="closeHandler"
       append-to-body
     >
@@ -48,8 +48,8 @@
 <script>
 import { guid } from "@/utils/index.js";
 export default {
-  name: "SocWebAddEvaluate",
   dicts: ["evaluate_type"],
+  name: "SocWebAddEvaluate",
   data() {
     return {
       ruleForm: {},
@@ -102,8 +102,9 @@ export default {
   },
 };
 </script>
+
 <style lang="scss" scoped>
 .el-select {
   width: 100%;
 }
-</style>
+</style>

src/views/resumptionEvaluate/evaluate/editDialog.vue

@@ -2,7 +2,7 @@
   <div class="rule-type">
     <DialogCom
       @colse="onHide"
-      :title="`${id ? '编辑' : '新增'}外包履职评价计划`"
+      :title="`${id ? '编辑' : '新增'}外包履职评价任务`"
       :visible.sync="isShow"
       width="1500px"
     >
@@ -86,13 +86,13 @@
               </el-form-item>
             </el-col>
            
-            <el-col :span="4">
+            <!-- <el-col :span="4">
               <el-form-item prop="buildTaskNow" label="立即生效:" v-if="!(id&&(isDistribute==1))">
                 <el-checkbox v-model="formData.buildTaskNow" size="medium"
                   >勾选后当前周期开始生效</el-checkbox
                 >
               </el-form-item>
-            </el-col>
+            </el-col> -->
           </el-row>
         </el-form>
         <el-button
@@ -151,9 +151,19 @@ import {
   getEvaluateById,
   editEvaluate,
 } from "@/api/resumption/outsourcing.js";
-
 export default {
   dicts: ["evaluate_cycle", "sys_org_type"],
+  components: { DialogSelect },
+
+  props: {
+    orgTypeOptions: {
+      type: Array,
+    },
+    ruleTypeOptions: {
+      type: Array,
+    },
+  },
+
   data() {
     return {
       isDistribute:0,
@@ -194,20 +204,14 @@ export default {
       },
     };
   },
-  props: {
-    orgTypeOptions: {
-      type: Array,
-    },
-    ruleTypeOptions: {
-      type: Array,
-    },
-  },
-  watch: {},
+
   computed: {
     ...mapGetters(["orgId", "orgName"]),
   },
+
+  watch: {},
   mounted() {},
-  components: { DialogSelect },
+
   methods: {
     //数据格式化
     typeFormat(row) {
@@ -380,7 +384,7 @@ export default {
     },
     // 事件
     //apimark//
-  },
+  }
 };
 </script>
 
@@ -396,4 +400,4 @@ export default {
   color: #999;
   height: 10px;
 }
-</style>
+</style>

src/views/safetyBook/aqbwbndjh/dialog.des.vue

@@ -90,7 +90,7 @@
             </el-form-item> -->
             <el-descriptions-item
               labelClassName="gx_info_label"
-              label="附件(word、pdf文件格式)"
+              label="文件资料"
             >
               <!-- <imgs-upload
                 :limit="5"

src/views/safetyBook/aqbwbndjh/dialog.edit.vue

@@ -62,7 +62,7 @@
             ></el-date-picker>
           </el-form-item>
 
-          <el-form-item label="上传附件（word、pdf文件格式）" prop="images">
+          <el-form-item label="文件资料" prop="images">
             <!-- <imgs-upload
               :limit="5"
               v-model="formData.images"
@@ -137,8 +137,8 @@ export default {
       deptOptions: [],
       formDataRules: {
         userIds: [{ required: true, message: "请选择参与人员" }],
-        date: [{ required: true, message: "请选择记录日期" }],
-        images: [{ required: true, message: "请选择照片" }],
+        date: [{ required: true, message: "请选择日期" }],
+        images: [{ required: true, message: "请上传年度工作计划文件" }],
         content: [{ required: true, message: "请输入内容" }],
         orgId: [{ required: true, message: "请选择机构" }],
         type: [{ required: true, message: "请输入文件种类" }],

src/views/safetyBook/newBook/dialog.edit.vue

@@ -67,7 +67,7 @@
             <div>
               <el-input
                 v-model="formData.partyAOrgName"
-                placeholder="请输入甲方机构"
+                placeholder="请输入甲方所属机构"
                 maxlength="50"
               ></el-input>
             </div>
@@ -79,7 +79,7 @@
               :show-count="true"
               :normalizer="tenantIdnormalizer"
               :props="{ checkStrictly: true, label: 'shortName' }"
-              placeholder="请选择乙方所属机构"
+              placeholder="请选择甲方所属机构"
             />
           </el-form-item>
           <el-form-item prop="partyB" label="乙方姓名:">
@@ -95,13 +95,13 @@
             <div>
               <el-input
                 v-model="formData.partyBOrgName"
-                placeholder="请输入甲方机构"
+                placeholder="请输入择乙方机构"
                 maxlength="50"
               ></el-input>
             </div>
           </el-form-item>
           <el-form-item prop="partyBOrg" label="乙方机构:" v-if="formData.type==1||formData.type==3">
-            <tree-select
+            <tree-
               v-model="formData.partyBOrg"
               :options="deptOptions"
               :show-count="true"
@@ -131,8 +131,8 @@
             </el-date-picker>
           </el-form-item>
 
-         
-         
+
+
           <el-col :xs="24" :sm="24" :md="24" :lg="24">
             <el-form-item label="上传文件" prop="files">
               <W-file-upload
@@ -206,15 +206,15 @@ export default {
       }
       return false;
     },
-   
+
     dayjs,
-   
+
     editII(row) {
-     
+
     },
     //新增签署
     openSelect() {
-     
+
     },
     /** 查询机构树数据 */
     getDeptTree() {