feat:合并

2025-12-13 12:56:45 +08:00 · 2022-11-30 13:45:44 +08:00
parent 48412990a0 d83b8668a9
commit cb809c06cc
3 changed files with 79 additions and 62 deletions
--- a/src/api/config.js
+++ b/src/api/config.js
@@ -2,7 +2,7 @@
 * @Author: lixg lixg@dongwu-inc.com
 * @Date: 2022-11-21 14:32:52
 * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2022-11-29 21:03:51
+ * @LastEditTime: 2022-11-30 13:45:23
 * @FilePath: /fe-manage/src/api/config.js
 * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 */
@@ -53,7 +53,7 @@ http.interceptors.response.use(
      return response;
    } else {
      if (code === 1000) {
-        // window.open("https://u-pre.boe.com/web/", '_self');
+        window.open("https://u-pre.boe.com/web/", '_self');
      }
      console.log("api %o", msg);
    }
--- a/src/components/drawers/ProjectAudit.vue
+++ b/src/components/drawers/ProjectAudit.vue
@@ -1,18 +1,18 @@
 <template>
  <a-drawer
-    :visible="ProjAuditvisible"
-    class="drawerStyle ProjectAudit"
-    placement="right"
-    width="60%"
-    @after-visible-change="afterVisibleChange"
+      :visible="ProjAuditvisible"
+      class="drawerStyle ProjectAudit"
+      placement="right"
+      width="60%"
+      @after-visible-change="afterVisibleChange"
  >
    <div class="drawerMain">
      <div class="header">
        <div class="headerTitle">审核项目</div>
        <img
-          style="width: 29px; height: 29px; cursor: pointer"
-          src="../../assets/images/basicinfo/close.png"
-          @click="closeDrawer"
+            style="width: 29px; height: 29px; cursor: pointer"
+            src="../../assets/images/basicinfo/close.png"
+            @click="closeDrawer"
        />
      </div>
      <div class="main" style="padding-right: 10px">
@@ -30,9 +30,9 @@
                  <div class="setc_name"><span>封面图：</span></div>
                  <div class="setc_main">
                    <img
-                      style="width: 151px; height: 84px"
-                      :src="picUrl"
-                      alt=""
+                        style="width: 151px; height: 84px"
+                        :src="picUrl"
+                        alt=""
                    />
                  </div>
                </div>
@@ -40,7 +40,7 @@
                  <div class="setc_name"><span>项目时间：</span></div>
                  <div class="setc_main">
                    <span style="color: #999999"
-                      >{{ startTime }} ～ {{ endTime }}</span
+                    >{{ startTime }} ～ {{ endTime }}</span
                    >
                  </div>
                </div>
@@ -66,9 +66,9 @@
                  <div class="setc_name"><span>同步学习记录：</span></div>
                  <div class="setc_main">
                    <a-radio v-model:checked="checkedSty"
-                      ><span style="color: #333333"
-                        >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
-                      ></a-radio
+                    ><span style="color: #333333"
+                    >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
+                    ></a-radio
                    >
                  </div>
                </div>
@@ -88,7 +88,7 @@
                  <div class="setc_name"><span>是否BOEU实施：</span></div>
                  <div class="setc_main">
                    <a-radio v-model:checked="checkedBOEU"
-                      ><span style="color: #333333">BOEU实施</span></a-radio
+                    ><span style="color: #333333">BOEU实施</span></a-radio
                    >
                  </div>
                </div>
@@ -101,7 +101,7 @@
              </button>
            </div>
          </a-tab-pane>
-          <a-tab-pane key="2" tab="修改记录"> </a-tab-pane>
+          <a-tab-pane key="2" tab="修改记录"></a-tab-pane>
        </a-tabs>
        <div class="audit">
          <div class="set_content">
@@ -116,7 +116,7 @@
          <div class="set_content">
            <div class="setc_name"><span>审核意见：</span></div>
            <div class="setc_main">
-              <a-textarea v-model:value="valueSuggest" :rows="4" />
+              <a-textarea v-model:value="valueSuggest" :rows="4"/>
            </div>
          </div>
        </div>
@@ -130,11 +130,12 @@
 </template>

 <script>
-import { toRefs, reactive } from "vue";
-import { getTask } from "../../api/indexTaskadd";
-import { toDate } from "../../api/method";
-import { auditView } from "../../api/indexAudit";
-import { message } from "ant-design-vue";
+import {toRefs, reactive} from "vue";
+import {getTask} from "../../api/indexTaskadd";
+import {toDate} from "../../api/method";
+import {auditView} from "../../api/indexAudit";
+import {message} from "ant-design-vue";
+
 export default {
  name: "ProjectAudit",
  components: {},
@@ -155,6 +156,10 @@ export default {
      type: String,
      default: null,
    },
+    finishdFun: {
+      type: Function,
+      default: null
+    }
  },

  setup(props, ctx) {
@@ -195,6 +200,8 @@ export default {

    const closeDrawer = () => {
      ctx.emit("update:ProjAuditvisible", false);
+      console.log(props.finishdFun)
+      props.finishdFun && props.finishdFun()
      state.valueSuggest = null;
      state.valuePass = "1";
    };
@@ -202,8 +209,7 @@ export default {
    //获取项目信息
    const getTaskInfo = () => {
      getTask({
-        // 先使用了固定projectId
-        projectId: 37,
+        projectId: props.chooseProject,
      }).then((res) => {
        console.log("get task", res.data.data);
        let info = res.data.data.projectInfo;
@@ -219,26 +225,26 @@ export default {
        state.manager = info.manager;
        state.remark = info.remark;
        state.level =
-          info.level == 1
-            ? "集团级"
-            : info.level == 2
-            ? "组织级"
-            : info.level == 3
-            ? "现地级"
-            : info.level == 4
-            ? "部门级"
-            : "-";
+            info.level == 1
+                ? "集团级"
+                : info.level == 2
+                    ? "组织级"
+                    : info.level == 3
+                        ? "现地级"
+                        : info.level == 4
+                            ? "部门级"
+                            : "-";
        state.tlevel = info.level;
        state.systemId =
-          info.systemId == 1
-            ? "集团级"
-            : info.systemId == 2
-            ? "组织级"
-            : info.systemId == 3
-            ? "现地级"
-            : info.systemId == 4
-            ? "部门级"
-            : "-";
+            info.systemId == 1
+                ? "集团级"
+                : info.systemId == 2
+                    ? "组织级"
+                    : info.systemId == 3
+                        ? "现地级"
+                        : info.systemId == 4
+                            ? "部门级"
+                            : "-";
        state.tsystemId = info.systemId;
        state.checkedSty = info.courseSyncFlag == 1 ? true : false;
        state.courseSyncFlag = info.courseSyncFlag;
@@ -254,13 +260,13 @@ export default {
        // state.attach = info.attach;
        // state.templateId = info.templateId;
        state.sourceBelong =
-          info.sourceBelongId == 1
-            ? "项目一"
-            : info.sourceBelongId == 2
-            ? "项目二"
-            : info.sourceBelongId == 3
-            ? "项目三"
-            : "-";
+            info.sourceBelongId == 1
+                ? "项目一"
+                : info.sourceBelongId == 2
+                    ? "项目二"
+                    : info.sourceBelongId == 3
+                        ? "项目三"
+                        : "-";
      });
    };

@@ -278,16 +284,16 @@ export default {
        pass: state.valuePass == "1" ? 1 : -1,
        projectId: props.chooseProject,
      })
-        .then((res) => {
-          console.log("提交成功", res);
-          message.destroy();
-          message.success("提交成功");
-          closeDrawer();
-        })
-        .catch((err) => {
-          console.log(err);
-          message.warning("提交失败");
-        });
+          .then((res) => {
+            console.log("提交成功", res);
+            message.destroy();
+            message.success("提交成功");
+            closeDrawer();
+          })
+          .catch((err) => {
+            console.log(err);
+            message.warning("提交失败");
+          });
    };

    return {
@@ -310,6 +316,7 @@ export default {
    // overflow-x: auto;
    display: flex;
    flex-direction: column;
+
    .header {
      height: 73px;
      border-bottom: 1px solid #e8e8e8;
@@ -319,6 +326,7 @@ export default {
      // background-color: red;
      margin-bottom: 20px;
      flex-shrink: 0;
+
      .headerTitle {
        font-size: 18px;
        font-weight: 600;
@@ -328,12 +336,14 @@ export default {
        // margin-left: 24px;
      }
    }
+
    .main {
      width: 100%;
      height: 100%;
      // background-color: #bfa;
      overflow-y: auto;
      padding-right: 10px;
+
      .content7 {
        margin-top: 20px;

@@ -401,11 +411,13 @@ export default {
          }
        }
      }
+
      .detaile {
        width: 100%;
        // background-color: blue;
        display: flex;
        justify-content: center;
+
        .can {
          width: 130px;
          height: 40px;
@@ -415,6 +427,7 @@ export default {
          background-color: #fff;
          margin-right: 30px;
        }
+
        .debtn {
          width: 130px;
          height: 40px;
@@ -425,10 +438,12 @@ export default {
          cursor: pointer;
        }
      }
+
      .audit {
        margin-left: 34px;
        margin-right: 34px;
        position: relative;
+
        .set_content {
          margin: 32px auto;
          display: flex;
@@ -443,6 +458,7 @@ export default {
          .setc_main {
            flex: 1;
            margin-left: 12px;
+
            textarea {
              border-radius: 4px !important;
              resize: none;
--- a/src/views/examine/ProjectReviewedN.vue
+++ b/src/views/examine/ProjectReviewedN.vue
@@ -104,6 +104,7 @@
      v-model:chooseProject="chooseProject"
      v-model:chooseCreateId="chooseCreateId"
      v-model:chooseCreater="chooseCreater"
+      v-model:finishdFun="getProjList"
    />
  </div>
 </template>