| src/api/basicData/processRoute.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/basicData/bom/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/basicData/processRouteDataPreparate/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/mainPlan/abnormalPartNumberReport/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/mainPlan/sheetMetalOrderManage/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/mainPlan/sheetMetalRedundantReport/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/api/basicData/processRoute.js
@@ -10,6 +10,13 @@ params: query }) } // /ApsStandardProcessRouteHeader/refreshProcessRouteData export function apsRefreshProcessRouteDataList() { return request({ url: '/aps/ApsStandardProcessRouteHeader/refreshProcessRouteData', method: 'post' }) } export function apsStandardProcessRouteLineList(query) { return request({ url: '/aps/ApsStandardProcessRouteLine/list', src/views/basicData/bom/index.vue
@@ -1,64 +1,62 @@ <template> <div class="app-container"> <el-row :gutter="20"> <el-form :model="queryParams" ref="queryRef" :rules="rules" :inline="true" v-show="showSearch" :label-width="locale === 'zh' ? '90px' : '160px'" > <!-- <el-row :gutter="20"> <el-col :span="10"> --> <el-form-item :label="$t('plan.query.itemNumber')" prop="itemCode"> <el-input style="width: 210px" v-model="queryParams.itemCode" :placeholder="`${$t('common.common.placeholder')}${$t( 'plan.query.itemNumber' )}`" clearable @keyup.enter="handleQuery" /> </el-form-item> <!-- </el-col> <el-col :span="10"> --> <el-form-item :label="$t('plan.table.applicableFactories')" prop="orgCode" > <el-select clearable v-model="queryParams.orgCode" style="width: 160px" :placeholder="`${$t('common.common.placeholder')}${$t( 'plan.table.applicableFactories' )}`" <el-form :model="queryParams" ref="queryRef" :rules="rules" :inline="true" v-show="showSearch" :label-width="locale === 'zh' ? '90px' : '160px'" > <el-row :gutter="20"> <el-col :span="locale === 'zh' ? 5 : 9"> <el-form-item :label="$t('plan.query.itemNumber')" prop="itemCode"> <el-input :style="{ width: locale === 'zh' ? '140px' : '220px' }" v-model="queryParams.itemCode" :placeholder="`${$t('common.common.placeholder')}${$t( 'plan.query.itemNumber' )}`" clearable @keyup.enter="handleQuery" /> </el-form-item> </el-col> <el-col :span="locale === 'zh' ? 7 : 9"> <el-form-item :label="$t('plan.table.applicableFactories')" prop="orgCode" > <el-option v-for="plant in plantList" :key="plant.id" :label="plant.plantName" :value="plant.plantCode" <el-select clearable v-model="queryParams.orgCode" :style="{ width: locale === 'zh' ? '180px' : '240px' }" :placeholder="`${$t('common.common.placeholder')}${$t( 'plan.table.applicableFactories' )}`" > </el-option> </el-select> </el-form-item> <!-- </el-col> <el-col :span="4" style="text-align: right"> --> <el-form-item> <el-button type="primary" icon="Search" @click="handleQuery">{{ $t("common.common.query") }}</el-button> <el-button icon="Refresh" @click="resetQuery">{{ $t("common.common.reset") }}</el-button> </el-form-item> <!-- </el-col> </el-row> --> </el-form> </el-row> <el-option v-for="plant in plantList" :key="plant.id" :label="plant.plantName" :value="plant.plantCode" > </el-option> </el-select> </el-form-item> </el-col> <el-col :span="locale === 'zh' ? 11 : 6" style="text-align: right"> <el-form-item class="column-with-margin"> <el-button type="primary" icon="Search" @click="handleQuery">{{ $t("common.common.query") }}</el-button> <el-button icon="Refresh" @click="resetQuery">{{ $t("common.common.reset") }}</el-button> </el-form-item> </el-col> </el-row> </el-form> <el-row :gutter="10" class="mb8"> <el-col :span="1.5"> <el-button @@ -105,7 +103,7 @@ v-model="openDialog" width="900px" append-to-body style="height:400px;overflow:hidden;" style="height: 400px; overflow: hidden" > <HxlhTable style="width: 100%" @@ -130,7 +128,7 @@ import { listApsBomHeaderList, listApsBomLineList, listApsBomRefreshBomDataList listApsBomRefreshBomDataList, } from "@/api/basicData/bom/bom.js"; import { listAll_plant } from "@/api/basicData/plant"; import HxlhTable from "@/components/HxlhTable/index.vue"; @@ -230,7 +228,7 @@ }, }, { title: "操作", title: t("common.common.operate"), width: 100, fixed: "right", slots: { default: "buttons" }, @@ -307,15 +305,15 @@ ); async function handleRefresh() { loadingRefresh.value = true; const res = await listApsBomRefreshBomDataList() if(res.code == 200){ const res = await listApsBomRefreshBomDataList(); if (res.code == 200) { ElMessage({ message: t("plan.message.update"), type: "success", message: t("plan.message.update"), type: "success", }); loadingRefresh.value = false; getList(); }else{ } else { loadingRefresh.value = false; } } src/views/basicData/processRouteDataPreparate/index.vue
@@ -1,72 +1,71 @@ <template> <div class="app-container"> <el-row :gutter="20"> <el-form :model="queryParams" ref="queryRef" :rules="rules" :inline="true" v-show="showSearch" :label-width="locale === 'zh' ? '90px' : '160px'" > <el-row :gutter="20"> <el-col :span="9"> <el-form-item :label="$t('plan.query.itemNumber')" prop="itemCode"> <el-input style="width: 240px" v-model="queryParams.itemCode" :placeholder="`${$t('common.common.placeholder')}${$t( 'plan.query.itemNumber' )}`" clearable @keyup.enter="handleQuery" /> </el-form-item> </el-col> <el-col :span="9"> <el-form-item :label="$t('plan.table.applicableFactories')" prop="orgCode" <el-form :model="queryParams" ref="queryRef" :rules="rules" :inline="true" v-show="showSearch" :label-width="locale === 'zh' ? '90px' : '160px'" > <el-row type="flex" justify="left" :gutter="20"> <el-col :span="locale === 'zh' ? 5 : 9"> <el-form-item :label="$t('plan.query.itemNumber')" prop="itemCode"> <el-input :style="{ width: locale === 'zh' ? '140px' : '240px' }" v-model="queryParams.itemCode" :placeholder="`${$t('common.common.placeholder')}${$t( 'plan.query.itemNumber' )}`" clearable @keyup.enter="handleQuery" /> </el-form-item> </el-col> <el-col :span="locale === 'zh' ? 7 : 9"> <el-form-item :label="$t('plan.table.applicableFactories')" prop="orgCode" > <el-select clearable v-model="queryParams.orgCode" :style="{ width: locale === 'zh' ? '180px' : '260px' }" :placeholder="`${$t('common.common.placeholder')}${$t( 'plan.table.applicableFactories' )}`" > <el-select clearable v-model="queryParams.orgCode" :style="{ width: locale == 'zh' ? '160px' : '250px' }" :placeholder="`${$t('common.common.placeholder')}${$t( 'plan.table.applicableFactories' )}`" <el-option v-for="plant in plantList" :key="plant.id" :label="plant.plantName" :value="plant.plantCode" > <el-option v-for="plant in plantList" :key="plant.id" :label="plant.plantName" :value="plant.plantCode" > </el-option> </el-select> </el-form-item> </el-col> <el-col :span="6" style="text-align: right"> <el-form-item> <el-button type="primary" icon="Search" @click="handleQuery">{{ $t("common.common.query") }}</el-button> <el-button icon="Refresh" @click="resetQuery">{{ $t("common.common.reset") }}</el-button> </el-form-item> </el-col> </el-row> </el-form> </el-row> </el-option> </el-select> </el-form-item> </el-col> <el-col :span="locale === 'zh' ? 11 : 6" style="text-align: right"> <el-form-item class="column-with-margin"> <el-button type="primary" icon="Search" @click="handleQuery">{{ $t("common.common.query") }}</el-button> <el-button icon="Refresh" @click="resetQuery">{{ $t("common.common.reset") }}</el-button> </el-form-item> </el-col> </el-row> </el-form> <el-row :gutter="10" class="mb8"> <el-col :span="1.5"> <el-button type="success" plain icon="Refresh" :disabled="loadingRefresh" @click="handleRefresh" v-hasPermi="['apsPartRouteStat:edit']" v-hasPermi="['Aps:ApsStandardProcessRouteHeader:refreshProcessRouteData']" >{{ $t("common.common.update") }}</el-button > </el-col> @@ -105,7 +104,7 @@ :title="$t('common.common.viewDetails')" v-model="openDialog" width="900px" style="height:400px;overflow:hidden;" style="height: 400px; overflow: hidden" append-to-body > <HxlhTable @@ -132,6 +131,7 @@ import { apsStandardProcessRouteHeaderList, apsStandardProcessRouteLineList, apsRefreshProcessRouteDataList } from "@/api/basicData/processRoute.js"; import { listAll_shop } from "@/api/basicData/shop"; import HxlhTable from "@/components/HxlhTable/index.vue"; @@ -145,7 +145,7 @@ enabled: true, gt: 0, threshold: 50, } }; // 分页属性 const page = ref({ total: 0, @@ -158,6 +158,7 @@ const subGridOptions = ref([]); const subList = ref([]); const loading = ref(false); const loadingRefresh = ref(false); const showSearch = ref(true); const single = ref(true); const total = ref(0); @@ -241,7 +242,7 @@ }, }, { title: "操作", title: t("common.common.operate"), width: 100, fixed: "right", slots: { default: "buttons" }, @@ -332,6 +333,20 @@ }, { immediate: true, deep: true } ); async function handleRefresh() { loadingRefresh.value = true; const res = await apsRefreshProcessRouteDataList(); if (res.code == 200) { ElMessage({ message: t("plan.message.update"), type: "success", }); loadingRefresh.value = false; getList(); } else { loadingRefresh.value = false; } } function changePageNo(currentPage) { queryParams.value.pageNum = currentPage; page.value.current = currentPage; @@ -412,4 +427,7 @@ h4 { font-weight: bold; } .column-with-margin { margin-right: 0px; } </style> src/views/mainPlan/abnormalPartNumberReport/index.vue
@@ -9,10 +9,10 @@ :label-width="locale === 'zh' ? '90px' : '200px'" > <el-row type="flex" justify="left"> <el-col :span="locale === 'zh' ? 5 : 10"> <el-col :span="locale === 'zh' ? 5 : 8"> <el-form-item :label="$t('plan.query.itemNumber')" prop="itemNum"> <el-input :style="{ width: locale === 'zh' ? '140px' : '300px' }" :style="{ width: locale === 'zh' ? '140px' : '240px' }" v-model="queryParams.itemNum" :placeholder="`${$t('common.common.placeholder')}${$t('plan.query.itemNumber')}`" clearable @@ -20,13 +20,13 @@ /> </el-form-item> </el-col> <el-col :span="locale === 'zh' ? 8 : 9"> <el-col :span="locale === 'zh' ? 8 :10"> <el-form-item :label="$t('plan.query.workOrderNo')" prop="docNum" > <el-input :style="{ width: locale === 'zh' ? '140px' : '210px' }" :style="{ width: locale === 'zh' ? '140px' : '260px' }" v-model="queryParams.docNum" :placeholder="`${$t('common.common.placeholder')}${$t( 'plan.query.workOrderNo' @@ -36,7 +36,7 @@ /> </el-form-item> </el-col> <el-col :span="locale === 'zh' ? 11 : 5" style="text-align: right"> <el-col :span="locale === 'zh' ? 11 : 6" style="text-align: right"> <el-form-item class="column-with-margin"> <el-button type="primary" icon="Search" @click="handleQuery">{{ $t("common.common.query") src/views/mainPlan/sheetMetalOrderManage/index.vue
@@ -8,51 +8,63 @@ v-show="showSearch" :label-width="locale == 'zh' ? '110px' : '200px'" > <el-form-item :label="$t('plan.query.workOrderNo')" prop="workOrderNo"> <el-input :style="{ width: locale == 'zh' ? '200px' : '280px' }" v-model="queryParams.workOrderNo" :placeholder="`${$t('common.common.placeholder')}${$t( 'plan.query.workOrderNo' )}`" clearable @keyup.enter="handleQuery" /> </el-form-item> <!-- <el-row type="flex" justify="left"> <el-col :span="5"> --> <el-form-item :label="$t('plan.query.requireTraceID')" prop="requireTrackId" > <el-input :style="{ width: locale == 'zh' ? '200px' : '280px' }" v-model="queryParams.requireTrackId" :placeholder="`${$t('common.common.placeholder')}${$t( 'plan.query.requireTraceID' )}`" clearable @keyup.enter="handleQuery" /> </el-form-item> <!-- </el-col> <el-col :span="5"> --> <el-form-item :label="$t('plan.query.itemNumber')" prop="mainPartNumber"> <el-input :style="{ width: locale == 'zh' ? '200px' : '280px' }" v-model="queryParams.mainPartNumber" :placeholder="`${$t('common.common.placeholder')}${$t( 'plan.query.itemNumber' )}`" clearable @keyup.enter="handleQuery" /> </el-form-item> <el-form-item :label="$t('plan.table.delayRiskIdentification')" prop="hasDelayRisk" > <!-- <el-input <el-row type="flex" justify="left"> <el-col :span="12"> <el-form-item :label="$t('plan.query.workOrderNo')" prop="workOrderNo" > <el-input :style="{ width: '280px' }" v-model="queryParams.workOrderNo" :placeholder="`${$t('common.common.placeholder')}${$t( 'plan.query.workOrderNo' )}`" clearable @keyup.enter="handleQuery" /> </el-form-item> </el-col> <el-col :span="12"> <el-form-item :label="$t('plan.query.requireTraceID')" prop="requireTrackId" > <el-input :style="{ width: '280px' }" v-model="queryParams.requireTrackId" :placeholder="`${$t('common.common.placeholder')}${$t( 'plan.query.requireTraceID' )}`" clearable @keyup.enter="handleQuery" /> </el-form-item> </el-col> </el-row> <el-row type="flex" justify="left"> <el-col :span="12"> <el-form-item :label="$t('plan.query.itemNumber')" prop="mainPartNumber" > <el-input :style="{ width:'280px' }" v-model="queryParams.mainPartNumber" :placeholder="`${$t('common.common.placeholder')}${$t( 'plan.query.itemNumber' )}`" clearable @keyup.enter="handleQuery" /> </el-form-item> </el-col> <el-col :span="12"> <el-form-item :label="$t('plan.table.delayRiskIdentification')" prop="hasDelayRisk" > <!-- <el-input :style="{ width: locale == 'zh' ? '200px' : '280px' }" v-model="queryParams.hasDelayRisk" :placeholder="`${$t('common.common.placeholder')}${$t( @@ -61,31 +73,41 @@ clearable @keyup.enter="handleQuery" /> --> <el-select clearable v-model="queryParams.hasDelayRisk" style="width: 140px" <el-select clearable v-model="queryParams.hasDelayRisk" style="width: 280px" > <el-option v-for="item in delayRiskOptions" :key="item.value" :label="item.label" :value="item.value" /> </el-select> </el-form-item> </el-col> </el-row> <el-row> <el-col :span="24" style=" display: flex; justify-content: flex-end; align-item: center; text-align: right; " > <el-option v-for="item in delayRiskOptions" :key="item.value" :label="item.label" :value="item.value" /> </el-select> </el-form-item> <!-- </el-col> <el-col :span="14" style="text-align: right"> --> <el-form-item class="column-with-margin"> <el-button type="primary" icon="Search" @click="handleQuery">{{ $t("common.common.query") }}</el-button> <el-button icon="Refresh" @click="resetQuery">{{ $t("common.common.reset") }}</el-button> </el-form-item> <!-- </el-col> </el-row> --> <el-form-item class="column-with-margin"> <el-button type="primary" icon="Search" @click="handleQuery">{{ $t("common.common.query") }}</el-button> <el-button icon="Refresh" @click="resetQuery">{{ $t("common.common.reset") }}</el-button> </el-form-item> </el-col> </el-row> </el-form> <el-row :gutter="10" class="mb8"> @@ -296,7 +318,7 @@ const shopList = ref([]); const allShopList = ref([]); const processList = ref([]); const height = ref(document.documentElement.clientHeight - 270 + "px;"); const height = ref(document.documentElement.clientHeight - 320 + "px;"); // 表格配置-列表 const columns = ref([]); // 分页属性 @@ -426,7 +448,7 @@ }, { title: t("common.common.operate"), width: 100, width: 150, fixed: "right", slots: { default: "buttons" }, align: "center", @@ -753,7 +775,7 @@ }); loadingGenerateList.value = false; getList(); }else { } else { loadingGenerateList.value = false; } } src/views/mainPlan/sheetMetalRedundantReport/index.vue
@@ -9,25 +9,11 @@ :label-width="locale === 'zh' ? '90px' : '200px'" > <el-row type="flex" justify="left"> <el-col :span="locale === 'zh' ? 5 : 8" style="text-align:left;"> <el-form-item :label="$t('plan.query.itemNumber')" style="display:flex; justify-content:flex-start; align-item:center" prop="itemNumber"> <el-col :span="9" style="text-align:left;"> <el-form-item :label="$t('plan.query.itemNumber')" prop="itemNumber"> <el-input :style="{ width: locale === 'zh' ? '140px' : '240px' }" style="width:240px;" v-model="queryParams.itemNumber" :placeholder="`${$t('plan.placeholder.requireTraceID')}`" clearable @keyup.enter="handleQuery" /> </el-form-item> </el-col> <el-col :span="locale === 'zh' ? 8 : 8"> <el-form-item :label="$t('plan.query.workOrderNo')" prop="documentNumber" > <el-input :style="{ width: locale === 'zh' ? '140px' : '210px' }" v-model="queryParams.documentNumber" :placeholder="`${$t('common.common.placeholder')}${$t( 'plan.query.itemNumber' )}`" @@ -36,7 +22,23 @@ /> </el-form-item> </el-col> <el-col :span="locale === 'zh' ? 11 : 8" style="text-align: right"> <el-col :span="9"> <el-form-item :label="$t('plan.query.workOrderNo')" prop="documentNumber" > <el-input style="width:240px" v-model="queryParams.documentNumber" :placeholder="`${$t('common.common.placeholder')}${$t( 'plan.query.workOrderNo' )}`" clearable @keyup.enter="handleQuery" /> </el-form-item> </el-col> <el-col :span="6" style="text-align: right"> <el-form-item class="column-with-margin"> <el-button type="primary" icon="Search" @click="handleQuery">{{ $t("common.common.query")
