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

9 months ago · 76a4ca0668
8 changed files with 621 additions and 41 deletions
--- a/src/api/wms/plansetting/index.ts
+++ b/src/api/wms/plansetting/index.ts
@ -0,0 +1,57 @@
+import request from '@/config/axios'
+
+export interface PlansettingVO {
+  id: number
+  code: string
+  requestMode: string
+  autoCommit: string
+  autoAgree: string
+  autoExecute: string
+  directCreateRecord: string
+  available: string
+  activeTime: Date
+  expireTime: Date
+  remark: string
+  concurrencyStamp: number
+}
+
+// 查询计划设置列表
+export const getPlansettingPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/plansetting/senior', data })
+  } else {
+    return await request.get({ url: `/wms/plansetting/page`, params })
+  }
+}
+
+// 查询计划设置详情
+export const getPlansetting = async (id: number) => {
+  return await request.get({ url: `/wms/plansetting/get?id=` + id })
+}
+
+// 新增计划设置
+export const createPlansetting = async (data: PlansettingVO) => {
+  return await request.post({ url: `/wms/plansetting/create`, data })
+}
+
+// 修改计划设置
+export const updatePlansetting = async (data: PlansettingVO) => {
+  return await request.put({ url: `/wms/plansetting/update`, data })
+}
+
+// 删除计划设置
+export const deletePlansetting = async (id: number) => {
+  return await request.delete({ url: `/wms/plansetting/delete?id=` + id })
+}
+
+// 导出计划设置 Excel
+export const exportPlansetting = async (params) => {
+  return await request.download({ url: `/wms/plansetting/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/plansetting/get-import-template' })
+}
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@ -273,4 +273,5 @@ export enum DICT_TYPE {
  BIND_TYPE = 'bind_type', // 器具绑定类型
  CONTAINER_STATUS = 'container_status', // 容器状态
  PREDICT_TIME_TYPE = 'predict_time_type', // 预测时间类型
+  PACK_UNIT_TYPE = 'pack_unit_type', // 包装规格类型
 }
--- a/src/views/wms/basicDataManage/documentSetting/plansetting/index.vue
+++ b/src/views/wms/basicDataManage/documentSetting/plansetting/index.vue
@ -0,0 +1,242 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="Plansetting.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead
+   :HeadButttondata="HeadButttondata" 
+   @button-base-click="buttonBaseClick"
+   :route-name="routeName" 
+   @updataTableColumns="updataTableColumns"
+   @searchFormClick="searchFormClick"
+   :allSchemas="Plansetting.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 #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="formsSuccess" 
+    :rules="PlansettingRules" 
+    :formAllSchemas="Plansetting.allSchemas" 
+    :apiUpdate="PlansettingApi.updatePlansetting"
+    :apiCreate="PlansettingApi.createPlansetting"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="Plansetting.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/plansetting/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import * as PlansettingApi from '@/api/wms/plansetting'
+import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
+import { Plansetting, PlansettingRules } from './plansetting.data'
+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: 'Plansetting' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() //路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Plansetting.allSchemas.tableColumns)
+
+//字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: PlansettingApi.getPlansettingPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  // defaultButtons.defaultAddBtn({hasPermi:'wms:plansetting:create'}), // 新增
+  // defaultButtons.defaultImportBtn({hasPermi:'wms:plansetting:import'}), // 导入
+  // defaultButtons.defaultExportBtn({hasPermi:'wms:plansetting: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 butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'wms:plansetting:update'}), // 编辑
+  // defaultButtons.mainListDeleteBtn({hasPermi:'wms:plansetting:delete'}), // 删除
+]
+
+// 列表-操作按钮事件 
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+      var isHave =Plansetting.allSchemas.formSchema.some(function (item) {
+        return item.field === 'activeTime' || item.field === 'expireTime';
+      });
+      if(isHave){
+        if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+          message.error('失效时间要大于生效时间')
+          return;
+        }
+      }
+      if(data.activeTime==0)data.activeTime = null;
+      if(data.expireTime==0)data.expireTime = null;
+      if (formType === 'create') {
+        await PlansettingApi.createPlansetting(data)
+        message.success(t('common.createSuccess'))
+      } else {
+        await PlansettingApi.updatePlansetting(data)
+        message.success(t('common.updateSuccess'))
+      }
+      basicFormRef.value.dialogVisible = false
+      getList()
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicPlansetting')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await PlansettingApi.deletePlansetting(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 PlansettingApi.exportPlansetting(tableObject.params)
+    download.excel(data, '计划单设置.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+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
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async() => {
+  getList()
+  importTemplateData.templateUrl = await PlansettingApi.importTemplate()
+})
+</script>
--- a/src/views/wms/basicDataManage/documentSetting/plansetting/plansetting.data.ts
+++ b/src/views/wms/basicDataManage/documentSetting/plansetting/plansetting.data.ts
@ -0,0 +1,259 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+const { t } = useI18n() // 国际化
+
+/**
+ * @returns {Array} 计划设置
+ */
+export const Plansetting = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '代码',
+    field: 'code',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '申请模式',
+    field: 'requestMode',
+    dictType: DICT_TYPE.REQEUST_MODE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动提交',
+    field: 'autoCommit',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '自动通过',
+    field: 'autoAgree',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '自动执行',
+    field: 'autoExecute',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '跳过任务生成记录',
+    field: 'directCreateRecord',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    isTable: false,
+    isForm: false
+  },
+  {
+    label: '生效时间',
+    field: 'activeTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '失效时间',
+    field: 'expireTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    isTable: false,
+    isForm: false,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  { 
+    label: '备注',
+    field: 'remark',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+  },
+  { 
+    label: '创建者', 
+    field: 'creator', 
+    isTable: false, 
+    isForm: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
+//表单校验
+export const PlansettingRules = reactive({
+  code: [
+    { required: true, message: '请输入代码', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  requestMode: [
+    { required: true, message: '请选择申请模式', trigger: 'change' }
+  ],
+  autoCommit: [
+    { required: true, message: '请选择是否自动提交', trigger: 'change' }
+  ],
+  autoAgree: [
+    { required: true, message: '请选择是否自动通过', trigger: 'change' }
+  ],
+  autoExecute: [
+    { required: true, message: '请选择是否自动执行', trigger: 'change' }
+  ],
+  directCreateRecord: [
+    { required: true, message: '请选择是否跳过任务直接生成记录', trigger: 'change' }
+  ],
+  remark: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
--- a/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts
+++ b/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts
@ -132,47 +132,6 @@ export const Supplieritem = useCrudSchemas(reactive<CrudSchema[]>([
      }
    },
  },
-  {
-    label: '供应商替代包装单位',
-    field: 'altPackUnit',
-    dictType: DICT_TYPE.PACK_UNIT,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 180
-    }
-  },
-  {
-    label: '供应商替代包装量',
-    field: 'altPackQty',
-    sort: 'custom',
-    table: {
-      width: 170
-    },
-    form: {
-      component: 'InputNumber',
-      componentProps: {
-        min: 0,
-        precision: 6
-      }
-    },
-  },
-  {
-    label: '每器具包装数',
-    field: 'packQtyOfContainer',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'InputNumber',
-      componentProps: {
-        min: 0,
-        precision: 6
-      }
-    },
-  },
  {
    label: '默认收货仓库',
    field: 'defaultWarehouseCode',
--- a/src/views/wms/inventoryManage/balance/balance.data.ts
+++ b/src/views/wms/inventoryManage/balance/balance.data.ts
@ -62,6 +62,33 @@ export const Balance = useCrudSchemas(reactive<CrudSchema[]>([
      width: 150
    },
  },
+  {
+    label: '库区类型',
+    field: 'areaType',
+    sort: 'custom',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
  {
    label: '库位代码',
    field: 'locationCode',
--- a/src/views/wms/inventoryManage/package/package.data.ts
+++ b/src/views/wms/inventoryManage/package/package.data.ts
@ -68,6 +68,14 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
      width: 150,
    },
  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
  {
    label: '生产日期',
    field: 'produceDate',
--- a/src/views/wms/inventoryManage/transaction/transaction.data.ts
+++ b/src/views/wms/inventoryManage/transaction/transaction.data.ts
@ -88,6 +88,33 @@ export const Transaction = useCrudSchemas(reactive<CrudSchema[]>([
      width: 150
    },
  },
+  {
+    label: '库区类型',
+    field: 'areaType',
+    sort: 'custom',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
  {
    label: '单价',
    field: 'singlePrice',