From 4e2bb29096ac63837f8d2c5e25766ee094f45d6c Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 27 十二月 2023 14:35:49 +0800
Subject: [PATCH] modified: src/page/index/top/index.vue modified: src/views/common/part.vue modified: src/views/equipment/equipment/index.vue modified: src/views/equipment/metering/index.vue modified: src/views/plan/manufacturingorder/auto-operationtask.vue modified: src/views/plan/operationtask/operationtask-form.vue modified: src/views/quality/Packaging_ledger/index.vue modified: src/views/quality/packageinspect/index.vue modified: src/views/quality/processconfiguration/index.vue modified: src/views/quality/teststandard/index.vue modified: vue.config.js
---
src/views/plan/operationtask/operationtask-form.vue | 78 +++++++++++++++++++++++----------------
1 files changed, 46 insertions(+), 32 deletions(-)
diff --git a/src/views/plan/operationtask/operationtask-form.vue b/src/views/plan/operationtask/operationtask-form.vue
index 2c1d48e..e57cdc9 100644
--- a/src/views/plan/operationtask/operationtask-form.vue
+++ b/src/views/plan/operationtask/operationtask-form.vue
@@ -145,7 +145,7 @@
</el-select>
</el-form-item>
</el-col>
- <el-col :span="7">
+ <el-col :span="10">
<el-form-item label="宸ヤ綔涓績" prop="workCenter">
<el-select v-model="dataForm.workCenter" :disabled="!editable" filterable placeholder="璇烽�夋嫨宸ヤ綔涓績"
style="width:100%" @change="changeWorkCenter">
@@ -153,6 +153,16 @@
:key="index">
</el-option>
</el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="10">
+ <el-col :span="15">
+ <el-form-item label="璁″垝鏃堕棿" prop="localDateTimes">
+ <el-date-picker :class="tattimest ? 'sed' : ''" v-model="dataForm.localDateTimes"
+ type="datetimerange" range-separator="鑷�" start-placeholder="寮�濮�" end-placeholder="缁撴潫"
+ value-format="yyyy-MM-dd HH:mm:ss" @change="selectChangedplannedDate">
+ </el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
@@ -167,37 +177,34 @@
</el-col>
</el-row>
<el-row :gutter="10">
- <el-col :span="14">
- <el-form-item label="璁″垝鏃堕棿" prop="localDateTimes">
- <el-date-picker :class="tattimest ? 'sed' : ''" v-model="dataForm.localDateTimes"
- type="datetimerange" range-separator="鑷�" start-placeholder="寮�濮�" end-placeholder="缁撴潫"
- value-format="yyyy-MM-dd HH:mm:ss" @change="selectChangedplannedDate">
- </el-date-picker>
- </el-form-item>
- </el-col>
<el-col :span="10">
<el-form-item label="璁″垝鏁伴噺" prop="plannedQuantity">
<el-input v-model="dataForm.plannedQuantity" :disabled="!editable" placeholder="璁″垝鏁伴噺"
style="width:calc(100% - 30px)"></el-input>
<span>{{ dataForm.unit }}</span>
</el-form-item>
- </el-col></el-row>
- <el-row :gutter="10">
- <el-col :span="12">
- <el-form-item label="闆朵欢" prop="partName">
- <el-input v-model="dataForm.partName" placeholder="闆朵欢" disabled></el-input>
- </el-form-item>
</el-col>
- <el-col :span="6">
- <el-form-item label="闆朵欢鍙�" prop="partNo">
- <el-input v-model="dataForm.partNo" placeholder="闆朵欢鍙�" disabled></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="6">
+ <el-col :span="10">
<el-form-item label="宸ュ崟鎵�闇�鏃堕棿" prop="taskTheoreticalTime">
<el-input v-model="dataForm.taskTheoreticalTime" placeholder="宸ュ崟鎵�闇�鏃堕棿"
style="width:calc(100% - 30px)"></el-input>
<span>min</span>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="10">
+ <el-col :span="12">
+ <el-form-item label="闆朵欢" prop="partName">
+ <el-tooltip class="item" effect="dark" :content="dataForm.partName" >
+ <el-input v-model="dataForm.partName" placeholder="闆朵欢" disabled></el-input>
+ </el-tooltip>
+ </el-form-item>
+ </el-col>
+ <el-col :span="10">
+ <el-form-item label="闆朵欢鍙�" prop="partNo">
+ <el-tooltip class="item" effect="dark" :content="dataForm.partNo" >
+ <el-input v-model="dataForm.partNo" placeholder="闆朵欢鍙�" disabled></el-input>
+ </el-tooltip>
</el-form-item>
</el-col>
</el-row>
@@ -391,13 +398,13 @@
<!-- </el-table>-->
<!-- </el-card>-->
<!-- </el-tab-pane>-->
- <el-tab-pane label="宸ュ崟渚涘簲琛�" v-if="this.dataForm.id">
+ <!-- <el-tab-pane label="宸ュ崟渚涘簲琛�" v-if="this.dataForm.id">
<manufacturing-order :operationId="this.dataForm.id" ref="manufacturing"></manufacturing-order>
- </el-tab-pane>
- <el-tab-pane label="宸ュ崟鎵�闇�鐗╂枡" v-if="this.dataForm.id">
+ </el-tab-pane> -->
+ <!-- <el-tab-pane label="宸ュ崟鎵�闇�鐗╂枡" v-if="this.dataForm.id">
<operation-supply :operationId="this.dataForm.id" :routingOperationId="this.dataForm.moRoutingOperationId"
ref="manufacturing"></operation-supply>
- </el-tab-pane>
+ </el-tab-pane> -->
</el-tabs>
<span slot="footer" class="dialog-footer">
@@ -664,7 +671,7 @@
}
})
},
- changeWorkCenter() {
+ changeWorkCenter(opName) {
this.workstations = []
this.dataForm.workstationId = null
this.locationOptions = []
@@ -674,17 +681,26 @@
this.$refs.ganttIndex.init(this.workCenter)
})
- this.changeWorkCenterAction()
+ this.changeWorkCenterAction(opName)
},
- changeWorkCenterAction() {
+ changeWorkCenterAction(opName) {
if (this.dataForm.workCenter) {
const queryParamStation = Object.assign({
workCenter: this.dataForm.workCenter
})
-
+
getAllWorkstationList(queryParamStation).then((response) => {
const resData = response.data.data
if (resData && resData.length > 0) {
+ let obj = null
+ resData.forEach((ele)=>{
+ if(ele.name.indexOf(opName)>-1){
+ obj = ele
+ }
+ })
+ if(obj){
+ this.dataForm.workstationId = obj.id
+ }
this.workstations = resData
}
})
@@ -778,7 +794,6 @@
// this.dataForm.partName = this.routingList.partName
// this.dataForm.partId = this.routingList.partId
// 鍒堕�犺鍗昮orm鍒涘缓鐨勶紝鑷姩甯﹀嚭宸ュ簭
- console.log(this.routingOptions);
if (param.selectedRoutingOperationId && this.routingOptions) {
const option = this.routingOptions.find(
(e) => e.id === param.selectedRoutingOperationId
@@ -939,11 +954,10 @@
this.dataForm.operationName = routingOperation.operationName
this.dataForm.workCenter = routingOperation.workCenter
- this.changeWorkCenter()
+ this.changeWorkCenter(routingOperation.operationName)
this.dataForm.routingOperationId =
routingOperation.technologyRoutingOperationId
},
-
// 鏍规嵁宸ヤ綔绔欏垏鎹㈠簱浣�
selectLocationByWorkstation() {
this.locationOptions = []
--
Gitblit v1.9.3