From 9a0e4f1641f41a3dc1df4453ad416fb1522bd2ea Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期四, 18 一月 2024 17:30:49 +0800
Subject: [PATCH] modified: src/page/wel.vue modified: src/views/quality/rawMaterial/rawMaterial-form.vue
---
src/views/quality/finishedProductInspection/finishedProduct-form.vue | 51 ++++++++++++++++++---------------------------------
1 files changed, 18 insertions(+), 33 deletions(-)
diff --git a/src/views/quality/finishedProductInspection/finishedProduct-form.vue b/src/views/quality/finishedProductInspection/finishedProduct-form.vue
index 1dbc295..10715eb 100644
--- a/src/views/quality/finishedProductInspection/finishedProduct-form.vue
+++ b/src/views/quality/finishedProductInspection/finishedProduct-form.vue
@@ -90,13 +90,9 @@
</el-form-item>
</el-col>
<el-col :span="6" v-if="processInspectVo.id != null">
- <el-form-item label="浜у搧鍚堟牸搴撲綅锛�" prop="locationId">
- <el-select @change="changeLocation" clearable style="width:100%"
- v-model="processInspectVo.locationId" placeholder="璇烽�夋嫨鍚堟牸搴撲綅"
- :disabled="resultVal!=null && processInspectVo.id!=null" autocomplete="off">
- <el-option v-for="(item,i) in locationList" :key="i"
- :label="item.locName+'-'+item.locNo" :value="item.id"></el-option>
- </el-select>
+ <el-form-item label="浜у搧鍚堟牸搴撲綅锛�" prop="locName">
+ <el-input v-model="processInspectVo.locName" clearable style="width:100%" placeholder="璇烽�夋嫨鍚堟牸搴撲綅" disabled autocomplete="off">
+ </el-input>
</el-form-item>
</el-col>
</el-row>
@@ -117,7 +113,11 @@
:header-cell-style="{textAlign:'center',color:'black',backgroundColor:'#fafafa'}"
:cell-style="{textAlign:'center'}" row-key="iid" default-expand-all
style="width: 100%" ref="table" :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
- <el-table-column type="index" label="搴忓彿" width="60"></el-table-column>
+ <el-table-column type="index" prop="parentIndex" label="搴忓彿" width="60">
+ <template scope="scope">
+ <span v-if="scope.row.isIndex">{{scope.row.parentIndex}}</span>
+ </template>
+ </el-table-column>
<el-table-column label="椤圭洰" prop="father" show-overflow-tooltip width="140" ></el-table-column>
<el-table-column prop="iname" label="鎸囨爣" show-overflow-tooltip width="140" ></el-table-column>
<el-table-column prop="iunit" label="鍗曚綅" show-overflow-tooltip width="140" ></el-table-column>
@@ -186,7 +186,7 @@
class="item" effect="dark" content="璇峰厛閫夋嫨璁惧锛�" placement="top-start">
<el-input :disabled="scope.row.eId == null"
v-model="scope.row.inote"
- @blur="changeState(scope.row)" placeholder="璇疯緭鍏ユ娴嬪��"></el-input>
+ @blur="changeState(scope.row)" placeholder="璇疯緭鍏ユ楠屾弿杩�"></el-input>
<span v-if="resultVal != null && processInspectVo.id != null"
v-text="scope.row.inote"></span>
</el-tooltip>
@@ -289,7 +289,7 @@
// 缂栬緫鏃跺瓨鍌ㄦ渶闀跨殑鍒楁暟瀛楋紝鍋氬垹闄ゅ垽鏂�
empiricalValueAddMaxNumber: 0,
processInspectRules: {
- locationId: [{required: true,message:'璇烽�夋嫨搴撲綅鍙�',trigger:'blur'}]
+ locName: [{required: true,message:'璇烽�夋嫨搴撲綅鍙�',trigger:'blur'}]
},
processInspectVo: {
id: null,
@@ -306,7 +306,7 @@
technologyId: null,
documentId: null,
outBatchNo: null,
- locationId: null,
+ locName: null,
},
inspectionItems: [], // 鏂板妫�楠岄」鐩〃鏍�
inspectionResultForm: [],
@@ -353,25 +353,12 @@
}
},
codeDevice(row,index){
- this.row=row
+ this.row=row
console.log("row",row);
this.deviceCode =true
this.$refs.codeDeviceCompont.openCamera()
this.proIndex=index
},
- changeLocation(val){
- if(val){
- let obj = {
- id: this.processInspectVo.id,
- locationId: val
- }
- updateLocationIdById(obj).then(res=>{
- if(res.status===200){
- this.$message.success("鏇存柊鍚堟牸搴撲綅鎴愬姛")
- }
- })
- }
- },
getIfsLocation(){
getIfsLocationByGroupCopyAll({locationGroup: '1'}).then(res=>{
if(res.status===200){
@@ -382,11 +369,6 @@
})
},
submitSave(){
- let locationId = this.processInspectVo.locationId
- if(locationId==null){
- this.$message.error("璇烽�夋嫨浜у搧鍚堟牸搴撲綅")
- return
- }
let pro = 0
this.inspectionItems.forEach(item => {
if(item.children){
@@ -461,10 +443,13 @@
this.processInspectVo.quantity = result.quantity
this.processInspectVo.documentId = result.documentId
this.processInspectVo.outBatchNo = result.outBatchNo
- this.processInspectVo.locationId = result.locationId
+ this.processInspectVo.locName = result.locName
+ this.processInspectVo.productNo = result.productNo
let userList = []
- result.children.forEach(item=>{
+ result.children.forEach((item,index)=>{
item.iid = Math.random()
+ item.isIndex = true;
+ item.parentIndex = index + 1;
if(item.children != undefined){
item.children.forEach(obj=>{
let arr = []
@@ -648,7 +633,7 @@
updateFinishedInsProduct(obj).then(res => {
if (res.data.code == 0) {
this.init()
- }
+ }
})
}
})
--
Gitblit v1.9.3