From a6599bb9365b8411cab0c6442f2363665f98a477 Mon Sep 17 00:00:00 2001
From: lijing <YourEmail>
Date: Sat, 2 Nov 2024 17:17:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC=E5=8F=B7?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9A=82=E5=AD=98=E6=8C=89=E9=92=AE0.0.127?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/login/login/index.vue               |  2 +-
 .../quality/Materialinspection/index.vue      | 46 ++++++++-----------
 src/utils/request.ts                          | 20 ++++----
 3 files changed, 31 insertions(+), 37 deletions(-)

diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue
index 0440f5b..5b4816c 100644
--- a/src/pages/login/login/index.vue
+++ b/src/pages/login/login/index.vue
@@ -142,7 +142,7 @@ export default class LoginPage extends BasePage {
     // console.log('Version////', this.Version);
   }
   ///********版本号修改区域**********
-  version = '0.0.126'; //正式版本号
+  version = '0.0.127'; //正式版本号
   //version = '0.0.14'; //测试版本号
   //***************标志修改区域：是否是测试标志： false 正式版本； true 测试版本****************
   //isTest = true;
diff --git a/src/pages/quality/Materialinspection/index.vue b/src/pages/quality/Materialinspection/index.vue
index 4c294c1..acd2841 100644
--- a/src/pages/quality/Materialinspection/index.vue
+++ b/src/pages/quality/Materialinspection/index.vue
@@ -211,6 +211,9 @@
             <!-- remark:不合格描述 -->
             <div class="item1">不合格描述:</div>
             <u-input style="background: #fafafa; border: 1px dashed #e2e2e2; padding: 10px 5px" v-model="item.remark" placeholder="" type="textarea" />
+            <view class="boder-icon-rigth2">
+              <u-button @click="SaveDraft()" type="primary">暂存</u-button>
+            </view>
           </view>
         </view>
         <!-- sampleQuality：抽样数量
@@ -1847,36 +1850,18 @@ export default class PurchaseWHSRM extends BasePage {
   }
   closepopup() {
     //是否关闭弹窗
+    this.SaveDraft();
     this.$nextTick(() => {
-      uni.showModal({
-        content: '是否退出？',
-        showCancel: true,
-        success: (res) => {
-          if (res.confirm) {
-            this.SaveDraft();
-            //this.sampleQuality = null;
-          } else if (res.cancel) {
-            console.log('不关闭');
-          }
-        },
-      });
+      this.show = false;
     });
   }
+
   onBackPress(e) {
     if (e.from === 'backbutton') {
       if (this.show === true) {
-        uni.showModal({
-          content: '是否退出？',
-          showCancel: true,
-          success: (res) => {
-            if (res.confirm) {
-              this.SaveDraft();
-
-              //this.sampleQuality = null;
-            } else if (res.cancel) {
-              console.log('不关闭');
-            }
-          },
+        this.SaveDraft();
+        this.$nextTick(() => {
+          this.show = false;
         });
         return true;
       } else {
@@ -2002,14 +1987,14 @@ export default class PurchaseWHSRM extends BasePage {
       //qc主管
       qczg: this.formdata.qcFrom,
     };
-    //console.log('草稿params', params);
+    console.log('草稿params', params);
     try {
       await model.commitDraft(params); //99999
       if (model.commitDraftCode == 200) {
         (this.$refs.uToast as any).show({
           title: '保存成功',
         });
-        this.show = false;
+        // this.show = false;
       } else {
         (this.$refs.uToast as any).show({
           title: '保存失败,请网络通畅了再试',
@@ -2115,6 +2100,15 @@ export default class PurchaseWHSRM extends BasePage {
   margin-top: 10rpx;
   padding: 10rpx;
 }
+// 暂存按钮
+.boder-icon-rigth2 {
+  text-align: center;
+  color: #ffffff;
+  margin-top: 20rpx;
+  .u-btn {
+    width: 280rpx;
+  }
+}
 .page-product-receipt {
   background: #f2f2f2 linear-gradient(0deg, #f2f2f2 0%, #f8262c 51%, #d9001b 100%) no-repeat;
   background-size: 100% 600rpx;
diff --git a/src/utils/request.ts b/src/utils/request.ts
index 2565968..54778cc 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -25,16 +25,16 @@ http.interceptors.request.use(
     config.timeout = 1000 * 60 * 60;
     //console.log('123456',config)
     //生产请将注释解开重要重要
-    // if (config.url.includes('/api')) {
-    //   config.baseURL = 'http://192.168.202.23:5001';
-    // }else if(config.url.includes('http')) {
-    //   //直接使用写死地址
-    // }else {
-    //   // config.baseURL = 'http://192.168.202.34:30000'//正式
-    //   config.baseURL = 'http://192.168.202.20:9000'//测试
-    //   //'http://192.168.202.20:9000' ///测试
-    //   //'http://192.168.202.34:30000'; //正式
-    // }
+    if (config.url.includes('/api')) {
+      config.baseURL = 'http://192.168.202.23:5001';
+    } else if (config.url.includes('http')) {
+      //直接使用写死地址
+    } else {
+      config.baseURL = 'http://192.168.202.34:30000'; //正式
+      // config.baseURL = 'http://192.168.202.20:9000'//测试
+      //'http://192.168.202.20:9000' ///测试
+      //'http://192.168.202.34:30000'; //正式
+    }
     // 所有请求默认提示加载中
     if (!loading) {
       uni.showLoading({ title: '加载中' });