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 = { export const serviceEnv: ServiceEnv = {
dev: { dev: {
// url: 'http://huaerda-api.24yt.com', // 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://127.0.0.1:8080/',
// url: 'http://192.168.9.89:8080', // url: 'http://192.168.9.89:8080',
// url: 'http://192.168.20.80:8080', // url: 'http://192.168.20.80:8080',
@ -24,7 +24,7 @@ export const serviceEnv: ServiceEnv = {
prod: { prod: {
// url: 'http://192.168.9.149:8021' // url: 'http://192.168.9.149:8021'
// url: 'http://huaerda-api.24yt.com', // 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', kkFileUrl: 'http://kkfile.24yt.com',
// reportServerUrl: 'http://localhost:9908' // reportServerUrl: 'http://localhost:9908'
reportServerUrl: 'http://huaerda-jimu.24yt.com/' 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', // key: 'planDateEnd',
// width: 180 // width: 180
// }, // },
{
title: '创建日期',
key: 'createTime',
width: 180
},
{ {
title: '计划员', title: '计划员',
key: 'createBy', key: 'createBy',

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

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

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

@ -21,15 +21,15 @@
<n-descriptions-item :span="1" label="应入数量："> <n-descriptions-item :span="1" label="应入数量：">
{{ RecptInfo.quantityRecived }} {{ RecptInfo.quantityRecived }}
</n-descriptions-item> </n-descriptions-item>
<n-descriptions-item :span="1" label="应入数量："> <!-- <n-descriptions-item :span="1" label="应入数量：">
{{ RecptInfo.weightRecived }} {{ RecptInfo.weightRecived }}
</n-descriptions-item> </n-descriptions-item> -->
<n-descriptions-item :span="1" label="入库数量："> <n-descriptions-item :span="1" label="入库数量：">
{{ num }} {{ num }}
</n-descriptions-item> </n-descriptions-item>
<n-descriptions-item :span="1" label="入库数量："> <!-- <n-descriptions-item :span="1" label="入库数量：">
{{ weight }} {{ weight }}
</n-descriptions-item> </n-descriptions-item> -->
<n-descriptions-item :span="1" label="入库仓库："> <n-descriptions-item :span="1" label="入库仓库：">
<n-select <n-select
v-model:value="RecptInfo.warehouseId" v-model:value="RecptInfo.warehouseId"
@ -151,9 +151,10 @@ const rules: any = {};
const storageOptions = ref<{ value: string; label: string }[]>([]); const storageOptions = ref<{ value: string; label: string }[]>([]);
const { proxy } = getCurrentInstance() as any; const { proxy } = getCurrentInstance() as any;
const { wms_item_recpt_status, wms_item_recpt_type } = proxy.useDict('wms_item_recpt_status', 'wms_item_recpt_type'); 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 route = useRoute();
const router = useRouter(); const router = useRouter();
console.log(wms_item_recpt_type);
const message = useMessage(); const message = useMessage();
@ -292,6 +293,11 @@ const columns: Ref<DataTableColumns<wms.recptLineRawType.columns>> = ref([
key: 'specification', key: 'specification',
width: 120 width: 120
}, },
{
title: '颜色',
key: 'colorName',
width: 120
},
// { // {
// title: '应入数量', // title: '应入数量',
// key: 'quantityRecived', // key: 'quantityRecived',
@ -333,21 +339,21 @@ const columns: Ref<DataTableColumns<wms.recptLineRawType.columns>> = ref([
); );
} }
}, },
{ // {
title: '入库数量', // title: '入库数量',
key: 'weight', // key: 'weight',
width: 180, // width: 180,
render: row => { // render: row => {
return ( // return (
<div class="flex-center"> // <div class="flex-center">
<sapn class="color-red mr-5px">*</sapn> // <sapn class="color-red mr-5px">*</sapn>
<n-form-item path={`weight${row.recptId}`}> // <n-form-item path={`weight${row.recptId}`}>
<n-input disabled={info.value} v-model:value={row.weight}></n-input> // <n-input disabled={info.value} v-model:value={row.weight}></n-input>
</n-form-item> // </n-form-item>
</div> // </div>
); // );
} // }
}, // },
{ {
title: '仓库名称', title: '仓库名称',
key: 'warehouseName', key: 'warehouseName',
@ -592,16 +598,16 @@ const num = computed(() => {
RecptInfo.value.quantitySaved = val; RecptInfo.value.quantitySaved = val;
return val; return val;
}); });
const weight = computed(() => { // const weight = computed(() => {
const val = data.value.reduce((acc, cur) => { // const val = data.value.reduce((acc, cur) => {
const num1 = new BigNumber(acc); // const num1 = new BigNumber(acc);
const num2 = new BigNumber(cur.weight || 0); // const num2 = new BigNumber(cur.weight || 0);
return num1.plus(num2).toNumber(); // return num1.plus(num2).toNumber();
}, 0); // }, 0);
// eslint-disable-next-line vue/no-side-effects-in-computed-properties // // eslint-disable-next-line vue/no-side-effects-in-computed-properties
RecptInfo.value.weightSaved = val; // RecptInfo.value.weightSaved = val;
return val; // return val;
}); // });
// function deptSelect(_val, item) { // function deptSelect(_val, item) {
// // console.log(_val, item, '11'); // // console.log(_val, item, '11');
// salesUser(_val); // salesUser(_val);

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

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

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

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

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

@ -78,7 +78,7 @@
<my-card :title="title"> <my-card :title="title">
<template #right> <template #right>
<div style="display: flex"> <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" /> <CxColumns v-model:columns="columns" />
</div> </div>
</template> </template>
@ -449,36 +449,36 @@ function submitReprint() {
}); });
} }
function lookReport() { // function lookReport() {
let url = 'http://huaerda-jimu.24yt.com/jmreport/view/998755386337329152'; // let url = 'http://huaerda-jimu.24yt.com/jmreport/view/998755386337329152';
let searchValue = ''; // let searchValue = '';
let isAddQuestionMask = false; // let isAddQuestionMask = false;
const filterData = ['pageNum', 'pageSize', 'total', 'params[beginTime]', 'params[endTime]']; // const filterData = ['pageNum', 'pageSize', 'total', 'params[beginTime]', 'params[endTime]'];
for (const key in searchForm.value) { // for (const key in searchForm.value) {
if (searchForm.value[key] && !filterData.includes(key)) { // if (searchForm.value[key] && !filterData.includes(key)) {
if (!isAddQuestionMask) { // if (!isAddQuestionMask) {
searchValue += `?${key}=${searchForm.value[key]}`; // searchValue += `?${key}=${searchForm.value[key]}`;
isAddQuestionMask = true; // isAddQuestionMask = true;
} else { // } else {
searchValue += `&${key}=${searchForm.value[key]}`; // searchValue += `&${key}=${searchForm.value[key]}`;
} // }
} // }
} // }
if (range.value !== null) { // if (range.value !== null) {
const day = 1000 * 60 * 60 * 24; // const day = 1000 * 60 * 60 * 24;
const beginTime = formatDate(new Date(range.value[0]), 'yyyy-MM-dd'); // 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'); // const endTime = formatDate(new Date(new Date(range.value[1]).getTime() + day), 'yyyy-MM-dd');
if (isAddQuestionMask) { // if (isAddQuestionMask) {
searchValue += `&beginTime=${beginTime}&endTime=${endTime}`; // searchValue += `&beginTime=${beginTime}&endTime=${endTime}`;
} else { // } else {
searchValue = `?beginTime=${beginTime}&endTime=${endTime}`; // searchValue = `?beginTime=${beginTime}&endTime=${endTime}`;
} // }
} // }
url += searchValue; // url += searchValue;
window.open(url, '_blank'); // window.open(url, '_blank');
} // }
function search() { function search() {
if (range.value !== null) { 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: '数量', title: '数量',
key: 'totalWeight' key: 'quantityOnhand'
}, },
{ {
title: '单位', title: '单位',

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

@ -75,11 +75,11 @@
:options="typeOptions" :options="typeOptions"
/> />
</n-form-item-grid-item> </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 <n-select
v-model:value="formData.workstageId" v-model:value="formData.workstageId"
filterable filterable
placeholder="请选择机台" placeholder="请选择关联工序"
:options="workstageOptions" :options="workstageOptions"
@update:value="changeWorkstage" @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', align: 'center',
width: 100, width: 100,
key: 'createBy' key: 'createBy'
}, }
// { // {
// title: '审核人', // title: '审核人',
// align: 'center', // align: 'center',
@ -320,30 +320,30 @@ const columns: Ref<DataTableColumns<DataType>> = ref([
// width: 120, // width: 120,
// key: 'standardDiameter' // key: 'standardDiameter'
// }, // },
{ // {
title: '漆包线最大外径薄漆膜', // title: '漆包线最大外径薄漆膜',
align: 'center', // align: 'center',
width: 180, // width: 180,
key: 'wireFilmMax' // key: 'wireFilmMax'
}, // },
{ // {
title: '漆包线最大外径厚漆膜', // title: '漆包线最大外径厚漆膜',
align: 'center', // align: 'center',
width: 180, // width: 180,
key: 'wireThickMax' // key: 'wireThickMax'
}, // },
{ // {
title: '最小漆膜厚度薄漆膜', // title: '最小漆膜厚度薄漆膜',
align: 'center', // align: 'center',
width: 180, // width: 180,
key: 'wireFilmMin' // key: 'wireFilmMin'
}, // },
{ // {
title: '最小漆膜厚度厚漆膜', // title: '最小漆膜厚度厚漆膜',
align: 'center', // align: 'center',
width: 180, // width: 180,
key: 'wireThickMin' // key: 'wireThickMin'
} // }
]); ]);
const checked = ref<(string | number)[]>([]); const checked = ref<(string | number)[]>([]);

Write Preview
Loading…
Cancel
Save