From 12e7754d0d8e173a55f53d2e2d5b25c5648956d5 Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Tue, 28 May 2024 17:01:04 +0800 Subject: [PATCH 01/31] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerreturn/customerreturnRequestMain/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue index 2fd8a1768..639e766d7 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue @@ -203,7 +203,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => setV['customerDockCode'] = val[0]['customerDockCode'] // 获取子表数据 - DeliverRecordDetailApi.getDeliverRecordDetailPage({masterId:val[0]['id']}) + DeliverRecordDetailApi.getDeliverRecordDetailPage({masterId:val[0]['masterId']}) .then(res => { res.list.forEach(obj => { From a5e7cf00d8b4d8727a14eebe94a6640bef10ae5f Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Tue, 28 May 2024 17:03:37 +0800 Subject: [PATCH 02/31] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processproductionRequest/index.vue | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue b/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue index 19c9f77d0..a32c96128 100644 --- a/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue +++ b/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue @@ -72,7 +72,15 @@ /> - + diff --git a/src/views/eam/equipmentSigning/equipmentSigning.data.ts b/src/views/eam/equipmentSigning/equipmentSigning.data.ts new file mode 100644 index 000000000..99bcd1af5 --- /dev/null +++ b/src/views/eam/equipmentSigning/equipmentSigning.data.ts @@ -0,0 +1,343 @@ +import type { CrudSchema } from '@/hooks/web/useCrudSchemas' +import { dateFormatter } from '@/utils/formatTime' +import * as WorkshopApi from '@/api/wms/workshop' +import { Workshop } from '@/views/wms/basicDataManage/factoryModeling/workshop/workshop.data' +import { handleTreeToComponentOptions } from '@/utils/tree' +import * as DeptApi from '@/api/system/dept' +import * as UserApi from '@/api/system/user' +import { EquipmentAccounts,EquipmentAccountsRules } from '../equipmentAccounts/equipmentAccounts.data' +import * as EquipmentAccountsApi from '@/api/eam/equipmentAccounts' + +export interface User { + id: number, + nickname: string +} + +const deptList = ref([]) // 树形结构 +const workshopNoPage = await WorkshopApi.getWorkshopNoPage({}) +const userList = ref([]) +// 加载部门树（默认格式） +deptList.value = handleTreeToComponentOptions(await DeptApi.getSimpleDeptList()) + +// 表单校验 +export const EquipmentSigningRules = reactive({ + equipmentCode: [required], + operationDate: [required], + operationer: [required], + operationDept: [required], + supplierCode: [required], + status: [required], + storageLocation: [required], + concurrencyStamp: [required] +}) + +export const EquipmentSigning = useCrudSchemas(reactive([ + { + label: '设备编码', + field: 'equipmentCode', + sort: 'custom', + isSearch: true, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择设备', // 输入框占位文本 + searchField: 'code', // 查询弹窗赋值字段 + searchTitle: '设备信息', // 查询弹窗标题 + searchAllSchemas: EquipmentAccounts.allSchemas, // 查询弹窗所需类 + searchPage: EquipmentAccountsApi.getEquipmentAccountsPage, // 查询弹窗所需分页方法 + searchCondition: [{ + key: 'available', + value: 'TRUE', + isMainValue: false + }] + } + }, + }, + { + label: '验收日期', + field: 'operationDate', + 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')] + } + }, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + valueFormat: 'x' + } + } + }, + { + label: '验收人部门', + field: 'operationDept', + sort: 'custom', + isSearch: true, + form: { + component: 'TreeSelect', + componentProps: { // 假设deptList是部门数据列表 + data: deptList, + disabled: false, + placeholder: "请选择部门", + filterable: true, + multiple: false, + } + } + }, + { + label: '验收人', + field: 'operationer', + sort: 'custom', + isSearch: true, + form: { + component: 'Select', + componentProps: { // 假设deptList是部门数据列表 + options: [], + optionsAlias: { + valueField: 'id', + labelField: 'nickname' + }, + disabled: false, + placeholder: "请先选择部门", + filterable: true, + multiple: false, + } + } + }, + { + label: '验收人联系方式', + field: 'telephone', + sort: 'custom', + isSearch: false + }, + { + label: '供应商编号', + field: 'supplierCode', + sort: 'custom', + isSearch: true + }, + { + label: '供应商联系人', + field: 'supplierPeople', + sort: 'custom', + isSearch: true + }, + { + label: '供应商联系方式', + field: 'supplierTelephone', + sort: 'custom', + isSearch: false + }, + // { + // label: '流程状态', + // field: 'status', + // sort: 'custom', + // isSearch: true, + // dictType: DICT_TYPE.JOB_STATUS, + // dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + // form: { + // component: 'Select' + // } + // }, + // { + // label: '审核人', + // field: 'approver', + // sort: 'custom', + // isSearch: true, + // form: { + // component: 'InputNumber', + // value: 0 + // } + // }, + // { + // label: '审核内容', + // field: 'approveContent', + // sort: 'custom', + // isSearch: false, + // form: { + // component: 'Input', + // componentProps: { + // type: 'textarea', + // valueHtml: '', + // height: 200 + // } + // } + // }, + // { + // label: '审核时间', + // field: 'approveTime', + // 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')] + // } + // }, + // form: { + // component: 'DatePicker', + // componentProps: { + // type: 'datetime', + // valueFormat: 'x' + // } + // } + // }, + // { + // label: '自动审核', + // field: 'autoExamine', + // sort: 'custom', + // dictType: DICT_TYPE.TRUE_FALSE, + // dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + // isSearch: false, + // form: { + // component: 'Switch', + // value: 'TRUE', + // componentProps: { + // inactiveValue: 'FALSE', + // activeValue: 'TRUE' + // } + // } + // }, + // { + // label: '自动通过', + // field: 'autoAgree', + // sort: 'custom', + // dictType: DICT_TYPE.TRUE_FALSE, + // dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + // isSearch: false, + // form: { + // component: 'Switch', + // value: 'TRUE', + // componentProps: { + // inactiveValue: 'FALSE', + // activeValue: 'TRUE' + // } + // } + // }, + // { + // label: '直接生成记录', + // field: 'directCreateRecord', + // sort: 'custom', + // dictType: DICT_TYPE.TRUE_FALSE, + // dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + // isSearch: false, + // form: { + // component: 'Switch', + // value: 'TRUE', + // componentProps: { + // inactiveValue: 'FALSE', + // activeValue: 'TRUE' + // } + // } + // }, + { + label: '存放位置描述', + field: 'storageLocation', + sort: 'custom', + isSearch: false, + form: { + component: 'Input', + componentProps: { + type: 'textarea', + placeholder: '请输入存放位置描述' + } + } + }, + // { + // label: '所属厂区编号', + // field: 'factoryAreaCode', + // sort: 'custom', + // isSearch: false + // }, + { + label: '车间编号', + field: 'workshopCode', + sort: 'custom', + isSearch: true, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择车间代码', // 输入框占位文本 + searchField: 'code', // 查询弹窗赋值字段 + searchTitle: '车间信息', // 查询弹窗标题 + searchAllSchemas: Workshop.allSchemas, // 查询弹窗所需类 + searchPage: WorkshopApi.getWorkshopPage, // 查询弹窗所需分页方法 + searchCondition: [{ + key: 'available', + value: 'TRUE', + isMainValue: false + }] + } + }, + }, + { + label: '产线编号', + field: 'lineCode', + sort: 'custom', + isSearch: true, + form: { + component: 'Select' + } + }, + { + label: '工序编号', + field: 'processCode', + sort: 'custom', + isSearch: true, + form: { + component: 'Select' + } + }, + { + label: '工位编号', + field: 'workstationCode', + sort: 'custom', + isSearch: true, + form: { + component: 'Select' + } + }, + { + label: '备注', + field: 'remark', + sort: 'custom', + isSearch: false + }, + // { + // label: '是否可用', + // field: 'available', + // sort: 'custom', + // dictType: DICT_TYPE.TRUE_FALSE, + // dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + // isSearch: true, + // form: { + // component: 'Switch', + // value: 'TRUE', + // componentProps: { + // inactiveValue: 'FALSE', + // activeValue: 'TRUE' + // } + // } + // }, + { + label: '操作', + field: 'action', + isForm: false, + table: { + width: 150, + fixed: 'right' + } + } +])) diff --git a/src/views/eam/equipmentSigning/index.vue b/src/views/eam/equipmentSigning/index.vue new file mode 100644 index 000000000..571bfccb3 --- /dev/null +++ b/src/views/eam/equipmentSigning/index.vue @@ -0,0 +1,263 @@ + + + diff --git a/src/views/eam/equipmentSpotCheckRecordDetail/equipmentSpotCheckRecordDetail.data.ts b/src/views/eam/equipmentSpotCheckRecordDetail/equipmentSpotCheckRecordDetail.data.ts index 0ffa3a064..96ac8c29e 100644 --- a/src/views/eam/equipmentSpotCheckRecordDetail/equipmentSpotCheckRecordDetail.data.ts +++ b/src/views/eam/equipmentSpotCheckRecordDetail/equipmentSpotCheckRecordDetail.data.ts @@ -10,34 +10,28 @@ export const EquipmentSpotCheckRecordDetailRules = reactive({ }) export const EquipmentSpotCheckRecordDetail = useCrudSchemas(reactive([ - { - label: 'id', - field: 'id', - sort: 'custom', - isForm: false - }, { label: '点检工单号', field: 'number', sort: 'custom', isSearch: true }, - { - label: '主表', - field: 'masterId', - sort: 'custom', - isSearch: true, - form: { - component: 'InputNumber', - value: 0 - } - }, + // { + // label: '主表', + // field: 'masterId', + // sort: 'custom', + // isSearch: false, + // form: { + // component: 'InputNumber', + // value: 0 + // } + // }, { label: '完成时间', field: 'completionTime', sort: 'custom', formatter: dateFormatter, - isSearch: true, + isSearch: false, search: { component: 'DatePicker', componentProps: { @@ -58,27 +52,27 @@ export const EquipmentSpotCheckRecordDetail = useCrudSchemas(reactive([ - { - label: 'id', - field: 'id', - sort: 'custom', - isForm: false - }, { label: '设备编码', field: 'equipmentCode', @@ -24,19 +18,19 @@ export const EquipmentTransferRecord = useCrudSchemas(reactive([ label: '设备类型枚举', field: 'type', sort: 'custom', - dictType: DICT_TYPE.DEVICE_TYPE, - dictClass: 'string', // 默认都是字符串类型其他暂不考虑 - isSearch: true, - form: { - component: 'SelectV2' - } + dictType: DICT_TYPE.DEVICE_TYPE, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + isSearch: false, + form: { + component: 'Select' + } }, { label: '操作日期', field: 'operationDate', sort: 'custom', formatter: dateFormatter, - isSearch: true, + isSearch: false, search: { component: 'DatePicker', componentProps: { @@ -57,14 +51,14 @@ export const EquipmentTransferRecord = useCrudSchemas(reactive([ label: '操作人', field: 'operationer', sort: 'custom', - isSearch: true - }, - { - label: '原所属厂区编号', - field: 'beforeFactoryAreaCode', - sort: 'custom', - isSearch: true + isSearch: false }, + // { + // label: '原所属厂区编号', + // field: 'beforeFactoryAreaCode', + // sort: 'custom', + // isSearch: false + // }, { label: '原地点', field: 'beforeLocation', @@ -81,7 +75,7 @@ export const EquipmentTransferRecord = useCrudSchemas(reactive([ label: '原工段编号', field: 'beforeWorkshopSectionCode', sort: 'custom', - isSearch: true + isSearch: false }, { label: '现地点', @@ -89,12 +83,12 @@ export const EquipmentTransferRecord = useCrudSchemas(reactive([ sort: 'custom', isSearch: true }, - { - label: '所属厂区编号', - field: 'factoryAreaCode', - sort: 'custom', - isSearch: true - }, + // { + // label: '所属厂区编号', + // field: 'factoryAreaCode', + // sort: 'custom', + // isSearch: true + // }, { label: '车间编号', field: 'workshopCode', @@ -105,96 +99,24 @@ export const EquipmentTransferRecord = useCrudSchemas(reactive([ label: '工段编号', field: 'workshopSectionCode', sort: 'custom', - isSearch: true - }, - { - label: '创建时间', - field: 'createTime', - sort: 'custom', - formatter: dateFormatter, - isSearch: true, - 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: 'departmentCode', - sort: 'custom', - isSearch: true - }, - { - label: '备注', - field: 'remark', - sort: 'custom', - isSearch: true - }, - { - label: '地点', - field: 'siteId', - sort: 'custom', - isSearch: true - }, - { - label: '是否可用默认TRUE', - field: 'available', - sort: 'custom', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', // 默认都是字符串类型其他暂不考虑 - isSearch: true, - form: { - component: 'Switch', - value: 'TRUE', - componentProps: { - inactiveValue: 'FALSE', - activeValue: 'TRUE' - } - } - }, - { - label: '删除时间', - field: 'deletionTime', - sort: 'custom', - formatter: dateFormatter, - isSearch: true, - 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: 'deleterId', - sort: 'custom', - isSearch: true - }, - { - label: '并发乐观锁', - field: 'concurrencyStamp', - sort: 'custom', - isSearch: true, - form: { - component: 'InputNumber', - value: 0 - } - }, + isSearch: false + }, + // { + // label: '是否可用', + // field: 'available', + // sort: 'custom', + // dictType: DICT_TYPE.TRUE_FALSE, + // dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + // isSearch: false, + // form: { + // component: 'Switch', + // value: 'TRUE', + // componentProps: { + // inactiveValue: 'FALSE', + // activeValue: 'TRUE' + // } + // } + // }, { label: '操作', field: 'action', diff --git a/src/views/eam/equipmentTransferRecord/index.vue b/src/views/eam/equipmentTransferRecord/index.vue index f90ae8def..dcab8a1ec 100644 --- a/src/views/eam/equipmentTransferRecord/index.vue +++ b/src/views/eam/equipmentTransferRecord/index.vue @@ -99,9 +99,9 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultAddBtn({hasPermi:'wms:equipmentTransferRecord:create'}), // 新增 - defaultButtons.defaultImportBtn({hasPermi:'wms:equipmentTransferRecord:import'}), // 导入 - defaultButtons.defaultExportBtn({hasPermi:'wms:equipmentTransferRecord:export'}), // 导出 + defaultButtons.defaultAddBtn({hasPermi:'eam:equipment-transfer-record:create'}), // 新增 + defaultButtons.defaultImportBtn({hasPermi:'eam:equipment-transfer-record:import'}), // 导入 + defaultButtons.defaultExportBtn({hasPermi:'eam:equipment-transfer-record:export'}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 @@ -133,8 +133,8 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = [ - defaultButtons.mainListEditBtn({hasPermi:'wms:equipmentTransferRecord:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'wms:equipmentTransferRecord:delete'}), // 删除 + defaultButtons.mainListEditBtn({hasPermi:'eam:equipment-transfer-record:update'}), // 编辑 + defaultButtons.mainListDeleteBtn({hasPermi:'eam:equipment-transfer-record:delete'}), // 删除 ] // 列表-操作按钮事件 diff --git a/src/views/qms/dynamicRule/index.vue b/src/views/qms/dynamicRule/index.vue index 49e9ff621..4eb9bf10a 100644 --- a/src/views/qms/dynamicRule/index.vue +++ b/src/views/qms/dynamicRule/index.vue @@ -70,10 +70,10 @@ :apiPage="InspectionStageApi.getInspectionStagePage" :apiDelete="InspectionStageApi.deleteInspectionStage" :detailValidate="detailValidate" - @searchTableSuccessDetail="searchTableSuccessDetail" - :detailButtonIsShowEdit=true - :detailButtonIsShowAdd=true - :detailButtonIsShowDelete=true + @searchTableSuccessDetail="searchTableSuccessDetail" + :detailButtonIsShowEdit="checkPermi(['qms:inspection-stage:update'])" + :detailButtonIsShowAdd="checkPermi(['qms:inspection-stage:create'])" + :detailButtonIsShowDelete="checkPermi(['qms:inspection-stage:delete'])" @detailOpenForm="detailOpenForm" myFuncTypeSign="InspectionStage" /> @@ -91,6 +91,7 @@ import * as InspectionStageApi from '@/api/qms/inspectionStage' import * as defaultButtons from '@/utils/disposition/defaultButtons' import UploadFile from '@/components/UploadFile/src/UploadFile.vue' +import { checkPermi } from '@/utils/permission' // import TableHead from '@/components/TableHead/src/TableHead.vue' // import ImportForm from '@/components/ImportForm/src/ImportForm.vue' // import Detail from '@/components/Detail/src/Detail.vue' diff --git a/src/views/qms/selectedSet/index.vue b/src/views/qms/selectedSet/index.vue index b302283f1..63d287b40 100644 --- a/src/views/qms/selectedSet/index.vue +++ b/src/views/qms/selectedSet/index.vue @@ -72,9 +72,9 @@ :apiDelete="SelectedProjectApi.deleteSelectedProject" :detailValidate="detailValidate" @searchTableSuccessDetail="searchTableSuccessDetail" - :detailButtonIsShowEdit=true - :detailButtonIsShowAdd=true - :detailButtonIsShowDelete=true + :detailButtonIsShowEdit="checkPermi(['qms:selected-project:update'])" + :detailButtonIsShowAdd="checkPermi(['qms:selected-project:create'])" + :detailButtonIsShowDelete="checkPermi(['qms:selected-project:delete'])" @detailOpenForm="detailOpenForm" @detailBasicFormOnChange="detailBasiFormOnChange" :detailButtonIsShowFilter="false" @@ -94,6 +94,7 @@ import * as SelectedProjectApi from '@/api/qms/selectedProject' import * as DictDataApi from '@/api/system/dict/dict.data' import component from 'virtual:svg-icons-register' import * as DictTypeApi from '@/api/system/dict/dict.type' +import { checkPermi } from '@/utils/permission' // import TableHead from '@/components/TableHead/src/TableHead.vue' // import ImportForm from '@/components/ImportForm/src/ImportForm.vue' // import Detail from '@/components/Detail/src/Detail.vue' From b373bee56d421ebd65611f2ce32ba3323539f1e0 Mon Sep 17 00:00:00 2001 From: bjang03 Date: Wed, 29 May 2024 11:12:47 +0800 Subject: [PATCH 20/31] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D=201=E3=80=81.env?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=9B=9E=E9=80=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 3 --- 1 file changed, 3 deletions(-) diff --git a/.env b/.env index 4eb2fc114..74e66bb15 100644 --- a/.env +++ b/.env @@ -15,6 +15,3 @@ VITE_APP_CAPTCHA_ENABLE=true # 百度统计 VITE_APP_BAIDU_CODE = a1ff8825baa73c3a78eb96aa40325abc - -# 查看质检报告环境 -VITE_REPORT_URL = 'http://dev.ccwin-in.com:25400' From dd6bb143bb7c8bf33665aada65ac538e2e12c2ca Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Wed, 29 May 2024 11:17:35 +0800 Subject: [PATCH 21/31] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../unplannedreceipt/unplannedreceiptRequestMain/index.vue | 1 + .../unplannedreceiptRequestMain.data.ts | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue index 167761dc5..25d4b91b0 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue @@ -190,6 +190,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => } else { row['itemCode'] = val[0]['code'] row['uom'] = val[0]['uom'] + row['singlePrice'] = val[0]['price'] } } else if(formField === 'costcentreCode'){ row['costcentreCode'] = val[0]['costcentreCode'] diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts index 0df221d91..502d4cfe0 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts @@ -532,6 +532,7 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive Date: Wed, 29 May 2024 11:27:26 +0800 Subject: [PATCH 22/31] =?UTF-8?q?=E4=B8=8A=E6=9E=B6=E7=AD=96=E7=95=A5?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../strategy/upShelfStrategy/AddForm.vue | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue index c1c28fdab..48fa418c5 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue @@ -674,19 +674,23 @@ const buttonBaseClick = (val, item) => { // 获取供应商列表 const getFormSupplierList = async () => { - options.originSupplierList = await getSupplierList() + options.originSupplierList = await getSupplierList(null) options.supplierList = [...options.originSupplierList] } // 获取客户列表 const getFormCustomerList = async () => { - options.originSupplierList = await getCustomerList() + options.originSupplierList = await getCustomerList(null) options.supplierList = [...options.originSupplierList] } const filterMethod = (query: string) => { if (query) { options.supplierList = options.originSupplierList.filter((item) => { - return item.name.includes(query) + if(item.name==''){ + return item.code.includes(query) + }else{ + return item.name.includes(query) + } }) } else { options.supplierList = [...options.originSupplierList] From 3de9f01d6238913737dc67cfd8f2d57cc17b1e44 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Wed, 29 May 2024 11:32:09 +0800 Subject: [PATCH 23/31] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/processproductionRequestMain/index.ts | 30 ++++ .../processproductionRequest/index.vue | 132 +++++++++++++++--- 2 files changed, 146 insertions(+), 16 deletions(-) diff --git a/src/api/wms/processproductionRequestMain/index.ts b/src/api/wms/processproductionRequestMain/index.ts index 66a626e93..4075041cb 100644 --- a/src/api/wms/processproductionRequestMain/index.ts +++ b/src/api/wms/processproductionRequestMain/index.ts @@ -54,4 +54,34 @@ export const exportProcessproductionRequestMain = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/processproduction-request-main/get-import-template' }) +} + +// 关闭 +export const closeProcessproductionRequestMain = async (id) => { + return await request.put({ url: `/wms/processproduction-request-main/close?id=` + id }) +} + +// 重新添加 +export const reAddProcessproductionRequestMain = async (id) => { + return await request.put({ url: `/wms/processproduction-request-main/reAdd?id=` + id }) +} + +// 提交审批 +export const submitProcessproductionRequestMain = async (id) => { + return await request.put({ url: `/wms/processproduction-request-main/submit?id=` + id }) +} + +// 审批驳回 +export const refusedProcessproductionRequestMain = async (id) => { + return await request.put({ url: `/wms/processproduction-request-main/refused?id=` + id }) +} + +// 审批通过 +export const agreeProcessproductionRequestMain = async (id) => { + return await request.put({ url: `/wms/processproduction-request-main/agree?id=` + id }) +} + +// 处理 +export const handleProcessproductionRequestMain = async (id) => { + return await request.put({ url: `/wms/processproduction-request-main/handle?id=` + id }) } \ No newline at end of file diff --git a/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue b/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue index e5b6d824d..12c0c74b5 100644 --- a/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue +++ b/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue @@ -166,6 +166,16 @@ const buttonBaseClick = (val, item) => { } } + +// 根据状态返回该按钮是否显示 +const isShowMainButton = (row,val) => { + if (val.indexOf(row.status) > -1) { + return false + } else { + return true + } +} + // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 @@ -173,8 +183,14 @@ const butttondata = (row,$index) => { return [] } return [ - defaultButtons.mainListEditBtn({hasPermi:'wms:processproduction-request-main:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'wms:processproduction-request-main:delete'}), // 删除 + defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']),hasPermi:'wms:processproduction-request-main:close'}), // 关闭 + defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:transferreceipt-request-main:reAdd'}), // 重新添加 + defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:transferreceipt-request-main:submit'}), // 提交审批 + defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:transferreceipt-request-main:refused'}), // 驳回 + defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:transferreceipt-request-main:agree'}), // 审批通过 + defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:transferreceipt-request-main:handle'}), // 处理 + defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:processproduction-request-main:update'}), // 编辑 + defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:processproduction-request-main:delete'}), // 删除 ] } @@ -182,19 +198,116 @@ const buttondataTable = ref() // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { - if (val == 'edit') { // 编辑 + if (val == 'mainClose') { // 关闭 + handleClose(row.masterId) + } else if(val == 'mainReAdd'){// 重新添加 + handleReAdd(row.masterId) + } else if(val == ''){ // 提交审批 + handleSubmit(row.masterId) + } else if (val == 'mainTurnDown') { // 驳回 + handleRefused(row.masterId) + } else if (val == 'mainApprove') { // 审批通过 + handleAgree(row.masterId) + } else if (val == 'mainHandle') { // 处理 + handleHandle(row.masterId) + } else if (val == 'edit') { // 编辑 openForm('update', row) } else if (val == 'delete') { // 删除 handleDelete(row.id) } } +/** 关闭按钮操作 */ +const handleClose = async (id: number) => { + try { + await message.confirm(t('common.confirmColse')) + tableObject.loading = true + await ProcessproductionRequestMainApi.closeProcessproductionRequestMain(id) + message.success(t('common.closeSuccess')) + tableObject.loading = false + await getList() + } catch {} +} + +/** 重新添加按钮操作 */ +const handleReAdd = async (id: number) => { + try { + await message.confirm(t('common.confirmReAdd')) + tableObject.loading = true + await ProcessproductionRequestMainApi.reAddProcessproductionRequestMain(id) + message.success(t('common.reAddSuccess')) + tableObject.loading = false + await getList() + } catch {} +} + +/** 提交按钮操作 */ +const handleSubmit = async (id: number) => { + try { + await message.confirm(t('common.confirmSubmit')) + tableObject.loading = true + await ProcessproductionRequestMainApi.submitProcessproductionRequestMain(id) + message.success(t('common.submitSuccess')) + tableObject.loading = false + await getList() + } catch {} +} + +/** 审批驳回按钮操作 */ +const handleRefused = async (id: number) => { + try { + await message.confirm(t('common.confirmRefused')) + tableObject.loading = true + await ProcessproductionRequestMainApi.refusedProcessproductionRequestMain(id) + message.success(t('common.refusedSuccess')) + tableObject.loading = false + await getList() + } catch {} +} + +/** 审批通过按钮操作 */ +const handleAgree = async (id: number) => { + try { + await message.confirm(t('common.confirmAgree')) + tableObject.loading = true + await ProcessproductionRequestMainApi.agreeProcessproductionRequestMain(id) + message.success(t('common.agreeSuccess')) + tableObject.loading = false + await getList() + } catch {} +} + +/** 处理按钮操作 */ +const handleHandle = async (id: number) => { + try { + await message.confirm(t('common.confirmHandle')) + tableObject.loading = true + await ProcessproductionRequestMainApi.handleProcessproductionRequestMain(id) + message.success(t('common.handleSuccess')) + tableObject.loading = false + await getList() + } catch {} +} + /** 添加/修改操作 */ const basicFormRef = ref() const openForm = (type: string, row?: any) => { basicFormRef.value.open(type, row) } +/** 删除按钮操作 */ +const handleDelete = async (id: number) => { + try { + // 删除的二次确认 + await message.delConfirm() + // 发起删除 + await ProcessproductionRequestMainApi.deleteProcessproductionRequestMain(id) + message.success(t('common.delSuccess')) + // 刷新列表 + await getList() + } catch {} +} + // 主子数据 提交 const submitForm = async (formType, data) => { @@ -241,19 +354,6 @@ const openDetail = (row: any, titleName: any, titleValue: any) => { detailRef.value.openDetail(row, titleName, titleValue, 'basicProcessproductionRequestMain') } -/** 删除按钮操作 */ -const handleDelete = async (id: number) => { - try { - // 删除的二次确认 - await message.delConfirm() - // 发起删除 - await ProcessproductionRequestMainApi.deleteProcessproductionRequestMain(id) - message.success(t('common.delSuccess')) - // 刷新列表 - await getList() - } catch {} -} - /** 导出按钮操作 */ const exportLoading = ref(false) // 导出的加载中 const handleExport = async () => { From d7e5c76d0963acdde2606ce009bcccfb88376f69 Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Wed, 29 May 2024 11:37:38 +0800 Subject: [PATCH 24/31] =?UTF-8?q?=E4=B8=AD=E8=8B=B1=E6=96=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/locales/en-US.ts | 1 + src/locales/zh-CN.ts | 1 + 2 files changed, 2 insertions(+) diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts index 55a96a516..8716cb4cf 100644 --- a/src/locales/en-US.ts +++ b/src/locales/en-US.ts @@ -994,6 +994,7 @@ export default { 驳回:'Refusal', 审批通过:'Approve', 要货预测主:'Demand forecast master data', + 要货预测主导入模版:'Demand forecast master data leads into the template', 创建供应商发货申请:'Create a supplier shipping request', '是否重新打开所选中数据？':'Do you want to reopen the selected data?', '请先上传自检报告!':'Please upload the self-test report first!', diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index 6c12136b6..54594706f 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -994,6 +994,7 @@ export default { 驳回:'驳回', 审批通过:'审批通过', 要货预测主:'要货预测主', + 要货预测主导入模版:'要货预测主导入模版', 创建供应商发货申请:'创建供应商发货申请', '是否重新打开所选中数据？':'是否重新打开所选中数据？', '请先上传自检报告!':'请先上传自检报告!', From 7fbe40fe43a9c31c70b5e564921682cc48098a34 Mon Sep 17 00:00:00 2001 From: liuchen864 <23082234@qq.com> Date: Wed, 29 May 2024 11:50:13 +0800 Subject: [PATCH 25/31] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A3=80=E9=AA=8C?= =?UTF-8?q?=E6=96=B9=E6=A1=88=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qms/inspectionScheme/index.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/qms/inspectionScheme/index.vue b/src/views/qms/inspectionScheme/index.vue index e2cfe3f75..59dfc515c 100644 --- a/src/views/qms/inspectionScheme/index.vue +++ b/src/views/qms/inspectionScheme/index.vue @@ -89,7 +89,7 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultAddBtn({hasPermi:'qms:type-template:create'}), // 新增 + defaultButtons.defaultAddBtn({hasPermi:'qms:inspection-scheme:create'}), // 新增 defaultButtons.defaultImportBtn({hasPermi:'qms:inspection-scheme:import'}), // 导入 // defaultButtons.defaultExportBtn({hasPermi:'wms:agv-locationrelation:export'}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 @@ -131,9 +131,9 @@ const isShowMainButton = (row,val) => { const butttondata = (row) => { return [ - defaultButtons.mainListEditBtn({hasPermi: 'qms:type-template:update'}), - defaultButtons.mainListEnableBtn({hide:isShowMainButton(row,['FALSE']),hasPermi:'qms:type-template:enable'}), - defaultButtons.mainListDisableBtn({hide:isShowMainButton(row,['TRUE']),hasPermi:'qms:type-template:disable'}), + defaultButtons.mainListEditBtn({hasPermi: 'qms:inspection-scheme:update'}), + defaultButtons.mainListEnableBtn({hide:isShowMainButton(row,['FALSE']),hasPermi:'qms:inspection-scheme:enable'}), + defaultButtons.mainListDisableBtn({hide:isShowMainButton(row,['TRUE']),hasPermi:'qms:inspection-scheme:disable'}), ] } From dfeec750fca16ee2d1bf2450b292724df8c72bda Mon Sep 17 00:00:00 2001 From: ljlong_2630 Date: Wed, 29 May 2024 12:00:26 +0800 Subject: [PATCH 26/31] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=89=93=E5=8C=85bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/eam/equipmentSigning/index.vue | 263 ----------------------- 1 file changed, 263 deletions(-) delete mode 100644 src/views/eam/equipmentSigning/index.vue diff --git a/src/views/eam/equipmentSigning/index.vue b/src/views/eam/equipmentSigning/index.vue deleted file mode 100644 index 571bfccb3..000000000 --- a/src/views/eam/equipmentSigning/index.vue +++ /dev/null @@ -1,263 +0,0 @@ - - - From 1562ee7fc027401cda97d930ca74de65ba7f02be Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Wed, 29 May 2024 13:16:59 +0800 Subject: [PATCH 27/31] 404 --- src/locales/zh-CN.ts | 2 +- src/views/error/404.vue | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index 54594706f..ea7b03a7d 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -79,7 +79,7 @@ export default { }, error: { noPermission: `抱歉，您无权访问此页面。`, - pageError: '抱歉，您访问的页面不存在。', + pageError: '抱歉，您访问的页面不存在', networkError: '抱歉，服务器报告错误。', returnToHome: '返回首页' }, diff --git a/src/views/error/404.vue b/src/views/error/404.vue index 2e3f078a2..f6a08de2f 100644 --- a/src/views/error/404.vue +++ b/src/views/error/404.vue @@ -1,6 +1,5 @@