bug修复

value

2023-08-31 5a15331883386cb2206acd081ee54b873a08858b

bug修复

 .env.development

@@ -2,4 +2,4 @@
ENV = 'development'

# base api
VUE_APP_BASE_API =  'http://192.168.110.254:1234/'
VUE_APP_BASE_API =  'http://localhost:1234/'

 src/views/experiment/inspectionApplication/Viewdetails/index.vue

@@ -88,7 +88,7 @@
                        </el-table-column>
                        <el-table-column prop="userName" label="责任人" width="220px">
                            <template slot-scope="scope">
                                <el-select v-model="scope.row.username" size="small" slot="append"
                                <el-select v-model="scope.row.username" slot="append"
                                    @change="(val)=>chooseUseProId(val, scope.row)">
                                    <el-option v-for="(item,indxe) in ZERENren" :key="indxe" :label="item.name"
                                        :value="item.id"></el-option>
@@ -97,7 +97,9 @@
                        </el-table-column>
                        <el-table-column prop="inspectionMaterialId" label="实验设备" width="220px">
                            <template slot-scope="scope">
                                <el-cascader v-model="scope.row.instrumentName" :options="devices" @change="(val)=>chooseEquipment(val, scope.row)"></el-cascader>
                                <el-cascader v-model="scope.row.instrumentName" :options="devices"
                                    :props="{label: 'Name',value: 'Id',children: 'childrenList'}"
                                    @change="(val)=>chooseEquipment(val, scope.row)"></el-cascader>
                            </template>
                        </el-table-column>
                    </el-table>
@@ -156,7 +158,8 @@
            },
            async selectEquipment() {
                const res = await selectEquipment()
                this.getDevices = res.data
                this.devices = JSON.parse(JSON.stringify(res.data).replaceAll('father', '').replaceAll('ins', '').replaceAll(
                    'son', '').replaceAll('name', 'Name'))
            },
            //检验单表
            async selectInspectsListById() {
@@ -171,15 +174,15 @@
                    id: row.id,
                    userProId: val
                }).then(res => {
                    this.$message.success('责任人分配成功')
                    if (res.data) this.$message.success('责任人分配成功')
                })
            },
            chooseEquipment(val, row){
                chooseUseProId({
            chooseEquipment(val, row) {
                chooseEquipment({
                    id: row.id,
                    equipmentId: val
                    equipmentId: val[2]
                }).then(res => {
                    this.$message.success('设备分配成功')
                    if (res.data) this.$message.success('设备分配成功')
                })
            }
        }

 src/views/experiment/inspectionApplication/index.vue

@@ -72,8 +72,8 @@
                            <el-table-column prop="createTime" label="登记日期" min-width="80px" />
                            <el-table-column prop="inspection_status" label="检验结果" min-width="80px">
                                <template slot-scope="scope">
                                    <el-tag class="tag" :type="scope.row.inspection_status === 0 ? 'danger' : 'success'"
                                        disable-transitions>{{ scope.row.inspection_status === 0 ? '不合格' : '合格' }}</el-tag>
                                    <el-tag class="tag" type="danger" disable-transitions v-if="scope.row.inspection_status == 0">不合格</el-tag>
                                    <el-tag class="tag" type="success" disable-transitions v-else-if="scope.row.inspection_status == 1">合格</el-tag>
                                </template>
                            </el-table-column>
                            <el-table-column prop="userName" label="登记人" min-width="80px" />
@@ -567,11 +567,11 @@
                })
                const data = res.data.row
                data.forEach((item) => {
                    var formTime = item["DATE_FORMAT(`form_time`,'%Y-%m-%d')"]
                    var startTime = item["DATE_FORMAT(i"]["`start_time`,'%Y-%m-%d')"]
                    var endTime = item["DATE_FORMAT(i"]["`end_time`,'%Y-%m-%d')"]
                    var formTime = item["form_time"]
                    var startTime = item["start_time"]
                    var endTime = item["end_time"]
                    var checkdate = startTime + '~' + endTime
                    var createTime = item["DATE_FORMAT(i"]["`create_time`,'%Y-%d')"]
                    var createTime = item["create_time"]
                    item['formTime'] = formTime // 来料日期
                    item['checkdate'] = checkdate // 检验日期
                    item['createTime'] = createTime // 登记日期
@@ -587,11 +587,11 @@
                })
                var data = res.data.row
                data.forEach((item) => {
                    var formTime = item["DATE_FORMAT(`form_time`,'%Y-%m-%d')"]
                    var startTime = item["DATE_FORMAT(i"]["`start_time`,'%Y-%m-%d')"]
                    var endTime = item["DATE_FORMAT(i"]["`end_time`,'%Y-%m-%d')"]
                    var formTime = item["form_time"]
                    var startTime = item["start_time"]
                    var endTime = item["end_time"]
                    var checkdate = startTime + '~' + endTime
                    var createTime = item["DATE_FORMAT(i"]["`create_time`,'%Y-%m-%d')"]
                    var createTime = item["create_time"]
                    item['formTime'] = formTime // 来料日期
                    item['checkdate'] = checkdate // 检验日期
                    item['createTime'] = createTime // 登记日期

 src/views/inspectionManagement/commissionInspection/addCommision.vue

@@ -22,7 +22,7 @@
                        <el-table-column type="index" label="序号" min-width="10%" />
                        <el-table-column prop="sampleNumber" label="样品编号" min-width="8%" />
                        <el-table-column prop="sampleName" label="样品名称" min-width="10%" />
                        <el-table-column prop="speName" label="规格型号" min-width="10%" >
                        <el-table-column prop="speName" label="规格型号" min-width="10%">
                        </el-table-column>
                        <el-table-column prop="unit" label="单位" min-width="8%" />
                        <el-table-column prop="samplesNumber" label="数量" min-width="8%" />
@@ -262,19 +262,7 @@
                    experiment: [],
                    addway: ''
                },
                experList: [{
                    key: '1',
                    label: '外观检查'
                }, {
                    key: '2',
                    label: '动作电压试验'
                }, {
                    key: '3',
                    label: '电阻管泄漏电流试验'
                }, {
                    key: '4',
                    label: '绝缘部分交流耐压试验'
                }],
                experList: [],
                sampleoptions: [],
                samplecodeoptions: [],
                model_spe_options: [],
@@ -369,12 +357,16 @@
            },
            addInspection() {
                let exper = this.addPointerForm.experiment[0]
                this.addPointerForm.addway = 1
                for (let i = 1; i < this.addPointerForm.experiment.length; i++) {
                    exper += ',' + this.addPointerForm.experiment[i]
                }
                this.addPointerForm.experiment = exper
                let tmp = this.addPointerForm
                this.sampleoptions.forEach(a => {
                    if (a.key == tmp.sampleName) tmp.sampleName = a.value
                })
                tmp.speName = tmp.addway + '-' + tmp.speName
                tmp.addway = 1
                this.detectionInfo.push(tmp)
                this.dialogueFormVisible = false
                this.addPointerForm = {
@@ -447,8 +439,8 @@
                        return item.name
                    })
                })
                this.model_sta_options.forEach(a=>{
                    if(a.key == val){
                this.model_sta_options.forEach(a => {
                    if (a.key == val) {
                        this.addPointerForm.speName = a.value
                    }
                })

 src/views/inspectionManagement/reportForInspection/index.vue

@@ -82,7 +82,7 @@
                        <el-table-column type="selection" :selectable="checkSelect" min-width="5%">
                        </el-table-column>
                        <el-table-column type="index" label="序号" min-width="8%" />
                        <el-table-column prop="createTime" label="来料日期" min-width="8%" />
                        <el-table-column prop="dateSurvey" label="来料日期" min-width="8%" />
                        <el-table-column prop="supplierName" label="供应商名称" min-width="12%" />
                        <el-table-column prop="materialCoding" label="材料编码" min-width="8%" />
                        <el-table-column prop="materialName" label="材料名称" min-width="8%" />
@@ -91,7 +91,7 @@
                        <el-table-column prop="quantity" label="数量" min-width="5%" />
                        <el-table-column prop="inspectionDate" label="报检日期" min-width="8%" />
                        <el-table-column prop="surveyor" label="检验人" min-width="8%" />
                        <el-table-column prop="dateSurvey" label="检验日期" min-width="8%" />
                        <el-table-column prop="insTime" label="检验日期" min-width="8%" />
                        <el-table-column prop="type" label="状态" min-width="8%">
                            <template slot-scope="scope">
                                <span :style="{ color: scope.row.type === 1 ? 'green' : 'red' }">
@@ -347,19 +347,7 @@
                    label: '未报检'
                }],
                radioValue: null,
                inspectionTable: [{
                    createTime: '2023-07-28',
                    supplier_name: '国网山东省电力有限公司',
                    materialCoding: 'BP214274',
                    materialName: '铝包钢绞线',
                    specificationsModels: 'JLHA/G1A-185/30-26/7',
                    unit: '吨',
                    quantity: 21,
                    dateSurvey: '2023-08-02',
                    surveyor: '黄小明',
                    inspectionDate: '2023-12-09',
                    condition: 1
                }],
                inspectionTable: [],
                currentPage: 1,
                pageSize: 10,
                total: 20,
@@ -437,7 +425,6 @@
                });
            },
            blurOptions(row) {
                console.log("更新", row);
            },
            async initNewSelection() {
                const res = await selectUser();
@@ -456,7 +443,6 @@
                    cancelButtonText: '取消',
                    type: 'warning'
                }).then(() => {
                    console.log(row.id);
                    this.deleteMaterialFun(row, index);
                }).catch(() => {});
            },
@@ -469,7 +455,6 @@
            },
            handleSelectionChange(val) {
                this.checkData = val;
        console.log(val);
            },
            //生成报检单按钮
            addReportBtn() {
@@ -483,7 +468,6 @@
            let name = this.checkData[0].materialName;
            let specifications = this.checkData[0].specificationsModels;
            this.getChooseVersionFun(mcode,name,specifications);
            console.log(this.standardLibraryData);
                        this.addReportDialog = true;
                    }
                }
@@ -504,7 +488,6 @@
              specifications : specifications,
              version: version
          }).then((res)=>{
            console.log(res);
            vm.standardLibraryData = res.data;
          })
          
@@ -548,20 +531,17 @@
                    "unit": val.unit,
                    "version": this.addInspectionForm.version
                }
                // this.createReport(obj);
                this.addReportDialog = false;
                this.initNewSelection();
                this.showNewPage = true;
                this.createReport(obj);
                // this.addReportDialog = false;
                // this.initNewSelection();
                // this.showNewPage = true;
            },
            //生成报检单
            async createReport(param) {
                let res = await addInspect(param);
                const res2 = await selectInspectsListById({
                    id: res.data
                });
                this.resultData = res2.data;
                this.inspectionForm = res2.data;
                this.inspectionItems = res2.data.insProducts;
                if(res.data==null)return
                this.$message.success('报检成功')
                this.$router.push(`/experiment/Viewdetails/${res.data}`)
            },
            // 获取分页列表数据
            async getRawMaterialList() {
@@ -597,7 +577,6 @@
                this.getRawMaterialList()
            },
            radioclick() {
                console.log(this.inspectionTable);
                if (this.radioValue === 0) {

                }