代码合并

apis/http.js

@@ -15,15 +15,29 @@ class HttpConfig {
     // baseUrl = "https://z.csgmall.com.cn/gl"
     // baseUrl = "http://10.40.92.141:28080"
     // #endif
-    // 基地址
-    // authPath = `${this.baseUrl}/dev-api/auth`;
-    // systemPath = `${this.baseUrl}/dev-api/system`;
-    // basePath = `${this.baseUrl}/dev-api/base`;
-    // materialPath = `${this.baseUrl}/dev-api/material`;
-    authPath = `${this.baseUrl}/auth`;
-    systemPath = `${this.baseUrl}/system`;
-    basePath = `${this.baseUrl}/material/base`;
-    materialPath = `${this.baseUrl}/material`;
+    // 基地址 （部署时使用 需要加 dev-api）
+    // authPath = `${this.baseUrl}/dev-api/auth`
+    // systemPath = `${this.baseUrl}/dev-api/system`
+    // basePath = `${this.baseUrl}/dev-api/base`
+    // materialPath = `${this.baseUrl}/dev-api/material`
+    baseUrl =
+        ENV === "production"
+            ? "http://192.168.0.56:21627/dev-api"
+            : this.target;
+    authPath =
+        ENV === "production" ? `${this.baseUrl}/auth` : `${this.baseUrl}/auth`;
+    systemPath =
+        ENV === "production"
+            ? `${this.baseUrl}/system`
+            : `${this.baseUrl}/system`;
+    basePath =
+        ENV === "production"
+            ? `${this.baseUrl}/material/base`
+            : `${this.baseUrl}/material/base`;
+    materialPath =
+        ENV === "production"
+            ? `${this.baseUrl}/material`
+            : `${this.baseUrl}/material`;
     // 短链
     serviceUrl = {
         login: {
@@ -61,7 +75,8 @@ class HttpConfig {
             fetchExamListAll: "/tm_task/getLeaseAuditListAll", // 获取领料申请列表
             fetchTrueExamList: "/tm_task/getLeaseManageListAll", // 获取领料审批列表
             fetchTrueExamListCq: "/tm_task/getLeaseManageListAllCq", // 获取重庆领料审批列表
-            fetchDetailList: "/tm_task/getLeaseListAll", // 获取领料明细列表
+            fetchDetailList: "/tm_task/getLeaseListAllCq", // 获取领料明细列表
+            fetchConfirmByCq: "/tm_task/updateLeaseTaskStatusConfirmByCq",
             subExam: "/tm_task/auditLeaseByCompany", // 通过领料审批
             subExamCq: "/tm_task/auditLeaseByCompanyCq", // 通过重庆领料审批
             rejectExam: "/tm_task/rejectLeaseByCompany", // 驳回领料审批
@@ -126,7 +141,7 @@ class HttpConfig {
             backReceiveEndBack: "/backReceive/endBack",
             seeBackMaterialDetail: "/backReceive/backReceiveRecord", // 查看退料明细
             searchRfid: "/backReceive/rfidCodeQuery", // 查询rfid
-            subRfid: "/backReceive/setRfidCodeBack",   
+            subRfid: "/backReceive/setRfidCodeBack",
         },
         // 报废审核接口
         crashExam: {