From a6a7b0bbf6f67fb1a2a1619296202c9e29915325 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期三, 15 十一月 2023 10:24:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/quality/rawMaterial/rawMaterial-form.vue | 18 ++++++++-
src/views/plan/manufacturingorder/productorder-form.vue | 4 +-
src/views/quality/finishedProductInspection/finishedProduct-form.vue | 19 ++++++---
src/views/quality/processInspect/processInspect-form.vue | 38 +++++++++---------
4 files changed, 49 insertions(+), 30 deletions(-)
diff --git a/src/views/plan/manufacturingorder/productorder-form.vue b/src/views/plan/manufacturingorder/productorder-form.vue
index 212ad12..0c3b5ea 100644
--- a/src/views/plan/manufacturingorder/productorder-form.vue
+++ b/src/views/plan/manufacturingorder/productorder-form.vue
@@ -759,7 +759,7 @@
</el-table-column>
</el-table>
</el-row>
- <el-row>
+ <!-- <el-row>
<el-col :span="24"
><div style="margin-top:5px;">
<span style="font-size:12px;">澶栧崗鍙戞枡琛�</span>
@@ -851,7 +851,7 @@
</el-table-column>
</el-table>
</el-col>
- </el-row>
+ </el-row> -->
</el-tab-pane>
<el-tab-pane label="瀹㈡埛璁㈠崟" id="ta3" key="ta3" name="ta3">
<CustomerOrder :orderId="dataForm.id" />
diff --git a/src/views/quality/finishedProductInspection/finishedProduct-form.vue b/src/views/quality/finishedProductInspection/finishedProduct-form.vue
index a09ed00..90fec3b 100644
--- a/src/views/quality/finishedProductInspection/finishedProduct-form.vue
+++ b/src/views/quality/finishedProductInspection/finishedProduct-form.vue
@@ -111,9 +111,12 @@
<el-tooltip v-if="scope.row.iname != null" :disabled="scope.row.eId != null"
class="item" effect="dark" content="璇峰厛閫夋嫨璁惧锛�" placement="top-start">
<el-select style="width: 100%;" @change="changeState(scope.row, index)" :disabled="scope.row.eId == null" v-model="scope.row.empiricalValueAddss[index]" placeholder="璇烽�夋嫨">
- <el-option v-for="item in dataVal" :key="item.value" :label="item.label"
+ <!-- <el-option v-for="item in dataVal" :key="item.value" :label="item.label"
:value="item.value">
- </el-option>
+ </el-option> -->
+ <el-option v-for="item in dataVal" :key="item.value" :label="(item.value === '1' ? '鏄�' : '鍚�')" :value="item.value"></el-option>
+
+
</el-select>
<span v-if="resultVal != null && processInspectVo.id != null"
v-text="scope.row.empiricalValueAddss[index]"></span>
@@ -224,12 +227,13 @@
export default {
data() {
return {
+ // 1 鏄� 0鍚�
dataVal: [{
- label: '鏄�',
- value: '鏄�'
+ label: '1',
+ value: '1'
}, {
- label: '鍚�',
- value: '鍚�'
+ label: '0',
+ value: '0'
}],
resultVal: null,
deviceList: [],
@@ -276,7 +280,7 @@
this.init()
},
methods: {
-
+
submitSave(){
let pro = 0
this.inspectionItems.forEach(item => {
@@ -375,6 +379,7 @@
material: result.material,
userName: Array.from(new Set(userList)).join(","),
result: this.resultVal==null ? '' : this.resultVal,
+
}]
}).catch(error=>{
console.log(error)
diff --git a/src/views/quality/processInspect/processInspect-form.vue b/src/views/quality/processInspect/processInspect-form.vue
index 6a85e93..068e5c7 100644
--- a/src/views/quality/processInspect/processInspect-form.vue
+++ b/src/views/quality/processInspect/processInspect-form.vue
@@ -86,14 +86,14 @@
</el-row>
<el-row style="width:100%;">
<el-col :span="24">
- <el-table border
- :data="inspectionItems"
+ <el-table border
+ :data="inspectionItems"
height="400"
:header-cell-style="{ textAlign: 'center', color: 'black', backgroundColor: '#fafafa' }"
- :cell-style="{ textAlign: 'center' }"
- row-key="iid"
+ :cell-style="{ textAlign: 'center' }"
+ row-key="iid"
default-expand-all style="width: 100%"
- ref="table"
+ ref="table"
:tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
<el-table-column type="index" label="搴忓彿" width="60"></el-table-column>
<el-table-column label="椤圭洰" prop="father" width="240"></el-table-column>
@@ -120,9 +120,9 @@
v-model="scope.row.empiricalValueAddss[index]"
@blur="changeState(scope.row, index)" placeholder="璇疯緭鍏ユ娴嬪��"></el-input> -->
<el-select style="width: 100%;" @change="changeState(scope.row, index)" :disabled="scope.row.eId == null" v-model="scope.row.empiricalValueAddss[index]" placeholder="璇烽�夋嫨">
- <el-option v-for="item in dataVal" :key="item.value" :label="item.label"
- :value="item.value">
- </el-option>
+ <el-option v-for="item in dataVal" :key="item.value" :label="(item.value === '1' ? '鏄�' : '鍚�')" :value="item.value"></el-option>
+
+
</el-select>
<span v-if="resultVal != null && processInspectVo.id != null"
v-text="scope.row.empiricalValueAddss[index]"></span>
@@ -143,7 +143,7 @@
</div>
</template>
</el-table-column>
- <el-table-column
+ <el-table-column
label="妫�楠屾弿杩�" width="240" style="text-align: center;">
<template slot-scope="scope">
<el-col v-if="scope.row.itype === '1'">
@@ -170,7 +170,7 @@
<span v-if="resultVal != null && processInspectVo.id != null"
v-text="scope.row.inote"></span>
</el-tooltip>
- </el-col>
+ </el-col>
</template>
</el-table-column>
<el-table-column label="缁撹" fixed="right" min-width="100">
@@ -217,7 +217,7 @@
</div>
</div>
</template>
-
+
<script>
import {
chooseMater,
@@ -232,11 +232,11 @@
data() {
return {
dataVal: [{
- label: '鏄�',
- value: '鏄�'
+ label: '1',
+ value: '1'
}, {
- label: '鍚�',
- value: '鍚�'
+ label: '0',
+ value: '0'
}],
resultVal: null,
technologyList: [],
@@ -434,7 +434,7 @@
row.empiricalValueAddss.forEach(e => {
str += e + ","
})
-
+
// if (note === undefined || note === '' || note === null) {
// return
// }
@@ -444,7 +444,7 @@
return
}
-
+
let obj = {
devideId: row.eId,
ppid: row.iid,
@@ -526,7 +526,7 @@
},
}
</script>
-
+
<style scoped>
.finishedProduct-detail {
width: 100%;
@@ -590,4 +590,4 @@
border-top: 0 !important;
cursor: pointer !important;
}
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/quality/rawMaterial/rawMaterial-form.vue b/src/views/quality/rawMaterial/rawMaterial-form.vue
index 39f55c5..17494d7 100644
--- a/src/views/quality/rawMaterial/rawMaterial-form.vue
+++ b/src/views/quality/rawMaterial/rawMaterial-form.vue
@@ -164,13 +164,20 @@
:disabled="scope.row.deviceId == null || (dataForm.id!=null&&resultVal!=null)"
v-model="scope.row.testValueList[index]"
placeholder="璇疯緭鍏ユ垨閫夋嫨妫�娴嬪��" @change="updateTestValue(scope.row,scope.$index)">
- <el-option label="鏄�" value="鏄�"/>
- <el-option label="鍚�" value="鍚�"/>
+ <!-- <el-option label="鏄�" value="鏄�"/>
+ <el-option label="鍚�" value="鍚�"/> -->
+ <el-option v-for="item in dataVal" :key="item.value" :label="(item.value === '1' ? '鏄�' : '鍚�')" :value="item.value"></el-option>
+
+
</el-select>
</el-tooltip>
</div>
</template>
</el-table-column>
+
+
+
+
<el-table-column prop="deviceName" label="璇曢獙璁惧" min-width="260">
<template slot-scope="scope">
<div v-if="!scope.row.children">
@@ -276,6 +283,13 @@
},
data(){
return{
+ dataVal: [{
+ label: '1',
+ value: '1'
+ }, {
+ label: '0',
+ value: '0'
+ }],
userdata:[],
currentRow:[],
userlist:[],
--
Gitblit v1.9.3