From dcf9c9e0410fe1186239e3f8d6f7bdc789c08010 Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期三, 05 六月 2024 18:00:39 +0800
Subject: [PATCH] 1
---
src/views/console/product-process/process-route/addWorkmanship.vue | 71 ++++++++++++++++++++++++++++++-----
1 files changed, 61 insertions(+), 10 deletions(-)
diff --git a/src/views/console/product-process/process-route/addWorkmanship.vue b/src/views/console/product-process/process-route/addWorkmanship.vue
index e9fd4fb..dbca07a 100644
--- a/src/views/console/product-process/process-route/addWorkmanship.vue
+++ b/src/views/console/product-process/process-route/addWorkmanship.vue
@@ -2,12 +2,12 @@
* @Author: lzhe lzhe@example.com
* @Date: 2024-05-24 11:25:26
* @LastEditors: lzhe lzhe@example.com
- * @LastEditTime: 2024-05-24 15:24:10
+ * @LastEditTime: 2024-05-27 17:55:54
* @FilePath: /src/views/console/product-process/process-route/addWorking.vue
* @Description: 杩欐槸榛樿璁剧疆,璇疯缃甡customMade`, 鎵撳紑koroFileHeader鏌ョ湅閰嶇疆 杩涜璁剧疆: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
<template>
- <el-form :inline="true" :model="workmanshipForm" :rules="workmanshipRules" label-width="80px" class="form-view-data">
+ <el-form :inline="true" :model="workmanshipForm" :rules="workmanshipRules" label-width="100px" class="form-view-data">
<el-row>
<el-col :span="24">
<el-form-item label="宸ュ簭缂栧彿" prop="test0">
@@ -33,7 +33,7 @@
<el-input-number v-model="workmanshipForm.sort" :min="1" :max="10" @change="handleChange" />
</el-form-item>
</el-col>
- <el-col :span="24">
+ <el-col :span="24" v-if="workmanshipForm.processTypeName != '娴嬮噺'">
<el-form-item label="鏍囧噯鐢ㄦ椂">
<el-input v-model="workmanshipForm.d" style="width: 20%;margin-right: 12px;">
<template #suffix>澶�</template>
@@ -49,14 +49,14 @@
</el-input>
</el-form-item>
</el-col>
- <el-col :span="8">
+ <el-col :span="8" v-if="workmanshipForm.processTypeName != '娴嬮噺'">
<el-form-item label="鍑嗗宸ユ椂">
<el-input v-model="workmanshipForm.prepareTime">
<template #suffix>鍒�</template>
</el-input>
</el-form-item>
</el-col>
- <el-col :span="8">
+ <el-col :span="8" v-if="workmanshipForm.processTypeName != '娴嬮噺'">
<el-form-item label="瑁呭嵏宸ユ椂">
<el-input v-model="workmanshipForm.disassemblyTime">
<template #suffix>鍒�</template>
@@ -70,7 +70,7 @@
</el-input>
</el-form-item>
</el-col>
- <el-col :span="12">
+ <el-col :span="12" v-if="workmanshipForm.processTypeName != '娴嬮噺'">
<el-form-item label="鍔犲伐绋嬪簭">
<el-tree-select
v-if="workmanshipForm.isSelectProgramFiles"
@@ -89,12 +89,12 @@
<el-input v-if="!workmanshipForm.isSelectProgramFiles" v-model="workmanshipForm.programName"></el-input>
</el-form-item>
</el-col>
- <el-col :span="12">
+ <el-col :span="12" v-if="workmanshipForm.processTypeName != '娴嬮噺'">
<el-form-item label="">
<el-checkbox v-model="workmanshipForm.isSelectProgramFiles" label="閫夋嫨绋嬪簭鏂囦欢" size="small"/>
</el-form-item>
</el-col>
- <el-col :span="12">
+ <el-col :span="12" v-if="workmanshipForm.processTypeName != '娴嬮噺'">
<el-form-item label="宸ヨ壓鍖�">
<el-tree-select
@change = "bagIdChange"
@@ -109,6 +109,25 @@
:props="{ label: 'name' }"
style="width:100%;"
:render-after-expand="false" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="24" v-if="workmanshipForm.processTypeName == '娴嬮噺'">
+ <el-form-item label="娴嬮噺鏂瑰紡">
+ <el-checkbox-group v-model="workmanshipForm.checkListData" class="flexColumn">
+ <el-checkbox v-for="item in checkList" :label="item.name"></el-checkbox>
+ </el-checkbox-group>
+ </el-form-item>
+ <el-input-number v-model="workmanshipForm.meaMethodValue" :min="1" :max="10" />
+ <span style="margin-left: 12px;">缁存姢涓�0锛屽垯涓哄繀妫�宸ュ簭锛涚淮鎶や负闈�0锛屽垯涓洪娆℃娊妫�</span>
+ </el-col>
+ <el-col :span="24" v-if="workmanshipForm.processTypeName == '娴嬮噺'">
+ <el-form-item label="涓嶅悎鏍煎鐞嗘柟寮�">
+ <el-radio-group v-model="workmanshipForm.handlerMethod" class="flexColumn">
+ <el-radio :label="0">鍑虹嚎</el-radio>
+ <el-radio :label="1">杩旂嚎锛屼笂涓�搴忚繑宸�</el-radio>
+ <el-radio :label="2">杩旂嚎锛屾墽琛屽悗缁伐搴�</el-radio>
+ <el-radio :label="3">HMI閫夋嫨</el-radio>
+ </el-radio-group>
</el-form-item>
</el-col>
<el-col :span="24">
@@ -172,7 +191,7 @@
</el-table-column>
</el-table>
</el-col>
- <el-col :span="24">
+ <el-col :span="24" v-if="workmanshipForm.processTypeName != '娴嬮噺'">
<el-form-item label="鍒�鍏�">
<el-button type="primary" size="small" @click="isShowFirstTools = true" :disabled="isShowFirstTools">鍏宠仈鍒�鍏�</el-button>
<el-button size="small">鎵归噺鍏宠仈</el-button>
@@ -214,7 +233,7 @@
</el-row>
</el-col>
<!-- 鍒�鍏穞able -->
- <el-col :span="24">
+ <el-col :span="24" v-if="workmanshipForm.processTypeName != '娴嬮噺'">
<el-table ref="multipleTableRef" :data="tools" border style="width: 100%;" class="multipleTableRef">
<el-table-column prop="code" label="鍒�鍏风被鍨�">
<template #default="scope">
@@ -281,7 +300,11 @@
testList: [],
processCodeList: [],
processNameList: [],
+ checkList: [{name:'棰戞鎶芥',code: 0},{name: '淇″彿鎶芥',code: 1},{name: '棣栦欢妫�',code: 2},{name: '鏈欢妫�',code: 3}],
workmanshipForm: {
+ checkListData: [], //娴嬮噺
+ meaMethodValue: null, //娴嬮噺
+ handlerMethod: "", //娴嬮噺
processCode: "",
processId: "",
processName: "",
@@ -394,6 +417,18 @@
obj.id = "";
obj.fixtures = this.fixtures;
obj.tools = this.tools;
+ console.log(this.workmanshipForm.checkListData)
+ //for娴嬮噺
+ var meaMethodArray = [];
+ for (let name of this.workmanshipForm.checkListData) {
+ for (let item of this.checkList) {
+ if (item.name === name) {
+ meaMethodArray.push(item.code);
+ }
+ }
+ }
+ obj.meaMethod = meaMethodArray.join(",");
+ return;
this.$HTTP.post(`/api/blade-cps/production-craft-process/insert?versionId=${this.craftId}`,[obj]).then(res=> {
if(res.code == 200) {
this.$emit('success', obj);
@@ -518,9 +553,20 @@
setData(data) {
this.$HTTP.get(`/api/blade-cps/production-craft-process/get/${data.id}`).then(res=> {
if(res.code == 200) {
+ //for娴嬮噺
+ var meaMethodArray = [];
+ for (let name of res.data.meaMethod) {
+ for (let item of this.checkList) {
+ if (item.code === name) {
+ meaMethodArray.push(item.name);
+ }
+ }
+ }
this.workmanshipForm = res.data;
+ this.workmanshipForm.checkListData = meaMethodArray;
this.fixtures = res.data.fixtures;
this.tools = res.data.tools;
+ console.log(res.data,123)
}
})
@@ -530,4 +576,9 @@
</script>
<style scoped>
+.flexColumn {
+ display: flex;
+ flex-direction: column;
+ align-items: flex-start;
+}
</style>
\ No newline at end of file
--
Gitblit v1.9.3