From 480fd6b48efc83dc4754ea2d6211e5b0f3a97429 Mon Sep 17 00:00:00 2001
From: 86134 <aa>
Date: 星期三, 08 十一月 2023 11:25:47 +0800
Subject: [PATCH] 仝亚平

---
 src/views/quality/processInspect/processInspect-form.vue |  263 ++++++++--------------------------------------------
 1 files changed, 43 insertions(+), 220 deletions(-)

diff --git a/src/views/quality/processInspect/processInspect-form.vue b/src/views/quality/processInspect/processInspect-form.vue
index 19a9326..94f62b5 100644
--- a/src/views/quality/processInspect/processInspect-form.vue
+++ b/src/views/quality/processInspect/processInspect-form.vue
@@ -130,36 +130,44 @@
                                     <span v-if="resultVal != null && scope.row.iname != null"
                                         v-text="scope.row.ename"></span>
                                     <div v-else>
-<<<<<<< HEAD
-                                        <el-select style="width:100%" v-model="scope.row.eId" 
-                                        v-if="scope.row.iname != null" filterable @change="updateDevice(scope.row,scope.$index)">
-                                            <el-option v-for="(item,index) in deviceList" 
-                                            :key="index" :value="item.id" :label="item.code +'-'+ item.name"></el-option>
-=======
                                         <el-select style="width:100%" v-model="scope.row.eId" v-if="scope.row.iname != null"
                                             filterable @change="updateDevice(scope.row, scope.$index)">
                                             <el-option v-for="(item, index) in deviceList" :key="index" :value="item.id"
                                                 :label="item.code + '-' + item.name"></el-option>
->>>>>>> c36b81234cff45a92a096a94e844041cc1a31f2a
                                         </el-select>
                                     </div>
                                 </template>
                             </el-table-column>
-                            <el-table-column  label="妫�楠屾弿杩�"
-                                width="240" style="text-align: center;">
+                            <el-table-column prop="inspectionValue" v-for="(item, index) in empiricalValueAdd" :key="index"
+                                label="妫�楠屾弿杩�" width="240" style="text-align: center;">
                                 <template slot-scope="scope">
-                                        <el-tooltip v-if="scope.row.iname!=null" :disabled="scope.row.eId != null" 
-                                        class="item" effect="dark" content="璇峰厛閫夋嫨璁惧锛�"
-                                            placement="top-start">
-                                            <el-input :disabled="scope.row.eId == null" v-model="scope.row.inote"
-                                         placeholder="璇疯緭鍏ユ楠屾弿杩�"></el-input>
-                                            <span v-if="resultVal != null && processInspectVo.id!=null" v-text="scope.row.inote"></span>
+                                    <el-col v-if="scope.row.itype === '1'">
+                                        <el-tooltip v-if="scope.row.iname != null" :disabled="scope.row.eId != null"
+                                            class="item" effect="dark" content="璇峰厛閫夋嫨璁惧锛�" placement="top-start">
+                                            <el-input :disabled="scope.row.eId == null"
+                                                v-model="scope.row.inote"
+                                                @blur="changeState(scope.row, index)" placeholder="璇疯緭鍏ユ楠屾弿杩�"></el-input>
+                                            <span v-if="resultVal != null && processInspectVo.id != null"
+                                                v-text="scope.row.inote"></span>
                                         </el-tooltip>
+                                    </el-col>
+                                    <el-col v-else>
+                                        <el-tooltip v-if="scope.row.iname != null" :disabled="scope.row.eId != null"
+                                            class="item" effect="dark" content="璇峰厛閫夋嫨璁惧锛�" placement="top-start">
+                                            <!-- <el-input :disabled="scope.row.eId == null"
+                                                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.inote" placeholder="璇烽�夋嫨">
+                                                <el-option v-for="item in dataVal" :key="item.value" :label="item.label"
+                                                    :value="item.value">
+                                                </el-option>
+                                            </el-select>
+                                            <span v-if="resultVal != null && processInspectVo.id != null"
+                                                v-text="scope.row.inote"></span>
+                                        </el-tooltip>
+                                    </el-col>
                                 </template>
                             </el-table-column>
-
-
-
                             <el-table-column label="缁撹" fixed="right" min-width="100">
                                 <template slot-scope="scope">
                                     <div v-if="scope.row.iname != null">
@@ -253,33 +261,6 @@
     beforeUpdate() {
         this.$nextTick(() => {
             this.$refs.table.doLayout();
-<<<<<<< HEAD
-          })
-        },
-        created() {
-        },
-        mounted() {
-            this.getDeviceList()
-            this.processInspectVo.id = this.$route.query.id
-            this.resultVal = this.$route.query.resultVal
-            if(this.resultVal == null){
-                let val = sessionStorage.getItem("process-resultVal-"+this.processInspectVo.id);
-                val == undefined ? this.resultVal=null : this.resultVal = val
-            }
-            this.init()
-        },
-        methods: {
-            
-            submitSave(){
-                let pro = 0
-                console.log(this.inspectionItems);
-                this.inspectionItems.forEach(item => {
-                    if(item.children){
-                        let arr = item.children.filter(obj=>{
-                                return obj.iresult == 0;
-                        })
-                        pro+=arr.length
-=======
         })
     },
     created() {
@@ -316,7 +297,6 @@
                     let data = {
                         id: this.processInspectVo.id,
                         number: value
->>>>>>> c36b81234cff45a92a096a94e844041cc1a31f2a
                     }
                     updateProcessInspectsById(data).then(res => {
                         let data = res.data.data
@@ -387,6 +367,9 @@
                                     arr = obj.inspectionValue.split(",")
                                 }
                                 obj.empiricalValueAddss = arr
+                                if(obj.note){
+                                        snote=obj.inote
+                                    }
                                 if (arr.length > this.empiricalValueAdd) {
                                     this.empiricalValueAdd = arr.length
                                 }
@@ -418,180 +401,9 @@
                         obj.children[index - 1].inspectionValue = null
                         obj.children[index - 1].iresult = null
                         obj.children[index - 1].empiricalValueAddss = []
+                        obj.children[index-1].inote=''
                     }
                 })
-<<<<<<< HEAD
-                this.resultVal = resultVal
-                this.inspectionResultForm[0].result = resultVal
-                sessionStorage.setItem("process-resultVal-"+this.processInspectVo.id,resultVal)
-            },
-            init(){
-                let id = this.processInspectVo.id
-                if(id != null){
-                    queryById(id).then(res=>{
-                        console.log(res)
-                        let result = res.data.data
-                        this.processInspectVo.orderNumber = result.orderNumber
-                        this.processInspectVo.materialCode = result.materialCode
-                        this.processInspectVo.material = result.material
-                        this.processInspectVo.technologyOperationId = result.technologyOperationName
-                        this.processInspectVo.specs = result.specs
-                        this.processInspectVo.unit = result.punit
-                        this.processInspectVo.quantity = result.quantity
-                        let userList = []
-                        result.children.forEach(item=>{
-                            item.iid = Math.random()
-                            if(item.children != undefined){
-                            
-                                item.children.forEach(obj=>{
-                                    let arr = []
-                                    if(obj.userName){
-                                        userList.push(obj.userName)
-                                    }
-                                    if(obj.inspectionValue){
-                                        arr = obj.inspectionValue.split(",")
-                                    }
-                                    obj.empiricalValueAddss = arr
-                                    if(obj.note){
-                                        snote=obj.inote
-                                    }
-                                    if(arr.length > this.empiricalValueAdd){
-                                        this.empiricalValueAdd = arr.length
-                                    }
-                                })
-                            }
-                        })
-                        this.inspectionItems = result.children
-                        console.log(result.children)
-                        this.inspectionResultForm = [{
-                            materialCode: result.materialCode,
-                            material: result.material,
-                            userName: Array.from(new Set(userList)).join(","),
-                            result: this.resultVal == null ? '' : this.resultVal,
-                        }]
-                    }).catch(error=>{
-                        console.log(error)
-                    })
-                }
-            },
-            getDeviceList(){
-                selectDevice(null).then(res=>{
-                    this.deviceList = res.data.data
-                    console.log(this.deviceList);
-                })
-            },
-            updateDevice(row,index){
-                console.log(row);
-                updateDeviceBypppId({equiomentId:row.eId,ppid: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=''
-                        }
-                    })
-                }).catch(error=>{
-                    console.log(error)
-                })
-            },
-            //浜у搧鍚嶇О锛岄�夋嫨
-            changeOptionsSamplename(val) {
-                let sample = this.optionsSamplename.filter(o=>{
-                    return o.materialCode == val
-                })[0]
-                this.processInspectVo.materialCode = sample.materialCode
-                this.processInspectVo.specs = sample.specs
-                this.processInspectVo.unit = sample.unit
-                this.processInspectVo.material = sample.material
-                this.technologyList = sample.children
-            },
-            changeState(row, index) {
-                console.log(row)
-                
-                if (row.iid != null && row.iid != '') {
-                    let str = ""
-                    row.empiricalValueAddss.forEach(e => {
-                        str += e + ","
-                    })
-                    str = str.slice(0,-1);
-                    if (str === undefined || str === '' || str === null ) {
-                        return
-                    }
-
-                // if ( note === undefined || str === '' || str === null ) {
-                //         return
-                //     }
-                    
-                    let obj = {
-                        equiomentId: row.eId,
-                        ppid: row.iid,
-                        inspectionValue: str,
-                        note:row.inote,
-                    
-                    }
-                  
-                    updateProcessInsProduct(obj).then(res=>{
-                        if(res.data.code == 0){
-                            this.$message.success("鏇存柊鎴愬姛")
-                        }else{
-                            this.$message.error("鏇存柊澶辫触")
-                        }
-                        this.init()
-                    })
-                }
-            },
-            addTestProject() {
-                let val = this.processInspectVo
-                addProcess(val).then(res=>{
-                    let id = res.data.data
-                    if(id != null){
-                        queryById(id).then(response=>{
-                            console.log(response.data.data.children)
-                            let proList = response.data.data.children
-                            proList.forEach(item=>{
-                                item.iid = Math.random();
-                                if(item.children != undefined){
-                                    item.children.forEach(obj=>{
-                                        obj.empiricalValueAddss = []
-                                        // obj.note=[];
-                                    })
-                                }
-                            })
-                            this.inspectionItems = proList
-                        }).catch(error=>{
-                            console.log(error);
-                        })
-                    }
-                }).catch(error=>{
-                    console.log(error)
-                })
-            },
-            selectInfoByOrderId() {
-                chooseMater({
-                        orderNumber: this.processInspectVo.orderNumber
-                    }).then(res => {
-                    
-                    if (res.data.data != null) {
-                        this.optionsSamplename = res.data.data.children
-                        
-                    } else {
-                        this.$message({
-                            message: '娌℃湁璇ヨ鍗曞彿锛�',
-                            type: 'warning'
-                        });
-                        this.optionsSamplename = []
-                        this.processInspectVo.materialCode = null
-                        this.processInspectVo.material = null
-                        this.processInspectVo.specs = null
-                        this.processInspectVo.unit = null
-                    }
-                })
-            },
-            // 鍒犻櫎妫�楠屽�煎垪
-            clickDeleteInspectionColumn() {
-                if (this.empiricalValueAdd - 1 === 0) {
-=======
             }).catch(error => {
                 console.log(error)
             })
@@ -608,20 +420,31 @@
             this.technologyList = sample.children
         },
         changeState(row, index) {
+            console.log(row)
             if (row.iid != null && row.iid != '') {
                 let str = ""
                 row.empiricalValueAddss.forEach(e => {
                     str += e + ","
                 })
+             
+                // if (note === undefined || note === '' || note === null) {
+                //     return
+                // }
+                console.log(str)
                 str = str.slice(0, -1);
                 if (str === undefined || str === '' || str === null) {
                     return
                 }
+
+                
                 let obj = {
                     devideId: row.eId,
                     ppid: row.iid,
-                    inspectionValue: str
+                    inspectionValue: str,
+                    note : row.inote
+
                 }
+                console.log(obj)
                 updateProcessInsProduct(obj).then(res => {
                     if (res.data.code == 0) {
                         this.$message.success("鏇存柊鎴愬姛")
@@ -663,7 +486,6 @@
             }).then(res => {
                 if (res.data.data != null) {
                     this.optionsSamplename = res.data.data.children
->>>>>>> c36b81234cff45a92a096a94e844041cc1a31f2a
                 } else {
                     this.$message({
                         message: '娌℃湁璇ヨ鍗曞彿锛�',
@@ -722,6 +544,7 @@
     flex-wrap: wrap;
 }
 
+
 .finishedProduct-basic {
     background-color: #fff;
     height: 155px;

--
Gitblit v1.9.3