From 40a75e50692922bb692dbd38681a2ed9894c3c2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Thu, 12 Oct 2023 15:15:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E7=89=A9=E5=93=81=E5=8C=85=E8=A3=85=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/itempackaging/ItempackagingForm.vue   | 250 +++---------------
 src/views/wms/itempackaging/index.vue         |   3 +-
 2 files changed, 43 insertions(+), 210 deletions(-)

diff --git a/src/views/wms/itempackaging/ItempackagingForm.vue b/src/views/wms/itempackaging/ItempackagingForm.vue
index 92d504c46..577a28417 100644
--- a/src/views/wms/itempackaging/ItempackagingForm.vue
+++ b/src/views/wms/itempackaging/ItempackagingForm.vue
@@ -1,172 +1,20 @@
 <template>
   <Dialog :title="dialogTitle" v-model="dialogVisible">
-    <div class="p-20px m--10px" style="max-height: 600px;overflow-y: auto;">
-    <el-form
-      ref="formRef"
-      :model="formData"
-      :rules="formRules"
-      label-width="100px"
-      v-loading="formLoading"
-    >
-    <el-row>
-        <el-col :span="12">
-
-          <el-form-item label="物品代码" prop="itemCode">
-            <el-input v-model="formData.itemCode" placeholder="请输入物品代码" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-      <el-form-item label="计量单位" prop="uom">
-        <el-select v-model="formData.uom" placeholder="请选择计量单位">
-          <el-option
-            v-for="dict in getStrDictOptions(DICT_TYPE.UOM)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-        </el-col>
-        <el-col :span="12">
-      <el-form-item label="包装单位" prop="stdPackUnit">
-        <el-select v-model="formData.stdPackUnit" placeholder="请选择包装单位">
-          <el-option
-            v-for="dict in getStrDictOptions(DICT_TYPE.PACK_UNIT)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-        </el-col>
-        <el-col :span="12">
-
-          <el-form-item label="包装数量" prop="stdPackQty">
-            <el-input v-model="formData.stdPackQty" placeholder="请输入包装数量" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-      <el-form-item label="替代包装单位" prop="altPackUnit1">
-        <el-select v-model="formData.altPackUnit1" placeholder="请选择替代包装单位">
-          <el-option
-            v-for="dict in getStrDictOptions(DICT_TYPE.PACK_UNIT)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-        </el-col>
-        <el-col :span="12">
-
-          <el-form-item label="替代包装量" prop="altPackQty1">
-            <el-input v-model="formData.altPackQty1" placeholder="请输入替代包装量" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-      <el-form-item label="替代包装单位" prop="altPackUnit2">
-        <el-select v-model="formData.altPackUnit2" placeholder="请选择替代包装单位">
-          <el-option
-            v-for="dict in getStrDictOptions(DICT_TYPE.PACK_UNIT)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-        </el-col>
-        <el-col :span="12">
-
-          <el-form-item label="替代包装量" prop="altPackQty2">
-            <el-input v-model="formData.altPackQty2" placeholder="请输入替代包装量" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-      <el-form-item label="替代包装单位" prop="altPackUnit3">
-        <el-select v-model="formData.altPackUnit3" placeholder="请选择替代包装单位">
-          <el-option
-            v-for="dict in getStrDictOptions(DICT_TYPE.PACK_UNIT)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-        </el-col>
-        <el-col :span="12">
-
-          <el-form-item label="替代包装量" prop="altPackQty3">
-            <el-input v-model="formData.altPackQty3" placeholder="请输入替代包装量" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-      <el-form-item label="替代包装单位" prop="altPackUnit4">
-        <el-select v-model="formData.altPackUnit4" placeholder="请选择替代包装单位">
-          <el-option
-            v-for="dict in getStrDictOptions(DICT_TYPE.PACK_UNIT)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-        </el-col>
-        <el-col :span="12">
-
-          <el-form-item label="替代包装量" prop="altPackQty4">
-            <el-input v-model="formData.altPackQty4" placeholder="请输入替代包装量" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-      <el-form-item label="是否可用" prop="available">
-        <el-select v-model="formData.available" placeholder="请选择是否可用">
-          <el-option
-            v-for="dict in getStrDictOptions(DICT_TYPE.TRUE_FALSE)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-        </el-col>
-        <el-col :span="12">
-      <el-form-item label="生效时间" prop="activeTime">
-        <el-date-picker
-          v-model="formData.activeTime"
-          type="date"
-          value-format="x"
-          placeholder="选择生效时间"
-        />
-      </el-form-item>
-        </el-col>
-        <el-col :span="12">
-      <el-form-item label="失效时间" prop="expireTime">
-        <el-date-picker
-          v-model="formData.expireTime"
-          type="date"
-          value-format="x"
-          placeholder="选择失效时间"
-        />
-      </el-form-item>
-        </el-col>
-        <el-col :span="12">
-
-          <el-form-item label="备注" prop="remark">
-            <el-input v-model="formData.remark" placeholder="请输入备注" />
-          </el-form-item>
-        </el-col>
-</el-row>
-    </el-form>
-    </div>
+    <Form ref="formRef" v-loading="formLoading" :rules="ItempackagingRules" :schema="Itempackaging.allSchemas.formSchema" :is-col="true" />
     <template #footer>
-      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
-      <el-button @click="dialogVisible = false">取 消</el-button>
+      <ButtonBase :Butttondata="Butttondata" @buttonBaseClick="buttonBaseClick" />
     </template>
   </Dialog>
+  <SearchTable ref="searchTableRef" dialogTitle="物料基础信息" />
 </template>
 <script setup lang="ts">
-import { DICT_TYPE, getStrDictOptions, getIntDictOptions } from '@/utils/dict'
+import { Itempackaging, ItempackagingRules, ItemBasic  } from '@/utils/disposition/tableColumns'
 import * as ItempackagingApi from '@/api/wms/itempackaging'
+import { SearchTable } from '@/components/SearchTable';
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import ButtonBase from '@/components/XButton/src/ButtonBase.vue' 
+
+import * as ItembasicApi from '@/api/wms/itembasic'
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
@@ -175,33 +23,15 @@ const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
-const formData = ref({
-  itemCode: undefined,
-  uom: undefined,
-  stdPackUnit: undefined,
-  stdPackQty: undefined,
-  altPackUnit1: undefined,
-  altPackQty1: undefined,
-  altPackUnit2: undefined,
-  altPackQty2: undefined,
-  altPackUnit3: undefined,
-  altPackQty3: undefined,
-  altPackUnit4: undefined,
-  altPackQty4: undefined,
-  available: undefined,
-  activeTime: undefined,
-  expireTime: undefined,
-  remark: undefined
-})
-const formRules = reactive({
-  itemCode: [{ required: true, message: '物品代码不能为空', trigger: 'blur' }],
-  uom: [{ required: true, message: '计量单位不能为空', trigger: 'change' }],
-  stdPackUnit: [{ required: true, message: '包装单位不能为空', trigger: 'change' }],
-  stdPackQty: [{ required: true, message: '包装数量不能为空', trigger: 'blur' }],
-  available: [{ required: true, message: '是否可用不能为空', trigger: 'change' }]
-})
+
 const formRef = ref() // 表单 Ref
 
+/** 弹层操作 */
+const searchTableRef = ref()
+const opensearchTable = () => {
+  searchTableRef.value.open('物品基础信息', ItemBasic.allSchemas, ItembasicApi.getItembasicPage)
+}
+
 /** 打开弹窗 */
 const open = async (type: string, id?: number) => {
   dialogVisible.value = true
@@ -212,7 +42,8 @@ const open = async (type: string, id?: number) => {
   if (id) {
     formLoading.value = true
     try {
-      formData.value = await ItempackagingApi.getItempackaging(id)
+      const res = await ItempackagingApi.getItempackaging(id)
+      unref(formRef)?.setValues(res)
     } finally {
       formLoading.value = false
     }
@@ -220,17 +51,36 @@ const open = async (type: string, id?: number) => {
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
+/** 弹窗按钮 */
+const Butttondata = [
+  defaultButtons.formSaveBtn(null), // 保存
+  defaultButtons.formCloseBtn(null), // 关闭
+]
+
+/** 按钮事件 */
+const buttonBaseClick = (val) => {
+  // 保存
+  if (val == 'save') {
+    submitForm()
+  }
+  // 关闭
+  else if (val == 'close') {
+    dialogVisible.value = false
+  }
+}
+
 /** 提交表单 */
 const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
 const submitForm = async () => {
+  const elForm = unref(formRef)?.getElFormRef()
   // 校验表单
-  if (!formRef) return
-  const valid = await formRef.value.validate()
+  if (!elForm) return
+  const valid = await elForm.validate()
   if (!valid) return
   // 提交请求
   formLoading.value = true
   try {
-    const data = formData.value as unknown as ItempackagingApi.ItempackagingVO
+    const data = unref(formRef)?.formModel as ItempackagingApi.ItempackagingVO
     if (formType.value === 'create') {
       await ItempackagingApi.createItempackaging(data)
       message.success(t('common.createSuccess'))
@@ -248,24 +98,6 @@ const submitForm = async () => {
 
 /** 重置表单 */
 const resetForm = () => {
-  formData.value = {
-    itemCode: undefined,
-    uom: undefined,
-    stdPackUnit: undefined,
-    stdPackQty: undefined,
-    altPackUnit1: undefined,
-    altPackQty1: undefined,
-    altPackUnit2: undefined,
-    altPackQty2: undefined,
-    altPackUnit3: undefined,
-    altPackQty3: undefined,
-    altPackUnit4: undefined,
-    altPackQty4: undefined,
-    available: undefined,
-    activeTime: undefined,
-    expireTime: undefined,
-    remark: undefined
-  }
-  formRef.value?.resetFields()
+  unref(formRef)?.resetFields()
 }
 </script>
diff --git a/src/views/wms/itempackaging/index.vue b/src/views/wms/itempackaging/index.vue
index 357e4d93e..0f7b3bb55 100644
--- a/src/views/wms/itempackaging/index.vue
+++ b/src/views/wms/itempackaging/index.vue
@@ -23,7 +23,7 @@
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
     >
-      <template #default="{row}">
+      <template #itemCode="{row}">
         <el-button type="primary" link @click="openDetail(row.id)">
           <span>{{ row.itemCode }}</span>
         </el-button>
@@ -53,6 +53,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue' 
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 
+
 defineOptions({ name: 'Itempackaging' })
 
 const { tableObject, tableMethods } = useTable({