Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella

9 months ago · eb7e475b74
3 changed files with 425 additions and 2 deletions
--- a/src/views/wms/basicDataManage/labelManage/callMaterials/callMaterials.data.ts
+++ b/src/views/wms/basicDataManage/labelManage/callMaterials/callMaterials.data.ts
@ -0,0 +1,116 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+// 表单校验
+export const PackageRules = reactive({
+  number: [required],
+  itemCode: [required],
+  itemName: [required],
+  barcodeString: [required]
+})
+export const Package = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '标签号',
+    field: 'number',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      fixed: 'left'
+    }
+  },
+  {
+    label: '标签类型',
+    field: 'type',
+    sort: 'custom',
+    isSearch: true,
+    dictType: DICT_TYPE.LABEL_TYPE,
+    dictClass: 'string'
+  },
+  {
+    label: '标签模板',
+    field: 'template',
+    sort: 'custom',
+  },
+  {
+    label: '标签状态',
+    field: 'status',
+    sort: 'custom',
+    isSearch: true,
+    dictType: DICT_TYPE.LABEL_STATUS,
+    dictClass: 'string'
+  },
+  {
+    label: '关联号',
+    field: 'relateNumber',
+    sort: 'custom',
+  },
+  {
+    label: '标签条码字符串',
+    field: 'barcodeString',
+    sort: 'custom',
+    form: {
+      // component: 'textarea',
+      componentProps: {
+        type: "textarea",
+        rows: "6"
+      },
+    },
+    table: {
+      width: 180,
+    }
+  },
+  {
+    label: '打印次数',
+    field: 'printTimes',
+    sort: 'custom',
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0
+      },
+      value: 0
+    },
+    isForm: false
+  },
+  {
+    label: '最后打印时间',
+    field: 'lastPrintTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false
+  },
+  {
+    label: '最后打印人ID',
+    field: 'lastPrintUserId',
+    sort: 'custom',
+    isForm: false
+  },
+  {
+    label: '最后打印人用户名',
+    field: 'lastPrintUserName',
+    sort: 'custom',
+    isForm: false,
+    table: {
+      width: 180,
+    }
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
--- a/src/views/wms/basicDataManage/labelManage/callMaterials/index.vue
+++ b/src/views/wms/basicDataManage/labelManage/callMaterials/index.vue
@ -0,0 +1,307 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="Package.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="Package.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="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 #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm 
+    ref="basicFormRef" 
+    @success="formsSuccess" 
+    :rules="PackageRules" 
+    :formAllSchemas="Package.allSchemas" 
+    :apiUpdate="BarbasicApi.updateBarbasic"
+    :apiCreate="BarbasicApi.createBarbasic"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="Package.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/package/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { getAccessToken } from '@/utils/auth'
+import { Package,PackageRules } from './callMaterials.data'
+import * as BarbasicApi from '@/api/wms/barbasic'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { formatTime } from '@/utils/index'
+import * as Itempackaging from '@/api/wms/itempackage'
+
+// 采购标签
+defineOptions({ name: 'CallMaterials' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Package.allSchemas.tableColumns)
+
+
+/**
+ * PurchasePackage type = PurchaseLabel 采购件标签记录页面   
+ * ManufacturePackage type = MakeLabel  制造件标签记录页面
+ * UtensilPackage type = ContainerLabel  器具标签记录页面
+ * SupplierPackage type = PurchaseLabel  供应商发货标签记录(用采购标签)
+ * callMaterials type = CallMaterialsLabel  叫料标签
+ */
+ const type = ref('CallMaterialsLabel')
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, basicFormRef, type, row ) => {
+  nextTick(async () => {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      if (formField == 'itemCode') {
+        setV['itemCode'] = val[0]['code']
+        setV['itemName'] = val[0]['name']
+        setV['itemDesc1'] = val[0]['desc1']
+        setV['itemDesc2'] = val[0]['desc2']
+        setV['uom'] = val[0]['uom']
+        setV['produceDate'] = val[0]['activeTime']
+        setV['expireDate'] = val[0]['expireTime']
+        setV['validityDays'] = val[0]['validityDays']
+        await Itempackaging.getItempackagingPage({
+          itemCode: val[0]['code']
+        }).then(res => {
+          if (res) {
+            if (res.list.length > 0) {
+              setV['packQty'] = res.list[0].packQty
+              setV['packUnit'] = res.list[0].packUnit
+            }
+          }
+        })
+      }
+      basicFormRef.setValues(setV)
+  })
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: BarbasicApi.getBarbasicPage // 分页接口
+})
+tableObject.params.type = type.value
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:package:create'}), // 新增
+  // defaultButtons.defaultImportBtn({hasPermi:'wms:package:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:package:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(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') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+// const isShowMainButton = (row,val) => {
+//   if (val.indexOf(row.status) > -1) {
+//     return false
+//   } else {
+//     return true
+//   }
+// }
+
+// 列表-操作按钮
+// const butttondata = (row) => {
+//     return [
+//         defaultButtons.mainListEditBtn({hasPermi:'wms:package:update'}), // 编辑
+//         defaultButtons.mainListDeleteBtn({hasPermi:'wms:package:delete'}), // 删除
+//         defaultButtons.mainListPointBtn(null), // 标签打印
+//     ]
+// }
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'wms:package:update'}), // 编辑
+  // defaultButtons.mainListDeleteBtn({hasPermi:'wms:package:delete'}), // 删除
+  defaultButtons.mainListPointBtn(null), // 标签打印
+]
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  } else if (val == 'point') { // 标签打印
+    handlePoint(row)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: number) => {
+  basicFormRef.value.open(type, row)
+  if (type == 'create') {
+    nextTick(() => {
+      basicFormRef.value.formRef.formModel.batch = formatTime(new Date(), 'yyyyMMdd')
+    })
+  }
+}
+
+/** 详情操作 */
+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()
+    tableObject.loading = true
+    // 发起删除
+    await BarbasicApi.deleteBarbasic(id)
+    tableObject.loading = false
+    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 BarbasicApi.exportBarbasic(tableObject.params)
+    download.excel(data, '采购件标签.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
+const src = ref(BASE_URL + '/jmreport/view/924811818898698240?token=' + getAccessToken())
+// 标签打印
+const handlePoint = async (row) => {
+  window.open(src.value+'&id='+row.id)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+  if (formType === 'create') {
+    await BarbasicApi.createBarbasic(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await BarbasicApi.updateBarbasic(data)
+    message.success(t('common.updateSuccess'))
+  }
+  basicFormRef.value.dialogVisible = false
+  getList()
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '包装导入模版.xlsx'
+})
+
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters,
+    type:type.value
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
+@/api/wms/itempackage
--- a/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue
+++ b/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue
@ -245,7 +245,7 @@ const handleExport = async () => {
    // 发起导出
    exportLoading.value = true
    const data = await BarbasicApi.exportBarbasic(tableObject.params)
-    download.excel(data, '采购件标签.xlsx')
+    download.excel(data, '制造件件标签.xlsx')
  } catch {
  } finally {
    exportLoading.value = false
@ -253,7 +253,7 @@ const handleExport = async () => {
 }

 const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
-const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
+const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
 // 标签打印
 const handlePoint = async (row) => {
  window.open(src.value+'&number='+row.relateNumber)