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/quality/rawMaterial/rawMaterial-form.vue | 29 +++++++++++++++--------------
1 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/src/views/quality/rawMaterial/rawMaterial-form.vue b/src/views/quality/rawMaterial/rawMaterial-form.vue
index 5a05f43..fd7022f 100644
--- a/src/views/quality/rawMaterial/rawMaterial-form.vue
+++ b/src/views/quality/rawMaterial/rawMaterial-form.vue
@@ -115,14 +115,14 @@
<el-tabs class="rawMaterial-detail" @tab-click="tabsClick">
<el-tab-pane label="妫�楠岄」鐩�">
<el-row style="width:100%;z-index: 10;height:50px;">
- <el-col :sm="12" :lg="18"></el-col>
- <el-col :sm="4" :lg="2" style="text-align: right;">
+ <el-col :sm="15" :lg="18"></el-col>
+ <el-col :sm="3" :lg="2" style="text-align: right;">
<el-button v-if="dataForm.id==null" size="small" @click="clickAddLine()">娣诲姞妫�楠岄」鐩�</el-button>
</el-col>
- <el-col :sm="4" :lg="2" style="text-align: right;">
+ <el-col :sm="3" :lg="2" style="text-align: right;">
<el-button class="pad-addcol-btn" v-if="resultVal==null || dataForm.id==null" size="small" @click="addTeatValueColumn()">娣诲姞妫�娴嬪�煎垪</el-button>
</el-col>
- <el-col :sm="4" :lg="2" style="text-align: right;">
+ <el-col :sm="3" :lg="2" style="text-align: right;">
<el-button v-if="resultVal==null || dataForm.id==null" size="small" @click="delTeatValueColumn()">鍒犻櫎妫�娴嬪�煎垪</el-button>
</el-col>
</el-row>
@@ -141,12 +141,12 @@
:tree-props="{children: 'children', hasChildren: 'hasChildren'}">
<el-table-column type="index" label="搴忓彿" width="60">
</el-table-column>
- <el-table-column prop="father" label="妫�楠岄」鐩�" width="260">
+ <el-table-column prop="father" label="妫�楠岄」鐩�" width="160">
<template slot-scope="scope">
<el-input v-if="scope.row.children" style="width:90%" :disabled="dataForm.id!=null" v-model="scope.row.father" placeholder="璇疯緭鍏ユ楠岄」鐩�"></el-input>
</template>
</el-table-column>
- <el-table-column prop="name" label="椤圭洰" width="260">
+ <el-table-column prop="name" label="椤圭洰" width="160">
<template slot-scope="scope">
<div v-if="!scope.row.children">
<el-input class="inline-input" :disabled="dataForm.id!=null" v-model="scope.row.name"
@@ -154,7 +154,7 @@
</div>
</template>
</el-table-column>
- <el-table-column prop="unit" label="鍗曚綅" width="260">
+ <el-table-column prop="unit" label="鍗曚綅" width="160">
<template slot-scope="scope">
<div v-if="!scope.row.children">
<el-input :disabled="dataForm.id != null" v-model="scope.row.unit" placeholder="璇疯緭鍏ュ崟浣�"></el-input>
@@ -162,7 +162,7 @@
</template>
</el-table-column>
- <el-table-column prop="required" label="鏍囧噯鍊�" width="260">
+ <el-table-column prop="required" label="鏍囧噯鍊�" width="160">
<template slot-scope="scope">
<div v-if="!scope.row.children">
<el-input :disabled="dataForm.id != null" v-model="scope.row.required"
@@ -170,7 +170,7 @@
</div>
</template>
</el-table-column>
- <el-table-column prop="testValue" label="妫�娴嬪��" min-width="260" v-for="(item,index) in empiricalValueAdd" :key="index">
+ <el-table-column prop="testValue" label="妫�娴嬪��" min-width="160" v-for="(item,index) in empiricalValueAdd" :key="index">
<template slot-scope="scope">
<div v-if="!scope.row.children">
<el-tooltip :disabled="scope.row.deviceId != null" class="item" effect="dark" content="璇峰厛閫夋嫨璁惧锛�" placement="top-start">
@@ -186,10 +186,10 @@
</div>
</template>
</el-table-column>
- <el-table-column prop="deviceName" label="璇曢獙璁惧" min-width="260">
+ <el-table-column prop="deviceName" label="璇曢獙璁惧" min-width="200">
<template slot-scope="scope">
<div v-if="!scope.row.children">
- <el-select ref="" :disabled="dataForm!=null && resultVal!=null" style="width:80%"
+ <el-select ref="" :disabled="dataForm!=null && resultVal!=null" style="width:60%"
v-model="scope.row.deviceId" filterable @change="updateDevice(scope.row,scope.$index)">
<el-option v-for="(item,index) in deviceList"
:key="index" :value="item.id" :label="item.code +'-'+ item.name"></el-option>
@@ -203,7 +203,7 @@
</div>
</template>
</el-table-column>
- <el-table-column prop="note" label="妫�楠屾弿杩�" width="260" >
+ <el-table-column prop="note" label="妫�楠屾弿杩�" width="160" >
<template slot-scope="scope">
<div v-if="!scope.row.children">
<el-input @blur="changeState(scope.row, scope.$index)" :disabled="scope.row.deviceId == null || (dataForm.id!=null&&resultVal!=null)" v-model="scope.row.note" placeholder="妫�楠屾弿杩�"></el-input>
@@ -264,6 +264,7 @@
<el-table-column
prop="rawInsNo"
align="center"
+ width="120"
label="鍘熸潗鏂欐楠岀紪鍙�"
show-overflow-tooltip
></el-table-column>
@@ -319,8 +320,8 @@
<el-table border height="90" :data="conclusionTable" ref="conclusion" v-model="conclusion"
:header-cell-style="{textAlign:'center',color:'black',backgroundColor:'#fafafa'}"
:cell-style="{textAlign:'center'}">
- <el-table-column prop="code" label="鐗╂枡缂栧彿"></el-table-column>
- <el-table-column prop="name" label="鐗╂枡鍚嶇О"></el-table-column>
+ <el-table-column prop="code" width="150" show-overflow-tooltip label="鐗╂枡缂栧彿"></el-table-column>
+ <el-table-column prop="name" width="150" show-overflow-tooltip label="鐗╂枡鍚嶇О"></el-table-column>
<el-table-column prop="userName" label="妫�楠屽憳"></el-table-column>
<el-table-column prop="judgeState" label="妫�楠岀粨璁�">
<template slot-scope="scope">
--
Gitblit v1.9.3