质检模块修改

zouyu

2024-01-04 dce1a39a7c7c52d36007e2b134def3d2bfb85ce0

质检模块修改

 src/views/basic/workstation/workstation-form.vue

@@ -138,7 +138,7 @@
          >
          </el-transfer>
        </el-tab-pane> -->
        <el-tab-pane label="产品不合格库位" name="disqualified">
        <!-- <el-tab-pane label="产品不合格库位" name="disqualified">
          <el-transfer
            filterable
            v-model="disqualifiedLocationIds"
@@ -148,7 +148,7 @@
            @change="handleChangeDisqualifiedLocation"
          >
          </el-transfer>
        </el-tab-pane>
        </el-tab-pane> -->
        <el-tab-pane label="产品合格库位" name="qualified">
          <el-transfer
            filterable

 src/views/quality/finishedProductInspection/finishedProduct-form.vue

@@ -303,6 +303,7 @@
                documentId: null,
                outBatchNo: null,
                locName: null,
                productNo: null,
            },
            inspectionItems: [], // 新增检验项目表格
            inspectionResultForm: [],
@@ -349,7 +350,7 @@
        }
      },
      codeDevice(row,index){
        this.row=row 
        this.row=row
        console.log("row",row);
        this.deviceCode =true
        this.$refs.codeDeviceCompont.openCamera()
@@ -440,6 +441,7 @@
                    this.processInspectVo.documentId = result.documentId
                    this.processInspectVo.outBatchNo = result.outBatchNo
                    this.processInspectVo.locName = result.locName
                    this.processInspectVo.productNo = result.productNo
                    let userList = []
                    result.children.forEach(item=>{
                        item.iid = Math.random()
@@ -626,7 +628,7 @@
                                updateFinishedInsProduct(obj).then(res => {
                                    if (res.data.code == 0) {
                                        this.init()
                                    } 
                                    }
                                })
                            }
                        })

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

@@ -24,9 +24,9 @@
                                </el-form-item>
                            </el-col>
                            <el-col :span="6">
                                <el-form-item label="车间订单号" prop="moNumber">
                                <el-form-item label="车间订单号" prop="moNo">
                                    <el-input @blur="selectInfoByOrderId" :disabled="processInspectVo.id != null"
                                        v-model="processInspectVo.moNumber" placeholder="请输入车间订单号" autocomplete="off" >
                                        v-model="processInspectVo.moNo" placeholder="请输入车间订单号" autocomplete="off" >
                                        <el-button
                                            slot="append"
                                            icon="el-icon-full-screen"
@@ -62,7 +62,7 @@
                                    </el-tooltip>
                                </el-form-item>
                            </el-col>
                        

                            <el-col :span="6">
                                <el-form-item label="工单" prop="operationTaskId">
                                    <el-select style="width: 100%" :disabled="processInspectVo.id != null"
@@ -110,14 +110,14 @@
                </el-row>
                <el-row style="width:100%;">
                    <el-col :span="24">
                        <el-table border 
                            :data="inspectionItems" 
                        <el-table border
                            :data="inspectionItems"
                            height="400"
                            :header-cell-style="{ textAlign: 'center', color: 'black', backgroundColor: '#fafafa' }"
                            :cell-style="{ textAlign: 'center' }" 
                            row-key="iid" 
                            :cell-style="{ textAlign: 'center' }"
                            row-key="iid"
                            default-expand-all style="width: 100%"
                            ref="table" 
                            ref="table"
                            :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
                            <el-table-column type="index" label="序号" show-overflow-tooltip width="60"></el-table-column>
                            <el-table-column label="项目" prop="father" show-overflow-tooltip width="140"></el-table-column>
@@ -253,7 +253,7 @@
        </el-dialog>
    </div>
</template>
    

<script>
import {
    chooseMater,
@@ -277,7 +277,7 @@
            proIndex: 0,
            deviceCode: false,
            rules: {
                moNumber: [{required:true,message:'车间订单号不能为空',trigger:'blur'}],
                moNo: [{required:true,message:'车间订单号不能为空',trigger:'blur'}],
                quantity: [{required:true,validator: validatePositiveInteger,trigger:'blur'}],
                operationTaskId: [{required:true,message: '请选择工单',trigger:'change'}],
            },
@@ -299,7 +299,7 @@
            empiricalValueAddMaxNumber: 0,
            processInspectVo: {
                id: null,
                moNumber: null,
                moNo: null,
                proInsNo: null,
                material: null,
                materialCode: null,
@@ -345,7 +345,7 @@
        let obj=JSON.parse(data)
        let info={"code":obj["moNo"]}
        if(info.code){
            this.processInspectVo.moNumber = obj["moNo"]
            this.processInspectVo.moNo = obj["moNo"]
            this.selectInfoByOrderId()
        }else{
            this.$message.warning('未识别出车间订单号信息！');
@@ -375,7 +375,7 @@
        }
      },
      codeDevice(row,index){
        this.row=row 
        this.row=row
        this.deviceCode =true
        this.$refs.codeDeviceCompont.openCamera()
        this.proIndex=index
@@ -452,7 +452,7 @@
            if (id != null) {
                queryById(id).then(res => {
                    let result = res.data.data
                    this.processInspectVo.moNumber = result.moNumber
                    this.processInspectVo.moNo = result.moNo
                    this.processInspectVo.operationTaskId = result.technologyOperationName
                    this.processInspectVo.proInsNo = result.proInsNo
                    this.processInspectVo.projectName = result.projectName
@@ -608,9 +608,9 @@
            })
        },
        selectInfoByOrderId() {
            if(this.processInspectVo.moNumber){
            if(this.processInspectVo.moNo){
                chooseMater({
                        moNo: this.processInspectVo.moNumber
                        moNo: this.processInspectVo.moNo
                    }).then(res => {
                        let data = res.data.data
                        if (data) {
@@ -651,7 +651,7 @@
                                updateProcessInsProduct(obj).then(res => {
                                    if (res.data.code == 0) {
                                        this.init()
                                    } 
                                    }
                                })
                            }
                        })
@@ -684,7 +684,7 @@
    },
}
</script>
    

<style scoped>
.finishedProduct-detail {
    width: 100%;
@@ -748,4 +748,4 @@
    border-top: 0 !important;
    cursor: pointer !important;
}
</style>
</style>