Skip to content

M
mes-ui
Commit b6407ce9 authored by 沈翠玲's avatar 沈翠玲
Browse files
Options

生产排产和生产版本和生产工单

parent e37bb346
Hide whitespace changes
Inline Side-by-side
Showing with 163 additions and 30 deletions
src/components/productionSolution/index.vue
View file @ b6407ce9
......@@ -37,6 +37,7 @@
<el-tabs type="border-card" style="margin-top: 30px">
<el-tab-pane :label="$t('工序')">
<el-table v-loading="processLoading" :data="processList">
<el-table-column :label="$t('工序序号')" align="center" fixed prop="idx" />
<el-table-column :label="$t('工序编码')" width="120px" fixed align="center" prop="processCode" />
<el-table-column :label="$t('工序名称')" width="150px" fixed align="center" prop="processName" />
<el-table-column :label="$t('标准工时')" width="150px" align="center" prop="stdWorkingTime" />
......
src/i18n/lang/th_TH.json
View file @ b6407ce9
......@@ -2967,5 +2967,16 @@
"请选择标签模板": "โปรดเลือกแม่แบบฉลาก",
"没有配置标签模版": "ไม่มีการกำหนดค่าลายฉลุฉลาก",
"是否允许超报": "ไม่ว่าจะเป็นการอนุญาตให้มีการโอเวอร์พาร์",
"工艺路线更新": "การปรับปรุงเส้นทางกระบวนการ"
"工艺路线更新": "การปรับปรุงเส้นทางกระบวนการ",
"工序序号": "หมายเลขลำดับขั้นตอน",
"订单单别": "ใบสั่งซื้อ",
"订单单号": "หมายเลขใบสั่ง",
"订单序号": "หมายเลขลำดับการสั่งซื้อ",
"客户图号": "หมายเลขแผนภาพของลูกค้า",
"客户项目号": "หมายเลขสินค้าของลูกค้า",
"内部图号": "หมายเลขแผนภาพภายใน",
"是否紧急": "ไม่ว่าจะเป็นเรื่องเร่งด่วน",
"是否委外": "ไม่ว่าจะเป็นนอกสภา",
"订单项次": "รายการสั่งซื้อ",
"订单号": "หมายเลขการสั่งซื้อ"
}
\ No newline at end of file
src/i18n/lang/zh_CN.json
View file @ b6407ce9
......@@ -2967,5 +2967,16 @@
"请选择标签模板": "请选择标签模板",
"没有配置标签模版": "没有配置标签模版",
"是否允许超报": "是否允许超报",
"工艺路线更新": "工艺路线更新"
"工艺路线更新": "工艺路线更新",
"工序序号": "工序序号",
"订单单别": "订单单别",
"订单单号": "订单单号",
"订单序号": "订单序号",
"客户图号": "客户图号",
"客户项目号": "客户项目号",
"内部图号": "内部图号",
"是否紧急": "是否紧急",
"是否委外": "是否委外",
"订单项次": "订单项次",
"订单号": "订单号"
}
src/views/mes/pro/productionSolution/components/ProogingProcess.vue
View file @ b6407ce9
......@@ -36,7 +36,11 @@
</el-button>
</template>
</el-table-column>
<!-- <el-table-column :label="$t('role.idx')" type="index" align="center" /> -->
<el-table-column :label="$t('工序序号')" type="idx" align="center" >
<template slot-scope="scope">
{{ ((scope.$index + 1) * 10).toString().padStart(4, '0') }}
</template>
</el-table-column>
<el-table-column :label="$t('工序名称')" prop="processName" align="center" width="160">
<template slot-scope="scope">
<el-select v-model="scope.row.processName" filterable :disabled="mode == 'info'"
......@@ -540,7 +544,7 @@ export default {
workstationCode: null,
stdWorkingTime: null,
lineBreakTime: null,
stdWorkingTimeUom: null,
stdWorkingTimeUom: 'SECOND',
outsourced: 'N',
unitOfMeasure: null,
keyFlag: 'N',
......@@ -569,7 +573,7 @@ export default {
employeesNum: "",
stdWorkingTime: "",
lineBreakTime: "",
stdWorkingTimeUom: "",
stdWorkingTimeUom: "SECOND",
procurementInformationId: "",
vendorSubjectId: "",
netPrice: "",
......@@ -755,6 +759,9 @@ export default {
if (isNULL) {
return isNULL
}
this.tableData.forEach((item, index) => {
item['idx'] = ((index + 1) * 10).toString().padStart(4, '0')
})
return this.tableData.filter(v => v && v.processName && v.workstationId && v.stdWorkingTime );
},
/**重置表单 */
......@@ -776,7 +783,7 @@ export default {
employeesNum: "",
stdWorkingTime: "",
lineBreakTime: "",
stdWorkingTimeUom: "",
stdWorkingTimeUom: "SECOND",
procurementInformationId: "",
vendorSubjectId: "",
netPrice: "",
......
src/views/mes/pro/productionSolution/proofingApply.vue
View file @ b6407ce9
......@@ -7,11 +7,6 @@
<el-form-item :label="$t('成品物名称')" prop="itemName">
<el-input v-model="queryParams.itemName" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item :label="$t('打样订单号')" prop="sapPrototypeMakeCode">
<el-input v-model="queryParams.sapPrototypeMakeCode" clearable
@keyup.enter.native="handleQuery">
</el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{ $t('common.search') }}</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{ $t('common.reset') }}</el-button>
......@@ -33,8 +28,6 @@
<el-table-column :label="$t('产品版本名称')" align="center" prop="productionSolutionName" :show-overflow-tooltip="true" />
<el-table-column :label="$t('成品物料编码')" align="center" prop="itemCode" />
<el-table-column :label="$t('成品物料名称')" align="center" prop="itemName" />
<el-table-column :label="$t('生产用途')" align="center" prop="usageName" />
<el-table-column :label="$t('打样订单')" align="center" prop="sapPrototypeMakeCode" />
<el-table-column :label="$t('common.remark')" align="center" prop="remark" />
<!-- <el-table-column :label="$t('common.status')" align="center" width="100" prop="status">
<template slot-scope="scope">
......@@ -137,7 +130,6 @@ export default {
productionSolutionId: null, // 可以查简称与英文名
productionSolutionCode: null,
productionSolutionName: null,
sapPrototypeMakeCode: null,
statsu: "PREPARE",
itemId: null,
routeId: null,
......@@ -193,7 +185,6 @@ export default {
productionSolutionId: null,
productionSolutionCode: null,
productionSolutionName: null,
sapPrototypeMakeCode: null,
itemId: null,
routeId: null,
usageId: null,
......
src/views/mes/pro/scheduleList/index.vue
View file @ b6407ce9
......@@ -81,6 +81,22 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="$t('项目号')" prop="customerProjectNo">
<el-input
v-model="queryParams.customerProjectNo"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="$t('订单号')" prop="orderCode">
<el-input
v-model="queryParams.orderCode"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="$t('计划开始时间段')" label-width="130px" prop="scheduleStartDate">
<el-date-picker
v-model="queryParams.scheduleStartDate"
......@@ -246,6 +262,8 @@
}}</span>
</template>
</el-table-column>
<el-table-column :label="$t('项目号')" align="center" prop="customerProjectNo"/>
<el-table-column :label="$t('订单号')" align="center" prop="orderCode"/>
<!-- <el-table-column
:label="$t('common.option')"
width="150px"
......@@ -566,6 +584,8 @@ export default {
arrangeUsername: null,
workorderCode: null,
processName: null,
customerProjectNo: null,
orderCode: null,
statusArr: ['PREPARE'],
scheduleStartDate: null,
scheduleEndDate: null,
......
src/views/mes/pro/scheduleList/orderList.vue
View file @ b6407ce9
......@@ -25,6 +25,30 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="$t('项目号')" prop="customerProjectNo">
<el-input
v-model="queryParams.customerProjectNo"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="$t('订单号')" prop="orderCode">
<el-input
v-model="queryParams.orderCode"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="$t('订单项次')" prop="orderSerial">
<el-input
v-model="queryParams.orderSerial"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{ $t('common.search') }}</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{ $t('common.reset') }}</el-button>
......@@ -51,7 +75,7 @@
<el-table-column :label="$t('产品名称')" align="center" prop="productName"/>
<el-table-column :label="$t('预交日期')" align="center" prop="requestDate"/>
<el-table-column :label="$t('未排数量')" align="center" prop="disQuantity"/>
<el-table-column :label="$t('本次数量')" align="center" prop="scheduleQuantity">
<el-table-column :label="$t('本次数量')" align="center" prop="scheduleQuantity" width="160">
<template slot-scope="scope">
<el-input-number style="width: 140px;"
v-model="scope.row.scheduleQuantity"
......@@ -60,7 +84,9 @@
/>
</template>
</el-table-column>
<el-table-column :label="$t('项目号')" align="center" prop="customerProjectNo"/>
<el-table-column :label="$t('订单号')" align="center" prop="orderCode"/>
<el-table-column :label="$t('订单项次')" align="center" prop="orderSerial"/>
</el-table>
<pagination
......@@ -107,7 +133,10 @@ export default {
pageSize: 50,
workorderCode: '',
productCode: '',
productName: ''
productName: '',
customerProjectNo: '',
orderCode: '',
orderSerial: ''
},
};
},
......
src/views/mes/pro/workorder/components/ProogingProcess.vue
View file @ b6407ce9
<template>
<div>
<el-table :data="tableData">
<el-table-column :label="$t('role.idx')" prop="idx" width="80" align="center" />
<el-table-column :label="$t('工序序号')" prop="idx" width="80" align="center" />
<el-table-column :label="$t('工序编码')" prop="processCode" width="150" align="center" />
<el-table-column :label="$t('工序名称')" prop="processName" align="center" />
<el-table-column :label="$t('工序顺序')" prop="idx" align="center" />
<el-table-column :label="$t('common.workstation_code')" prop="workstationCode" width="150" align="center" />
<el-table-column :label="$t('common.workstation')" prop="workstationName" align="center" />
<el-table-column v-if="mode === 'make'" :label="$t('common.workunit_name')" width="200" prop="workunitName" align="center" >
......@@ -24,15 +23,12 @@
<el-table-column :label="$t('工时单位')" prop="stdWorkingTimeUom" align="center" />
<el-table-column :label="$t('基本数量')" prop="quantity" align="center" />
<el-table-column :label="$t('委外数量')" prop="assistQuantity" align="center" />
<el-table-column :label="$t('加工方式')" prop="controlCode" align="center">
<el-table-column :label="$t('是否委外')" align="center" prop="outsourced" >
<template slot-scope="scope">
<dict-tag
:options="dict.type.process_control_code"
:value="scope.row.controlCode"
/>
{{scope.row.outsourced === 'Y' ? $t('是') : $t('否')}}
</template>
</el-table-column>
<el-table-column :label="$t('标准文本代码')" prop="x" width="150" align="center" />
</el-table-column>
<el-table-column :label="$t('备注')" prop="remark" width="150" align="center" />
<el-table-column width="220" v-if="mode === 'make'" :label="$t('开始时间')" align="center" prop="startTime" >
<template slot-scope="scope">
<el-date-picker
......
src/views/mes/pro/workorder/indexApply.vue
View file @ b6407ce9
......@@ -61,14 +61,14 @@
</el-select>
</el-form-item>
<!-- <el-form-item label="工单类型" prop="workorderType">
<el-form-item label="项目号" prop="customerProjectNo">
<el-input
v-model="queryParams.workorderType"
v-model="queryParams.customerProjectNo"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> -->
</el-form-item>
<el-form-item :label="$t('需求日期')">
<el-date-picker v-model="daterangePurchaseDate" value-format="yyyy-MM-dd" type="daterange" range-separator="-"
:start-placeholder="$t('common.start_date')" :end-placeholder="$t('common.end_date')"></el-date-picker>
......@@ -184,6 +184,16 @@
<dict-tag :options="dict.type.mes_workorder_status" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column :label="$t('订单项次')" width="140" align="center" prop="orderSerial" />
<el-table-column :label="$t('项目号')" width="140" align="center" prop="customerProjectNo" />
<el-table-column :label="$t('订单单别')" width="140" align="center" prop="orderType" />
<el-table-column :label="$t('订单单号')" width="140" align="center" prop="orderCode" />
<el-table-column :label="$t('订单序号')" width="140" align="center" prop="orderSerial" />
<el-table-column :label="$t('客户图号')" width="140" align="center" prop="customerDrawingNo" />
<el-table-column :label="$t('客户项目号')" width="140" align="center" prop="customerProjectNo" />
<el-table-column :label="$t('内部图号')" width="140" align="center" prop="inDrawingNo" />
<el-table-column :label="$t('是否紧急')" width="140" align="center" prop="rushOrder" />
<el-table-column :label="$t('工单类型')" align="center" prop="workorderType">
<template slot-scope="scope">
<dict-tag :options="dict.type.mes_workorder_type" :value="scope.row.workorderType" />
......@@ -644,6 +654,7 @@ export default {
sapItemCode: null,
// sourceCode: null,
productId: null,
customerProjectNo: null,
productCode: null,
productName: null,
productSpc: null,
......
src/views/mes/pro/workorder/proofingInfo.vue
View file @ b6407ce9
......@@ -51,6 +51,62 @@
/>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item :label="$t('订单单别')" prop="orderType">
<el-input
v-model="form.orderType"
disabled
/>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item :label="$t('订单单号')" prop="orderCode">
<el-input
v-model="form.orderCode"
disabled
/>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item :label="$t('订单序号')" prop="orderSerial">
<el-input
v-model="form.orderSerial"
disabled
/>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item :label="$t('客户图号')" prop="customerDrawingNo">
<el-input
v-model="form.customerDrawingNo"
disabled
/>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item :label="$t('客户项目号')" prop="customerProjectNo">
<el-input
v-model="form.customerProjectNo"
disabled
/>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item :label="$t('内部图号')" prop="inDrawingNo">
<el-input
v-model="form.inDrawingNo"
disabled
/>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item :label="$t('是否紧急')" prop="rushOrder">
<el-input
v-model="form.rushOrder"
disabled
/>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item :label="$t('工单类型')" prop="workorderType">
<el-select :disabled="mode == 'make'" v-model="form.workorderType">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment