xutao
/
lx-MOM-front
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

init(projects): 整体修改

Browse Source
master
xushilin 12 months ago
parent 83fd487efb
commit 5539ca35ab
10 changed files with 223 additions and 204 deletions
Show Stats Download Patch File Download Diff File

4
.env-config.ts
Unescape Escape View File

@ -5,7 +5,7 @@ type ServiceEnv = Record<ServiceEnvType, ServiceEnvConfig>;
export const serviceEnv: ServiceEnv = {
dev: {
// url: 'http://huaerda-api.24yt.com',
url: 'http://106.227.80.14:8086/',
url: 'http://106.227.80.14:8086',
// url: 'http://127.0.0.1:8080/',
// url: 'http://192.168.9.89:8080',
// url: 'http://192.168.20.80:8080',
@ -24,7 +24,7 @@ export const serviceEnv: ServiceEnv = {
prod: {
// url: 'http://192.168.9.149:8021'
// url: 'http://huaerda-api.24yt.com',
url: 'http://106.227.80.14:8086/',
url: 'http://106.227.80.14:8086',
kkFileUrl: 'http://kkfile.24yt.com',
// reportServerUrl: 'http://localhost:9908'
reportServerUrl: 'http://huaerda-jimu.24yt.com/'

5
src/views/procure/procureOrder/index.vue
Unescape Escape View File

@ -650,6 +650,11 @@ const columns: Ref<DataTableColumns<Procure.rawProcureList.columns>> = ref([
// key: 'planDateEnd',
// width: 180
// },
{
title: '创建日期',
key: 'createTime',
width: 180
},
{
title: '计划员',
key: 'createBy',

58
src/views/produce/workRecords/index.vue
Unescape Escape View File

@ -115,7 +115,7 @@
<my-card title="报工记录">
<template #right>
<div style="display: flex">
<n-button type="info" size="small" style="margin-right: 10px" @click="lookReport">查看报表</n-button>
<!-- <n-button type="info" size="small" style="margin-right: 10px" @click="lookReport">查看报表</n-button> -->
<CxColumns v-if="searchForm.taskType === 0" v-model:columns="lsColumns" />
<CxColumns v-else v-model:columns="qbColumns" />
</div>
@ -401,34 +401,34 @@ function selectTaskType(value: number) {
});
}
}
function lookReport() {
let url = 'http://huaerda-jimu.24yt.com/jmreport/view/989752370909216768';
let searchValue = '';
let isAddQuestionMask = false;
const filterData = ['pageNum', 'pageSize', 'total', 'params[beginTime]', 'params[endTime]'];
for (const key in searchForm.value) {
if (searchForm.value[key] && !filterData.includes(key)) {
if (!isAddQuestionMask) {
searchValue += `?${key}=${searchForm.value[key]}`;
isAddQuestionMask = true;
} else {
searchValue += `&${key}=${searchForm.value[key]}`;
}
}
}
if (range.value !== null) {
const day = 1000 * 60 * 60 * 24;
const beginTime = formatDate(new Date(range.value[0]), 'yyyy-MM-dd');
const endTime = formatDate(new Date(new Date(range.value[1]).getTime() + day), 'yyyy-MM-dd');
if (isAddQuestionMask) {
searchValue += `&beginTime=${beginTime}&endTime=${endTime}`;
} else {
searchValue = `?beginTime=${beginTime}&endTime=${endTime}`;
}
}
url += searchValue;
window.open(url, '_blank');
}
// function lookReport() {
// let url = 'http://huaerda-jimu.24yt.com/jmreport/view/989752370909216768';
// let searchValue = '';
// let isAddQuestionMask = false;
// const filterData = ['pageNum', 'pageSize', 'total', 'params[beginTime]', 'params[endTime]'];
// for (const key in searchForm.value) {
// if (searchForm.value[key] && !filterData.includes(key)) {
// if (!isAddQuestionMask) {
// searchValue += `?${key}=${searchForm.value[key]}`;
// isAddQuestionMask = true;
// } else {
// searchValue += `&${key}=${searchForm.value[key]}`;
// }
// }
// }
// if (range.value !== null) {
// const day = 1000 * 60 * 60 * 24;
// const beginTime = formatDate(new Date(range.value[0]), 'yyyy-MM-dd');
// const endTime = formatDate(new Date(new Date(range.value[1]).getTime() + day), 'yyyy-MM-dd');
// if (isAddQuestionMask) {
// searchValue += `&beginTime=${beginTime}&endTime=${endTime}`;
// } else {
// searchValue = `?beginTime=${beginTime}&endTime=${endTime}`;
// }
// }
// url += searchValue;
// window.open(url, '_blank');
// }
// function getList() {
// getMaterialList({ pageSize: 999 }).then(res => {

120
src/views/storage/auxiliaryProduceinfo/index.vue
Unescape Escape View File

@ -21,15 +21,15 @@
<n-descriptions-item :span="1" label="应入数量：">
{{ RecptInfo.quantityRecived }}
</n-descriptions-item>
<n-descriptions-item :span="1" label="应入数量：">
<!-- <n-descriptions-item :span="1" label="应入数量：">
{{ RecptInfo.weightRecived }}
</n-descriptions-item>
</n-descriptions-item> -->
<n-descriptions-item :span="1" label="入库数量：">
{{ num }}
</n-descriptions-item>
<n-descriptions-item :span="1" label="入库数量：">
<!-- <n-descriptions-item :span="1" label="入库数量：">
{{ weight }}
</n-descriptions-item>
</n-descriptions-item> -->
<n-descriptions-item :span="1" label="入库仓库：">
<n-select
v-model:value="RecptInfo.warehouseId"
@ -61,22 +61,22 @@
<n-select class="w-210px" :disabled="info" :options="userOptions" @update:value="headSelect"></n-select>
</n-descriptions-item>
<!-- <n-descriptions-item :span="1" label="业务部门：">
<n-tree-select
v-model:value="RecptInfo.salseDeptId"
:options="menuOptions"
label-field="label"
key-field="id"
@update:value="deptSelect"
></n-tree-select>
</n-descriptions-item>
<n-descriptions-item :span="1" label="业务员：">
<n-select
v-model:value="RecptInfo.salseBy"
class="w-210px"
:options="salesOptions"
@update:value="salseSelect"
></n-select>
</n-descriptions-item> -->
<n-tree-select
v-model:value="RecptInfo.salseDeptId"
:options="menuOptions"
label-field="label"
key-field="id"
@update:value="deptSelect"
></n-tree-select>
</n-descriptions-item>
<n-descriptions-item :span="1" label="业务员：">
<n-select
v-model:value="RecptInfo.salseBy"
class="w-210px"
:options="salesOptions"
@update:value="salseSelect"
></n-select>
</n-descriptions-item> -->
<n-descriptions-item :span="1" label="备注：">
<!-- {{ RecptInfo.remark }} -->
<n-input v-model:value="RecptInfo.remark" :disabled="info"></n-input>
@ -84,12 +84,12 @@
</n-descriptions>
</my-card>
<!-- <my-card title="搜索条件" search>
<n-form ref="formRef" inline label-width="auto" :model="searchForm" size="medium">
<n-form-item>
<component :is="useSearchBtn(search, reset)"></component>
</n-form-item>
</n-form>
</my-card> -->
<n-form ref="formRef" inline label-width="auto" :model="searchForm" size="medium">
<n-form-item>
<component :is="useSearchBtn(search, reset)"></component>
</n-form-item>
</n-form>
</my-card> -->
<my-card title="产品(物料)信息">
<template #right>
<div class="flex-center">
@ -120,11 +120,11 @@
<my-pagination v-model:search-form="searchForm" @init="init"></my-pagination>
</div>
<!-- <table-action-modal
v-model:visible="showModal"
:type="modalType"
:edit-data="editData"
:get-list="getWmsItemRecptLineData"
/> -->
v-model:visible="showModal"
:type="modalType"
:edit-data="editData"
:get-list="getWmsItemRecptLineData"
/> -->
</my-card>
</div>
</template>
@ -151,9 +151,10 @@ const rules: any = {};
const storageOptions = ref<{ value: string; label: string }[]>([]);
const { proxy } = getCurrentInstance() as any;
const { wms_item_recpt_status, wms_item_recpt_type } = proxy.useDict('wms_item_recpt_status', 'wms_item_recpt_type');
console.log(wms_item_recpt_type);
const route = useRoute();
const router = useRouter();
console.log(wms_item_recpt_type);
const message = useMessage();
@ -292,6 +293,11 @@ const columns: Ref<DataTableColumns<wms.recptLineRawType.columns>> = ref([
key: 'specification',
width: 120
},
{
title: '颜色',
key: 'colorName',
width: 120
},
// {
// title: '应入数量',
// key: 'quantityRecived',
@ -333,21 +339,21 @@ const columns: Ref<DataTableColumns<wms.recptLineRawType.columns>> = ref([
);
}
},
{
title: '入库数量',
key: 'weight',
width: 180,
render: row => {
return (
<div class="flex-center">
<sapn class="color-red mr-5px">*</sapn>
<n-form-item path={`weight${row.recptId}`}>
<n-input disabled={info.value} v-model:value={row.weight}></n-input>
</n-form-item>
</div>
);
}
},
// {
// title: '入库数量',
// key: 'weight',
// width: 180,
// render: row => {
// return (
// <div class="flex-center">
// <sapn class="color-red mr-5px">*</sapn>
// <n-form-item path={`weight${row.recptId}`}>
// <n-input disabled={info.value} v-model:value={row.weight}></n-input>
// </n-form-item>
// </div>
// );
// }
// },
{
title: '仓库名称',
key: 'warehouseName',
@ -592,16 +598,16 @@ const num = computed(() => {
RecptInfo.value.quantitySaved = val;
return val;
});
const weight = computed(() => {
const val = data.value.reduce((acc, cur) => {
const num1 = new BigNumber(acc);
const num2 = new BigNumber(cur.weight || 0);
return num1.plus(num2).toNumber();
}, 0);
// eslint-disable-next-line vue/no-side-effects-in-computed-properties
RecptInfo.value.weightSaved = val;
return val;
});
// const weight = computed(() => {
// const val = data.value.reduce((acc, cur) => {
// const num1 = new BigNumber(acc);
// const num2 = new BigNumber(cur.weight || 0);
// return num1.plus(num2).toNumber();
// }, 0);
// // eslint-disable-next-line vue/no-side-effects-in-computed-properties
// RecptInfo.value.weightSaved = val;
// return val;
// });
// function deptSelect(_val, item) {
// // console.log(_val, item, '11');
// salesUser(_val);

54
src/views/storage/finishedProductInventory/index.vue
Unescape Escape View File

@ -74,14 +74,14 @@
<n-form-item-grid-item label="规格: ">
<n-space>{{ addForm.specification }}</n-space>
</n-form-item-grid-item>
<n-form-item-grid-item label="线盘: ">
<n-form-item-grid-item label="颜色: ">
<n-space>{{ addForm.wireDisc }}</n-space>
</n-form-item-grid-item>
<n-form-item-grid-item label="当前数量: ">
<!-- <n-form-item-grid-item label="当前数量: ">
<n-space>{{ showDialogForm.totalNetWeight }}</n-space>
</n-form-item-grid-item>
</n-form-item-grid-item> -->
<n-form-item-grid-item label="当前箱数: ">
<n-space>{{ showDialogForm.totalNumber }}</n-space>
<n-space>{{ getNum(showDialogForm.totalNumber) }}</n-space>
</n-form-item-grid-item>
<n-form-item-grid-item :span="12">
<n-divider title-placement="center"></n-divider>
@ -276,30 +276,31 @@ const columns: Ref<DataTableColumns<finishedProductInventory.tableList>> = ref([
width: 100,
align: 'center'
},
// {
// title: '线盘',
// key: 'wireDisc',
// width: 200,
// align: 'center'
// },
{
title: '箱数',
key: 'totalNumber',
width: 100,
align: 'center'
},
{
title: '净重(kg)',
key: 'totalNetWeight',
width: 120,
title: '颜色',
key: 'wireDisc',
width: 200,
align: 'center'
},
{
title: '毛重(kg)',
key: 'totalGrossWeight',
width: 120,
align: 'center'
title: '箱数',
key: 'totalNumber',
width: 100,
align: 'center',
render: row => getNum(row.totalNumber)
},
// {
// title: '净重(kg)',
// key: 'totalNetWeight',
// width: 120,
// align: 'center'
// },
// {
// title: '毛重(kg)',
// key: 'totalGrossWeight',
// width: 120,
// align: 'center'
// },
{
title: '预警状态',
key: '',
@ -346,6 +347,13 @@ const columns: Ref<DataTableColumns<finishedProductInventory.tableList>> = ref([
const showColumns: Ref<DataTableColumns<finishedProductInventory.tableList>> = ref([]);
function getNum(num: number) {
if (Math.floor(Number(num) / 10) > 40) {
return Math.floor(Number(num) / 100);
}
return Math.floor(Number(num) / 10) || 1;
}
function setEarlyWarningValue(row: finishedProductInventory.tableList) {
show.value = true;
showDialogForm.value.totalNumber = 0;

72
src/views/storage/rawMaterial/index.vue
Unescape Escape View File

@ -85,7 +85,7 @@
<my-card :title="title">
<template #right>
<div style="display: flex">
<n-button type="info" size="small" style="margin-right: 10px" @click="lookReport">查看报表</n-button>
<!-- <n-button type="info" size="small" style="margin-right: 10px" @click="lookReport">查看报表</n-button> -->
<!-- <n-button type="error" size="small" style="margin-right: 10px" :disabled="checkedRowKeys.length === 0">
批量错误处理
</n-button> -->
@ -529,41 +529,41 @@ function submitEdit() {
});
}
function lookReport() {
let url = 'http://huaerda-jimu.24yt.com/jmreport/view/986870961181822976';
let searchValue = '';
let isAddQuestionMask = false;
const filterData = ['pageNum', 'pageSize', 'total', 'params[beginTime]', 'params[endTime]'];
for (const key in searchForm.value) {
if (searchForm.value[key] && !filterData.includes(key)) {
if (!isAddQuestionMask) {
searchValue += `?${key}=${searchForm.value[key]}`;
isAddQuestionMask = true;
} else {
searchValue += `&${key}=${searchForm.value[key]}`;
}
}
}
if (range.value !== null) {
const day = 1000 * 60 * 60 * 24;
const beginTime = formatDate(new Date(range.value[0]), 'yyyy-MM-dd');
const endTime = formatDate(new Date(new Date(range.value[1]).getTime() + day), 'yyyy-MM-dd');
if (isAddQuestionMask) {
searchValue += `&beginTime=${beginTime}&endTime=${endTime}`;
} else {
searchValue = `?beginTime=${beginTime}&endTime=${endTime}`;
}
}
// if (forModel.value.inDate) {
// if (isAddQuestionMask) {
// searchValue += `&inDate=${forModel.value.inDate}`;
// } else {
// searchValue = `?inDate=${forModel.value.inDate}`;
// }
// }
url += searchValue;
window.open(url, 'rawMaterial');
}
// function lookReport() {
// let url = 'http://huaerda-jimu.24yt.com/jmreport/view/986870961181822976';
// let searchValue = '';
// let isAddQuestionMask = false;
// const filterData = ['pageNum', 'pageSize', 'total', 'params[beginTime]', 'params[endTime]'];
// for (const key in searchForm.value) {
// if (searchForm.value[key] && !filterData.includes(key)) {
// if (!isAddQuestionMask) {
// searchValue += `?${key}=${searchForm.value[key]}`;
// isAddQuestionMask = true;
// } else {
// searchValue += `&${key}=${searchForm.value[key]}`;
// }
// }
// }
// if (range.value !== null) {
// const day = 1000 * 60 * 60 * 24;
// const beginTime = formatDate(new Date(range.value[0]), 'yyyy-MM-dd');
// const endTime = formatDate(new Date(new Date(range.value[1]).getTime() + day), 'yyyy-MM-dd');
// if (isAddQuestionMask) {
// searchValue += `&beginTime=${beginTime}&endTime=${endTime}`;
// } else {
// searchValue = `?beginTime=${beginTime}&endTime=${endTime}`;
// }
// }
// if (forModel.value.inDate) {
// if (isAddQuestionMask) {
// searchValue += `&inDate=${forModel.value.inDate}`;
// } else {
// searchValue = `?inDate=${forModel.value.inDate}`;
// }
// }
// url += searchValue;
// window.open(url, 'rawMaterial');
// }
const sleep = (func: any, params: any) =>
new Promise(resolve => {

58
src/views/storage/semiProduct/index.vue
Unescape Escape View File

@ -78,7 +78,7 @@
<my-card :title="title">
<template #right>
<div style="display: flex">
<n-button type="info" size="small" style="margin-right: 10px" @click="lookReport">查看报表</n-button>
<!-- <n-button type="info" size="small" style="margin-right: 10px" @click="lookReport">查看报表</n-button> -->
<CxColumns v-model:columns="columns" />
</div>
</template>
@ -449,36 +449,36 @@ function submitReprint() {
});
}
function lookReport() {
let url = 'http://huaerda-jimu.24yt.com/jmreport/view/998755386337329152';
let searchValue = '';
let isAddQuestionMask = false;
const filterData = ['pageNum', 'pageSize', 'total', 'params[beginTime]', 'params[endTime]'];
for (const key in searchForm.value) {
if (searchForm.value[key] && !filterData.includes(key)) {
if (!isAddQuestionMask) {
searchValue += `?${key}=${searchForm.value[key]}`;
isAddQuestionMask = true;
} else {
searchValue += `&${key}=${searchForm.value[key]}`;
}
}
}
// function lookReport() {
// let url = 'http://huaerda-jimu.24yt.com/jmreport/view/998755386337329152';
// let searchValue = '';
// let isAddQuestionMask = false;
// const filterData = ['pageNum', 'pageSize', 'total', 'params[beginTime]', 'params[endTime]'];
// for (const key in searchForm.value) {
// if (searchForm.value[key] && !filterData.includes(key)) {
// if (!isAddQuestionMask) {
// searchValue += `?${key}=${searchForm.value[key]}`;
// isAddQuestionMask = true;
// } else {
// searchValue += `&${key}=${searchForm.value[key]}`;
// }
// }
// }
if (range.value !== null) {
const day = 1000 * 60 * 60 * 24;
const beginTime = formatDate(new Date(range.value[0]), 'yyyy-MM-dd');
const endTime = formatDate(new Date(new Date(range.value[1]).getTime() + day), 'yyyy-MM-dd');
if (isAddQuestionMask) {
searchValue += `&beginTime=${beginTime}&endTime=${endTime}`;
} else {
searchValue = `?beginTime=${beginTime}&endTime=${endTime}`;
}
}
// if (range.value !== null) {
// const day = 1000 * 60 * 60 * 24;
// const beginTime = formatDate(new Date(range.value[0]), 'yyyy-MM-dd');
// const endTime = formatDate(new Date(new Date(range.value[1]).getTime() + day), 'yyyy-MM-dd');
// if (isAddQuestionMask) {
// searchValue += `&beginTime=${beginTime}&endTime=${endTime}`;
// } else {
// searchValue = `?beginTime=${beginTime}&endTime=${endTime}`;
// }
// }
url += searchValue;
window.open(url, '_blank');
}
// url += searchValue;
// window.open(url, '_blank');
// }
function search() {
if (range.value !== null) {

2
src/views/storage/stockControl/index.vue
Unescape Escape View File

@ -166,7 +166,7 @@ const columns: Ref<DataTableColumns<DataType>> = ref([
},
{
title: '数量',
key: 'totalWeight'
key: 'quantityOnhand'
},
{
title: '单位',

4
src/views/storage/warehouseSet/index.vue
Unescape Escape View File

@ -75,11 +75,11 @@
:options="typeOptions"
/>
</n-form-item-grid-item>
<n-form-item-grid-item v-show="formData.type === '1'" :span="1" label="关联工序" path="workstageId">
<n-form-item-grid-item :span="1" label="关联工序" path="workstageId">
<n-select
v-model:value="formData.workstageId"
filterable
placeholder="请选择机台"
placeholder="请选择关联工序"
:options="workstageOptions"
@update:value="changeWorkstage"
/>

50
src/views/technology/technologySearch/index.vue
Unescape Escape View File

@ -295,7 +295,7 @@ const columns: Ref<DataTableColumns<DataType>> = ref([
align: 'center',
width: 100,
key: 'createBy'
},
}
// {
// title: '审核人',
// align: 'center',
@ -320,30 +320,30 @@ const columns: Ref<DataTableColumns<DataType>> = ref([
// width: 120,
// key: 'standardDiameter'
// },
{
title: '漆包线最大外径薄漆膜',
align: 'center',
width: 180,
key: 'wireFilmMax'
},
{
title: '漆包线最大外径厚漆膜',
align: 'center',
width: 180,
key: 'wireThickMax'
},
{
title: '最小漆膜厚度薄漆膜',
align: 'center',
width: 180,
key: 'wireFilmMin'
},
{
title: '最小漆膜厚度厚漆膜',
align: 'center',
width: 180,
key: 'wireThickMin'
}
// {
// title: '漆包线最大外径薄漆膜',
// align: 'center',
// width: 180,
// key: 'wireFilmMax'
// },
// {
// title: '漆包线最大外径厚漆膜',
// align: 'center',
// width: 180,
// key: 'wireThickMax'
// },
// {
// title: '最小漆膜厚度薄漆膜',
// align: 'center',
// width: 180,
// key: 'wireFilmMin'
// },
// {
// title: '最小漆膜厚度厚漆膜',
// align: 'center',
// width: 180,
// key: 'wireThickMin'
// }
]);
const checked = ref<(string | number)[]>([]);

Write Preview
Loading…
Cancel
Save