From 605f6bd3ed028ffb05061a7cfe932b2e6ed017ef Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期一, 08 一月 2024 12:24:41 +0800
Subject: [PATCH] 销售订单-下载word修改
---
src/views/quality/rawMaterial/rawMaterial-form.vue | 30 ++++++++++++++++--------------
1 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/src/views/quality/rawMaterial/rawMaterial-form.vue b/src/views/quality/rawMaterial/rawMaterial-form.vue
index 8b98203..b4d8e55 100644
--- a/src/views/quality/rawMaterial/rawMaterial-form.vue
+++ b/src/views/quality/rawMaterial/rawMaterial-form.vue
@@ -114,15 +114,11 @@
<div>
<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="15" :lg="18"></el-col>
- <el-col :sm="3" :lg="2" style="text-align: right;">
+ <el-row style="width:100%;z-index: 10;height:50px;" v-if="resultVal==null">
+ <el-col :span="12"></el-col>
+ <el-col :span="12" style="text-align: right;">
<el-button v-if="dataForm.id==null" size="small" @click="clickAddLine()">娣诲姞妫�楠岄」鐩�</el-button>
- </el-col>
- <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="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>
@@ -160,7 +156,7 @@
<el-input :disabled="dataForm.id != null" v-model="scope.row.unit" placeholder="璇疯緭鍏ュ崟浣�"></el-input>
</div>
</template>
-
+
</el-table-column>
<el-table-column prop="required" label="鏍囧噯鍊�" width="160">
<template slot-scope="scope">
@@ -177,7 +173,7 @@
<el-select style="width:100%" allow-create filterable default-first-option
:disabled="scope.row.deviceId == null || (dataForm.id!=null&&resultVal!=null)"
v-model="scope.row.testValueList[index]"
- placeholder="璇疯緭鍏ユ垨閫夋嫨妫�娴嬪��"
+ placeholder="璇疯緭鍏ユ垨閫夋嫨妫�娴嬪��"
@change="changeState(scope.row,scope.$index)">
<el-option label="鏄�" value="鏄�"/>
<el-option label="鍚�" value="鍚�"/>
@@ -241,7 +237,7 @@
element-loading-text="璇风◢绛夛紝鏂囦欢涓婁紶涓�"
>
<el-upload
- :disabled="dataForm.rawInsNo==null"
+ :disabled="dataForm.rawInsNo==null || resultVal!=null"
drag
ref="upload"
action="/mes/rawInsProduct/upload"
@@ -559,7 +555,7 @@
}
},
codeDevice(row,index){
- this.row=row
+ this.row=row
console.log("row",row);
this.deviceCode =true
this.$refs.codeDeviceCompont.openCamera()
@@ -828,16 +824,22 @@
this.list.push(ele)
}}
})
- let rVal = '1'
+ let rVal = ''
+ let passNum = 0
+ let unPassNum = 0
this.list.forEach(item=>{
if(item.children){
item.children.forEach(ele=>{
if(ele.testState == 0){
- rVal = '0'
+ unPassNum += 1
+ }
+ if(ele.testState == 1){
+ passNum+=1
}
})
}
})
+ rVal = (passNum+unPassNum)>0 ? unPassNum>0 ? '0' :'1' : ''
this.conclusionTable = [{
code: data.code,
name: data.name,
@@ -974,7 +976,7 @@
.rawMaterial-basic {
background-color: #fff;
- height: 155px;
+ height: 170px;
display: flex;
flex-wrap: wrap;
padding: 10px 20px;
--
Gitblit v1.9.3