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

src/utils/dict.ts

@@ -189,7 +189,8 @@ export enum DICT_TYPE {
   ABC_CLASS = 'abc_class', // ABC类
   TRUE_FALSE = 'true_false', // 是否
   ITEM_GROUP = 'item_group', // 物品分组
-  ITEM_CATEGORY = 'Item_category', // 物品种类
+  ITEM_CATEGORY = 'item_category', // 物品种类
+  ITEM_REGION = 'item_region', // 物品区域
   ITEM_COLOR = 'item_color', // 物品颜色
   ITEM_CONFIGURATION = 'item_configuration', // 物品配置
   EQ_LEVEL = 'eq_level', // 质量等级
@@ -298,7 +299,6 @@ export enum DICT_TYPE {
   POWER_RANGE = 'power_range', //功率范围
   ADJUST_STATUS = 'adjust_status', //盘点调整状态
   APP_DEVICE_MOLD_TYPE = 'app_device_mold_type', //设备/模具/工艺：类型
-  
+  ITEM_SUBJECT = 'item_subject', //备件的科目
-  
   
 }

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

@@ -21,6 +21,7 @@ export const DeviceMOLD = useCrudSchemas(reactive<CrudSchema[]>([
       width: 180,
       fixed: 'left'
     },
+
   },
   {
     label: '名称',
@@ -41,6 +42,11 @@ export const DeviceMaintenance = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'name',
     sort: 'custom',
     isSearch: true,
+    form: {
+      componentProps: {
+        type: 'textarea',
+      }
+    }
   },
   {
     label: '类型',
@@ -84,6 +90,13 @@ export const DeviceMaintenance = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '设备名称',
+    field: 'deviceName',
+    sort: 'custom',
+    isSearch: false,
+    isForm: false,
+  },
   {
     label: '项类型',
     field: 'status',

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

@@ -42,6 +42,7 @@
   <BasicForm
     ref="basicFormRef"
     @success="formsSuccess"
+    :isCol="true"
     :rules="DeviceMaintenanceRules"
     :formAllSchemas="DeviceMaintenance.allSchemas"
     :apiUpdate="DeviceMaintenanceApi.updateDeviceMoldItems"

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

@@ -37,10 +37,15 @@ export const DeviceMOLD = useCrudSchemas(reactive<CrudSchema[]>([
 
 export const DeviceMoldItems = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '保养内容',
+    label: '巡检点检项',
     field: 'name',
     sort: 'custom',
     isSearch: true,
+    form: {
+      componentProps: {
+        type: 'textarea',
+      }
+    }
   },
   {
     label: '类型',
@@ -84,6 +89,13 @@ export const DeviceMoldItems = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '设备名称',
+    field: 'deviceName',
+    sort: 'custom',
+    isSearch: false,
+    isForm: false,
+  },
   {
     label: '项类型',
     field: 'status',

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

@@ -35,7 +35,7 @@ export const Item = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
   },
   {
-    label: '是否存储',
+    label: '是否常储',
     field: 'isConstant',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
@@ -64,6 +64,12 @@ export const Item = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'subject',
     sort: 'custom',
   },
+    {
+      label: '科目代码',
+      field: 'subjectCode',
+      sort: 'custom',
+      isTable: true,
+    },
   {
     label: '单位',
     field: 'uom',
@@ -76,6 +82,18 @@ export const Item = useCrudSchemas(reactive<CrudSchema[]>([
       type: 'Select'
     }
   },
+    {
+      label: '类别',
+      field: 'category',
+      sort: 'custom',
+      dictType: DICT_TYPE.ITEM_CATEGORY,
+      dictClass: 'string',
+      isSearch: false,
+      isTable: true,
+      tableForm: {
+        type: 'Select'
+      }
+    },
   {
     label: '备件分类',
     field: 'classification',
@@ -88,13 +106,25 @@ export const Item = useCrudSchemas(reactive<CrudSchema[]>([
       type: 'Select'
     }
   },
+  {
+    label: '区域',
+    field: 'region',
+    sort: 'custom',
+    dictType: DICT_TYPE.ITEM_REGION,
+    dictClass: 'string',
+    isSearch: false,
+    isTable: true,
+    tableForm: {
+      type: 'Select'
+    }
+  },
   {
     label: '单价',
     field: 'singlePrice',
     sort: 'custom',
   },
   {
-    label: '重点采购',
+    label: '重采购点',
     field: 'reprocurement',
     sort: 'custom',
     table: {
@@ -163,6 +193,31 @@ export const Item = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+   {
+      label: '是否框架协议',
+      field: 'isFramework',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isSearch: false,
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 140
+      },
+      tableForm: {
+        type: 'Select',
+        inactiveValue: 'FALSE',
+        disabled: true
+      },
+      form: {
+        component: 'Switch',
+        value: 'TRUE',
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE'
+        }
+      }
+    },
   {
     label: '是否可用',
     field: 'available',

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

@@ -5,28 +5,15 @@
   </ContentWrap>
 
   <!-- 列表头部 -->
-    <TableHead
+  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" :routeName="routeName"
-      :HeadButttondata="HeadButttondata"
+    @updataTableColumns="updataTableColumns" @searchFormClick="searchFormClick" :allSchemas="Location.allSchemas" />
-      @button-base-click="buttonBaseClick"
-      :routeName="routeName"
-      @updataTableColumns="updataTableColumns"
-      @searchFormClick="searchFormClick"
-      :allSchemas="Location.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"
-      v-model:sort="tableObject.sort"
-    >
       <template #code="{row}">
         <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
           <span>{{ row.code }}</span>
@@ -39,66 +26,68 @@
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
-  <BasicForm
+  <BasicForm ref="basicFormRef" @success="formsSuccess" :rules="LocationRules" :formAllSchemas="Location.allSchemas"
-    ref="basicFormRef"
+    :apiUpdate="LocationApi.updateLocation" :apiCreate="LocationApi.createLocation"
-    @success="formsSuccess"
+    @searchTableSuccess="searchTableSuccess" :isBusiness="false" />
-    :rules="LocationRules"
-    :formAllSchemas="Location.allSchemas"
-    :apiUpdate="LocationApi.updateLocation"
-    :apiCreate="LocationApi.createLocation"
-    @searchTableSuccess="searchTableSuccess"
-    :isBusiness="false"
-  />
 
   <!-- 详情 -->
   <Detail ref="detailRef" :isBasic="true" :allSchemas="Location.allSchemas" />
 
   <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/eam/location/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+  <ImportForm ref="importFormRef" url="/eam/location/import" :importTemplateData="importTemplateData"
+    @success="importSuccess" />
 </template>
 
 <script setup lang="ts">
-import download from '@/utils/download'
+  import download from '@/utils/download'
-import { Location,LocationRules } from './location.data'
+  import { Location, LocationRules } from './location.data'
-import * as LocationApi from '@/api/eam/basic/location'
+  import * as LocationApi from '@/api/eam/basic/location'
-import * as defaultButtons from '@/utils/disposition/defaultButtons'
+  import * as defaultButtons from '@/utils/disposition/defaultButtons'
-import TableHead from '@/components/TableHead/src/TableHead.vue'
+  import TableHead from '@/components/TableHead/src/TableHead.vue'
-import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+  import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
-import Detail from '@/components/Detail/src/Detail.vue'
+  import Detail from '@/components/Detail/src/Detail.vue'
-
+
-defineOptions({ name: 'Location' })
+  defineOptions({ name: 'Location' })
-
+
-const message = useMessage() // 消息弹窗
+  const message = useMessage() // 消息弹窗
-const { t } = useI18n() // 国际化
+  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(Location.allSchemas.tableColumns)
+  const tableColumns = ref(Location.allSchemas.tableColumns)
-
+
-// 查询页面返回
+  // 查询页面返回
-const searchTableSuccess = (formField, searchField, val, formRef) => {
+  const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
     nextTick(() => {
+      if (formField == 'areaNumber') {
         const setV = {}
         setV[formField] = val[0][searchField]
+        setV['areaNumber'] = val[0]['number']
+        setV['type'] = val[0]['type']
         formRef.setValues(setV)
+      } else {
+        const setV = {}
+        setV[formField] = val[0][searchField]
+        formRef.setValues(setV)
+      }
     })
-}
+  }
 
-// 字段设置 更新主列表字段
+  // 字段设置 更新主列表字段
-const updataTableColumns = (val) => {
+  const updataTableColumns = (val) => {
     tableColumns.value = val
-}
+  }
 
-const { tableObject, tableMethods } = useTable({
+  const { tableObject, tableMethods } = useTable({
     getListApi: LocationApi.getLocationPage // 分页接口
-})
+  })
 
-// 获得表格的各种操作
+  // 获得表格的各种操作
-const { getList, setSearchParams } = tableMethods
+  const { getList, setSearchParams } = tableMethods
 
-// 列表头部按钮
+  // 列表头部按钮
-const HeadButttondata = [
+  const HeadButttondata = [
     defaultButtons.defaultAddBtn(null), // 新增
     defaultButtons.defaultExportBtn(null), // 导出
     defaultButtons.defaultFreshBtn(null), // 刷新
@@ -112,10 +101,10 @@ const HeadButttondata = [
     //   icon: 'Select',
     //   color: ''
     // },
-]
+  ]
 
-// 头部按钮事件
+  // 头部按钮事件
-const buttonBaseClick = (val, item) => {
+  const buttonBaseClick = (val, item) => {
     if (val == 'add') { // 新增
       openForm('create')
     } else if (val == 'export') { // 导出
@@ -126,42 +115,42 @@ const buttonBaseClick = (val, item) => {
     } else { // 其他按钮
       console.log('其他按钮', item)
     }
-}
+  }
 
-// 列表-操作按钮
+  // 列表-操作按钮
-const butttondata = [
+  const butttondata = [
     defaultButtons.mainListEditBtn(null), // 编辑
     defaultButtons.mainListDeleteBtn(null), // 删除
-]
+  ]
 
-// 列表-操作按钮事件
+  // 列表-操作按钮事件
-const buttonTableClick = async (val, row) => {
+  const buttonTableClick = async (val, row) => {
     if (val == 'edit') { // 编辑
       openForm('update', row)
     } else if (val == 'delete') { // 删除
       handleDelete(row.id)
     }
-}
+  }
 
-/** 添加/修改操作 */
+  /** 添加/修改操作 */
-const basicFormRef = ref()
+  const basicFormRef = ref()
-const openForm = (type: string, row?: any) => {
+  const openForm = (type : string, row ?: any) => {
     basicFormRef.value.open(type, row)
-}
+  }
 
-// form表单提交
+  // form表单提交
-const formsSuccess = async (formType,data) => {
+  const formsSuccess = async (formType, data) => {
-  var isHave =Location.allSchemas.formSchema.some(function (item) {
+    var isHave = Location.allSchemas.formSchema.some(function (item) {
       return item.field === 'activeTime' || item.field === 'expireTime';
     });
-  if(isHave){
+    if (isHave) {
-    if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+      if (data.activeTime && data.expireTime && data.activeTime >= data.expireTime) {
         message.error('失效时间要大于生效时间')
         return;
       }
     }
-  if(data.activeTime==0)data.activeTime = null;
+    if (data.activeTime == 0) data.activeTime = null;
-  if(data.expireTime==0)data.expireTime = null;
+    if (data.expireTime == 0) data.expireTime = null;
     if (formType === 'create') {
       await LocationApi.createLocation(data)
       message.success(t('common.createSuccess'))
@@ -171,16 +160,16 @@ const formsSuccess = async (formType,data) => {
     }
     basicFormRef.value.dialogVisible = false
     getList()
-}
+  }
 
-/** 详情操作 */
+  /** 详情操作 */
-const detailRef = ref()
+  const detailRef = ref()
-const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const openDetail = (row : any, titleName : any, titleValue : any) => {
     detailRef.value.openDetail(row, titleName, titleValue, 'basicLocation')
-}
+  }
 
-/** 删除按钮操作 */
+  /** 删除按钮操作 */
-const handleDelete = async (id: number) => {
+  const handleDelete = async (id : number) => {
     try {
       // 删除的二次确认
       await message.delConfirm()
@@ -189,12 +178,12 @@ const handleDelete = async (id: number) => {
       message.success(t('common.delSuccess'))
       // 刷新列表
       await getList()
-  } catch {}
+    } catch { }
-}
+  }
 
-/** 导出按钮操作 */
+  /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
+  const exportLoading = ref(false) // 导出的加载中
-const handleExport = async () => {
+  const handleExport = async () => {
     try {
       // 导出的二次确认
       await message.exportConfirm()
@@ -206,20 +195,19 @@ const handleExport = async () => {
     } finally {
       exportLoading.value = false
     }
-}
+  }
 
-// 筛选提交
+  // 筛选提交
-const searchFormClick = (searchData) => {
+  const searchFormClick = (searchData) => {
     tableObject.params = {
       isSearch: true,
       filters: searchData.filters
     }
     getList() // 刷新当前列表
-}
+  }
 
-/** 初始化 **/
+  /** 初始化 **/
-onMounted(async () => {
+  onMounted(async () => {
     getList()
-})
+  })
-
 </script>

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

@@ -5,6 +5,10 @@ import { LocationArea } from '../locationArea/locationArea.data'
 
 // 表单校验
 export const LocationRules = reactive({
+    number: [
+      { required: true, message: '请输入库位编号', trigger: 'blur' },
+      { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+    ],
   name: [
     { required: true, message: '请输入库位名称', trigger: 'blur' }, 
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
@@ -21,7 +25,7 @@ export const Location = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     isSearch: true,
-    isForm: false,
+    isForm: true,
     table: {
       width: 180,
       fixed: 'left'

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

@@ -41,6 +41,11 @@ export const MoldMaintenance = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'name',
     sort: 'custom',
     isSearch: true,
+    form: {
+      componentProps: {
+        type: 'textarea',
+      }
+    }
   },
   {
     label: '类型',
@@ -84,6 +89,13 @@ export const MoldMaintenance = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '模具名称',
+    field: 'deviceName',
+    sort: 'custom',
+    isSearch: false,
+    isForm: false,
+  },
   {
     label: '项类型',
     field: 'status',

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

@@ -3,6 +3,10 @@ import {validateHanset,validateFax,validatePostCode,validateYS} from '@/utils/va
 
 // 表单校验
 export const SupplierRules = reactive({
+    number: [
+      { required: true, message: '请输入供应商编号', trigger: 'blur' },
+      { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+    ],
  name: [
    { required: true, message: '请输入供应商名称', trigger: 'blur' }, 
    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
@@ -19,7 +23,7 @@ export const Supplier = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     isSearch: true,
-    isForm: false,
+    isForm: true,
     table: {
       width: 180,
       fixed: 'left'