From d50a830aa630d595d66733bface534923d7d104c Mon Sep 17 00:00:00 2001
From: zhangli <2235006734@qq.com>
Date: Thu, 26 Oct 2023 19:57:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E7=AD=96=E7=95=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/strategy/downShelfStrategy/index.vue  |   1 -
 .../strategy/inspectStrategy/AddForm copy.vue | 381 +++++++++++++++
 .../wms/strategy/inspectStrategy/AddForm.vue  | 434 ++++++++++--------
 .../wms/strategy/inspectStrategy/index.vue    |  88 +++-
 4 files changed, 703 insertions(+), 201 deletions(-)
 create mode 100644 src/views/wms/strategy/inspectStrategy/AddForm copy.vue

diff --git a/src/views/wms/strategy/downShelfStrategy/index.vue b/src/views/wms/strategy/downShelfStrategy/index.vue
index e57d742a8..06e67a1ae 100644
--- a/src/views/wms/strategy/downShelfStrategy/index.vue
+++ b/src/views/wms/strategy/downShelfStrategy/index.vue
@@ -1,4 +1,3 @@
-
 <!-- 下架策略 -->
 <template>
   <!-- 列表头部 -->
diff --git a/src/views/wms/strategy/inspectStrategy/AddForm copy.vue b/src/views/wms/strategy/inspectStrategy/AddForm copy.vue
new file mode 100644
index 000000000..57ed775dd
--- /dev/null
+++ b/src/views/wms/strategy/inspectStrategy/AddForm copy.vue	
@@ -0,0 +1,381 @@
+<!-- 检验策略弹窗 -->
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible">
+    <div class="p-20px m--10px" style="max-height: 500px;overflow-y: auto;">
+      <!-- 规则 -->
+      <div class="item">
+        <div class="title">规则</div>
+        <el-form ref="formRef1" :model="formData" :rules="rules" label-width="120px" label-position="left">
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="代码" prop="code">
+                <el-input v-model="formData.code" placeholder="请输入代码" clearable />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="名称" prop="name">
+                <el-input v-model="formData.name" placeholder="请输入名称" clearable />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="描述" prop="describe">
+                <el-input v-model="formData.describe" placeholder="请输入描述" clearable />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="优先级" prop="priority">
+                <el-input-number v-model="formData.priority" :min="1" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="状态" prop="status">
+                <el-switch v-model="formData.status" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+      <!-- 规则条件 -->
+      <div class="item mt-20px">
+        <div class="title">规则条件</div>
+        <el-form ref="formRef2" :model="formData" :rules="rules" label-width="120px" label-position="left">
+          <el-row>
+            <!-- 供应商类型 -->
+            <el-col :span="24">
+              <el-form-item label="供应商类型" class="flex-top err-120" prop="supplierType">
+                <el-select v-model="formData.supplierTypeRange" placeholder="请选择范围"
+                  style="width: 110px;;margin-right: 10px;">
+                  <el-option :label="item.label" :value="item.value" v-for="item in options.rangeOptions"
+                    :key="item.value" />
+                </el-select>
+                <el-select v-model="formData.supplierType" placeholder="请选择供应商类型" style="flex: 1;" clearable>
+                  <el-option v-for="item in options.supplierTypeOptions" :key="item.value" :label="item.label"
+                    :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <!-- 供应商 -->
+            <el-col :span="24">
+              <el-form-item label="供应商" prop="supplier" class="err-120">
+                <el-select v-model="formData.supplierRange" placeholder="请选择范围" style="width: 110px;margin-right: 10px;">
+                  <el-option :label="item.label" :value="item.value" v-for="item in options.rangeOptions"
+                    :key="item.value" />
+                </el-select>
+                <el-select v-model="formData.supplier" placeholder="请选择供应商" style="flex: 1;" clearable>
+                  <el-option v-for="item in options.supplierList" :key="item.value" :label="item.label"
+                    :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <!-- 物品 -->
+            <el-col :span="24">
+              <el-form-item label="物品" prop="items" class="err-120">
+                <el-select v-model="formData.itemsRange" placeholder="请选择范围" style="width: 110px;;margin-right: 10px;">
+                  <el-option :label="item.label" :value="item.value" v-for="item in options.rangeOptions"
+                    :key="item.value" />
+                </el-select>
+                <el-select v-model="formData.items" placeholder="请选择物品" style="flex: 1;" clearable>
+                  <el-option v-for="item in options.itemsList" :key="item.value" :label="item.label"
+                    :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+      <!-- 规则配置 -->
+      <div class="item mt-20px">
+        <div class="title">规则配置</div>
+        <el-form ref="formRef3" :model="formData" :rules="rules" label-width="120px" label-position="left">
+          <el-row>
+            <!-- 检验方式 -->
+            <el-col :span="24">
+              <el-form-item label="检验方式" class="flex-top" prop="inspectWay">
+                <div class="checkbox">
+                  <el-checkbox-group v-model="formData.inspectWay">
+                    <el-checkbox :label="item.label" v-for="item in options.inspectWayOptions" :key="item.value" />
+                  </el-checkbox-group>
+                </div>
+              </el-form-item>
+            </el-col>
+            <!-- 抽检方式 -->
+            <el-col :span="24">
+              <el-form-item label="抽检方式" class="flex-top" prop="spotceckWay">
+                <div class="checkbox">
+                  <el-radio-group v-model="formData.spotceckWay">
+                    <el-radio :label="item.value" v-for="item in options.spotceckWayOptions" :key="item.value">{{
+                      item.label }}</el-radio>
+                  </el-radio-group>
+                </div>
+              </el-form-item>
+            </el-col>
+            <!-- 抽检规则 -->
+            <el-col :span="24">
+              <el-form-item label="抽检规则" class="flex-top" prop="spotceckRules1">
+                <div style="flex:1;display:flex;align-items:center;margin-bottom:10px"
+                  v-for="(item, index) in formData.spotceckRules" :key="index">
+                  <div style="width: 26px;display: flex;">
+                    <Icon icon="ep:remove" color="#757575" size="26" style="cursor: pointer;"
+                      @click="handleDeleteTable(item, index)" v-if="formData.spotceckRules?.length>1" />
+                  </div>
+
+                  <el-input-number v-model="item.minNum" :min="0" :max="item.maxNum - 1" class='ml-20px mr-20px'
+                    style="width:100px" controls-position="right" @blur="inputNumberBlur" />
+                  <div>至</div>
+                  <el-input-number v-model="item.maxNum" :min="item.minNum + 1" class='ml-20px mr-20px'
+                    style="width:100px" controls-position="right"  @blur="inputNumberBlur"/>
+                  <div>抽样数</div>
+                  <el-input-number v-model="item.num"  :min="0" class='ml-20px mr-20px'
+                      style="width:100px" controls-position="right"  @blur="inputNumberBlur"/>
+                  <div>EA</div>
+                </div>
+                <div class="button flex">
+                  <div @click="handleAddTable">
+                    <Icon icon="ep:circle-plus" color="#409eff" size="26" style="cursor: pointer;" />
+                    <div>添加条件</div>
+                  </div>
+                </div>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </div>
+    <template #footer>
+      <!-- 按钮-->
+      <TableHead :HeadButttondata="Butttondata" @buttonBaseClick="buttonBaseClick" />
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import {
+  validateInteger,
+} from "@/utils/validator";
+defineOptions({ name: 'InspectStrategyAddForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formRef1 = ref() // 表单 Ref
+const formRef2 = ref() // 表单 Ref
+const formRef3 = ref() // 表单 Ref
+// form表单数据
+const formData = ref({
+  code: '',//代码
+  name: '',//名称
+  describe: '',//描述
+  priority: '',//优先级
+  status: false,//状态
+
+  supplierTypeRange: 1,//供应商类型范围
+  supplierType: '',//选择的供应商类型
+
+  supplierRange: 1,//供应商范围
+  supplier: '',//选择的供应商
+
+  itemsRange: 1,//物品范围
+  items: '',//选择的物品
+
+  inspectWay: [],//选择的检验方式
+  spotceckWay: 1,//选择的抽检方式
+
+  spotceckRules: [{
+    minNum: 0,
+    maxNum: 1,
+    num: 0,
+  }],//抽检规则
+  spotceckRules1: ''
+})
+// 验证规则
+const rules = ref({
+  code: [{ required: true, message: '请输入代码', trigger: 'blur' }],
+  name: [{ required: true, message: '请输入名字', trigger: 'blur' }],
+  describe: [{ required: true, message: '请输入描述', trigger: 'blur' }],
+  priority: [{ required: true, message: '请输入优先级', trigger: 'blur' }],
+  supplierType: [{ required: true, message: '请选择供应商类型', trigger: 'change' }],
+  supplier: [{ required: true, message: '请选择供应商', trigger: 'change' }],
+  items: [{ required: true, message: '请选择物品', trigger: 'change' }],
+  inspectWay: [{ required: true, message: '请选择检验方式', trigger: 'change' }],
+  spotceckWay: [{ required: true, message: '请选择抽检方式', trigger: 'change' }],
+  spotceckRules1: [{ required: true, message: '抽检规则请填写完全', trigger: 'blur' },
+  { validator: validateInteger, message: '请输入整数', trigger: 'blur' }],
+})
+// 下拉框列表集合
+const options = reactive({
+  // 范围下拉框列表
+  rangeOptions: [{ value: 1, label: '包含' }, { value: 2, label: '大于', }],
+  // 供应商类型列表
+  supplierTypeOptions: [{ value: 1, label: '标准' }, { value: 2, label: '委外' }, { value: 3, label: '其他' }],
+  //供应商列表
+  supplierList: [{ value: 1, label: '供应商1' }, { value: 2, label: '供应商2' }, { value: 3, label: '供应商3' }],
+  //物品列表
+  itemsList: [{ value: 1, label: '物品1' }, { value: 2, label: '物品2' }],
+  //检验方式列表
+  inspectWayOptions: [{ value: 1, label: '免检' }, { value: 2, label: '全检' }, { value: 3, label: '抽检' }],
+  //抽检方式列表
+  spotceckWayOptions: [{ value: 1, label: '数量' }, { value: 2, label: '半分比' }],
+})
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+//失去焦点的时候验证
+const inputNumberBlur = ()=>{
+  const isEmpty = formData.value.spotceckRules.some((item, index) => {
+    return item.minNum < 0 || item.minNum == null || item.maxNum < 0 || item.maxNum == null || item.num < 0 || item.num == null
+  })
+  console.log(isEmpty);
+  
+  if (isEmpty) {
+    formData.value.spotceckRules1 = ''
+  } else {
+    formData.value.spotceckRules1 = '1'
+  }
+} 
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+
+  // 校验抽检规则是否全部填写
+  const isEmpty = formData.value.spotceckRules.some((item, index) => {
+    return item.minNum<0|| item.minNum==null || item.maxNum < 0 || item.maxNum == null || item.num < 0 || item.num == null
+  })
+  if (isEmpty) {
+    formData.value.spotceckRules1 = ''
+  } else {
+    formData.value.spotceckRules1 = '1'
+  }
+  // 校验表单
+  if (!formRef1 || !formRef2 || !formRef3) return
+  const valid2 = formRef2.value.validate()
+  const valid1 = formRef1.value.validate()
+  const valid3 = await formRef3.value.validate()
+  if (!valid1 || !valid2 || !valid3) return
+  // 提交请求
+  formLoading.value = true
+
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    code: '',
+    name: '',
+    describe: '',
+    priority: '',
+    status: false,
+
+    supplierTypeRange: 1,//供应商类型范围
+    supplierType: '',//选择的供应商类型
+
+    supplierRange: 1,//供应商范围
+    supplier: '',//选择的供应商
+
+    itemsRange: 1,//物品范围
+    items: '',//选择的物品
+
+    inspectWay: [],//选择的检验方式
+    spotceckWay: 1,//选择的抽检方式
+
+    spotceckRules: [{
+      minNum: 0,
+      maxNum: 1,
+      num: 0,
+    }],//抽检规则
+  }
+}
+
+// 弹窗按钮
+const Butttondata = [
+  defaultButtons.formSaveBtn(null), // 保存
+  defaultButtons.formCloseBtn(null), // 关闭
+]
+// 按钮事件 
+const buttonBaseClick = (val, item) => {
+  // 保存
+  if (val == 'save') {
+    submitForm()
+  }
+  // 关闭
+  else if (val == 'close') {
+    dialogVisible.value = false
+  }
+}
+
+// 添加抽查规则
+const handleAddTable = () => {
+  console.log(formData.value.spotceckRules);
+  formData.value.spotceckRules.push({
+    minNum: 0,
+    maxNum: 1,
+    num: 0,
+  })
+}
+// 删除抽查规则
+const handleDeleteTable = (item, index) => {
+  formData.value.spotceckRules.splice(index, 1)
+}
+
+</script>
+<style scoped lang="scss">
+.item {
+  border: 1px solid #dedede;
+  border-radius: 4px;
+  padding: 30px 30px 5px;
+  position: relative;
+
+  .title {
+    position: absolute;
+    background: white;
+    padding: 0px 10px;
+    position: absolute;
+    top: 0px;
+    height: 30px;
+    line-height: 30px;
+    margin-top: -15px;
+  }
+}
+
+.checkbox {
+  background: #f5f5f5;
+  flex: 1;
+  padding: 0px 15px;
+  border-radius: 2px;
+}
+
+::v-deep .flex-top .el-form-item__content {
+  align-items: flex-start !important;
+}
+
+::v-deep .err-120 .el-form-item__error {
+  padding-left: 120px !important;
+}
+
+.button {
+  >div {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    cursor: pointer;
+
+    >div {
+      margin-left: 6px;
+      text-decoration: underline;
+      color: #409eff;
+    }
+  }
+}
+</style>
diff --git a/src/views/wms/strategy/inspectStrategy/AddForm.vue b/src/views/wms/strategy/inspectStrategy/AddForm.vue
index 57ed775dd..4b00e4bf3 100644
--- a/src/views/wms/strategy/inspectStrategy/AddForm.vue
+++ b/src/views/wms/strategy/inspectStrategy/AddForm.vue
@@ -1,15 +1,16 @@
+
 <!-- 检验策略弹窗 -->
 <template>
   <Dialog :title="dialogTitle" v-model="dialogVisible">
     <div class="p-20px m--10px" style="max-height: 500px;overflow-y: auto;">
-      <!-- 规则 -->
-      <div class="item">
-        <div class="title">规则</div>
-        <el-form ref="formRef1" :model="formData" :rules="rules" label-width="120px" label-position="left">
+      <el-form ref="formRef" :model="formData" :rules="rules" label-width="120px" label-position="left">
+        <!-- 规则 -->
+        <div class="item">
+          <div class="title">规则</div>
           <el-row>
             <el-col :span="24">
-              <el-form-item label="代码" prop="code">
-                <el-input v-model="formData.code" placeholder="请输入代码" clearable />
+              <el-form-item label="代码" prop="strategyCode">
+                <el-input v-model="formData.strategyCode" placeholder="请输入代码" clearable disabled />
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -18,8 +19,8 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="描述" prop="describe">
-                <el-input v-model="formData.describe" placeholder="请输入描述" clearable />
+              <el-form-item label="描述" prop="description">
+                <el-input v-model="formData.description" placeholder="请输入描述" clearable />
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -33,104 +34,94 @@
               </el-form-item>
             </el-col>
           </el-row>
-        </el-form>
-      </div>
-      <!-- 规则条件 -->
-      <div class="item mt-20px">
-        <div class="title">规则条件</div>
-        <el-form ref="formRef2" :model="formData" :rules="rules" label-width="120px" label-position="left">
+        </div>
+        <!-- 规则条件 -->
+        <div class="item mt-20px">
+          <div class="title">规则条件</div>
           <el-row>
-            <!-- 供应商类型 -->
-            <el-col :span="24">
-              <el-form-item label="供应商类型" class="flex-top err-120" prop="supplierType">
-                <el-select v-model="formData.supplierTypeRange" placeholder="请选择范围"
-                  style="width: 110px;;margin-right: 10px;">
-                  <el-option :label="item.label" :value="item.value" v-for="item in options.rangeOptions"
-                    :key="item.value" />
+            <el-col :span="24" v-for="(item, index) in formData.condition" :key="index">
+              <!-- 供应商类型 -->
+              <el-form-item v-if="index == 0" label="供应商类型" class="flex-top err-120">
+                <el-select v-model="item.Operator" placeholder="请选择范围" style="width: 110px;;margin-right: 10px;">
+                  <el-option :label="cur.label" :value="cur.value" v-for="cur in options.supplierTypeRangeOptions"
+                    :key="cur.value" />
                 </el-select>
-                <el-select v-model="formData.supplierType" placeholder="请选择供应商类型" style="flex: 1;" clearable>
-                  <el-option v-for="item in options.supplierTypeOptions" :key="item.value" :label="item.label"
-                    :value="item.value" />
+                <el-select v-model="item.Value" placeholder="请选择供应商类型" style="flex: 1;" clearable
+                  @change="changeSupplierType">
+                  <el-option v-for="dict in getStrDictOptions(DICT_TYPE.SUPPLIER_TYPE)" :key="dict.value"
+                    :label="dict.label" :value="dict.value" />
                 </el-select>
               </el-form-item>
-            </el-col>
-            <!-- 供应商 -->
-            <el-col :span="24">
-              <el-form-item label="供应商" prop="supplier" class="err-120">
-                <el-select v-model="formData.supplierRange" placeholder="请选择范围" style="width: 110px;margin-right: 10px;">
-                  <el-option :label="item.label" :value="item.value" v-for="item in options.rangeOptions"
-                    :key="item.value" />
+              <!-- 供应商 -->
+              <el-form-item v-else-if="index == 1" label="供应商" class="err-120" :prop="'condition.' + index + '.Value'"
+                :rules="{
+                  required: true,
+                  message: '请选择供应商',
+                  trigger: 'change',
+                }">
+                <el-select v-model="item.Operator" placeholder="请选择范围" style="width: 110px;margin-right: 10px;">
+                  <el-option :label="cur.label" :value="cur.value" v-for="cur in options.supplierRangeOptions"
+                    :key="cur.value" />
                 </el-select>
-                <el-select v-model="formData.supplier" placeholder="请选择供应商" style="flex: 1;" clearable>
-                  <el-option v-for="item in options.supplierList" :key="item.value" :label="item.label"
-                    :value="item.value" />
+                <el-select v-model="item.Value" placeholder="请选择供应商" style="flex: 1;" clearable>
+                  <el-option v-for="cur in options.supplierList" :key="cur.id" :label="cur.name" :value="cur.id" />
                 </el-select>
               </el-form-item>
-            </el-col>
-            <!-- 物品 -->
-            <el-col :span="24">
-              <el-form-item label="物品" prop="items" class="err-120">
-                <el-select v-model="formData.itemsRange" placeholder="请选择范围" style="width: 110px;;margin-right: 10px;">
-                  <el-option :label="item.label" :value="item.value" v-for="item in options.rangeOptions"
-                    :key="item.value" />
-                </el-select>
-                <el-select v-model="formData.items" placeholder="请选择物品" style="flex: 1;" clearable>
-                  <el-option v-for="item in options.itemsList" :key="item.value" :label="item.label"
-                    :value="item.value" />
+              <!-- 物品 -->
+              <el-form-item v-else-if="index == 2" label="物品" class="flex-top err-120">
+                <el-select v-model="item.Operator" placeholder="请选择范围" style="width: 110px;;margin-right: 10px;">
+                  <el-option :label="cur.label" :value="cur.value" v-for="cur in options.ItemCodeRangeOptions"
+                    :key="cur.value" />
                 </el-select>
+                <el-input v-model="item.Value" placeholder="请输入物品" clearable style="flex: 1;" />
               </el-form-item>
             </el-col>
           </el-row>
-        </el-form>
-      </div>
-      <!-- 规则配置 -->
-      <div class="item mt-20px">
-        <div class="title">规则配置</div>
-        <el-form ref="formRef3" :model="formData" :rules="rules" label-width="120px" label-position="left">
+        </div>
+        <!-- 规则配置 -->
+        <div class="item mt-20px">
+          <div class="title">规则配置</div>
           <el-row>
-            <!-- 检验方式 -->
-            <el-col :span="24">
-              <el-form-item label="检验方式" class="flex-top" prop="inspectWay">
+            <!-- 开始时间 -->
+            <el-col :span="24" v-for="(item, index) in formData.configuration" :key="index">
+              <!-- 检验方式 -->
+              <el-form-item label="检验方式" class="flex-top" v-if="index == 0">
                 <div class="checkbox">
-                  <el-checkbox-group v-model="formData.inspectWay">
-                    <el-checkbox :label="item.label" v-for="item in options.inspectWayOptions" :key="item.value" />
-                  </el-checkbox-group>
+                  <el-radio-group v-model="item.Value">
+                    <el-radio :label="cur.value" v-for="cur in getStrDictOptions(DICT_TYPE.INSPECT_TYPE)"
+                      :key="cur.value">{{ cur.label }}</el-radio>
+                  </el-radio-group>
                 </div>
               </el-form-item>
-            </el-col>
-            <!-- 抽检方式 -->
-            <el-col :span="24">
-              <el-form-item label="抽检方式" class="flex-top" prop="spotceckWay">
+              <!-- 抽检方式 -->
+              <el-form-item label="抽检方式" class="flex-top" v-if="index == 1">
                 <div class="checkbox">
-                  <el-radio-group v-model="formData.spotceckWay">
-                    <el-radio :label="item.value" v-for="item in options.spotceckWayOptions" :key="item.value">{{
-                      item.label }}</el-radio>
+                  <el-radio-group v-model="item.Value">
+                    <el-radio :label="cur.value" v-for="cur in getStrDictOptions(DICT_TYPE.SAMPLE_METHOD)"
+                      :key="cur.value">{{ cur.label }}</el-radio>
                   </el-radio-group>
                 </div>
               </el-form-item>
-            </el-col>
-            <!-- 抽检规则 -->
-            <el-col :span="24">
-              <el-form-item label="抽检规则" class="flex-top" prop="spotceckRules1">
-                <div style="flex:1;display:flex;align-items:center;margin-bottom:10px"
-                  v-for="(item, index) in formData.spotceckRules" :key="index">
+              <!-- 抽检规则 -->
+              <el-form-item label="抽检规则" class="flex-top" v-if="index == 2">
+                <div style="flex:1;display:flex;align-items:center;margin-bottom:10px" v-for="(cur, key) in item.Value"
+                  :key="key">
                   <div style="width: 26px;display: flex;">
                     <Icon icon="ep:remove" color="#757575" size="26" style="cursor: pointer;"
-                      @click="handleDeleteTable(item, index)" v-if="formData.spotceckRules?.length>1" />
+                      @click="handleDeleteTable(item.Value,cur, key)" v-if="item.Value?.length > 1" />
                   </div>
-
-                  <el-input-number v-model="item.minNum" :min="0" :max="item.maxNum - 1" class='ml-20px mr-20px'
+                  <el-input-number v-model="cur.minNum" :min="0" :max="cur.maxNum - 1" class='ml-20px mr-20px'
                     style="width:100px" controls-position="right" @blur="inputNumberBlur" />
                   <div>至</div>
-                  <el-input-number v-model="item.maxNum" :min="item.minNum + 1" class='ml-20px mr-20px'
-                    style="width:100px" controls-position="right"  @blur="inputNumberBlur"/>
+                  <el-input-number v-model="cur.maxNum" :min="cur.minNum + 1" class='ml-20px mr-20px' style="width:100px"
+                    controls-position="right" @blur="inputNumberBlur" />
                   <div>抽样数</div>
-                  <el-input-number v-model="item.num"  :min="0" class='ml-20px mr-20px'
-                      style="width:100px" controls-position="right"  @blur="inputNumberBlur"/>
+                  <el-input-number v-model="cur.num" :min="0" class='ml-20px mr-20px' style="width:100px"
+                    controls-position="right" @blur="inputNumberBlur" />
                   <div>EA</div>
                 </div>
                 <div class="button flex">
-                  <div @click="handleAddTable">
+                  <div @click="handleAddTable(item.Value)">
                     <Icon icon="ep:circle-plus" color="#409eff" size="26" style="cursor: pointer;" />
                     <div>添加条件</div>
                   </div>
@@ -138,8 +129,8 @@
               </el-form-item>
             </el-col>
           </el-row>
-        </el-form>
-      </div>
+        </div>
+      </el-form>
     </div>
     <template #footer>
       <!-- 按钮-->
@@ -149,10 +140,15 @@
 </template>
 <script setup lang="ts">
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-import {
-  validateInteger,
-} from "@/utils/validator";
-defineOptions({ name: 'InspectStrategyAddForm' })
+defineOptions({ name: 'SupplieDeliveryStrategyAddForm' })
+import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
+import { getSupplierList } from '@/api/wms/supplier'
+import { getWarehouseList } from '@/api/wms/warehouse'
+import { getDockList } from '@/api/wms/dock'
+import { getLocationList } from '@/api/wms/location'
+import * as RuleApi from '@/api/wms/rule'
+
+
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
@@ -161,140 +157,204 @@ const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
-const formRef1 = ref() // 表单 Ref
-const formRef2 = ref() // 表单 Ref
-const formRef3 = ref() // 表单 Ref
+const formRef = ref() // 表单 Ref
+const change = (e) => {
+  console.log(e);
+
+}
+const formStrategyCode = ref('')
 // form表单数据
 const formData = ref({
-  code: '',//代码
+  id: '',
+  strategyCode: formStrategyCode.value,//策略代码id
   name: '',//名称
-  describe: '',//描述
+  description: '',//描述
   priority: '',//优先级
-  status: false,//状态
-
-  supplierTypeRange: 1,//供应商类型范围
-  supplierType: '',//选择的供应商类型
-
-  supplierRange: 1,//供应商范围
-  supplier: '',//选择的供应商
-
-  itemsRange: 1,//物品范围
-  items: '',//选择的物品
-
-  inspectWay: [],//选择的检验方式
-  spotceckWay: 1,//选择的抽检方式
-
-  spotceckRules: [{
-    minNum: 0,
-    maxNum: 1,
-    num: 0,
-  }],//抽检规则
-  spotceckRules1: ''
+  status: true,//状态
+  //规则条件集合
+  condition: [
+    // 供应商类型
+    { ParamCode: 'SupplierType', Operator: "==", Value: "" },
+    // 供应商
+    { ParamCode: 'SupplierCode', Operator: "==", Value: "" },
+    // 物品代码
+    { ParamCode: 'ItemCode', Operator: "IN", Value: [] }
+  ],
+  configuration: [
+    // 检验方式
+    { ParamCode: 'InspectType', Value: "EXAMPT" },
+    // 抽检方式
+    { ParamCode: 'SampleMethod', Value: "QTY" },
+    // 抽检规则列表
+    {
+      ParamCode: 'AqlList', Value: [{
+        minNum: 0,
+        maxNum: 1,
+        num: 0,
+      }]
+    },
+  ]
 })
+
 // 验证规则
 const rules = ref({
-  code: [{ required: true, message: '请输入代码', trigger: 'blur' }],
+  strategyCode: [{ required: true, message: '请输入代码', trigger: 'blur' }],
   name: [{ required: true, message: '请输入名字', trigger: 'blur' }],
-  describe: [{ required: true, message: '请输入描述', trigger: 'blur' }],
+  description: [{ required: true, message: '请输入描述', trigger: 'blur' }],
   priority: [{ required: true, message: '请输入优先级', trigger: 'blur' }],
-  supplierType: [{ required: true, message: '请选择供应商类型', trigger: 'change' }],
-  supplier: [{ required: true, message: '请选择供应商', trigger: 'change' }],
-  items: [{ required: true, message: '请选择物品', trigger: 'change' }],
-  inspectWay: [{ required: true, message: '请选择检验方式', trigger: 'change' }],
-  spotceckWay: [{ required: true, message: '请选择抽检方式', trigger: 'change' }],
-  spotceckRules1: [{ required: true, message: '抽检规则请填写完全', trigger: 'blur' },
-  { validator: validateInteger, message: '请输入整数', trigger: 'blur' }],
 })
+
+// 所有的范围类型
+const rangeOptions = [
+  { value: '==', label: '等于' },
+  { value: '!=', label: '不等于' },
+  { value: '>', label: '大于' },
+  { value: '<', label: '小于' },
+  { value: '>=', label: '大于等于' },
+  { value: '<=', label: '小于等于' },
+  { value: 'IN', label: '包含' },
+  { value: 'NOT IN', label: '不包含' },
+  { value: 'NULL', label: '为空' },
+  { value: 'NOT NULL', label: '不为空' },
+]
+const formatRangeOptions = (...rest) => {
+  // 交集
+  let result = rangeOptions.filter(aItem => rest.some(bItem => aItem.value === bItem));
+  return result
+}
 // 下拉框列表集合
 const options = reactive({
-  // 范围下拉框列表
-  rangeOptions: [{ value: 1, label: '包含' }, { value: 2, label: '大于', }],
-  // 供应商类型列表
-  supplierTypeOptions: [{ value: 1, label: '标准' }, { value: 2, label: '委外' }, { value: 3, label: '其他' }],
+  // 供应商类型范围下拉框列表
+  supplierTypeRangeOptions: formatRangeOptions('=='),
+  // 供应商列表
+  supplierTypeOptions: [],
+  // 供应商范围下拉框列表
+  supplierRangeOptions: formatRangeOptions('=='),
   //供应商列表
-  supplierList: [{ value: 1, label: '供应商1' }, { value: 2, label: '供应商2' }, { value: 3, label: '供应商3' }],
-  //物品列表
-  itemsList: [{ value: 1, label: '物品1' }, { value: 2, label: '物品2' }],
-  //检验方式列表
-  inspectWayOptions: [{ value: 1, label: '免检' }, { value: 2, label: '全检' }, { value: 3, label: '抽检' }],
-  //抽检方式列表
-  spotceckWayOptions: [{ value: 1, label: '数量' }, { value: 2, label: '半分比' }],
+  supplierList: [],
+  // 物品范围下拉框列表
+  ItemCodeRangeOptions: formatRangeOptions('IN', 'NOT IN'),
+})
+// 获取供应商列表的参数
+const querySupplierParams = ref({
+  type: ''
 })
+// 获取供应商列表
+const getFormSupplierList = async () => {
+  options.supplierList = await getSupplierList(querySupplierParams.value);
+}
+
+// 选择供应商类型
+const changeSupplierType = (e) => {
+  querySupplierParams.value.type = e
+  formData.value.condition[1].Value = []
+  getFormSupplierList()
+}
+getFormSupplierList()
 
 /** 打开弹窗 */
-const open = async (type: string, id?: number) => {
+const open = async (type: string, strategyCode: string, id?: number) => {
+  formStrategyCode.value = strategyCode
   dialogVisible.value = true
   dialogTitle.value = t('action.' + type)
   formType.value = type
   resetForm()
   // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      let data = await RuleApi.getRule(id)
+      formData.value.id = data.id
+      formData.value.strategyCode = data.strategyCode
+      formData.value.name = data.name
+      formData.value.description = data.description
+      formData.value.priority = data.priority
+      formData.value.status = data.status == 0 ? true : false
+      if (data.condition) {
+        formData.value.condition = JSON.parse(data.condition)
+      }
+      if (data.configuration) {
+        formData.value.configuration = JSON.parse(data.configuration)
+      }
 
+      querySupplierParams.value.type = formData.value?.condition[0]?.Value || ''
+      getFormSupplierList()
+
+    } finally {
+      formLoading.value = false
+    }
+  }
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
-//失去焦点的时候验证
-const inputNumberBlur = ()=>{
-  const isEmpty = formData.value.spotceckRules.some((item, index) => {
-    return item.minNum < 0 || item.minNum == null || item.maxNum < 0 || item.maxNum == null || item.num < 0 || item.num == null
-  })
-  console.log(isEmpty);
-  
-  if (isEmpty) {
-    formData.value.spotceckRules1 = ''
-  } else {
-    formData.value.spotceckRules1 = '1'
-  }
-} 
 /** 提交表单 */
 const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
 const submitForm = async () => {
-
-  // 校验抽检规则是否全部填写
-  const isEmpty = formData.value.spotceckRules.some((item, index) => {
-    return item.minNum<0|| item.minNum==null || item.maxNum < 0 || item.maxNum == null || item.num < 0 || item.num == null
-  })
-  if (isEmpty) {
-    formData.value.spotceckRules1 = ''
-  } else {
-    formData.value.spotceckRules1 = '1'
-  }
   // 校验表单
-  if (!formRef1 || !formRef2 || !formRef3) return
-  const valid2 = formRef2.value.validate()
-  const valid1 = formRef1.value.validate()
-  const valid3 = await formRef3.value.validate()
-  if (!valid1 || !valid2 || !valid3) return
+  if (!formRef) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
   // 提交请求
   formLoading.value = true
-
+  try {
+    let data = {
+      id: formData.value.id,
+      strategyCode: formData.value.strategyCode,//策略代码
+      name: formData.value.name,//名称
+      description: formData.value.description,//描述
+      priority: formData.value.priority,//优先级
+      status: formData.value.status ? 0 : 1,//状态
+      //规则条件集合
+      condition: JSON.stringify(formData.value.condition),
+      configuration: JSON.stringify(formData.value.configuration)
+    }
+    if (formType.value === 'create') {
+      await RuleApi.createRule(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await RuleApi.updateRule(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
 }
 
 /** 重置表单 */
 const resetForm = () => {
   formData.value = {
-    code: '',
-    name: '',
-    describe: '',
-    priority: '',
-    status: false,
-
-    supplierTypeRange: 1,//供应商类型范围
-    supplierType: '',//选择的供应商类型
-
-    supplierRange: 1,//供应商范围
-    supplier: '',//选择的供应商
-
-    itemsRange: 1,//物品范围
-    items: '',//选择的物品
-
-    inspectWay: [],//选择的检验方式
-    spotceckWay: 1,//选择的抽检方式
-
-    spotceckRules: [{
-      minNum: 0,
-      maxNum: 1,
-      num: 0,
-    }],//抽检规则
+    id: '',
+    strategyCode: formStrategyCode.value,//策略代码
+    name: '',//名称
+    description: '',//描述
+    priority: '',//优先级
+    status: true,//状态
+    //规则条件集合
+    condition: [
+      // 供应商类型
+      { ParamCode: 'SupplierType', Operator: "==", Value: "" },
+      // 供应商
+      { ParamCode: 'SupplierCode', Operator: "==", Value: "" },
+      // 物品代码
+      { ParamCode: 'ItemCode', Operator: "IN", Value: [] }
+    ],
+    configuration: [
+      // 检验方式
+      { ParamCode: 'InspectType', Value: "EXEMPT" },
+      // 抽检方式
+      { ParamCode: 'SampleMethod', Value: "QTY" },
+      // 抽检规则列表
+      {
+        ParamCode: 'AqlList', Value: [{
+          minNum: 0,
+          maxNum: 1,
+          num: 0,
+        }]
+      },
+    ]
   }
 }
 
@@ -316,17 +376,16 @@ const buttonBaseClick = (val, item) => {
 }
 
 // 添加抽查规则
-const handleAddTable = () => {
-  console.log(formData.value.spotceckRules);
-  formData.value.spotceckRules.push({
+const handleAddTable = (item) => {
+  item.push({
     minNum: 0,
     maxNum: 1,
     num: 0,
   })
 }
 // 删除抽查规则
-const handleDeleteTable = (item, index) => {
-  formData.value.spotceckRules.splice(index, 1)
+const handleDeleteTable = (item,cur, key) => {
+  item.splice(key, 1)
 }
 
 </script>
@@ -363,7 +422,6 @@ const handleDeleteTable = (item, index) => {
 ::v-deep .err-120 .el-form-item__error {
   padding-left: 120px !important;
 }
-
 .button {
   >div {
     display: flex;
diff --git a/src/views/wms/strategy/inspectStrategy/index.vue b/src/views/wms/strategy/inspectStrategy/index.vue
index 93f40af64..bfe366bbf 100644
--- a/src/views/wms/strategy/inspectStrategy/index.vue
+++ b/src/views/wms/strategy/inspectStrategy/index.vue
@@ -1,28 +1,87 @@
-<!-- 检验策略 -->
+<!-- 策略 -->
 <template>
   <!-- 列表头部 -->
   <TableHead :HeadButttondata="HeadButttondata" @buttonBaseClick="buttonBaseClick" />
-   <!-- 表单弹窗：添加/修改 -->
-    <AddForm ref="formRef" @success="getList" />
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list">
+      <el-table-column align="center" label="策略代码" prop="strategyCode" />
+      <el-table-column align="center" label="策略名称" prop="name" show-overflow-tooltip />
+      <el-table-column align="center" label="策略描述" prop="description" />
+      <el-table-column align="center" label="优先级" prop="priority" />
+      <el-table-column align="center" label="状态" prop="status">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="操作" fixed="right" width="240">
+        <template #default="scope">
+          <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event, scope.row)" />
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination v-model:limit="queryParams.pageSize" v-model:page="queryParams.pageNo" :total="total"
+      @pagination="getList" />
+  </ContentWrap>
+  <!-- 表单弹窗：添加/修改 -->
+  <AddForm ref="formRef" @success="getList" />
 </template>
 
 <script setup lang="ts">
+import { DICT_TYPE } from '@/utils/dict'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import * as RuleApi from '@/api/wms/rule'
 import AddForm from './AddForm.vue'
+// import { dateFormatter } from '@/utils/formatTime'
+
+defineOptions({ name: 'SupplieDeliveryStrategy' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 字典表格数据
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  strategyCode: 'S003',
+})
+
+/** 查询字典类型列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await RuleApi.getRulePage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
 
-defineOptions({ name: 'InspectStrategy' })
 // 显示弹窗
 const formRef = ref()
-const openForm = (type: string) => {
-  formRef.value.open(type)
+const openForm = (type: string, strategyCode: string, id: number) => {
+  formRef.value.open(type, strategyCode, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await RuleApi.deleteRule(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch { }
 }
 // 列表头部按钮
 const HeadButttondata = [
   defaultButtons.defaultAddBtn(null), // 新增
-  defaultButtons.defaultImportBtn(null), // 导入
-  defaultButtons.defaultExportBtn(null), // 导出
-  // defaultButtons.defaultFilterBtn(), // 筛选
-  defaultButtons.defaultFreshBtn(null), // 刷新
 ]
 
 
@@ -30,7 +89,7 @@ const HeadButttondata = [
 // 头部按钮事件 
 const buttonBaseClick = (val, item) => {
   if (val == 'add') { // 新增
-    openForm('create')
+    openForm('create', queryParams.strategyCode)
   } else if (val == 'import') { // 导入
     handleImport()
   } else if (val == 'export') { // 导出
@@ -52,10 +111,15 @@ const butttondata = [
 // 列表-操作按钮事件 
 const buttonTableClick = (val, row) => {
   if (val == 'edit') { // 编辑
-    openForm('update', row.id)
+    openForm('update', queryParams.strategyCode, row.id)
   } else if (val == 'delete') { // 删除
     handleDelete(row.id)
   }
 }
 
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+
 </script>