Merge remote-tracking branch 'origin/master'

zss

2023-12-11 c880739ec4cd5ede33b31eb98ad5f7628ea288e5

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

@@ -30,19 +30,25 @@
                            </el-form-item>
                        </el-col>
                        <el-col :span="6">
                            <el-form-item label="报工单号：">
                                <el-input disabled v-model="processInspectVo.productNo"
                                    placeholder="请输入报工单号：" autocomplete="off" />
                            </el-form-item>
                        </el-col>
                        <el-col :span="6">
                            <el-form-item label="客户名称：">
                                <el-input disabled v-model="processInspectVo.prname"
                                    placeholder="请输入客户名称" 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.sname"
                                    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%" @change="changeOptionsSamplename" :disabled="processInspectVo.id != null"
@@ -65,14 +71,14 @@
                                    placeholder="请输入规格型号" 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.unit"
                                    placeholder="请输入单位" 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="请输入数量"
@@ -88,7 +94,7 @@
                            <el-form-item label="产品合格库位：" prop="locationId">
                                <el-select @change="changeLocation" clearable style="width:100%" 
                                v-model="processInspectVo.locationId" placeholder="请选择合格库位"
                                    autocomplete="off">
                                :disabled="resultVal!=null && processInspectVo.id!=null" autocomplete="off">
                                    <el-option v-for="(item,i) in locationList" :key="i" 
                                    :label="item.locName+'-'+item.locNo" :value="item.id"></el-option>
                                </el-select>
@@ -294,7 +300,7 @@
    mounted() {
        this.getDeviceList()
        this.processInspectVo.id = this.$route.query.id
        this.resultVal = this.$route.query.resultVal
        this.resultVal = this.$route.params.resultVal
        if(this.resultVal == null){
            let val = sessionStorage.getItem("finished-resultVal-"+this.processInspectVo.id);
            val == undefined ? this.resultVal=null : this.resultVal = val
@@ -515,7 +521,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();