From 26bbf3648b29c0f855b53b3ee44c3d66b11818b2 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期五, 10 十一月 2023 17:00:30 +0800
Subject: [PATCH] s
---
src/views/quality/rawMaterial/rawMaterial-form.vue | 2 ++
src/views/plan/customerorder/index.vue | 1 +
src/views/quality/finishedProductInspection/index.vue | 18 +++++-------------
src/views/plan/customer/index.vue | 1 +
src/views/plan/customerorder/schedule-table.vue | 2 ++
src/views/quality/finishedProductInspection/finishedProduct-form.vue | 31 +++++++++++++++++++++----------
6 files changed, 32 insertions(+), 23 deletions(-)
diff --git a/src/views/plan/customer/index.vue b/src/views/plan/customer/index.vue
index 926ea8b..c73b5a8 100644
--- a/src/views/plan/customer/index.vue
+++ b/src/views/plan/customer/index.vue
@@ -242,6 +242,7 @@
},
handleSelectionChange(val) {
this.multipleSelection = val
+ console.log(this.multipleSelection);
},
// 鍒犻櫎
deleteHandle(row) {
diff --git a/src/views/plan/customerorder/index.vue b/src/views/plan/customerorder/index.vue
index 99c593c..03bd22c 100644
--- a/src/views/plan/customerorder/index.vue
+++ b/src/views/plan/customerorder/index.vue
@@ -975,6 +975,7 @@
// 鍒涘缓涓荤敓浜ц鍒�
masterPlanHandle() {
console.log(this.multipleSelection);
+
if (this.multipleSelection && this.multipleSelection.length > 0) {
if (this.judgeCoState(this.multipleSelection)) {
// 鍒ゆ柇涓�涓嬪墿浣欐暟閲忔槸鍚﹀ぇ浜�0
diff --git a/src/views/plan/customerorder/schedule-table.vue b/src/views/plan/customerorder/schedule-table.vue
index ae7702a..7cbc453 100644
--- a/src/views/plan/customerorder/schedule-table.vue
+++ b/src/views/plan/customerorder/schedule-table.vue
@@ -222,11 +222,13 @@
this.dataForm.customer = []
const _that = this
customer.forEach((item) => {
+ console.log(item);
const outPutBatchList = []
_that.$set(item, 'outPutBatchList', outPutBatchList)
customerList.push(item)
})
this.dataForm.customer = JSON.parse(JSON.stringify(customerList))
+ console.log(this.dataForm.customer);
})
},
dataFormSubmit() {
diff --git a/src/views/quality/finishedProductInspection/finishedProduct-form.vue b/src/views/quality/finishedProductInspection/finishedProduct-form.vue
index 72a20c6..a09ed00 100644
--- a/src/views/quality/finishedProductInspection/finishedProduct-form.vue
+++ b/src/views/quality/finishedProductInspection/finishedProduct-form.vue
@@ -8,7 +8,7 @@
<h2 v-else>缂栬緫-浜у搧妫�楠屽崟</h2>
</div>
<div class="btn-group header-right">
- <el-button @click="addTestProject" type="primary" v-if="processInspectVo.id==null">鐢熸垚妫�楠岄」鐩�</el-button>
+ <el-button @click="addTestProject" v-if="processInspectVo.id==null">鐢熸垚妫�楠岄」鐩�</el-button>
</div>
</div>
<div class="page-main">
@@ -134,7 +134,7 @@
</div>
</template>
</el-table-column>
- <el-table-column prop="inspectionValue" :key="index"
+ <el-table-column prop="inspectionValue" :key="index"
label="妫�楠屾弿杩�" width="240" style="text-align: center;">
<template slot-scope="scope">
<el-col v-if="scope.row.itype === '1'">
@@ -276,7 +276,7 @@
this.init()
},
methods: {
-
+
submitSave(){
let pro = 0
this.inspectionItems.forEach(item => {
@@ -390,15 +390,26 @@
})
},
updateDevice(row,index){
- updateDeviceById({deviceId:row.eId,fpid:row.iId}).then(res=>{
+ let rowId=JSON.stringify(row.iid)
+ console.log(row);
+ updateDeviceById({deviceId:row.eId,fpid:row.iid}).then(res=>{
this.inspectionItems.forEach(obj=>{
- if(obj.children){
- obj.children[index-1].inspectionValue = ''
- obj.children[index-1].iresult = null
- obj.children[index-1].empiricalValueAddss = []
- obj.children[index-1].inote=''
+ obj.children.forEach(c=>{
+ if(c.iid==rowId){
+ c.inspectionValue = null
+ c.iresult = null
+ c.empiricalValueAddss = []
+ c.inote=''
+ }
+ })
- }
+ // if(obj.children){
+ // obj.children[index-1].inspectionValue = ''
+ // obj.children[index-1].iresult = null
+ // obj.children[index-1].empiricalValueAddss = []
+ // obj.children[index-1].inote=''
+
+ // }
})
}).catch(error=>{
console.log(error)
diff --git a/src/views/quality/finishedProductInspection/index.vue b/src/views/quality/finishedProductInspection/index.vue
index 3206e04..def20b0 100644
--- a/src/views/quality/finishedProductInspection/index.vue
+++ b/src/views/quality/finishedProductInspection/index.vue
@@ -16,7 +16,7 @@
top="10vh"
title="鎵撳嵃棰勮"
:visible.sync="printDialogVisible"
- width="65%">
+ width="70%">
<div style="width:100%;height: 60vh;overflow-y: scroll;">
<printTemplate id="printRaw" :formData="printFormData"></printTemplate>
</div>
@@ -35,7 +35,7 @@
import finishedProductInspectionAdd from './finishedProduct-form'
import { page,deletePro,exportExaminationProducts,queryById } from '@/api/quality/finishedProduct'
import { transform } from '@/util/fileTransform'
- import printTemplate from './finishedProduct-print.vue'
+ import printTemplate from './finishedProducter-print.vue'
import PrintJS from 'print-js'
export default {
components: {
@@ -210,17 +210,7 @@
}
},
methods: {
- //鏌ョ湅鎶ュ憡鎸夐挳
- // showPrint(row){
- // queryById(row.id).then(res=>{
- // console.log(res);
- // this.printFormData = res.data.data
- // this.printDialogVisible = true
- // })
- // .catch(error=>{
- // console.log(error);
- // })
- // },
+
//鎵撳嵃鎸夐挳
printFun() {
this.printDialogVisible = false;
@@ -234,7 +224,9 @@
orientation: 'portrait'
});
},
+ //鏌ョ湅鎶ュ憡鎸夐挳
showPrint(row){
+ console.log('----------');
queryById(row.id).then(res=>{
this.printFormData = res.data.data
this.printDialogVisible = true
diff --git a/src/views/quality/rawMaterial/rawMaterial-form.vue b/src/views/quality/rawMaterial/rawMaterial-form.vue
index 3833aae..398a3e0 100644
--- a/src/views/quality/rawMaterial/rawMaterial-form.vue
+++ b/src/views/quality/rawMaterial/rawMaterial-form.vue
@@ -572,6 +572,7 @@
}
ele.children.push(o)
})
+ console.log("----------",ele);
this.list.push(ele)
}
})
@@ -635,6 +636,7 @@
let val=''
arr.forEach(a=>{
val+=a+","
+ // val += '"' + a + ","
})
let end=val.substring(0,val.length-1)
c.testValue=end
--
Gitblit v1.9.3