From de1f12b08f8f06fe042efebe3438ecfe2eae023f Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Tue, 7 Nov 2023 13:39:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E7=AD=96=E7=95=A5=E7=99=BE?=
 =?UTF-8?q?=E5=88=86=E6=AF=94=E7=AC=A6=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/rowDrop/index.vue              | 14 ++++++-------
 .../strategy/inspectStrategy/AddForm.vue      | 20 ++++++++++++++++---
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/src/components/rowDrop/index.vue b/src/components/rowDrop/index.vue
index b70f1dec2..d57096b3b 100644
--- a/src/components/rowDrop/index.vue
+++ b/src/components/rowDrop/index.vue
@@ -2,13 +2,13 @@
   <!-- <Dialog title="字段设置"  width="270" v-model="popoverVisible" :scroll="true" :maxHeight="500"> -->
     <div class="test_wrapper" @dragover="dragover($event)">
       <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handlecheckallchange">全部</el-checkbox>
-        <el-checkbox-group v-model="checkedDataList" @change="handlecheckedchange">
-          <draggable :list="allData" :force-fallback="true" chosen-class="chosen" animation="300" @end="dragend" @update="dragenter" >
-            <template #item="{element}">
-              <div><el-checkbox :key="element" :label="element">{{element}}</el-checkbox></div>
-            </template>
-          </draggable>
-        </el-checkbox-group>
+      <el-checkbox-group v-model="checkedDataList" @change="handlecheckedchange">
+        <draggable :list="allData" :force-fallback="true" chosen-class="chosen" animation="300" @end="dragend" @update="dragenter" >
+          <template #item="{element}">
+            <div><el-checkbox :key="element" :label="element">{{element}}</el-checkbox></div>
+          </template>
+        </draggable>
+      </el-checkbox-group>
     </div>
     <div class="footer">
     <!-- <template #footer> -->
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/AddForm.vue
index 50f11d84d..38d2d6fa8 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/AddForm.vue
@@ -97,7 +97,7 @@
               <el-form-item label="抽检方式" class="flex-top" v-if="index == 1">
                 <div class="checkbox">
                   <el-radio-group v-model="item.Value">
-                    <el-radio :label="cur.value" v-for="cur in getStrDictOptions(DICT_TYPE.SAMPLE_METHOD)"
+                    <el-radio :label="cur.value" v-for="cur in getStrDictOptions(DICT_TYPE.SAMPLE_METHOD)" @change="changeSampleMethod"
                       :key="cur.value">{{ cur.label }}</el-radio>
                   </el-radio-group>
                 </div>
@@ -116,9 +116,9 @@
                   <el-input-number v-model="cur.CeilingQty" :min="cur.FloorQty + 1" class='ml-20px mr-20px' style="width:100px"
                     controls-position="right" @blur="inputNumberBlur" />
                   <div>抽样数</div>
-                  <el-input-number v-model="cur.SampleValue" :min="1" class='ml-20px mr-20px' style="width:100px"
+                  <el-input-number v-model="cur.SampleValue" :min="1" :max="formData.configuration[1].Value == 'QTY'?Infinity:100" class='ml-20px mr-20px' style="width:100px"
                     controls-position="right" @blur="inputNumberBlur" />
-                  <div>EA</div>
+                  <div>{{formData.configuration[1].Value == 'QTY'?'EA':'%'}}</div>
                 </div>
                 <div class="button flex">
                   <div @click="handleAddTable(item.Value)">
@@ -248,6 +248,20 @@ const changeSupplierType = (e) => {
 }
 getFormSupplierList()
 
+// 改变抽检方式的时候
+function changeSampleMethod(e){
+  console.log(e);
+  if(e == 'PERCENT'){
+    console.log(formData.value.configuration[2].Value)
+    formData.value.configuration[2].Value.forEach(cur=>{
+      
+      if(cur.SampleValue>100){
+        cur.SampleValue=100
+      }
+    })
+  }
+  
+}
 /** 打开弹窗 */
 const open = async (type: string, strategyCode: string, id?: number) => {
   formStrategyCode.value = strategyCode