From 1094076235c6765ee0b527272d476df227d690ff Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 01 十一月 2023 14:13:25 +0800
Subject: [PATCH] modified: src/api/quality/finishedProduct.js deleted: src/const/crud/quality/rawMaterial.js modified: src/views/quality/finishedProductInspection/finishedProductInspectionAdd.vue deleted: src/views/quality/finishedProductInspection/finishedProductInspectionLook.vue deleted: src/views/quality/finishedProductInspection/finishedProductInspectionUp.vue modified: src/views/quality/finishedProductInspection/index.vue new file: src/views/quality/package/index.vue modified: src/views/quality/rawMaterial/rawMaterial-form.vue
---
src/views/quality/rawMaterial/rawMaterial-form.vue | 62 ++++++++++++++++++-------------
1 files changed, 36 insertions(+), 26 deletions(-)
diff --git a/src/views/quality/rawMaterial/rawMaterial-form.vue b/src/views/quality/rawMaterial/rawMaterial-form.vue
index 5ca9203..0966edf 100644
--- a/src/views/quality/rawMaterial/rawMaterial-form.vue
+++ b/src/views/quality/rawMaterial/rawMaterial-form.vue
@@ -38,6 +38,7 @@
<el-col :span="6">
<el-form-item prop="formTime" label="鏉ユ枡鏃ユ湡">
<el-date-picker
+ style="width:100%"
v-model="dataForm.formTime"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
@@ -92,8 +93,8 @@
<el-col :span="5">
<div style="width:100%;text-align: right;">
<el-button v-show="dataForm.id==null" size="small" @click="clickAddLine">娣诲姞妫�楠岃</el-button>
- <el-button size="small" @click="addTeatValueColumn()">娣诲姞妫�楠屽�煎垪</el-button>
- <el-button size="small" @click="delTeatValueColumn()">鍒犻櫎妫�楠屽�煎垪</el-button>
+ <el-button size="small" @click="addTeatValueColumn()">娣诲姞妫�娴嬪�煎垪</el-button>
+ <el-button size="small" @click="delTeatValueColumn()">鍒犻櫎妫�娴嬪�煎垪</el-button>
</div>
</el-col>
</el-row>
@@ -101,7 +102,7 @@
<el-col :span="24">
<el-table :header-cell-style="{textAlign:'center',color:'black',backgroundColor:'#fafafa'}"
:cell-style="{textAlign:'center'}" ref="table"
- :data="list" border style="width: 100%;" height="320">
+ :data="list" border style="width: 100%;" height="400">
<el-table-column type="index" label="搴忓彿" width="60">
</el-table-column>
<el-table-column prop="name" label="椤圭洰" width="260">
@@ -159,25 +160,30 @@
</el-col>
</el-row>
</div>
- <div class="rawMaterial-detail">
+ <div class="rawMaterial-result">
<el-row>
<el-col :span="24">妫�楠岀粨璁�</el-col>
</el-row>
<el-row style="width:100%">
<el-col :span="24">
- <avue-crud
- ref="conclusion"
- :option="option"
- :data="conclusionTable"
- v-model="conclusion">
- <template slot="judgeState" slot-scope="scope">
- <el-tag type="success" v-if="scope.row.judgeState == 1">鍚堟牸</el-tag>
- <el-tag type="danger" v-else-if="scope.row.judgeState == 0">涓嶅悎鏍�</el-tag>
- </template>
- <template #menu>
- <el-button type="text" @click="submitSave()" size="small">涓婃姤</el-button>
- </template>
- </avue-crud>
+ <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="userName" label="妫�楠屽憳"></el-table-column>
+ <el-table-column prop="judgeState" label="妫�楠岀粨璁�">
+ <template slot-scope="scope">
+ <el-tag type="success" v-if="scope.row.judgeState == 1">鍚堟牸</el-tag>
+ <el-tag type="danger" v-else-if="scope.row.judgeState == 0">涓嶅悎鏍�</el-tag>
+ </template>
+ </el-table-column>
+ <el-table-column label="鎿嶄綔">
+ <template>
+ <el-button type="text" @click="submitSave()" size="small">涓婃姤</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
</el-col>
</el-row>
</div>
@@ -187,7 +193,6 @@
</template>
<script>
-import { object,conclusion } from '@/const/crud/quality/rawMaterial'
import {
selectDevice,
addRawInspects,
@@ -243,8 +248,6 @@
userName: '',
testState: ''
}],
- tableOption: object,
- option: conclusion,
dataRule: {},
deviceList: [],
}
@@ -257,10 +260,6 @@
mounted(){
this.dataForm.id = this.$route.query.id
this.init()
- let isShow = this.dataForm.id == null ? true : false
- this.tableOption.menu = isShow
- let len = this.tableOption.column.length
- this.tableOption.column[len-1].hide = isShow
this.getDeviceList()
},
watch:{
@@ -426,7 +425,6 @@
})
}else{
this.conclusionTable = []
- this.tableOption.column = object.column
}
},
save(){
@@ -454,7 +452,19 @@
<style>
.rawMaterial-detail {
width: 100%;
- height: 400px;
+ height: 470px;
+ padding: 10px 20px;
+ display: flex;
+ border: 1px solid #ddd;
+ background-color: #fff;
+ margin-top: 10px;
+ box-sizing: border-box;
+ flex-wrap: wrap;
+}
+
+.rawMaterial-result {
+ width: 100%;
+ height: 150px;
padding: 10px 20px;
display: flex;
border: 1px solid #ddd;
--
Gitblit v1.9.3