From 57214d3ef6e7a32685b791ff3c8f1fc49539e055 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期四, 14 十二月 2023 22:59:10 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/technology/operation/operation-form.vue | 135 ++++++++-------------------------------------
1 files changed, 24 insertions(+), 111 deletions(-)
diff --git a/src/views/technology/operation/operation-form.vue b/src/views/technology/operation/operation-form.vue
index d6bd9e4..85832ba 100644
--- a/src/views/technology/operation/operation-form.vue
+++ b/src/views/technology/operation/operation-form.vue
@@ -6,7 +6,7 @@
<h2>缂栬緫-宸ュ簭</h2>
</div>
<div class="btn-group header-right">
- <el-button :disabled="isSubmit" v-thinclick="`dataFormSubmit`"
+ <el-button type="primary" :disabled="isSubmit" v-thinclick="`dataFormSubmit`"
>淇濆瓨</el-button
>
</div>
@@ -14,50 +14,38 @@
<div class="page-main">
<div class="operation-basic">
<el-form
- :inline="true"
+ style="width:100%"
:model="dataForm"
:rules="dataRule"
ref="dataForm"
label-width="100px"
- class="l-mes form-content"
- >
+ class="l-mes">
<el-row class="first-row">
- <el-col :span="24">
+ <el-col :span="6">
<el-form-item label="宸ュ簭鍚嶇О" prop="name">
<el-input
+ style="width:100%"
v-model="dataForm.name"
placeholder="宸ュ簭鍚嶇О"
></el-input>
</el-form-item>
+ </el-col>
+ <el-col :span="6">
<el-form-item label="宸ュ簭缂栧彿" prop="operationNo">
<el-input
+ style="width:100%"
v-model="dataForm.operationNo"
placeholder="宸ュ簭缂栧彿"
></el-input>
</el-form-item>
- <!-- <el-form-item label="闆朵欢鏃�" prop="partFamilyId">
- <el-select
- v-model="dataForm.partFamilyId"
- filterable
- placeholder="璇烽�夋嫨"
- style="width: 100%;"
- >
- <el-option
- v-for="(item, index) in this.partFamilyOptions"
- :key="index"
- :label="item.partFamilyName"
- :value="item.id"
- >
- </el-option>
- </el-select>
- </el-form-item> -->
+ </el-col>
+ <el-col :span="6">
<el-form-item label="宸ヤ綔涓績" prop="workCenter">
<el-select
v-model="dataForm.workCenter"
placeholder="宸ヤ綔涓績"
style="width: 100%"
- filterable
- >
+ filterable >
<el-option
v-for="item in workCenterOptions"
:key="item.id"
@@ -66,18 +54,8 @@
/>
</el-select>
</el-form-item>
- <!-- <el-form-item label="鏈哄櫒杩愯浆鍥犵礌" prop="machRunFactor">
- <el-input
- v-model="dataForm.machRunFactor"
- placeholder="鏈哄櫒杩愯浆鍥犵礌"
- ></el-input>
- </el-form-item>
- <el-form-item label="鏈哄櫒璁剧疆鏃堕棿" prop="machSetupTime">
- <el-input
- v-model="dataForm.machSetupTime"
- placeholder="鏈哄櫒璁剧疆鏃堕棿"
- ></el-input>
- </el-form-item> -->
+ </el-col>
+ <el-col :span="6">
<el-form-item label="浜哄伐绫诲埆" prop="laborClassNo">
<el-select
v-model="dataForm.laborClassNo"
@@ -94,95 +72,30 @@
</el-option>
</el-select>
</el-form-item>
- <!-- <el-form-item label="鍔冲姏杩愯浆鍥犵礌" prop="laborRunFactor">
- <el-input
- v-model="dataForm.laborRunFactor"
- placeholder="鍔冲姏杩愯浆鍥犵礌"
- ></el-input>
- </el-form-item> -->
- <!-- <el-form-item label="鍔冲姏璁剧疆鏃堕棿" prop="laborSetupTime">
- <el-input
- v-model="dataForm.laborSetupTime"
- placeholder="鍔冲姏璁剧疆鏃堕棿"
- ></el-input>
- </el-form-item> -->
- <!-- <el-form-item label="鍥犵礌鍗曚綅" prop="runTimeCodeDb">
- <el-select
- v-model="dataForm.runTimeCodeDb"
- placeholder="鍥犵礌鍗曚綅"
- style="width: 100%"
- >
- <el-option
- v-for="item in runTimeCodeDbOptions"
- :key="item.id"
- :label="item.label"
- :value="item.value"
- />
- </el-select>
- </el-form-item> -->
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="6">
<el-form-item label="鐝粍浜哄憳" prop="crewSize">
<el-input
+ style="width:100%"
v-model="dataForm.crewSize"
placeholder="鐝粍浜哄憳"
></el-input>
</el-form-item>
- <!-- <el-form-item label="澶栭儴宸ュ簭椤圭洰" prop="outsideOpItem">
- <el-select
- v-model="dataForm.outsideOpItem"
- placeholder="澶栭儴宸ュ簭椤圭洰"
- style="width: 170px"
- clearable
- >
- <el-option
- v-for="item in outsideOpItemOptions"
- :key="item.id"
- :label='item.value + "-" + item.label '
- :value="item.value"
- />
- </el-select>
- </el-form-item> -->
+ </el-col>
+ <el-col :span="12">
<el-form-item label="澶囨敞" prop="remark">
<el-input
v-model="dataForm.remark"
placeholder="澶囨敞"
- style="width: 280px"
+ style="width: 100%"
></el-input>
</el-form-item>
</el-col>
- </el-row>
- <!-- <el-row style="padding-top: 10px">
- <el-col :span="24">
- <el-form-item label="閰嶇疆椤�">
- <el-checkbox-group
- v-model="checkboxGroup"
- @change="checkboxGroupChange()"
- >
- <el-checkbox-button
- label="productionCounting"
- key="productionCounting"
- >鎶ュ伐</el-checkbox-button
- >
- <el-checkbox-button label="daq" key="daq"
- >閲囬泦</el-checkbox-button
- >
- <el-checkbox-button label="inspection" key="inspection"
- >妫�楠�</el-checkbox-button
- >
- <el-checkbox-button
- label="autoInspection"
- key="autoInspection"
- >鑷姩鎶ユ</el-checkbox-button
- >
- <el-checkbox-button label="semiFinished" key="semiFinished"
- >鍗婃垚鍝�</el-checkbox-button
- >
- <el-checkbox-button label="materialCost" key="materialCost"
- >鎶曟枡</el-checkbox-button
- >
- </el-checkbox-group>
- </el-form-item>
+ <el-col :span="6">
</el-col>
- </el-row> -->
+ </el-row>
</el-form>
</div>
@@ -1163,7 +1076,7 @@
<style>
.operation-basic {
background-color: #fff;
- height: 200px;
+ height: 130px;
display: flex;
padding: 20px 30px;
border: 1px solid #ddd;
--
Gitblit v1.9.3