Merge branch 'master' of http://dev.ccwin-in.com:3000/eam/eam-ui

src/api/eam/item/countadjustWork/index.ts

@@ -1,51 +0,0 @@
-import request from '@/config/axios'
-
-export interface CountadjustPlanVO {
-  id : number
-  number : string
-  name : string
-  classification : string
-  isInAccount : string
-  status : string
-}
-
-// 查询备件盘点计划列表
-export const getCountadjustWorkPage = async (params) => {
-  if (params.isSearch) {
-    delete params.isSearch
-    const data = { ...params }
-    return await request.post({ url: '/eam/countadjust-plan/senior', data })
-  } else {
-    return await request.get({ url: `/eam/countadjust-plan/page`, params })
-  }
-}
-
-// 查询备件盘点计划详情
-export const getCountadjustWork = async (id : number) => {
-  return await request.get({ url: `/eam/countadjust-plan/get?id=` + id })
-}
-
-// 新增备件盘点计划
-export const createCountadjustWork = async (data : CountadjustPlanVO) => {
-  return await request.post({ url: `/eam/countadjust-plan/create`, data })
-}
-
-// 修改备件盘点计划
-export const updateCountadjustWork = async (data : CountadjustPlanVO) => {
-  return await request.put({ url: `/eam/countadjust-plan/update`, data })
-}
-
-// 删除备件盘点计划
-export const deleteCountadjustWork = async (id : number) => {
-  return await request.delete({ url: `/eam/countadjust-plan/delete?id=` + id })
-}
-
-// 导出备件盘点计划 Excel
-export const exportCountadjustWork = async (params) => {
-  return await request.download({ url: `/eam/countadjust-plan/export-excel`, params })
-}
-
-// 下载用户导入模板
-export const importTemplate = () => {
-  return request.download({ url: '/eam/countadjust-plan/get-import-template' })
-}

src/utils/dict.ts

@@ -291,6 +291,8 @@ export enum DICT_TYPE {
   IS_OPEN = 'is_open', //是否打开
   ITEM_APPLY_STATUS = 'item_apply_status',//备件申领状态
   JX_DETAILS_STATUS = 'jx_details_status', //检修明细状态
+  CLASSIFICATION = 'classification', //检修明细状态
+  
   
   
 }

src/views/eam/basic/item/index.vue

@@ -83,7 +83,7 @@
 
   // 列表头部按钮
   const HeadButttondata = [
-    // defaultButtons.defaultAddBtn(null), // 新增
+    defaultButtons.defaultAddBtn(null), // 新增
     defaultButtons.defaultExportBtn(null), // 导出
     defaultButtons.defaultFreshBtn(null), // 刷新
     defaultButtons.defaultFilterBtn(null), // 筛选

src/views/eam/basic/item/item.data.ts

@@ -76,6 +76,18 @@ export const Item = useCrudSchemas(reactive<CrudSchema[]>([
       type: 'Select'
     }
   },
+  {
+    label: '备件分类',
+    field: 'classification',
+    sort: 'custom',
+    dictType: DICT_TYPE.CLASSIFICATION,
+    dictClass: 'string',
+    isSearch: false,
+    isTable: true,
+    tableForm: {
+      type: 'Select'
+    }
+  },
   {
     label: '单价',
     field: 'singlePrice',

src/views/eam/item/countadjustPlan/countadjustPlan.data.ts

@@ -20,26 +20,53 @@ export const CountadjustPlan = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isSearch: true,
   },
+  // {
+  //   label: '盘点类型',
+  //   field: 'classification',
+  //   sort: 'custom',
+  //   isSearch: false,
+  // },
+  
   {
     label: '盘点类型',
-    field: 'classification',
+    field: 'type',
-    sort: 'custom',
+    sort: 'classification',
-    isSearch: false,
+    dictType: DICT_TYPE.CLASSIFICATION,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select',
+      disabled: false
+    }
   },
   {
     label: '是否账内库',
     field: 'isInAccount',
-    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
     isSearch: false,
-  },
+    isTable: true,
-  {
-    label: '状态',
-    field: 'status',
     sort: 'custom',
-    isSearch: false,
+    table: {
-    form: {
+      width: 140
-      component: 'Radio'
+    },
+    tableForm: {
+      type: 'Select',
+      inactiveValue: 'FALSE',
+      disabled: true
     },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
   },
   {
     label: '操作',

src/views/eam/item/countadjustWork/countadjustWork.data.ts

@@ -1,52 +0,0 @@
-import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-
-// 表单校验
-export const CountadjustWorkRules = reactive({
-  number: [required],
-  name: [required],
-})
-
-export const CountadjustWork = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '计划编号',
-    field: 'number',
-    sort: 'custom',
-    isSearch: true,
-  },
-  {
-    label: '名称',
-    field: 'name',
-    sort: 'custom',
-    isSearch: true,
-  },
-  {
-    label: '盘点类型',
-    field: 'classification',
-    sort: 'custom',
-    isSearch: false,
-  },
-  {
-    label: '是否账内库',
-    field: 'isInAccount',
-    sort: 'custom',
-    isSearch: false,
-  },
-  {
-    label: '状态',
-    field: 'status',
-    sort: 'custom',
-    isSearch: false,
-    form: {
-      component: 'Radio'
-    },
-  },
-  {
-    label: '操作',
-    field: 'action',
-    isForm: false,
-    table: {
-      width: 150,
-      fixed: 'right'
-    }
-  }
-]))

src/views/eam/item/countadjustWork/index.vue

@@ -1,244 +1,300 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="CountadjustWork.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="CountJobMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
-    <!-- 列表头部 -->
+  <!-- 列表头部 -->
-    <TableHead
+  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" :routeName="routeName"
-      :HeadButttondata="HeadButttondata"
+    @updataTableColumns="updataTableColumns" @searchFormClick="searchFormClick"
-      @button-base-click="buttonBaseClick"
+    :allSchemas="CountJobMain.allSchemas" />
-      :routeName="routeName"
-      @updataTableColumns="updataTableColumns"
-      @searchFormClick="searchFormClick"
-      :allSchemas="CountadjustWork.allSchemas"
-    />
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table
+    <Table :columns="tableColumns" :data="tableObject.tableList" :loading="tableObject.loading" :pagination="{
-      :columns="tableColumns"
-      :data="tableObject.tableList"
-      :loading="tableObject.loading"
-      :pagination="{
         total: tableObject.total
-      }"
+      }" v-model:pageSize="tableObject.pageSize" v-model:currentPage="tableObject.currentPage"
-      v-model:pageSize="tableObject.pageSize"
+      v-model:sort="tableObject.sort">
-      v-model:currentPage="tableObject.currentPage"
+      <template #number="{row}">
-      v-model:sort="tableObject.sort"
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
-    >
+          <span>{{ row.number }}</span>
-      <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)" />
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
-  <BasicForm
+  <BasicForm ref="formRef" @success="getList" :rules="CountJobMainRules" :formAllSchemas="CountJobMain.allSchemas"
-    ref="basicFormRef"
+    :tableAllSchemas="CountJobDetail.allSchemas" :tableFormRules="CountJobDetailRules" :tableData="tableData"
-    @success="formsSuccess"
+    :apiUpdate="CountJobMainApi.updateCountJobMain" :apiCreate="CountJobMainApi.createCountJobMain"
-    :rules="CountadjustWorkRules"
+    :isBusiness="true" @handleAddTable="handleAddTable" @handleDeleteTable="handleDeleteTable"
-    :formAllSchemas="CountadjustWork.allSchemas"
+    @searchTableSuccess="searchTableSuccess" @submitForm="submitForm" />
-    :apiUpdate="CountadjustWorkApi.updateCountadjustWork"
-    :apiCreate="CountadjustWorkApi.createCountadjustWork"
-    @searchTableSuccess="searchTableSuccess"
-    :isBusiness="false"
-  />
 
   <!-- 详情 -->
-  <Detail ref="detailRef" :isBasic="true" :allSchemas="CountadjustWork.allSchemas" />
+  <Detail ref="detailRef" :isBasic="false" :allSchemas="CountJobMain.allSchemas"
+    :detailAllSchemas="CountJobDetail.allSchemas" :detailAllSchemasRules="CountJobDetailRules"
+    :apiCreate="CountJobDetailApi.createCountJobDetail" :apiUpdate="CountJobDetailApi.updateCountJobDetail"
+    :apiPage="CountJobDetailApi.getCountJobDetailPage" :apiDelete="CountJobDetailApi.deleteCountJobDetail"
+    @searchTableSuccessDetail="searchTableSuccessDetail" />
 
   <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/plan/countadjust-plan/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+  <ImportForm ref="importFormRef" url="/wms/purchase-main/import" :importTemplateData="importTemplateData"
+    @success="importSuccess" :isShowOut="true" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
 </template>
 
 <script setup lang="ts">
-import download from '@/utils/download'
+  import download from '@/utils/download'
-import { CountadjustWork,CountadjustWorkRules } from './countadjustWork.data'
+  import { CountJobMain, CountJobMainRules, CountJobDetail, CountJobDetailRules } from './countJobMain.data'
-import * as CountadjustWorkApi from '@/api/eam/item/countadjustWork'
+  import * as CountJobMainApi from '@/api/eam/item/countJobMain'
-import * as defaultButtons from '@/utils/disposition/defaultButtons'
+  import * as CountJobDetailApi from '@/api/eam/item/countJobDetail'
-import TableHead from '@/components/TableHead/src/TableHead.vue'
+  import * as defaultButtons from '@/utils/disposition/defaultButtons'
-import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+  import TableHead from '@/components/TableHead/src/TableHead.vue'
-import Detail from '@/components/Detail/src/Detail.vue'
+  import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
-
+
-defineOptions({ name: 'CountadjustWork' })
+  // 采购订单
-
+  defineOptions({ name: 'CountadjustWork' })
-const message = useMessage() // 消息弹窗
+
-const { t } = useI18n() // 国际化
+  const message = useMessage() // 消息弹窗
-
+  const { t } = useI18n() // 国际化
-const route = useRoute() // 路由信息
+  const route = useRoute() // 路由信息
-const routeName = ref()
+  const routeName = ref()
-routeName.value = route.name
+  routeName.value = route.name
-const tableColumns = ref(CountadjustWork.allSchemas.tableColumns)
+  const tableColumns = ref(CountJobMain.allSchemas.tableColumns)
-
+
-// 查询页面返回
+  // 字段设置 更新主列表字段
-const searchTableSuccess = (formField, searchField, val, formRef) => {
+  const updataTableColumns = (val) => {
-  nextTick(() => {
+    tableColumns.value = val
-    const setV = {}
+  }
-    setV[formField] = val[0][searchField]
+
-    formRef.setValues(setV)
+  // 查询页面返回
+  const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
+    nextTick(async () => {
+      if (type == 'tableForm') {
+        // 明细查询页赋值
+        row[formField] = val[0][searchField]
+        row['itemNumber'] = val[0]['number']
+        row['isRadeIn'] = val[0]['isRadeIn']
+        row['available'] = val[0]['available']
+      } else {
+        const setV = {}
+        setV[formField] = val[0][searchField]
+        formRef.setValues(setV)
+      }
+    })
+  }
+  // 查询页面返回——详情
+  const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
+    nextTick(async () => {
+      const setV = {}
+      // if(formField == 'itemCode'){
+      //     await ItembasicApi.getItembasicPage({
+      //       code: setV['itemCode']
+      //     }).then(res => {
+      //       setV['uom'] = res.list[0].uom
+      //       setV[formField] = val[0][searchField]
+      //     })
+      //   }
+      formRef.setValues(setV)
+    })
+  }
+
+  // 子表新增的时候选择表格之后需要会显得字段
+  const Echo = []
+  const { tableObject, tableMethods } = useTable({
+    getListApi: CountJobMainApi.getCountJobMainPage // 分页接口
   })
-}
+
-
+  // 获得表格的各种操作
-// 字段设置 更新主列表字段
+  const { getList, setSearchParams } = tableMethods
-const updataTableColumns = (val) => {
+
-  tableColumns.value = val
+  // 列表头部按钮
-}
+  const HeadButttondata = [
-
+    defaultButtons.defaultAddBtn(null), // 新增
-const { tableObject, tableMethods } = useTable({
+    defaultButtons.defaultImportBtn(null), // 导入
-  getListApi: CountadjustWorkApi.getCountadjustWorkPage // 分页接口
+    defaultButtons.defaultExportBtn(null), // 导出
-})
+    defaultButtons.defaultFreshBtn(null), // 刷新
-
+    defaultButtons.defaultFilterBtn(null), // 筛选
-// 获得表格的各种操作
+    defaultButtons.defaultSetBtn(null), // 设置
-const { getList, setSearchParams } = tableMethods
+    // {
-
+    //   label: '自定义扩展按钮',
-// 列表头部按钮
+    //   name: 'zdy',
-const HeadButttondata = [
+    //   hide: false,
-  defaultButtons.defaultAddBtn({hasPermi:'eam:countadjustWork:create'}), // 新增
+    //   type: 'primary',
-  defaultButtons.defaultImportBtn({hasPermi:'eam:countadjustWork:import'}), // 导入
+    //   icon: 'Select',
-  defaultButtons.defaultExportBtn({hasPermi:'eam:countadjustWork:export'}), // 导出
+    //   color: ''
-  defaultButtons.defaultFreshBtn(null), // 刷新
+    // },
-  defaultButtons.defaultFilterBtn(null), // 筛选
+  ]
-  defaultButtons.defaultSetBtn(null), // 设置
+
-  // {
+  // 头部按钮事件
-  //   label: '自定义扩展按钮',
+  const buttonBaseClick = (val, item) => {
-  //   name: 'zdy',
+    if (val == 'add') { // 新增
-  //   hide: false,
+      openForm('create')
-  //   type: 'primary',
+    } else if (val == 'import') { // 导入
-  //   icon: 'Select',
+      handleImport()
-  //   color: ''
+    } else if (val == 'export') { // 导出
-  // },
+      handleExport()
-]
+    } else if (val == 'refresh') { // 刷新
-
+      getList()
-// 头部按钮事件
+    } else if (val == 'filtrate') { // 筛选
-const buttonBaseClick = (val, item) => {
+    } else { // 其他按钮
-  if (val == 'add') { // 新增
+      console.log('其他按钮', item)
-    openForm('create')
+    }
-  } else if (val == 'import') { // 导入
+  }
-    handleImport()
+  
-  } else if (val == 'export') { // 导出
+  // 根据状态返回该按钮是否显示
-    handleExport()
+  const isShowMainButton = (row, val) => {
-  } else if (val == 'refresh') { // 刷新
+    if (val.indexOf(row.available) > -1) {
+      return false
+    } else {
+      return true
+    }
+  }
+
+  // 列表-操作按钮
+  const butttondata = (row) => {
+    return [
+      defaultButtons.mainListEditBtn(null), // 编辑
+      defaultButtons.mainListDeleteBtn(null), // 删除
+    ]
+  }
+
+  // 列表-操作按钮事件
+  const buttonTableClick = async (val, row) => {
+    if (val == 'edit') { // 编辑
+      openForm('update', row)
+    } 
+    else if (val == 'mainOrderClo') { // 关闭
+      handleClose(row.id)
+    }
+    else if (val == 'delete') { // 删除
+      handleDelete(row.id)
+    }
+  }
+
+  /** 添加/修改操作 */
+  const formRef = ref()
+  const openForm = async (type : string, row ?: number) => {
+    tableData.value = [] // 重置明细数据
+    formRef.value.open(type, row)
+  }
+
+  /** 详情操作 */
+  const detailRef = ref()
+  const openDetail = (row : any, titleName : any, titleValue : any) => {
+    detailRef.value.openDetail(row, titleName, titleValue, 'basicCountJobMain')
+  }
+
+  /** 删除按钮操作 */
+  const handleDelete = async (id : number) => {
+    try {
+      // 删除的二次确认
+      await message.delConfirm()
+      // 发起删除
+      await CountJobMainApi.deleteCountJobMain(id)
+      message.success(t('common.delSuccess'))
+      // 刷新列表
+      await getList()
+    } catch { }
+  }
+  
+  /** 关闭按钮操作 */
+  const handleClose = async (id : number) => {
+    try {
+      // 关闭的二次确认
+      await message.confirm('是否关闭所选中数据？')
+      // 发起关闭
+      await CountJobMainApi.closeCountJobMain(id)
+      message.success(t('关闭成功!'))
+      // 刷新列表
+      await getList()
+    } catch { }
+  }
+
+  /** 导出按钮操作 */
+  const exportLoading = ref(false) // 导出的加载中
+  const handleExport = async () => {
+    try {
+      // 导出的二次确认
+      await message.exportConfirm()
+      // 发起导出
+      exportLoading.value = true
+      const data = await CountJobMainApi.exportCountJobMain(tableObject.params)
+      download.excel(data, '备件申领记录主.xlsx')
+    } catch {
+    } finally {
+      exportLoading.value = false
+    }
+  }
+
+  /**
+    * tableForm方法
+  */
+  const tableFormKeys = {}
+  CountJobDetail.allSchemas.tableFormColumns.forEach(item => {
+    tableFormKeys[item.field] = item.default ? item.default : ''
+  })
+  const tableData = ref([])
+
+  // 添加明细
+  const handleAddTable = () => {
+    tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+  }
+  // 删除明细
+  const handleDeleteTable = (item, index) => {
+    tableData.value.splice(index, 1)
+  }
+
+  // 主子数据 提交
+  const submitForm = async (formType, data) => {
+    data.subList = tableData.value // 拼接子表数据参数
+    try {
+      if (formType === 'create') {
+        await CountJobMainApi.createCountJobMain(data)
+        message.success(t('common.createSuccess'))
+      } else {
+        await CountJobMainApi.updateCountJobMain(data)
+        message.success(t('common.updateSuccess'))
+      }
+      formRef.value.dialogVisible = false
+      // 刷新当前列表
+      getList()
+    } finally {
+      formRef.value.formLoading = false
+    }
+  }
+
+  /** 导入 */
+  const importFormRef = ref()
+  const handleImport = () => {
+    importFormRef.value.open()
+  }
+
+  // 导入附件弹窗所需的参数
+  const importTemplateData = reactive({
+    templateUrl: '',
+    templateTitle: '采购订单主导入模版.xlsx'
+  })
+
+  // 导入成功之后
+  const importSuccess = () => {
     getList()
-  } else if (val == 'filtrate') { // 筛选
+  }
-  } else { // 其他按钮
+
-    console.log('其他按钮', item)
+  // 筛选提交
-  }
+  const searchFormClick = (searchData) => {
-}
+    tableObject.params = {
-
+      isSearch: true,
-// 列表-操作按钮
+      filters: searchData.filters
-const butttondata = [
-  defaultButtons.mainListEditBtn({hasPermi:'eam:countadjustWork:update'}), // 编辑
-  defaultButtons.mainListDeleteBtn({hasPermi:'eam:countadjustWork: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 =CountadjustWork.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;
     }
+    getList() // 刷新当前列表
   }
-  if(data.activeTime==0)data.activeTime = null;
-  if(data.expireTime==0)data.expireTime = null;
-  if (formType === 'create') {
-    await CountadjustWorkApi.createCountadjustWork(data)
-    message.success(t('common.createSuccess'))
-  } else {
-    await CountadjustWorkApi.updateCountadjustWork(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, 'basicCountadjustWork')
-}
-
-/** 删除按钮操作 */
-const handleDelete = async (id: number) => {
-  try {
-    // 删除的二次确认
-    await message.delConfirm()
-    // 发起删除
-    await CountadjustWorkApi.deleteCountadjustWork(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 CountadjustWorkApi.exportCountadjustWork(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 CountadjustWorkApi.importTemplate()
-})
 
+  /** 初始化 **/
+  onMounted(async () => {
+    getList()
+    importTemplateData.templateUrl = await CountJobMainApi.importTemplate()
+  })
 </script>