Merge remote-tracking branch 'origin/master'

zss

2023-12-11 c880739ec4cd5ede33b31eb98ad5f7628ea288e5

 src/views/quality/processInspect/processInspect-form.vue

@@ -18,6 +18,12 @@
                    <div class="formwrapper">
                        <el-row>
                            <el-col :span="6">
                                <el-form-item label="过程检验编号：">
                                    <el-input @blur="selectInfoByOrderId" disabled
                                    v-model="processInspectVo.proInsNo"  autocomplete="off" />
                                </el-form-item>
                            </el-col>
                            <el-col :span="6">
                                <el-form-item label="订单号：">
                                    <el-input @blur="selectInfoByOrderId" :disabled="processInspectVo.id != null"
                                        v-model="processInspectVo.orderNumber" placeholder="请输入订单号" autocomplete="off" />
@@ -40,14 +46,15 @@
                                        autocomplete="off" />
                                </el-form-item>
                            </el-col>
                        </el-row>
                        <el-row>
                            <el-col :span="6">
                                <el-form-item label="规格型号：">
                                    <el-input disabled v-model="processInspectVo.specs" placeholder="请输入规格型号"
                                        autocomplete="off" />
                                </el-form-item>
                            </el-col>
                        </el-row>
                        <el-row>
                        
                            <el-col :span="6">
                                <el-form-item label="工序名称">
                                    <el-select style="width: 100%" :disabled="processInspectVo.id != null"
@@ -64,8 +71,6 @@
                                        autocomplete="off" />
                                </el-form-item>
                            </el-col>
                        </el-row>
                        <el-row>
                            <el-col :span="6">
                                <el-form-item label="数量：">
                                    <el-input v-model="processInspectVo.quantity" placeholder="请输入数量" autocomplete="off"
@@ -86,10 +91,15 @@
                </el-row>
                <el-row style="width:100%;">
                    <el-col :span="24">
                        <el-table border :data="inspectionItems" height="400"
                        <el-table border 
                            :data="inspectionItems" 
                            height="400"
                            :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' }">
                            :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 label="项目" prop="father" width="240"></el-table-column>
                            <el-table-column prop="iname" label="指标" width="240"></el-table-column>
@@ -130,36 +140,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 
                                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, inote)" 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.inote"
                                                @blur="changeState(scope.row, inote)" placeholder="请输入检测值"></el-input>
                                            <!-- <el-select style="width: 100%;" @change="changeState(scope.row, inote)" :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">
@@ -236,6 +254,7 @@
            empiricalValueAddMaxNumber: 0,
            processInspectVo: {
                id: null,
                proInsNo: null,
                material: null,
                materialCode: null,
                orderNumber: "ZTTIC20230001",
@@ -253,33 +272,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() {
@@ -297,7 +289,6 @@
    methods: {
        submitSave() {
            let pro = 0
            console.log(this.inspectionItems);
            this.inspectionItems.forEach(item => {
                if (item.children) {
                    let arr = item.children.filter(obj => {
@@ -316,7 +307,6 @@
                    let data = {
                        id: this.processInspectVo.id,
                        number: value
>>>>>>> c36b81234cff45a92a096a94e844041cc1a31f2a
                    }
                    updateProcessInspectsById(data).then(res => {
                        let data = res.data.data
@@ -367,6 +357,7 @@
            if (id != null) {
                queryById(id).then(res => {
                    let result = res.data.data
                    this.processInspectVo.proInsNo = result.proInsNo
                    this.processInspectVo.orderNumber = result.orderNumber
                    this.processInspectVo.materialCode = result.materialCode
                    this.processInspectVo.material = result.material
@@ -387,6 +378,9 @@
                                    arr = obj.inspectionValue.split(",")
                                }
                                obj.empiricalValueAddss = arr
                                if(obj.note){
                                        snote=obj.inote
                                    }
                                if (arr.length > this.empiricalValueAdd) {
                                    this.empiricalValueAdd = arr.length
                                }
@@ -411,187 +405,18 @@
            })
        },
        updateDevice(row, index) {
            let rowId=JSON.stringify(row.iid)
            updateDeviceBypppId({ deviceId: row.eId, ppid: row.iid }).then(res => {
                this.inspectionItems.forEach(obj => {
                    console.log(obj);
                    if (obj.children) {
                        obj.children[index - 1].inspectionValue = null
                        obj.children[index - 1].iresult = null
                        obj.children[index - 1].empiricalValueAddss = []
                    }
                })
<<<<<<< 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=''
                    obj.children.forEach(c=>{
                        if(c.iid==rowId){
                        c.inspectionValue = null
                        c.iresult = null
                        c.empiricalValueAddss = []
                        c.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)
            })
@@ -617,10 +442,13 @@
                if (str === undefined || str === '' || str === null) {
                    return
                }

                let obj = {
                    devideId: row.eId,
                    ppid: row.iid,
                    inspectionValue: str
                    inspectionValue: str,
                    note : row.inote

                }
                updateProcessInsProduct(obj).then(res => {
                    if (res.data.code == 0) {
@@ -638,7 +466,6 @@
                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();
@@ -663,7 +490,6 @@
            }).then(res => {
                if (res.data.data != null) {
                    this.optionsSamplename = res.data.data.children
>>>>>>> c36b81234cff45a92a096a94e844041cc1a31f2a
                } else {
                    this.$message({
                        message: '没有该订单号！',
@@ -722,6 +548,7 @@
    flex-wrap: wrap;
}


.finishedProduct-basic {
    background-color: #fff;
    height: 155px;