xins
/
hwmom-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改打包问题

Browse Source
master
夜笙歌 1 month ago
parent 4d6615cade
commit 22198670cc
9 changed files with 108 additions and 349 deletions
Show Stats Download Patch File Download Diff File

BIN
dist.zip
View File

Binary file not shown.

76
src/views/boardGenerate/nodes/form/customFormNode.vue
Unescape Escape View File

@ -0,0 +1,76 @@
<template>
<div
:style="{width:props.dimensions.width+'px',height:props.dimensions.height+'px'}">
<NodeResizer color="#fff" v-if="!props.isView && !props.isHideHandle && props.selected" @resize="resize" />
<div class="custom-node"
:style="{width:props.dimensions.width+'px',height:props.dimensions.height+'px',pointerEvents:props.isView?'auto': 'none'}">
<el-input v-model="input" placeholder="输入值" style="width: 100%;height: 100%" />
</div>
<Handle v-if="!props.isView" :id="`${props.id}.-t`" type="target" :position="Position.Left" />
<Handle v-if="!props.isView" :id="`${props.id}.-s`" type="source" :position="Position.Right" />
</div>
</template>
<script setup>
import { defineEmits, defineProps, ref } from 'vue';
import { NodeResizer } from '@vue-flow/node-resizer';
import { Handle, Position } from '@vue-flow/core';
const input = ref('');
const props = defineProps({
isView: {
type: Boolean,
required: false
},
inputData: {
type: Object,
required: false
},
id: {
type: String,
required: true
},
isHideHandle: {
type: Boolean,
required: false
},
selected: {
type: Boolean,
required: false
},
data: {
type: Object,
required: true
},
dimensions: {
type: Object,
required: true
}
});
watch(() => [JSON.parse(JSON.stringify(input.value || '')), JSON.parse(JSON.stringify(props.data.options.field))], (obj1, obj2) => {
if (JSON.stringify(obj1) !== JSON.stringify(obj2)) {
if (props.data?.options?.field) {
props.data.outputData[props.data.options.field] = input.value;
}
}
}, { deep: true, immediate: true });
watch(() => JSON.parse(JSON.stringify(props.data.options?.defaultInput || '')), (obj1, obj2) => {
if (JSON.stringify(obj1) !== JSON.stringify(obj2)) {
input.value = props.data.options.defaultInput;
if (props.data?.options?.field) {
props.data.outputData[props.data.options.field] = input.value;
}
}
}, { deep: true, immediate: true });
const emit = defineEmits(['resize']);
const resize = (e) => {
emit('resize', e, props.id);
};
</script>
<style scoped>
.custom-node {
position: absolute;
}
</style>

2
src/views/boardGenerate/tool.js
Unescape Escape View File

@ -120,5 +120,5 @@ const tool = () => {
};
export default tool;
export const options = {
isD: true
isD: false
};

2
src/views/dms/dmsBillsFaultInstance/copy.vue
Unescape Escape View File

@ -403,7 +403,7 @@ const initFormData: DmsBillsFaultInstanceForm = {
}
}
const data = reactive<PageData<DmsBillsFaultInstanceForm, DmsBillsFaultInstanceQuery>>({
form: {...initFormData},
queryParams: {

2
src/views/dms/dmsBillsFaultInstance/index.vue
Unescape Escape View File

@ -413,7 +413,7 @@ const initFormData: DmsBillsFaultInstanceForm = {
}
}
const data = reactive<PageData<DmsBillsFaultInstanceForm, DmsBillsFaultInstanceQuery>>({
form: {...initFormData},
queryParams: {

8
src/views/dms/dmsBillsLubeInstanceActivity/index.vue
Unescape Escape View File

@ -187,9 +187,9 @@ import {
DmsBillsLubeInstanceActivityForm
} from '@/api/dms/dmsBillsLubeInstanceActivity/types';
import { listDmsBillsLubeInstance } from '@/api/dms/dmsBillsLubeInstance';
import { listWfprocessactivity } from '@/api/system/common/wfprocessactivity';
import { selectPlanLubeDetailByPlanLubeId } from '@/api/dms/dmsPlanLubeDetail';
import { selectUserIdByDmsBillsLubeInstanceActivityId } from '@/api/dms/dmsBillsLubeInstanceActivity';
// import { listWfprocessactivity } from '@/api/system/common/wfprocessactivity';
// import { selectPlanLubeDetailByPlanLubeId } from '@/api/dms/dmsPlanLubeDetail';
// import { selectUserIdByDmsBillsLubeInstanceActivityId } from '@/api/dms/dmsBillsLubeInstanceActivity';
import { useUserStore } from '@/store/modules/user';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@ -319,7 +319,7 @@ const getDmsBillsLubeInstance = async () => {
// 获取流程定义
const getWfprocessActivity = async (wfProcessId: number) => {
try {
const res = await listWfprocessactivity({ wfProcessId });
// const res = await listWfprocessactivity({ wfProcessId });
wfProcessActivityList.value = res.rows;
// 更新实例节点名称

310
src/views/dms/dmsPlanRepairDetail/copy.vue
Unescape Escape View File

@ -1,310 +0,0 @@
<template>
<div class="p-2">
<transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
<div v-show="showSearch" class="mb-[10px]">
<el-card shadow="hover">
<el-form ref="queryFormRef" :model="queryParams" :inline="true">
<el-form-item label="主键标识" prop="planRepairDetailId">
<el-input v-model="queryParams.planRepairDetailId" placeholder="请输入主键标识" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="计划ID，关联dms_plan_repair的plan_maint_id" prop="planRepairId">
<el-input v-model="queryParams.planRepairId" placeholder="请输入计划ID，关联dms_plan_repair的plan_maint_id" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="检修计划明细类型(1设备 2设备类型)" prop="repairDetailTargetType">
<el-select v-model="queryParams.repairDetailTargetType" placeholder="请选择检修计划明细类型(1设备 2设备类型)" clearable >
<el-option v-for="dict in ${dictType}" :key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select>
</el-form-item>
<el-form-item label="检修计划明细ID,根据检修计划明细类型关联对应表的主键" prop="repairDetailTargetId">
<el-input v-model="queryParams.repairDetailTargetId" placeholder="请输入检修计划明细ID,根据检修计划明细类型关联对应表的主键" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="故障类别" prop="faultType">
<el-select v-model="queryParams.faultType" placeholder="请选择故障类别" clearable >
<el-option v-for="dict in fault_type" :key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select>
</el-form-item>
<el-form-item label="检修说明" prop="repairDesc">
<el-input v-model="queryParams.repairDesc" placeholder="请输入检修说明" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="检修标准" prop="repairProtocol">
<el-input v-model="queryParams.repairProtocol" placeholder="请输入检修标准" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="操作描述" prop="operationDescription">
<el-input v-model="queryParams.operationDescription" placeholder="请输入操作描述" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
</el-card>
</div>
</transition>
<el-card shadow="never">
<template #header>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['dms:dmsPlanRepairDetail:add']">新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['dms:dmsPlanRepairDetail:edit']">修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['dms:dmsPlanRepairDetail:remove']">删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['dms:dmsPlanRepairDetail:export']">导出</el-button>
</el-col>
<right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>
</el-row>
</template>
<el-table v-loading="loading" :data="dmsPlanRepairDetailList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="主键标识" align="center" prop="planRepairDetailId" v-if="columns[0].visible"/>
<el-table-column label="计划ID，关联dms_plan_repair的plan_maint_id" align="center" prop="planRepairId" v-if="columns[2].visible"/>
<el-table-column label="检修计划明细类型(1设备 2设备类型)" align="center" prop="repairDetailTargetType" v-if="columns[3].visible"/>
<el-table-column label="检修计划明细ID,根据检修计划明细类型关联对应表的主键" align="center" prop="repairDetailTargetId" v-if="columns[4].visible"/>
<el-table-column label="故障类别" align="center" prop="faultType" v-if="columns[5].visible">
<template #default="scope">
<dict-tag :options="fault_type" :value="scope.row.faultType"/>
</template>
</el-table-column>
<el-table-column label="检修说明" align="center" prop="repairDesc" v-if="columns[6].visible"/>
<el-table-column label="检修标准" align="center" prop="repairProtocol" v-if="columns[7].visible"/>
<el-table-column label="操作描述" align="center" prop="operationDescription" v-if="columns[8].visible"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<el-tooltip content="修改" placement="top">
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['dms:dmsPlanRepairDetail:edit']"></el-button>
</el-tooltip>
<el-tooltip content="删除" placement="top">
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['dms:dmsPlanRepairDetail:remove']"></el-button>
</el-tooltip>
</template>
</el-table-column>
</el-table>
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
</el-card>
<!-- 添加或修改检修计划明细对话框 -->
<el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
<el-form ref="dmsPlanRepairDetailFormRef" :model="form" :rules="rules" label-width="80px">
<el-form-item label="主键标识" prop="planRepairDetailId">
<el-input v-model="form.planRepairDetailId" placeholder="请输入主键标识" />
</el-form-item>
<el-form-item label="计划ID，关联dms_plan_repair的plan_maint_id" prop="planRepairId">
<el-input v-model="form.planRepairId" placeholder="请输入计划ID，关联dms_plan_repair的plan_maint_id" />
</el-form-item>
<el-form-item label="检修计划明细类型(1设备 2设备类型)" prop="repairDetailTargetType">
<el-select v-model="form.repairDetailTargetType" placeholder="请选择检修计划明细类型(1设备 2设备类型)">
<el-option
v-for="dict in ${dictType}"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="检修计划明细ID,根据检修计划明细类型关联对应表的主键" prop="repairDetailTargetId">
<el-input v-model="form.repairDetailTargetId" placeholder="请输入检修计划明细ID,根据检修计划明细类型关联对应表的主键" />
</el-form-item>
<el-form-item label="故障类别" prop="faultType">
<el-select v-model="form.faultType" placeholder="请选择故障类别">
<el-option
v-for="dict in fault_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="检修说明" prop="repairDesc">
<el-input v-model="form.repairDesc" placeholder="请输入检修说明" />
</el-form-item>
<el-form-item label="检修标准" prop="repairProtocol">
<el-input v-model="form.repairProtocol" placeholder="请输入检修标准" />
</el-form-item>
<el-form-item label="操作描述" prop="operationDescription">
<el-input v-model="form.operationDescription" placeholder="请输入操作描述" />
</el-form-item>
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</template>
</el-dialog>
</div>
</template>
<script setup name="DmsPlanRepairDetail" lang="ts">
import { listDmsPlanRepairDetail, getDmsPlanRepairDetail, delDmsPlanRepairDetail, addDmsPlanRepairDetail, updateDmsPlanRepairDetail } from '@/api/dms/dmsPlanRepairDetail';
import { DmsPlanRepairDetailVO, DmsPlanRepairDetailQuery, DmsPlanRepairDetailForm } from '@/api/dms/dmsPlanRepairDetail/types';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { fault_type } = toRefs<any>(proxy?.useDict('fault_type'));
const dmsPlanRepairDetailList = ref<DmsPlanRepairDetailVO[]>([]);
const buttonLoading = ref(false);
const loading = ref(true);
const showSearch = ref(true);
const ids = ref<Array<string | number>>([]);
const single = ref(true);
const multiple = ref(true);
const total = ref(0);
const queryFormRef = ref<ElFormInstance>();
const dmsPlanRepairDetailFormRef = ref<ElFormInstance>();
const dialog = reactive<DialogOption>({
visible: false,
title: ''
});
// 列显隐信息
const columns = ref<FieldOption[]>([
{ key: 0, label: `主键标识`, visible: true },
{ key: 1, label: `租户编号`, visible: true },
{ key: 2, label: `计划ID，关联dms_plan_repair的plan_maint_id`, visible: true },
{ key: 3, label: `检修计划明细类型(1设备 2设备类型)`, visible: true },
{ key: 4, label: `检修计划明细ID,根据检修计划明细类型关联对应表的主键`, visible: true },
{ key: 5, label: `故障类别`, visible: true },
{ key: 6, label: `检修说明`, visible: true },
{ key: 7, label: `检修标准`, visible: true },
{ key: 8, label: `操作描述`, visible: true },
{ key: 9, label: `创建部门`, visible: true },
{ key: 10, label: `创建人`, visible: true },
{ key: 11, label: `创建时间`, visible: true },
{ key: 12, label: `更新人`, visible: true },
{ key: 13, label: `更新时间`, visible: true },
]);
const initFormData: DmsPlanRepairDetailForm = {
planRepairDetailId: undefined,
planRepairId: undefined,
repairDetailTargetType: undefined,
repairDetailTargetId: undefined,
faultType: undefined,
repairDesc: undefined,
repairProtocol: undefined,
operationDescription: undefined,
}
const data = reactive<PageData<DmsPlanRepairDetailForm, DmsPlanRepairDetailQuery>>({
form: {...initFormData},
queryParams: {
pageNum: 1,
pageSize: 10,
planRepairDetailId: undefined,
planRepairId: undefined,
repairDetailTargetType: undefined,
repairDetailTargetId: undefined,
faultType: undefined,
repairDesc: undefined,
repairProtocol: undefined,
operationDescription: undefined,
params: {
}
},
rules: {
}
});
const { queryParams, form, rules } = toRefs(data);
/** 查询检修计划明细列表 */
const getList = async () => {
loading.value = true;
const res = await listDmsPlanRepairDetail(queryParams.value);
dmsPlanRepairDetailList.value = res.rows;
total.value = res.total;
loading.value = false;
}
/** 取消按钮 */
const cancel = () => {
reset();
dialog.visible = false;
}
/** 表单重置 */
const reset = () => {
form.value = {...initFormData};
dmsPlanRepairDetailFormRef.value?.resetFields();
}
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.value.pageNum = 1;
getList();
}
/** 重置按钮操作 */
const resetQuery = () => {
queryFormRef.value?.resetFields();
handleQuery();
}
/** 多选框选中数据 */
const handleSelectionChange = (selection: DmsPlanRepairDetailVO[]) => {
ids.value = selection.map(item => item.planRepairDetailId);
single.value = selection.length != 1;
multiple.value = !selection.length;
}
/** 新增按钮操作 */
const handleAdd = () => {
reset();
dialog.visible = true;
dialog.title = "添加检修计划明细";
}
/** 修改按钮操作 */
const handleUpdate = async (row?: DmsPlanRepairDetailVO) => {
reset();
const _planRepairDetailId = row?.planRepairDetailId || ids.value[0]
const res = await getDmsPlanRepairDetail(_planRepairDetailId);
Object.assign(form.value, res.data);
dialog.visible = true;
dialog.title = "修改检修计划明细";
}
/** 提交按钮 */
const submitForm = () => {
dmsPlanRepairDetailFormRef.value?.validate(async (valid: boolean) => {
if (valid) {
buttonLoading.value = true;
if (form.value.planRepairDetailId) {
await updateDmsPlanRepairDetail(form.value).finally(() => buttonLoading.value = false);
} else {
await addDmsPlanRepairDetail(form.value).finally(() => buttonLoading.value = false);
}
proxy?.$modal.msgSuccess("操作成功");
dialog.visible = false;
await getList();
}
});
}
/** 删除按钮操作 */
const handleDelete = async (row?: DmsPlanRepairDetailVO) => {
const _planRepairDetailIds = row?.planRepairDetailId || ids.value;
await proxy?.$modal.confirm('是否确认删除检修计划明细编号为"' + _planRepairDetailIds + '"的数据项？').finally(() => loading.value = false);
await delDmsPlanRepairDetail(_planRepairDetailIds);
proxy?.$modal.msgSuccess("删除成功");
await getList();
}
/** 导出按钮操作 */
const handleExport = () => {
proxy?.download('dms/dmsPlanRepairDetail/export', {
...queryParams.value
}, `dmsPlanRepairDetail_${new Date().getTime()}.xlsx`)
}
onMounted(() => {
getList();
});
</script>

7
src/views/mes/baseMaterialInfo/addMaterialInWMS.vue
Unescape Escape View File

@ -506,17 +506,10 @@ const getMaterialCategorySelect = async () => {
mategoryOptions.value = res.data;
};
//获取物料大类下拉框
let mategoryOptions = ref([]);
const getMaterialCategorySelect = async () => {
const res = await getBaseMaterialCategoryListInWMS(null);
mategoryOptions.value = res.data;
};
defineExpose({tableRef})
onMounted(() => {
getMaterialCategorySelect();
getList();
getMaterialCategorySelect();
});
</script>

2
src/views/wms/allocateOrderDetail/indexbackuo.vue
Unescape Escape View File

@ -216,7 +216,7 @@ const columns = ref<FieldOption[]>([
// aoId: undefined,
// allocateOrderCode: undefined,
// materialCategoryId: undefined,
materialCategoryName: undefined,//字段映射
// materialCategoryName: undefined,//字段映射
// planWarehouseId: undefined,
// orderStatus: undefined,
// targetWarehouseId: undefined,

Write Preview
Loading…
Cancel
Save