feat:合并

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);
     }

src/components/drawers/ProjectAudit.vue

@@ -135,6 +135,7 @@ 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: props.chooseProject,
-        projectId: 37,
       }).then((res) => {
         console.log("get task", res.data.data);
         let info = res.data.data.projectInfo;
@@ -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;

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>