Skip to content

P
pda-ui
Commit d090edfb authored by chenzj's avatar chenzj
Browse files
Options

Merge branch 'dev' of http://git.local.topsunit.com/mes/mes-ui into dev

parents 918f01c1 5ed353c6
Hide whitespace changes
Inline Side-by-side
Showing with 58 additions and 179 deletions
src/api/mes/pro/scheduleList.js
View file @ d090edfb
......@@ -35,6 +35,15 @@ export function makeSchedule(query) {
});
}
// 关联工单表查询编排表（合并重复项）
export function arrangeList(query) {
return request({
url: "/pro/arrange/list2",
method: "post",
data: query,
});
}
// 查询任务工作单元列表
export function taskWorkunitList(query) {
return request({
......
src/components/workunitSelect/single.vue
View file @ d090edfb
......@@ -30,7 +30,7 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="工作中心" prop="workstationName">
<el-form-item v-if="!workstationId" label="工作中心" prop="workstationName">
<el-input
v-model="queryParams.workstationName"
placeholder="请输入工作中心名称"
......@@ -102,6 +102,10 @@ export default {
type: String,
default: "",
},
workstationId: {
type: String | Number,
default: "",
},
workunitId: {
type: Number | undefined,
default: undefined,
......@@ -135,6 +139,7 @@ export default {
workunitName: null,
workstationId: null,
workstationName: this.workstationName,
workstationId: this.workstationId,
workunitId: null,
enableFlag: "Y",
},
......@@ -145,13 +150,15 @@ export default {
handler(newName) {
this.selectedWorkunitId = null
this.selectedRows = []
this.queryParams.workstationName = this.workstationName;
this.queryParams.workstationId = this.workstationId;
this.getList();
},
immediate: true
}
},
created() {
this.getList();
this.queryParams.workstationName = this.workstationName;
},
methods: {
/** 查询生产工单列表 */
......
src/views/mes/pro/productionSolution/components/ProogingSpecificationSheet.vue
View file @ d090edfb
......@@ -102,9 +102,9 @@
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12"
><el-form-item label="高度cm" prop="width"
><el-form-item label="高度cm" prop="height"
><el-input
v-model="form.width"
v-model="form.height"
placeholder
type="number"
:precision="2"
......@@ -113,9 +113,9 @@
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12"
><el-form-item label="宽度cm" prop="height"
><el-form-item label="宽度cm" prop="width"
><el-input
v-model="form.height"
v-model="form.width"
placeholder
type="number"
:precision="2"
......@@ -391,8 +391,8 @@
</el-select>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="角度(mm)" prop="angle">
<el-input
......@@ -435,7 +435,7 @@
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-select>
<el-radio-group v-model="form.isMould">
<el-radio
v-for="dict in dict.type.sys_yes_no"
......@@ -455,7 +455,7 @@
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-select>
<el-radio-group v-model="form.isCoding">
<el-radio
v-for="dict in dict.type.sys_yes_no"
......
src/views/mes/pro/productionSolution/proofingApply.vue
View file @ d090edfb
......@@ -32,7 +32,7 @@
</el-table-column>
<el-table-column label="组件号" align="center" prop="groupCounter" />
<el-table-column label="产品版本名称" align="center" prop="productionSolutionName" :show-overflow-tooltip="true" />
<el-table-column label="成品物料编码" align="center" prop="itemCode" />
<el-table-column label="成品物料编码" align="center" prop="sapItemCode" />
<el-table-column label="成品物料名称" align="center" prop="itemName" />
<el-table-column label="生产用途" align="center" prop="usageName" />
<el-table-column label="打样订单" align="center" prop="sapPrototypeMakeCode" />
......@@ -47,7 +47,7 @@
</el-table-column> -->
<!-- <el-table-column label="备注" align="center" prop="usageName" width="180"/> -->
<!--
<!--
<el-table-column
label="操作"
width="200px"
......
src/views/mes/pro/scheduleList/index.vue
View file @ d090edfb
......@@ -193,6 +193,7 @@
value-format="yyyy-MM-dd hh:mm:ss"
format="yyyy-MM-dd hh:mm:ss"
placeholder="请选择计划开始时间"
@blur="submitForm(scope.row)"
>
</el-date-picker>
<span v-else>{{
......@@ -215,6 +216,7 @@
value-format="yyyy-MM-dd hh:mm:ss"
format="yyyy-MM-dd hh:mm:ss"
placeholder="请选择计划结束时间"
@blur="submitForm(scope.row)"
>
</el-date-picker>
<span v-else>{{
......@@ -379,7 +381,7 @@
<!-- 排程 -->
<el-dialog
title="选择生产工单"
title="选择编排单"
:visible.sync="scheduleVisible"
width="1000px"
append-to-body
......@@ -409,7 +411,7 @@
<WorkuintSelect
ref="WorkunitSelect"
:workstationName="currentData.workstationName"
:workstationId="currentData.workstationId"
@onSelected="onWorkunitSelect"
/>
......@@ -531,8 +533,9 @@ export default {
this.getList()
},
// 获取工作单元
onWorkunitSelect(row) {
console.log(45456, row);
async onWorkunitSelect(row) {
await this.submitForm({...this.currentData, workunitId: row.workunitId})
this.$refs['WorkunitSelect'].showFlag = false
},
async hanldeGettaskWorkunitList() {
this.taskWorkunitList = []
......@@ -651,24 +654,18 @@ export default {
this.open = true
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
const {scheduleStartDate, scheduleEndDate, taskWorkunitId, remark} = this.form
const params = {scheduleStartDate, scheduleEndDate, taskWorkunitId, remark}
updateList(params).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
}
});
async submitForm(row) {
const {scheduleStartDate, scheduleEndDate, taskWorkunitId, workunitId } = row
const params = {scheduleStartDate, scheduleEndDate, taskWorkunitId, workunitId}
await updateList(params)
this.$modal.msgSuccess("修改成功");
this.getList();
},
handleSumbitScheduleList() {
if (this.$refs.orderListRef.selectedRows&&this.$refs.orderListRef.selectedRows.length > 0) {
let formData = this.$refs.orderListRef.selectedRows.map(item => {
return {
workorderId: item.workorderId,
// workorderId: item.workorderId,
arrangeCode: item.arrangeCode
}
});
......
src/views/mes/pro/scheduleList/orderList.vue
View file @ d090edfb
......@@ -9,41 +9,14 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item> -->
<el-form-item label="来源单据" prop="sourceCode">
<el-form-item label="编排单号" prop="arrangeCode">
<el-input
v-model="queryParams.sourceCode"
placeholder="请输入来源单据"
v-model="queryParams.arrangeCode"
placeholder="请输入编排单号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="产品名称" prop="productName">
<el-input
v-model="queryParams.productName"
placeholder="请输入产品名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="客户名称" prop="clientName">
<el-input
v-model="queryParams.clientName"
placeholder="请输入客户名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="需求日期" prop="requestDate">
<el-date-picker
v-model="queryParams.requestDate"
type="datetimerange"
range-separator="至"
start-placeholder="开始日期"
value-format="yyyy-MM-dd HH:mm:ss"
format="yyyy-MM-dd HH:mm:ss"
end-placeholder="结束日期">
</el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
......@@ -55,95 +28,10 @@
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" align="center"/>
<el-table-column label="工单编码" width="180" prop="workorderCode"/>
<el-table-column label="编排单号" align="center" prop="arrangeCode"/>
<el-table-column label="编排时间" align="center" prop="createTime"/>
<el-table-column label="编排人员" align="center" prop="createBy"/>
<el-table-column label="单据状态" align="center" prop="status">
<template slot-scope="scope">
<dict-tag
:options="dict.type.mes_workorder_status"
:value="scope.row.status"
/>
</template>
</el-table-column>
<el-table-column label="工单类型" align="center" prop="workorderType">
<template slot-scope="scope">
<dict-tag
:options="dict.type.mes_workorder_type"
:value="scope.row.workorderType"
/>
</template>
</el-table-column>
<el-table-column
label="组合单号"
width="180"
align="center"
prop="combinationCode"
:show-overflow-tooltip="true"
/>
<el-table-column
label="编排单号"
width="130px"
align="center"
prop="arrangeCode"
:show-overflow-tooltip="true"
/>
<el-table-column
label="订单编号"
width="140"
align="center"
prop="sourceCode"
/>
<el-table-column
label="产品编号"
width="120"
align="center"
prop="productCode"
/>
<el-table-column
label="产品名称"
width="200"
align="center"
prop="productName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="规格型号"
align="center"
prop="productSpc"
:show-overflow-tooltip="true"
/>
<el-table-column
label="需求日期"
align="center"
prop="requestDate"
width="180"
>
<template slot-scope="scope">
<span>{{ parseTime(scope.row.requestDate, "{y}-{m}-{d}") }}</span>
</template>
</el-table-column>
<el-table-column label="单位" align="center" prop="unitOfMeasure"/>
<el-table-column label="工单数量" align="center" prop="quantity"/>
<el-table-column label="调整数量" align="center" prop="quantityChanged"/>
<el-table-column
label="已生产数量"
align="center"
width="100px"
prop="quantityProduced"
/>
<el-table-column
label="批次号"
align="center"
width="100px"
prop="batchCode"
/>
<el-table-column label="客户编码" align="center" prop="clientCode"/>
<el-table-column
label="客户名称"
align="center"
prop="clientName"
:show-overflow-tooltip="true"
/>
</el-table>
<pagination
......@@ -158,12 +46,11 @@
<script>
import {
listWorkorder
} from "@/api/mes/pro/workorder";
arrangeList
} from "@/api/mes/pro/scheduleList";
export default {
name: "orderList",
dicts: ["mes_workorder_status","mes_workorder_type",],
components: { },
data() {
return {
......@@ -186,27 +73,7 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 10,
workorderCode: null,
workorderName: null,
orderSource: null,
sourceCode: null,
productId: null,
productCode: null,
productName: null,
productSpc: null,
routeName: null,
unitOfMeasure: null,
quantity: null,
quantityProduced: null,
quantityChanged: null,
quantityScheduled: null,
clientId: null,
clientCode: null,
clientName: null,
requestDate: null,
parentId: null,
ancestors: null,
statusArr: ["ORCHESTRATED"],
arrangeCode: ''
},
};
},
......@@ -220,13 +87,12 @@ export default {
/** 查询物料编码列表 */
getList() {
this.loading = true;
const params = {...this.queryParams}
if (params.requestDate&&params.requestDate.length > 0) {
params.requestDateFrom = params.requestDate[0]
params.requestDateTo = params.requestDate[1]
}
delete params.requestDate
listWorkorder(params).then((response) => {
const formdata = new FormData()
formdata.append('pageNum', this.queryParams.pageNum)
formdata.append('pageSize', this.queryParams.pageSize)
formdata.append('arrangeCode', this.queryParams.arrangeCode)
formdata.append('workorderStatus', ['ORCHESTRATED'])
arrangeList(formdata).then((response) => {
this.itemList = response.rows;
this.total = response.total;
this.loading = false;
......
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