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

src/api/eam/basicEamWorkshop/index.ts

@@ -0,0 +1,65 @@
+import request from '@/config/axios'
+import {EquipmentMainPartVO} from "@/api/eam/equipmentMainPart";
+
+export interface BasicEamWorkshopVO {
+  id: number
+  code: string
+  name: string
+  description: string
+  type: string
+  available: string
+  activeTime: Date
+  expireTime: Date
+  remark: string
+  deletionTime: Date
+  deleterId: string
+  extraProperties: string
+  concurrencyStamp: number
+  siteId: string
+}
+
+// 查询EAM车间列表
+export const getBasicEamWorkshopPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/eam/basic-eam-workshop/senior', data })
+  } else {
+    return await request.get({ url: `/eam/basic-eam-workshop/page`, params })
+  }
+}
+
+// 查询EAM车间详情
+export const getBasicEamWorkshop = async (id: number) => {
+  return await request.get({ url: `/eam/basic-eam-workshop/get?id=` + id })
+}
+
+// 新增EAM车间
+export const createBasicEamWorkshop = async (data: BasicEamWorkshopVO) => {
+  return await request.post({ url: `/eam/basic-eam-workshop/create`, data })
+}
+
+// 修改EAM车间
+export const updateBasicEamWorkshop = async (data: BasicEamWorkshopVO) => {
+  return await request.put({ url: `/eam/basic-eam-workshop/update`, data })
+}
+
+// 删除EAM车间
+export const deleteBasicEamWorkshop = async (id: number) => {
+  return await request.delete({ url: `/eam/basic-eam-workshop/delete?id=` + id })
+}
+
+// 导出EAM车间 Excel
+export const exportBasicEamWorkshop = async (params) => {
+  return await request.download({ url: `/eam/basic-eam-workshop/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/eam/basic-eam-workshop/get-import-template' })
+}
+
+// 启用 / 禁用
+export const updateEnableCode = async (data: BasicEamWorkshopVO) => {
+  return await request.post({ url: `/eam/basic-eam-workshop/ables` , data })
+}

src/api/qms/inspectionTemplate/index.ts

@@ -37,3 +37,8 @@ export const enableInspectionTemplate = async (id: number) => {
 export const disableInspectionTemplate = async (id: number) => {
   return await request.disable({ url: `/qms/programme-template/disable?id=` + id })
 }
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/qms/programme-template/get-import-template' })
+}

src/views/eam/basicEamWorkshop/basicEamWorkshop.data.ts

@@ -0,0 +1,199 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+// 表单校验
+export const BasicEamWorkshopRules = reactive({
+  code: [required],
+  available: [required],
+  concurrencyStamp: [required],
+})
+
+export const BasicEamWorkshop = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: 'id',
+    field: 'id',
+    sort: 'custom',
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
+  },
+  {
+    label: '车间编号',
+    field: 'code',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '车间名称',
+    field: 'name',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '描述',
+    field: 'description',
+    sort: 'custom',
+    isSearch: false,
+  },
+  {
+    label: '车间类型',
+    field: 'type',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    sort: 'custom',
+    isSearch: true,
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+  },
+  {
+    label: '生效时间',
+    field: 'activeTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '失效时间',
+    field: 'expireTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    isSearch: false,
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: false,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '删除时间',
+    field: 'deletionTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '删除者ID',
+    field: 'deleterId',
+    sort: 'custom',
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
+  },
+  {
+    label: '扩展属性',
+    field: 'extraProperties',
+    sort: 'custom',
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
+  },
+  {
+    label: '并发乐观锁',
+    field: 'concurrencyStamp',
+    sort: 'custom',
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '地点ID',
+    field: 'siteId',
+    sort: 'custom',
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))

src/views/eam/basicEamWorkshop/index.vue

@@ -0,0 +1,295 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="BasicEamWorkshop.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="BasicEamWorkshop.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(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="basicFormRef"
+    @success="formsSuccess"
+    :rules="BasicEamWorkshopRules"
+    :formAllSchemas="BasicEamWorkshop.allSchemas"
+    :apiUpdate="BasicEamWorkshopApi.updateBasicEamWorkshop"
+    :apiCreate="BasicEamWorkshopApi.createBasicEamWorkshop"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="BasicEamWorkshop.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/eam/basic-eam-workshop/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { BasicEamWorkshop,BasicEamWorkshopRules } from './basicEamWorkshop.data'
+import * as BasicEamWorkshopApi from '@/api/eam/basicEamWorkshop'
+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'
+import * as BasicFaultCauseApi from "@/api/eam/basicFaultCause";
+
+defineOptions({ name: 'BasicEamWorkshop' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(BasicEamWorkshop.allSchemas.tableColumns)
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: BasicEamWorkshopApi.getBasicEamWorkshopPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'eam:basicEamWorkshop:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'eam:basicEamWorkshop:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'eam:basicEamWorkshop: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') { // 刷新
+    getList()
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.available) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [
+    defaultButtons.mainListEditBtn({hasPermi:'eam:basicEamWorkshop:update'}), // 编辑
+    //defaultButtons.mainListDeleteBtn({hasPermi:'eam:basicEamWorkshop:delete'}), // 删除
+    defaultButtons.mainListEnableBtn({hide:isShowMainButton(row,['FALSE']),hasPermi:'eam:basicEamWorkshop:update'}),
+    defaultButtons.mainListDisableBtn({hide:isShowMainButton(row,['TRUE']),hasPermi:'eam:basicEamWorkshop:update'}),
+  ]
+}
+
+
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  } else if (val == 'enable') {
+    handleEnable(row.id)
+  } else if (val == 'disable') {
+    handleDisable(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+  var isHave =BasicEamWorkshop.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 BasicEamWorkshopApi.createBasicEamWorkshop(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await BasicEamWorkshopApi.updateBasicEamWorkshop(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, 'basicBasicEamWorkshop')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await BasicEamWorkshopApi.deleteBasicEamWorkshop(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+
+/** 启用 */
+const handleEnable = async (id: number) => {
+  try {
+    const params = ref({
+      id: '',
+      available:'',
+    })
+    params.value.id = id
+    params.value.available = 'TRUE'
+    await BasicEamWorkshopApi.updateEnableCode(params.value)
+    message.success(t('common.updateSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+/** 禁用 */
+const handleDisable = async (id: number) => {
+  try {
+    const params = ref({
+      id: '',
+      available:'',
+    })
+    params.value.id = id
+    params.value.available = 'FALSE'
+    await BasicEamWorkshopApi.updateEnableCode(params.value)
+    message.success(t('common.updateSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await BasicEamWorkshopApi.exportBasicEamWorkshop(tableObject.params)
+    download.excel(data, 'EAM车间.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: 'EAM车间导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await BasicEamWorkshopApi.importTemplate()
+})
+
+</script>

src/views/qms/inspectionTemplate/index.vue

@@ -56,7 +56,15 @@
     />
 
   <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/wms/agv-locationrelation/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+  <ImportForm
+    ref="importFormRef"
+    url="/qms/programme-template/import"
+    :importTemplateData="importTemplateData"
+    @success="importSuccess"
+    :updateIsDisable="true"
+    :coverIsDisable="true"
+    :mode="2"
+  />
 </template>
 
 <script setup lang="ts">
@@ -94,7 +102,7 @@ const { getList, setSearchParams } = tableMethods
 // 列表头部按钮
 const HeadButttondata = [
   defaultButtons.defaultAddBtn({hasPermi:'qms:programme-template:create'}), // 新增
-  // defaultButtons.defaultImportBtn({hasPermi:'wms:agv-locationrelation:import'}), // 导入
+  defaultButtons.defaultImportBtn({hasPermi:'qms:programme-template:import'}), // 导入
   // defaultButtons.defaultExportBtn({hasPermi:'wms:agv-locationrelation:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
@@ -220,9 +228,26 @@ const searchFormClick = (searchData) => {
   getList() // 刷新当前列表
 }
 
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '检验方案导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
 /** 初始化 **/
 onMounted(async () => {
   getList()
+  importTemplateData.templateUrl = await InspectionProcessPageApi.importTemplate()
 })
 
 </script>

src/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data.ts

@@ -254,7 +254,7 @@ export const AreaRules = reactive({
     { validate: validateYS, message: '请输入正确的代码', trigger: 'blur' }
   ],
   name: [
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+    { required: true, max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
   remark: [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }

src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue

@@ -70,6 +70,7 @@
     :apiPage="CountadjustRequestDetailApi.getCountadjustRequestDetailPage"
     :apiDelete="CountadjustRequestDetailApi.deleteCountadjustRequestDetail"
     fromeWhere="countadjustRequest"
+    :detailButtonIsShowAdd="false"
     :Echo="Echo"
     @searchTableSuccessDetail="searchTableSuccessDetail"
   />

src/views/wms/productionManage/productionplan/productionMain/index.vue

@@ -461,7 +461,11 @@ const tableSelectionDelete = (selection) => {
 }
 
 // 主子数据 提交
-const submitForm = async (formType, data) => {
+const submitForm = async (formType, submitData) => {
+    let data = {...submitData}
+    if(data.masterId){
+      data.id = data.masterId
+    }
   if(tableData.value.find(item => (item.planQty <= 0))) {
     message.warning('数量必须大于0')
     formRef.value.formLoading = false

src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue

@@ -448,7 +448,11 @@ const tableSelectionDelete = (selection) => {
 }
 
 // 主子数据 提交
-const submitForm = async (formType, data) => {
+const submitForm = async (formType, submitData) => {
+    let data = {...submitData}
+    if(data.masterId){
+      data.id = data.masterId
+    }
   if(tableData.value.find(item => (item.planQty <= 0))) {
     message.warning('数量必须大于0')
     formRef.value.formLoading = false

src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue

@@ -447,7 +447,11 @@ const tableSelectionDelete = (selection) => {
   tableData.value = tableData.value.filter(item => !selection.includes(item))
 }
 // 主子数据 提交
-const submitForm = async (formType, data) => {
+const submitForm = async (formType, submitData) => {
+    let data = {...submitData}
+    if(data.masterId){
+      data.id = data.masterId
+    }
   if(tableData.value.find(item => (item.planQty <= 0))) {
     message.warning('数量必须大于0')
     formRef.value.formLoading = false

src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue

@@ -448,7 +448,11 @@ const tableSelectionDelete = (selection) => {
 }
 
 // 主子数据 提交
-const submitForm = async (formType, data) => {
+const submitForm = async (formType, submitData) => {
+    let data = {...submitData}
+    if(data.masterId){
+      data.id = data.masterId
+    }
   if(tableData.value.find(item => (item.planQty <= 0))) {
     message.warning('数量必须大于0')
     formRef.value.formLoading = false