From b97f1e876d1c5640b89f4aaeda6858249b05fa04 Mon Sep 17 00:00:00 2001
From: lijing <YourEmail>
Date: Thu, 7 Nov 2024 16:12:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AE=9A=E6=97=B6=E5=99=A8?=
 =?UTF-8?q?=E6=9A=82=E5=AD=98=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../quality/Materialinspection/index.vue      | 107 +++++++++++++++---
 src/utils/request.ts                          |  12 +-
 2 files changed, 101 insertions(+), 18 deletions(-)

diff --git a/src/pages/quality/Materialinspection/index.vue b/src/pages/quality/Materialinspection/index.vue
index acd2841..a9938f8 100644
--- a/src/pages/quality/Materialinspection/index.vue
+++ b/src/pages/quality/Materialinspection/index.vue
@@ -149,7 +149,7 @@
               </div>
               <div v-if="selectList.value == 'checkTypeSC' && (item.projectNo === '2024010305' || item.projectNo === '2024010304')"><view>实际值：</view><u-input border v-model="item.actualValue" @confirm="confirmNumber(item, index)" @blur="confirmNumber(item, index)"></u-input></div>
 
-              <div v-else><view>实际值：</view><u-input border v-model="item.actualValue"></u-input></div>
+              <div v-else><view>实际值：</view><u-input type="textarea" border v-model="item.actualValue"></u-input></div>
             </div>
 
             <div class="item1 item2" style="width: 100%" v-if="item.propertyCode == '1'">
@@ -209,11 +209,11 @@
               </scroll-view>
             </div>
             <!-- remark:不合格描述 -->
-            <div class="item1">不合格描述:</div>
+            <!--<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>
         </view>
         <!-- sampleQuality：抽样数量
@@ -386,16 +386,17 @@
     <!-- <u-select v-model="showselect" mode="mutil-column-auto" :list="selectlist"></u-select> -->
     <u-modal v-model="isshow" class="modal" :show-cancel-button="true" :show-title="false" @cancel="cancel" @confirm="confirm">
       <div class="tagsbox">
-        <u-tag v-for="(item, index) in tagslist" class="tags" :key="index" :text="item" type="info" closeable @close="tagClick(index)" />
+        <u-tag v-for="(item, index) in tagslist" class="tags" :key="index" :text="item.label" type="info" closeable @close="tagClick(index)" />
       </div>
       <div class="upload-name">
-        <div>
-          <u-input :border="true" :value="tagsvalue" :focus="isfocus" style="overflow: hidden" @blur="changeInputtags($event)" />
-        </div>
-        <div>
-          <u-button style="width: 100px; height: 35px; margin-left: 5px" @click="ontagsadd" size="mini" type="primary">测量值增加</u-button>
+        <div style="display: flex">
+          <div><u-input :border="true" disabled :value="tagslist.length + 1" :focus="isfocus" style="background-color: #eee; width: 80rpx; margin-right: 10rpx" @blur="changeInputtags($event)" /></div>
+          <div><u-input :border="true" :value="tagsvalue" :focus="isfocus" style="overflow: hidden" @blur="changeInputtags($event)" /></div>
         </div>
       </div>
+      <div>
+        <u-button style="width: 200rpx; height: 70rpx; margin-left: 38rpx" @click="ontagsadd" size="mini" type="primary">测量值增加</u-button>
+      </div>
       <div class="upload-name" v-show="isgetAutoJudge">
         <jPicker style="border: 1px solid #dcdfe6; padding: 8px 18px" sureColor="#ff0000" :moren="moren7" @bindpicker="selectProductlocCode6" showKey="label" valKey="value" :val="selectList4.value" :options="model.locList4" />
       </div>
@@ -421,6 +422,11 @@
         </u-col>
       </u-row>
     </view>
+    <u-mask :show="showmask" :mask-click-able="false" z-index="100090">
+      <view class="warp">
+        <view class="rect" @tap.stop>系统自动保存中请勿操作</view>
+      </view>
+    </u-mask>
   </view>
 </template>
 <script lang="ts">
@@ -453,6 +459,7 @@ export default class PurchaseWHSRM extends BasePage {
   height = 100;
   autoHeight = true;
   showsing = false;
+  showmask = false;
   singmark = '';
   moren = '请选择检验节点';
   moren2 = '请选择批次号';
@@ -615,6 +622,8 @@ export default class PurchaseWHSRM extends BasePage {
   abnormallist: any = [];
   selectedFormIndexes: any = [];
   selectedForms: any = [];
+  keyboardHideInterval: any = [];
+  numLength: any = 0;
   materialCode: any = '';
   //sampleQuality = null; //成品检验样本数量
   // 引入原生插件
@@ -664,6 +673,13 @@ export default class PurchaseWHSRM extends BasePage {
 
   //收货按钮
   tagClick(index) {
+    if (index + 1 != this.tagslist.length) {
+      (this.$refs.uToast as any).show({
+        title: '请按顺序删除',
+        type: 'default',
+      });
+      return;
+    }
     this.tagslist.splice(index, 1);
   }
   // 标准输入
@@ -676,7 +692,12 @@ export default class PurchaseWHSRM extends BasePage {
       });
       return;
     }
-    this.tagslist.push(this.tagsvalue);
+    console.log(this.tagslist, 'sadasdww');
+    let a: any = {};
+    a.value = this.tagsvalue;
+    a.valueindex = this.tagslist.length + 1;
+    a.label = a.valueindex + ':' + a.value;
+    this.tagslist.push(a);
     // this.isfocus = false;
     // this.$nextTick(() => {
     //   this.isfocus = true;
@@ -968,6 +989,7 @@ export default class PurchaseWHSRM extends BasePage {
     //   this.formdata.checkResult = '不合格'
     // }
     this.show = true;
+    this.clearMessage();
   }
   // 最终判定是否合格
   determine() {
@@ -1183,7 +1205,12 @@ export default class PurchaseWHSRM extends BasePage {
       }
     }
     if (this.detaillistceshi[index].actualValue) {
-      this.tagslist = JSON.parse(this.detaillistceshi[index].actualValue);
+      this.tagslist = [];
+      JSON.parse(this.detaillistceshi[index].actualValue).forEach((item) => {
+        let a: any = {};
+        a.label = item;
+        this.tagslist.push(a);
+      });
       this.selectList4.value = this.detaillistceshi[index].sampleAql;
       this.selectList5.value = this.detaillistceshi[index].checkLevel;
     } else {
@@ -1658,7 +1685,9 @@ export default class PurchaseWHSRM extends BasePage {
         title: '成功',
         type: 'default',
       });
+
       this.show = false;
+      this.clickevent();
       this.getlist();
       this.clear();
     } else {
@@ -1677,7 +1706,11 @@ export default class PurchaseWHSRM extends BasePage {
     if (this.tagslist.length <= 0) {
       this.detaillistceshi[this.equipmentindex[0]].actualValue = null;
     } else {
-      this.detaillistceshi[this.equipmentindex[0]].actualValue = JSON.stringify(this.tagslist);
+      let tagslistitem = [];
+      this.tagslist.forEach((item) => {
+        tagslistitem.push(item.label);
+      });
+      this.detaillistceshi[this.equipmentindex[0]].actualValue = JSON.stringify(tagslistitem);
       if (this.isgetAutoJudge) {
         this.getAutoJudgelist();
       }
@@ -1853,6 +1886,7 @@ export default class PurchaseWHSRM extends BasePage {
     this.SaveDraft();
     this.$nextTick(() => {
       this.show = false;
+      this.clickevent();
     });
   }
 
@@ -1862,6 +1896,7 @@ export default class PurchaseWHSRM extends BasePage {
         this.SaveDraft();
         this.$nextTick(() => {
           this.show = false;
+          this.clickevent();
         });
         return true;
       } else {
@@ -1869,7 +1904,9 @@ export default class PurchaseWHSRM extends BasePage {
       }
     }
   }
+  // 暂存
   async SaveDraft() {
+    this.showmask = true;
     let typeCode = '';
     this.nodelist.forEach((item) => {
       if (this.selectList.value == item.orderCode) {
@@ -1991,9 +2028,7 @@ export default class PurchaseWHSRM extends BasePage {
     try {
       await model.commitDraft(params); //99999
       if (model.commitDraftCode == 200) {
-        (this.$refs.uToast as any).show({
-          title: '保存成功',
-        });
+        this.showmask = false;
         // this.show = false;
       } else {
         (this.$refs.uToast as any).show({
@@ -2088,6 +2123,33 @@ export default class PurchaseWHSRM extends BasePage {
   changeInputtags(event) {
     this.tagsvalue = event;
   }
+  // 清除定时器
+  clickevent() {
+    console.log(this.keyboardHideInterval);
+    this.keyboardHideInterval.forEach((id) => clearInterval(id)); // 清除所有定时器
+    this.keyboardHideInterval = []; // 清空数组
+    // #ifdef APP-PLUS
+    // #endif
+  }
+  // 启动定时器
+  clearMessage() {
+    // #ifdef APP-PLUS
+    this.keyboardHideInterval.forEach((id) => clearInterval(id)); // 清除所有定时器
+    this.keyboardHideInterval = []; // 清空数组
+    const intervalId = setInterval(() => {
+      this.SaveDraft();
+    }, 1000 * 60 * 1);
+    if (intervalId) {
+      this.keyboardHideInterval.push(intervalId);
+    }
+    // #endif
+  }
+  beforeDestroy() {
+    // 清除定时器
+    console.log('asdasd2222');
+    this.keyboardHideInterval.forEach((id) => clearInterval(id)); // 清除所有定时器
+    this.keyboardHideInterval = []; // 清空数组
+  }
 }
 </script>
 <style lang="scss" scoped>
@@ -2572,5 +2634,20 @@ export default class PurchaseWHSRM extends BasePage {
   .selected-form {
     background-color: #f0f0f0; /* 示例背景色 */
   }
+  .warp {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    height: 100%;
+  }
+
+  .rect {
+    // width: px;
+    // height: 120px;
+    background-color: #2c2c2c;
+    border-radius: 5px;
+    padding: 7px;
+    color: #ffffff;
+  }
 }
 </style>
diff --git a/src/utils/request.ts b/src/utils/request.ts
index 54778cc..1b95191 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -36,11 +36,17 @@ http.interceptors.request.use(
       //'http://192.168.202.34:30000'; //正式
     }
     // 所有请求默认提示加载中
-    if (!loading) {
-      uni.showLoading({ title: '加载中' });
+    if (config.url == '/prod-api/quality/handCheck/commitCheckResultsCg') {
+      loading = undefined;
+      uni.hideLoading();
     } else {
-      clearTimeout(loading);
+      if (!loading) {
+        uni.showLoading({ title: '加载中' });
+      } else {
+        clearTimeout(loading);
+      }
     }
+
     // 在请求发送之前做一些处理
     config.header['Referrer-Policy'] = 'strict-origin-when-cross-origin';
     config.header['poolName'] = session.PoolName;