培训/演练:修改 编辑使用中但未生成任务的计划时 的提示语

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/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() {