modified: src/components/view/finishedProductInspectionAdd.vue modified...

Fixiaobai

2023-09-15 8b50aeca95625137cbb09fe3968ac46284ca6f1d

 src/components/view/finishedProductInspectionUp.vue

@@ -38,8 +38,8 @@
                    <el-row>
                        <el-col :span="7">
                            <el-form-item label="产品名称：">
                                <el-select disabled @change="changeOptionsSamplename" style="width: 180px;" v-model="processInspectVo.material" size="small"
                                    placeholder="请选择产品名称">
                                <el-select disabled @change="changeOptionsSamplename" style="width: 180px;"
                                    v-model="processInspectVo.material" size="small" placeholder="请选择产品名称">
                                    <el-option v-for="item in optionsSamplename" :key="item.id" :label="item.name"
                                        :value="item.id + '-' + item.name">
                                    </el-option>
@@ -68,14 +68,14 @@
                        </el-col>
                        <el-col :span="7">
                            <el-form-item label="单位：">
                                <el-input disabled style="width: 180px;" v-model="processInspectVo.unit" placeholder="请输入产品编码"
                                    autocomplete="off" />
                                <el-input disabled style="width: 180px;" v-model="processInspectVo.unit"
                                    placeholder="请输入产品编码" autocomplete="off" />
                            </el-form-item>
                        </el-col>
                        <el-col :span="7">
                            <el-form-item label="数量：">
                                <el-input disabled style="width: 180px;" v-model="processInspectVo.quantity" placeholder="请输入数量"
                                    autocomplete="off" />
                                <el-input disabled style="width: 180px;" v-model="processInspectVo.quantity"
                                    placeholder="请输入数量" autocomplete="off" />
                            </el-form-item>
                        </el-col>
                        <el-col :span="3" style="display: flex;justify-content: end;">
@@ -88,7 +88,8 @@
        <div class="inspectionProject">
            <el-row>
                <el-col :span="12" class="inspectionProject_span">检验项目</el-col>
                <el-col v-if="!isUpBtn" :span="12" class="inspectionProject_span" style="display: flex;justify-content: end;">
                <el-col v-if="!isUpBtn" :span="12" class="inspectionProject_span"
                    style="display: flex;justify-content: end;">
                    <el-button size="mini" @click="clickDeleteInspectionColumn()">删除检验值列</el-button>
                    <el-button style="margin-right: 30px;" size="mini"
                        @click="clickAddInspectionColumn()">添加检验值列</el-button>
@@ -120,9 +121,13 @@
                </el-table-column>
                <el-table-column prop="dname" label="试验设备" min-width="100">
                    <template slot-scope="scope">
                        <el-button type="text" @click="clickTableSelect(scope)">{{
                        <el-button v-if="!scope.row.isSelectDevice" type="text" @click="clickTableSelect(scope)">{{
                            scope.row.dname == null ? "请选择" : scope.row.dname
                        }}</el-button>
                        <el-select v-if="scope.row.isSelectDevice" style="width: 100%;" @change="clickNodeSure(scope.row)"  v-model="filterText" placeholder="请选择">
                            <el-option v-for="item in materialOptions" :key="item.id" :label="item.device" :value="item.id">
                            </el-option>
                        </el-select>
                    </template>
                </el-table-column>
                <el-table-column label="结论">
@@ -153,8 +158,9 @@
                    </template>
                </el-table-column>
                <el-table-column prop="operation" label="上报">
                    <template slot-scope="scope"> 
                        <el-button v-if="scope.row.conclusion === null || scope.row.conclusion === undefined" type="primary" @click="escalation" size="small">上报</el-button>
                    <template slot-scope="scope">
                        <el-button v-if="scope.row.conclusion === null || scope.row.conclusion === undefined" type="primary"
                            @click="escalation" size="small">上报</el-button>
                        <el-button v-else type="success" size="small">已上报</el-button>
                    </template>
                </el-table-column>
@@ -162,22 +168,11 @@
        </div>
        <el-dialog title="请选择设备" :visible.sync="centerDialogVisible" width="20%">
            <div class="div_device_dialog">
                <el-input placeholder="输入关键字进行过滤" v-model="filterText" style="margin-bottom: 6px;">
                </el-input>
                <el-tree class="filter-tree" :data="materialOptions" :props="defaultProps" default-expand-all
                    highlight-current @node-click="nodeClick" :filter-node-method="filterNode" ref="tree">
                    <div class="custom-tree-node" slot-scope="{ data }">
                        <span><i :class="`node_i ${data.children ? 'el-icon-folder-opened' : 'el-icon-tickets'
                            }`
                            "></i>
                            {{ data.name }}</span>
                    </div>
                </el-tree>
                <el-select style="width: 100%;" @change="clickNodeSure()" v-model="filterText" placeholder="请选择">
                    <el-option v-for="item in materialOptions" :key="item.id" :label="item.device" :value="item.id">
                    </el-option>
                </el-select>
            </div>
            <span slot="footer" class="dialog-footer">
                <el-button @click="centerDialogVisible = false">取 消</el-button>
                <el-button type="primary" @click="clickNodeSure()">确 定</el-button>
            </span>
        </el-dialog>
    </div>
</template>
@@ -224,7 +219,8 @@
                qualityTraceability: null,
                quantity: null,
                specificationsModel: null,
                unit: null
                unit: null,
                technologyId: null
            },
            InspectioniD: null,
            addInspectionform: [
@@ -267,39 +263,46 @@
                children: "children",
                label: "name"
            },
            nodeData: "", // node点击保存当前点击数据
            nodeData: {
                id: 0,
                name: null
            }, // node点击保存当前点击数据
            clickSelectDevice: {
                index: "", // 点击选择存储当前行索引
                rpId: "" // 点击选择存储当前行项目Id
                index: null, // 点击选择存储当前行索引
                rpId: null // 点击选择存储当前行项目Id
            }
        };
    },
    watch: {
        filterText(val) {
            this.$refs.tree.filter(val);
        }
        // filterText(val) {
        //     this.$refs.tree.filter(val);
        // }
    },
    mounted() {
        if(this.rowInfo.result!=null&&this.rowInfo.result!=''){
            this.isUpBtn=true
        if (this.rowInfo.result != null && this.rowInfo.result != '') {
            this.isUpBtn = true
        }
        this.processInspectVo.material=this.rowInfo.material
        this.processInspectVo.mcode=this.rowInfo.material_code
        this.processInspectVo.orderNumber=this.rowInfo.order_number
        this.processInspectVo.qualityTraceability=this.rowInfo.quality_traceability
        this.processInspectVo.specificationsModel=this.rowInfo.specifications_model
        this.processInspectVo.unit=this.rowInfo.unit
        this.processInspectVo.quantity=this.rowInfo.quantity
        this.processInspectVo.prname=this.rowInfo.customer_name
        this.processInspectVo.sname=this.rowInfo.project_name
        this.inspectionResultForm[0].id=this.rowInfo.material_code
        this.inspectionResultForm[0].name=this.rowInfo.material
        this.inspectionResultForm[0].conclusion=this.rowInfo.result
        this.detailId=this.rowInfo.id
        this.processInspectVo.material = this.rowInfo.material
        this.processInspectVo.mcode = this.rowInfo.material_code
        this.processInspectVo.orderNumber = this.rowInfo.order_number
        this.processInspectVo.qualityTraceability = this.rowInfo.quality_traceability
        this.processInspectVo.specificationsModel = this.rowInfo.specifications_model
        this.processInspectVo.unit = this.rowInfo.unit
        this.processInspectVo.quantity = this.rowInfo.quantity
        this.processInspectVo.prname = this.rowInfo.customer_name
        this.processInspectVo.sname = this.rowInfo.project_name
        this.inspectionResultForm[0].id = this.rowInfo.material_code
        this.inspectionResultForm[0].name = this.rowInfo.material
        this.inspectionResultForm[0].conclusion = this.rowInfo.result
        this.detailId = this.rowInfo.id
        this.getTableData()
        this.getOptions();
        // this.getOptions();
    },
    methods: {
        // blurNode(row){
        //     console.log(11);
        //     row.isSelectDevice=false
        // },
        escalation() {
            let arr = this.inspectionItems
            let bl = false
@@ -323,6 +326,13 @@
                id: this.detailId
            }).then(res => {
                if (res.code == 200) {
                    if (res.message === '项目未检验完!') {
                        this.$message({
                            message: res.message,
                            type: 'warning'
                        });
                        return
                    }
                    this.$message({
                        message: '上报成功',
                        type: 'success'
@@ -337,17 +347,17 @@
            })

        },
        changeOptionsSamplename(){
            let id=this.processInspectVo.material.split("-")[0]
            let sample=this.optionsSamplename.filter(o=>{
                return o.id==id
        changeOptionsSamplename() {
            let id = this.processInspectVo.material.split("-")[0]
            let sample = this.optionsSamplename.filter(o => {
                return o.id == id
            })[0]
            this.processInspectVo.qualityTraceability=sample.qualityTraceability
            this.processInspectVo.mcode=sample.mcode
            this.processInspectVo.specificationsModel=sample.specifications
            this.processInspectVo.unit=sample.unit
            this.processInspectVo.qualityTraceability = sample.qualityTraceability
            this.processInspectVo.mcode = sample.mcode
            this.processInspectVo.specificationsModel = sample.specifications
            this.processInspectVo.unit = sample.unit
        },
        comBack(){
        comBack() {
            this.$parent.comBackMain()
        },
        handleClick(row) {
@@ -377,19 +387,42 @@
            return data.name.indexOf(value) !== -1;
        },
        // 获取设备树内容
        getOptions() {
            this.$axios.get(this.$api.url.rawSelectDevice).then(res => {
        getOptions(row) {
            this.$axios.get(this.$api.url.inspectionItemChooseDev, {
                params: {
                    father: row.father,
                    name: row.name,
                    technologyId: this.processInspectVo.technologyId
                }
            }).then(res => {
                this.materialOptions = res.data;
                if(this.materialOptions.length===1){
                    this.$message({
                    message: '该项目下只有一个试验设备，无需选择！',
                    type: 'warning'
                });
                    return
                }
                row.isSelectDevice = true
                this.filterText = row.did
            });
        },
        // 点击表格选择触发
        clickTableSelect(scope) {
            this.centerDialogVisible = true;
            if(this.clickSelectDevice.index!=null){
                this.$set(this.inspectionItems[this.clickSelectDevice.index],'isSelectDevice',false)
            }
            this.clickSelectDevice.index = scope.$index;
            this.clickSelectDevice.rpId = scope.row.id;
            this.getOptions(scope.row);
        },
        // 点击树里面的确定
        clickNodeSure() {
        clickNodeSure(row) {
            let select = this.materialOptions.filter(item => {
                return item.id === this.filterText
            })[0]
            this.nodeData.id = select.id
            this.nodeData.name = select.device
            if (this.detailId == null) {
                this.inspectionItems[
                    this.clickSelectDevice.index
@@ -408,16 +441,32 @@
                    .then(res => {
                        this.getTableData()
                        this.centerDialogVisible = false;
                        row.isSelectDevice=false
                    });
            }
        },
        changeState(row, index) {
            console.log(row);
            if (row.did != null && row.did != '') {
                // let val = row.empiricalValueAddss.filter(item => {
                //     return item != '' && item != null
                // })
                // let eq = val.filter(item => {
                //     return /^[^><=]/.test(item)
                // })
                // if (eq.length > 0) {
                //     this.$message({
                //         message: "检测值[" + eq + "]格式首位应包含>,<或者=",
                //         type: 'warning'
                //     });
                //     return
                // }
                let str = ""
                row.empiricalValueAddss.forEach(e => {
                    str += e + ","
                })
                if (str.slice(0, -1) === '' || str.slice(0, -1) === null || str.slice(0, -1) === undefined) {
                    return
                }
                this.$axios.post(this.$api.url.inspectionItemlose_focus_update, {
                    deviceId: row.did,
                    inspectionItemId: row.id,
@@ -489,7 +538,7 @@
            // this.isAddProject = true
            let val = JSON.parse(JSON.stringify(this.processInspectVo))
            val.material = this.processInspectVo.material.split("-")[1]
            val.id=this.processInspectVo.material.split("-")[0]
            val.id = this.processInspectVo.material.split("-")[0]
            this.$axios.post(this.$api.url.finishedInspectAddFinish, val, {
                headers: { "Content-Type": "application/json" }
            }).then(res => {
@@ -507,6 +556,14 @@
            })
        },
        getTableData() {
            console.log(this.rowInfo);
            this.$axios.get(this.$api.url.finishedInspectSelectFinishInspectsListById, {
                params: {
                    id: this.rowInfo.id
                }
            }).then(res => {
                this.processInspectVo.technologyId = res.data[0].techId
            })
            this.$axios.get(this.$api.url.inspectionItemListUser, {
                params: {
                    id: this.detailId,
@@ -532,6 +589,7 @@
                            c.empiricalValueAddss.push("")
                        }
                        uName.push(c['username'])
                        c.isSelectDevice = false
                        arr.push(c)
                    })
                })