From 602d3b12c5796a202300850c468713079d0a681a Mon Sep 17 00:00:00 2001
From: lijing <YourEmail>
Date: Wed, 13 Nov 2024 20:15:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B4=A8=E9=87=8F=E6=A3=80?=
 =?UTF-8?q?=E9=AA=8C=E6=B5=8B=E9=87=8F=E5=80=BC=E9=97=AE=E9=A2=98?=
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      | 64 +++++++++++++++----
 2 files changed, 52 insertions(+), 14 deletions(-)

diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue
index adec3b2..6c62cee 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.135'; //正式版本号
+  version = '0.0.136'; //正式版本号
   //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 335cbc0..e03f005 100644
--- a/src/pages/quality/Materialinspection/index.vue
+++ b/src/pages/quality/Materialinspection/index.vue
@@ -168,10 +168,9 @@
             </div>
             <div class="item1" style="color: #000; position: relative" v-show="!(selectList.value == 'checkTypeSC' || selectList.value == 'checkTypeSCXJ')">
               <div class="item1">抽样数量: {{ item.itemMethod }}</div>
-              <input :value="item.sampleQuality" style="border: 1px solid #ddd" @blur="changeInput($event, index)" />
-
+              <input :value="item.sampleQuality" type="number" v-if="selectList.value == 'checkTypeCP'" style="border: 1px solid #ddd" @input="changeInput1($event, index)" @blur="changeInput1($event, index)" />
+              <input :value="item.sampleQuality" type="number" v-if="selectList.value != 'checkTypeCP'" style="border: 1px solid #ddd" @blur="changeInput($event, index)" />
               <!-- <uni-easyinput type="number" :value="item.sampleQuality"  :inputBorder="true" @blur="changeInput($event,index)"/> -->
-
               <!-- <jPicker style="border: 1px solid #ffffff; color: #000" :moren="moren3" @bindpicker="selectProductlocCode2(index, $event)" showKey="label" valKey="value" :val="item.defectCode" :options="model.locList1" /> -->
               <!-- <u-input placeholder="请输入抽样数量" :value="item.sampleQuality"  :border="true" @input="changeInput($event,index)" /> -->
             </div>
@@ -390,7 +389,7 @@
       </div>
       <div class="upload-name">
         <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="serialnumber" :focus="isfocus" style="background-color: #eee; width: 80rpx; margin-right: 10rpx" @click="clickInputtags" /></div>
           <div><u-input :border="true" :value="tagsvalue" :focus="isfocus" style="overflow: hidden" @blur="changeInputtags($event)" /></div>
         </div>
       </div>
@@ -427,6 +426,7 @@
         <view class="rect" @tap.stop>系统自动保存中请勿操作</view>
       </view>
     </u-mask>
+    <u-picker mode="selector" @confirm="confirmindex" @cancel="cancelindex" v-model="showindex" :default-selector="[0]" :range="indexdata"></u-picker>
   </view>
 </template>
 <script lang="ts">
@@ -460,6 +460,7 @@ export default class PurchaseWHSRM extends BasePage {
   autoHeight = true;
   showsing = false;
   showmask = false;
+  showindex = false;
   singmark = '';
   moren = '请选择检验节点';
   moren2 = '请选择批次号';
@@ -489,6 +490,7 @@ export default class PurchaseWHSRM extends BasePage {
     barCodewl: '',
   };
   ischecklist: any = [];
+  indexdata: any = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
   listselect: any = [
     {
       type: 'Y',
@@ -556,6 +558,7 @@ export default class PurchaseWHSRM extends BasePage {
   detailList: any = [];
   equipmentindex: any = [];
   tagsvalue: any = '';
+  serialnumber: any = '1';
   tagslist: any = [];
   detailsinfo: any = [];
   nodelist: any = '';
@@ -670,15 +673,19 @@ export default class PurchaseWHSRM extends BasePage {
 
   //收货按钮
   tagClick(index) {
-    if (index + 1 != this.tagslist.length) {
-      (this.$refs.uToast as any).show({
-        title: '请按顺序删除',
-        type: 'default',
-      });
-      return;
-    }
+    // if (index + 1 != this.tagslist.length) {
+    //   (this.$refs.uToast as any).show({
+    //     title: '请按顺序删除',
+    //     type: 'default',
+    //   });
+    //   return;
+    // }
     this.tagslist.splice(index, 1);
   }
+  hasDuplicateValueIndex(arr) {
+    const valueIndexes = arr.map((item) => item.valueindex);
+    return valueIndexes.some((item, index) => valueIndexes.indexOf(item) !== index);
+  }
   // 标准输入
   ontagsadd() {
     if (this.tagsvalue == '' || this.tagsvalue == undefined) {
@@ -689,11 +696,22 @@ export default class PurchaseWHSRM extends BasePage {
       });
       return;
     }
+
     let a: any = {};
     a.value = this.tagsvalue;
-    a.valueindex = this.tagslist.length + 1;
+    a.valueindex = this.serialnumber;
     a.label = a.valueindex + ':' + a.value;
-    this.tagslist.push(a);
+    const exists = this.tagslist.some((item) => item.valueindex === a.valueindex);
+    // 如果不存在相同的 valueindex，则可以添加
+    if (!exists) {
+      this.tagslist.push(a);
+    } else {
+      (this.$refs.uToast as any).show({
+        title: '已存在，不能添加',
+        type: 'default',
+      });
+    }
+
     // this.isfocus = false;
     // this.$nextTick(() => {
     //   this.isfocus = true;
@@ -1195,6 +1213,7 @@ export default class PurchaseWHSRM extends BasePage {
     (this.$refs.badtable as any).open(item, index);
   }
   focus(item, value, index) {
+    this.serialnumber = 1;
     if (this.detaillistceshi[index].upperDiff == null && this.detaillistceshi[index].downDiff == null) {
       this.isgetAutoJudge = false;
     } else {
@@ -2112,6 +2131,14 @@ export default class PurchaseWHSRM extends BasePage {
     this.detaillistceshi[index].sampleQuality = event.target.value;
     console.log('后面改变了吗', this.detaillistceshi[index].sampleQuality);
   }
+
+  changeInput1(event, index) {
+    this.detaillistceshi.forEach((item) => {
+      item.sampleQuality = event.target.value;
+    });
+    this.detaillistceshi[index].sampleQuality = event.target.value;
+    console.log('后面改变了吗', this.detaillistceshi[index].sampleQuality);
+  }
   changeInputsamp(event) {
     this.formdata.sampleQuality = event;
   }
@@ -2147,6 +2174,17 @@ export default class PurchaseWHSRM extends BasePage {
     this.keyboardHideInterval.forEach((id) => clearInterval(id)); // 清除所有定时器
     this.keyboardHideInterval = []; // 清空数组
   }
+  //测量值修改
+  confirmindex(e) {
+    this.serialnumber = this.indexdata[e[0]];
+    console.log(e);
+  }
+  cancelindex(e) {
+    console.log(e);
+  }
+  clickInputtags() {
+    this.showindex = true;
+  }
 }
 </script>
 <style lang="scss" scoped>