From a110371daef5d6595227919523802ae4ae3167b5 Mon Sep 17 00:00:00 2001
From: zhangli <2235006734@qq.com>
Date: Wed, 18 Oct 2023 10:49:43 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AD=96=E7=95=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../strategy/groundingStrategy/AddForm.vue    | 303 ++++++++++++++++++
 .../wms/strategy/groundingStrategy/index.vue  |  60 ++++
 src/views/wms/strategy/index.vue              | 186 -----------
 .../supplieDeliveryStrategy/AddForm.vue       |   1 +
 .../supplieDeliveryStrategy/index.vue         |   2 +-
 5 files changed, 365 insertions(+), 187 deletions(-)
 create mode 100644 src/views/wms/strategy/groundingStrategy/AddForm.vue
 create mode 100644 src/views/wms/strategy/groundingStrategy/index.vue
 delete mode 100644 src/views/wms/strategy/index.vue

diff --git a/src/views/wms/strategy/groundingStrategy/AddForm.vue b/src/views/wms/strategy/groundingStrategy/AddForm.vue
new file mode 100644
index 000000000..863fa67e4
--- /dev/null
+++ b/src/views/wms/strategy/groundingStrategy/AddForm.vue
@@ -0,0 +1,303 @@
+<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="" label-width="0">
+                <el-select v-model="formData.type" placeholder="" style="width: 110px;margin-right: 10px;">
+                  <el-option :label="item.label" :value="item.value" v-for="item in options.typeOptions" :key="item.value" />
+                </el-select>
+                <el-select v-model="formData.range" placeholder="please select your zone"
+                  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.region" placeholder="please select your zone" style="flex:1">
+                  <el-option label="Zone one" value="shanghai" />
+                  <el-option label="Zone two" value="beijing" />
+                </el-select>
+              </el-form-item>
+            </el-col> -->
+            <el-col :span="24">
+              <el-form-item label="供应商类型" class="flex-top"  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>
+                <div class="checkbox">
+                  <el-checkbox-group v-model="formData.supplierType">
+                    <el-checkbox :label="item.label" v-for="item in options.supplierTypeCheckbox" :key="item.value" />
+                  </el-checkbox-group>
+                </div>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="供应商"  prop="supplier">
+                <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="星期几" class="flex-top"  prop="week">
+                <el-select v-model="formData.weekRange" 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>
+                <div class="checkbox">
+                  <el-checkbox-group v-model="formData.week">
+                    <el-checkbox :label="item.label" v-for="item in options.weekCheckbox" :key="item.value" />
+                  </el-checkbox-group>
+                </div>
+              </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="开始时间"  prop="startTime">
+                <el-date-picker v-model="formData.startTime" type="datetime" placeholder="请选择开始时间" style="width: 100%;"/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="结束时间"  prop="endTime">
+                <el-date-picker v-model="formData.endTime" type="datetime" placeholder="请选择结束时间" style="width: 100%;"/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="仓库"  prop="warehouse">
+                <el-select v-model="formData.warehouse" placeholder="请选择仓库" clearable>
+                  <el-option v-for="item in options.warehouseList" :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="moon">
+                <el-select v-model="formData.moon" placeholder="请选择月台" clearable>
+                  <el-option v-for="item in options.moonList" :key="item.value" :label="item.label"
+                    :value="item.value" />
+                </el-select>
+              </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'
+defineOptions({ name: 'GroundingStrategyAddForm' })
+
+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: '',//选择的供应商
+
+  weekRange: 1,//星期几范围
+  week: [],//选择的星期几
+
+  startTime:'',//开始时间
+  endTime: '',//开始时间
+  warehouse: '',//选择的仓库
+  moon: '',//选择的月台
+
+})
+// 验证规则
+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' }],
+  week: [{ required: true, message: '请选择星期几', trigger: 'change' }],
+  startTime: [{ required: true, message: '请选择开始时间', trigger: 'change' }],
+  endTime: [{ required: true, message: '请选择结束时间', trigger: 'change' }],
+  warehouse: [{ required: true, message: '请选择仓库', trigger: 'change' }],
+  moon: [{ required: true, message: '请选择月台', trigger: 'change' }],
+})
+// 下拉框列表集合
+const options = reactive({
+  // 供应商客户下拉框列表
+  typeOptions: [{ value: 1, label: '供应商' }, { value: 2, label: '客户' }],
+  // 范围下拉框列表
+  rangeOptions: [{ value: 1, label: '包含' }, { value: 2, label: '大于', }],
+  // 供应商类型列表
+  supplierTypeCheckbox: [{ value: 1, label: '标准' }, { value: 2, label: '委外' }, { value: 3, label: '其他' }],
+  //供应商列表
+  supplierList: [{ value: 1, label: '供应商1' }, { value: 2, label: '供应商2' }, { value: 3, label: '供应商3' }],
+  //星期几列表
+  weekCheckbox: [{ value: 1, label: '星期一' }, { value: 2, label: '星期二' }, { value: 3, label: '星期三' }, { value: 4, label: '星期四' }, { value: 5, label: '星期五' }, { value: 6, label: '星期六' }, { value: 7, label: '星期日' }],
+  //仓库列表
+  warehouseList: [{ value: 1, label: '仓库1' }, { value: 2, label: '仓库2' }, { value: 3, label: '仓库3' }],
+  //月台列表
+  moonList: [{ value: 1, label: '月台1' }, { value: 2, label: '月台2' }, { value: 3, label: '月台3' }],
+})
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  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: '',//选择的供应商
+
+    weekRange: 1,//星期几范围
+    week: [],//选择的星期几
+
+    warehouse: '',//选择的仓库
+    moon:'',//选择的月台
+  }
+  formRef1.value?.resetFields()
+}
+
+// 弹窗按钮
+const Butttondata = [
+  defaultButtons.formSaveBtn(null), // 保存
+  defaultButtons.formCloseBtn(null), // 关闭
+]
+// 按钮事件 
+const buttonBaseClick = (val, item) => {
+  // 保存
+  if (val == 'save') {
+    submitForm()
+  }
+  // 关闭
+  else if (val == 'close') {
+    dialogVisible.value = false
+  }
+}
+
+</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;
+}
+</style>
diff --git a/src/views/wms/strategy/groundingStrategy/index.vue b/src/views/wms/strategy/groundingStrategy/index.vue
new file mode 100644
index 000000000..32539dae0
--- /dev/null
+++ b/src/views/wms/strategy/groundingStrategy/index.vue
@@ -0,0 +1,60 @@
+<template>
+  <!-- 列表头部 -->
+  <TableHead :HeadButttondata="HeadButttondata" @buttonBaseClick="buttonBaseClick" />
+   <!-- 表单弹窗：添加/修改 -->
+    <AddForm ref="formRef" @success="getList" />
+</template>
+
+<script setup lang="ts">
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import AddForm from './AddForm.vue'
+
+defineOptions({ name: 'Itembasic' })
+// 显示弹窗
+const formRef = ref()
+const openForm = (type: string) => {
+  formRef.value.open(type)
+}
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn(null), // 新增
+  defaultButtons.defaultImportBtn(null), // 导入
+  defaultButtons.defaultExportBtn(null), // 导出
+  // defaultButtons.defaultFilterBtn(), // 筛选
+  defaultButtons.defaultFreshBtn(null), // 刷新
+]
+
+
+
+// 头部按钮事件 
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    getList()
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮 
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({ hasPermi: 'wms:itembasic:update' }), // 编辑
+  defaultButtons.mainListDeleteBtn({ hasPermi: 'wms:itembasic:delete' }), // 删除
+]
+
+// 列表-操作按钮事件 
+const buttonTableClick = (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row.id)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+</script>
diff --git a/src/views/wms/strategy/index.vue b/src/views/wms/strategy/index.vue
deleted file mode 100644
index 74ccbfd5d..000000000
--- a/src/views/wms/strategy/index.vue
+++ /dev/null
@@ -1,186 +0,0 @@
-<template>
-  <ContentWrap>
-    <!-- 搜索工作栏 -->
-    <Search :schema="Strategy.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
-  </ContentWrap>
-
-  <!-- 列表头部 -->
-  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" />
-
-  <!-- 列表 -->
-  <ContentWrap>
-    <Table
-      :columns="Strategy.allSchemas.tableColumns"
-      :data="tableObject.tableList"
-      :loading="tableObject.loading"
-      :pagination="{
-        total: tableObject.total
-      }"
-      v-model:pageSize="tableObject.pageSize"
-      v-model:currentPage="tableObject.currentPage"
-      v-model:sort="tableObject.sort"
-    >
-      <template #code="{row}">
-        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
-          <span>{{ row.code }}</span>
-        </el-button>
-      </template>
-      <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
-      </template>
-    </Table>
-  </ContentWrap>
-
-  <!-- 表单弹窗：添加/修改 -->
-  <BasicForm 
-    ref="basicFormRef" 
-    @success="getList" 
-    :rules="StrategyRules" 
-    :formAllSchemas="Strategy.allSchemas" 
-    searchTableTitle="物料基础信息"
-    :searchTableAllSchemas="ItemBasic.allSchemas"
-    :searchTablePage="ItembasicApi.getItembasicPage"
-    :apiUpdate="StrategyApi.updateStrategy"
-    :apiCreate="StrategyApi.createStrategy"
-  />
-
-  <!-- 详情 -->
-  <Detail ref="detailRef" :isBasic="true" :allSchemas="Strategy.allSchemas" />
-
-  <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/wms/strategy/import" :importTemplateData="importTemplateData" @success="importSuccess" />
-</template>
-
-<script setup lang="ts">
-import download from '@/utils/download'
-import * as StrategyApi from '@/api/wms/strategy'
-import * as ItembasicApi from '@/api/wms/itembasic'
-import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
-import { Strategy, StrategyRules, ItemBasic } from '@/utils/disposition/tableColumns'
-import * as defaultButtons from '@/utils/disposition/defaultButtons'
-import TableHead from '@/components/TableHead/src/TableHead.vue' 
-import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
-import Detail from '@/components/Detail/src/Detail.vue'
-
-defineOptions({ name: 'Strategy' })
-
-const message = useMessage() // 消息弹窗
-const { t } = useI18n() // 国际化
-
-const { tableObject, tableMethods } = useTable({
-  getListApi: StrategyApi.getStrategyPage // 分页接口
-})
-
-// 获得表格的各种操作
-const { getList, setSearchParams } = tableMethods
-
-// 列表头部按钮
-const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'wms:strategy:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'wms:strategy:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'wms:strategy:export'}), // 导出
-  // defaultButtons.defaultFilterBtn(), // 筛选
-  defaultButtons.defaultFreshBtn(null), // 刷新
-  // {
-  //   label: '自定义扩展按钮',
-  //   name: 'zdy',
-  //   hide: false,
-  //   type: 'primary',
-  //   icon: 'Select',
-  //   color: ''
-  // },
-]
-
-// 头部按钮事件 
-const buttonBaseClick = (val, item) => {
-  if (val == 'add') { // 新增
-    openForm('create')
-  } else if (val == 'import') { // 导入
-    handleImport()
-  } else if (val == 'export') { // 导出
-    handleExport()
-  } else if (val == 'refresh') { // 刷新
-    getList()
-  } else if (val == 'filtrate') { // 筛选
-  } else { // 其他按钮 
-    console.log('其他按钮', item)
-  }
-}
-
-// 列表-操作按钮
-const butttondata = [
-  defaultButtons.mainListEditBtn({hasPermi:'wms:strategy:update'}), // 编辑
-  defaultButtons.mainListDeleteBtn({hasPermi:'wms:strategy:delete'}), // 删除
-]
-
-// 列表-操作按钮事件 
-const buttonTableClick = async (val, row) => {
-  if (val == 'edit') { // 编辑
-    // const res = await StrategyApi.getItempackaging(row.id)
-    openForm('update', row)
-  } else if (val == 'delete') { // 删除
-    handleDelete(row.id)
-  }
-}
-
-/** 添加/修改操作 */
-const basicFormRef = ref()
-const openForm = (type: string, row?: any) => {
-  basicFormRef.value.open(type, row)
-}
-
-/** 详情操作 */
-const detailRef = ref()
-const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue)
-}
-
-/** 删除按钮操作 */
-const handleDelete = async (id: number) => {
-  try {
-    // 删除的二次确认
-    await message.delConfirm()
-    // 发起删除
-    await StrategyApi.deleteStrategy(id)
-    message.success(t('common.delSuccess'))
-    // 刷新列表
-    await getList()
-  } catch {}
-}
-
-/** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
-const handleExport = async () => {
-  try {
-    // 导出的二次确认
-    await message.exportConfirm()
-    // 发起导出
-    exportLoading.value = true
-    const data = await StrategyApi.exportStrategy(setSearchParams)
-    download.excel(data, '策略.xls')
-  } catch {
-  } finally {
-    exportLoading.value = false
-  }
-}
-
-/** 导入 */
-const importFormRef = ref()
-const handleImport = () => {
-  importFormRef.value.open()
-}
-// 导入附件弹窗所需的参数
-const importTemplateData = reactive({
-  templateUrl: '',
-  templateTitle: '策略导入模版.xls'
-})
-// 导入成功之后
-const importSuccess = () => {
-  getList()
-}
-
-/** 初始化 **/
-onMounted(() => {
-  getList()
-})
-</script>
\ No newline at end of file
diff --git a/src/views/wms/strategy/supplieDeliveryStrategy/AddForm.vue b/src/views/wms/strategy/supplieDeliveryStrategy/AddForm.vue
index 4ba136ef0..7f7078bf3 100644
--- a/src/views/wms/strategy/supplieDeliveryStrategy/AddForm.vue
+++ b/src/views/wms/strategy/supplieDeliveryStrategy/AddForm.vue
@@ -139,6 +139,7 @@
 </template>
 <script setup lang="ts">
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
+defineOptions({ name: 'SupplieDeliveryStrategyAddForm' })
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
diff --git a/src/views/wms/strategy/supplieDeliveryStrategy/index.vue b/src/views/wms/strategy/supplieDeliveryStrategy/index.vue
index 32539dae0..78590ea1b 100644
--- a/src/views/wms/strategy/supplieDeliveryStrategy/index.vue
+++ b/src/views/wms/strategy/supplieDeliveryStrategy/index.vue
@@ -9,7 +9,7 @@
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import AddForm from './AddForm.vue'
 
-defineOptions({ name: 'Itembasic' })
+defineOptions({ name: 'SupplieDeliveryStrategy' })
 // 显示弹窗
 const formRef = ref()
 const openForm = (type: string) => {