Merge remote-tracking branch 'origin/master'

value

2023-08-30 ad5cec53b9d5fb8397f5c0c1e30993e128ee92fd

Merge remote-tracking branch 'origin/master'

 .env.development

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

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

 src/utils/request.js

@@ -65,7 +65,6 @@
      sessionStorage.removeItem("user")
      sessionStorage.setItem("flushPage",1)
      router.replace({path: '/login'});
      // location.reload()
      }
      if(res.code===403){
        Message({

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

@@ -185,12 +185,7 @@
        this.ZERENren = res.data
        console.log(this.ZERENren);
      },
      //设备
    //   getDevices() {
    //             get(this.$url.chooseinstum).then(res => {
    //                 this.devices = res.data
    //             })
    //         },

    async chooseinstum(){
        const res =  await chooseinstum()
        this.getDevices = res.data

 src/views/experiment/inspectionApplication/index.vue

@@ -162,7 +162,7 @@
                                    </el-col>
                                    <el-col :span="10">
                                        <el-form-item label="检验时间：">
                                            <el-date-picker v-model="infoForm.endTime" type="daterange" range-separator="至"
                                            <el-date-picker v-model="infoForm.checkdate" type="daterange" range-separator="至"
                                                start-placeholder="开始日期" end-placeholder="结束日期" style="width: 300px;">
                                            </el-date-picker>
                                        </el-form-item>
@@ -313,36 +313,37 @@
                    </template>
                </el-card>
                <el-table :data="tableData" style="width: 100%; margin-bottom: 20px" row-key="id" border
                    height="calc(80vh - 250px)" default-expand-all ref="multipleTable"
                    :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
                    <el-table-column type="selection" label="序号"> </el-table-column>
                    <el-table-column type="index" width="50px" label="序号"></el-table-column>
                    <el-table-column label="项目名称" sortable>
                        <template scope="scope">
                            <el-tag>
                                <div class="firstDiv" :style="`color: ${
                              scope.row.code == '[1]' ? '#16a7ff' : '#58c173'
                            }`">
                                    {{ scope.row.code == "[1]" ? "01" : "02" }}
                                </div>
                                <span style="color: black">{{ scope.row.name }}</span>
                            </el-tag>
                        </template>
                    </el-table-column>
                    <el-table-column prop="unit" label="单位" sortable></el-table-column>
                    <el-table-column label="标准值" sortable>
                        <template scope="scope">
                            <el-input v-if="scope.row.edit === true || scope.row.code === '[2]'" @blur="requiredOnfocus(scope)"
                                v-model="scope.row.required" placeholder="请输入标准值"></el-input>
                        </template>
                    </el-table-column>
                    <el-table-column prop="internal" label="内控值" sortable>
                        <template scope="scope">
                            <el-input v-if="scope.row.edit === true || scope.row.code === '[2]'" @blur="requiredOnfocus(scope)"
                                v-model="scope.row.internal" placeholder="请输入内控值"></el-input>
                        </template>
                    </el-table-column>
                </el-table>
                        height="calc(80vh - 250px)" default-expand-all ref="multipleTable"
                        @select-all="selectAll" @selection-change="handleSelectionChange"
                        :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
                        <!-- <el-table-column type="selection" label="序号"> </el-table-column> -->
                        <el-table-column type="index" width="50px" label="序号"></el-table-column>
                        <el-table-column label="项目名称" sortable>
                            <template scope="scope">
                                <el-tag>
                                    <div class="firstDiv" :style="`color: ${
                      scope.row.code == '[1]' ? '#16a7ff' : '#58c173'
                    }`">
                                        {{ scope.row.code == "[1]" ? "01" : "02" }}
                                    </div>
                                    <span style="color: black">{{ scope.row.name }}</span>
                                </el-tag>
                            </template>
                        </el-table-column>
                        <el-table-column prop="unit" label="单位" sortable></el-table-column>
                        <el-table-column label="标准值" sortable>
                            <template scope="scope">
                                <el-input v-if="scope.row.edit === true || scope.row.code === '[2]'" @blur="requiredOnfocus(scope)"
                                    v-model="scope.row.required" placeholder="请输入标准值"></el-input>
                            </template>
                        </el-table-column>
                        <el-table-column prop="internal" label="内控值" sortable>
                            <template scope="scope">
                                <el-input v-if="scope.row.edit === true || scope.row.code === '[2]'" @blur="requiredOnfocus(scope)"
                                    v-model="scope.row.internal" placeholder="请输入内控值"></el-input>
                            </template>
                        </el-table-column>
                    </el-table>
                <span slot="footer" class="dialog-footer">
                    <el-button @click="Standardframe = false">取 消</el-button>
                    <el-button type="primary" @click="GOfrom">确 定</el-button>
@@ -432,7 +433,7 @@
        selectAll,
        addInspect,
        chooseVer,
        lookProByVer
        lookProByVer,
    } from '@/api/experiment/planAssignments'
    export default {
        data() {
@@ -459,7 +460,7 @@
                    amount: '',
                    checkdate: []
                },
                selectedValue: 1,
                selectedValue: {},
                infoForm: {},
                commisionSelection: {
                    entrust_coding: '',
@@ -509,8 +510,10 @@
                tableData: [],
                tableRow: {},
                BANben: [],
                select_1: [],
                aa: {}
                // select_1: [],
                aa: {},
                listdata:[],
                ddd:{}
            }
        },
        watch: {
@@ -528,6 +531,7 @@
            if (this.$route.name === 'ForInspectionDetail') this.showDetail = true
        },
        methods: {
			
            async selectAll() {
                const res = selectAll({
                    type: 0
@@ -569,6 +573,7 @@
                this.aa = this.BANben[0]
                this.lookProByVer()
            },
			
            //标准库
            async lookProByVer() {
                const res = await lookProByVer({
@@ -662,6 +667,7 @@
            },
            handleRawMaterialSelection() {
                this.infoForm = this.tmp
                console.log(this.infoForm);
                this.rawmaterialVisible = false
            },
            handleRadioChange() {
@@ -672,13 +678,13 @@
                        selectAll({
                            type: 0
                        }).then(res => {
                            //   var data = res.data
                            // data.forEach((item)=>{
                            //   var checkdate = []
                            //   checkdate.push(item['createTime'])
                            //   checkdate.push(item['updateTime'])
                            //   item['checkdate'] = checkdate // 检验日期
                            // })
                              var data = res.data
                            data.forEach((item)=>{
                              var checkdate = []
                              checkdate.push(item['createTime'])
                              checkdate.push(item['updateTime'])
                              item['checkdate'] = checkdate // 检验日期
                            })
                            this.rawMaterialTable = res.data
                        })

@@ -689,26 +695,35 @@
                        selectAll({
                            type: 2
                        }).then(res => {

                            var data = res.data
                            data.forEach((item)=>{
                              var checkdate = []
                              checkdate.push(item['createTime'])
                              checkdate.push(item['updateTime'])
                              item['checkdate'] = checkdate // 检验日期
                            })
                            this.commisionTable = res.data
                        })
                    }
                }, 100)
            },
            // 新增检验
            async addInspection() {
            async addInspection() {  
                if (this.type === 0) {
                    await addInspect({
                    addInspect({ 
                        endTime: this.infoForm.checkdate[1],
                        formTime: this.infoForm.dateSurvey,
                        mcode: this.infoForm.materialCoding,
                        name: this.infoForm.materialName,
                        num: this.infoForm.quantity,
                        specifications: this.infoForm.specificationsModels,
                        formTime: this.infoForm.formTime,
                        mcode: this.infoForm.mcode,
                        name: this.infoForm.name,
                        num: this.infoForm.num,
                        specifications: this.infoForm.specifications,
                        startTime: this.infoForm.checkdate[0],
                        supplier: this.infoForm.supplierName,
                        supplier: this.infoForm.supplier,
                        type: this.type,
                        unit: this.infoForm.unit
                        unit: this.infoForm.unit,
                        version:this.BANben[1]
                    }).then(res=>{
					
                    })
                }
                if (this.type === 1) {
@@ -722,7 +737,9 @@
                        startTime: this.commisionSelection.checkdate[0],
                        supplier: this.commisionSelection.supplier,
                        type: this.type,
                        unit: this.commisionSelection.unit
                        unit: this.commisionSelection.unit,
                        version:this.aa

                    })
                }
                if (this.type === 2) {
@@ -736,15 +753,18 @@
                        startTime: '2023-08-14',
                        supplier: this.finishedTable.supplier,
                        type: this.type,
                        unit: this.finishedTable.unit
                        unit: this.finishedTable.unit,
                        version:this.aa

                    })
                }
                this.type = 0
                this.checkTypeVisible = false
                this.$message({
                    message: '添加成功！',
                    type: 'success'
                });
                // this.$message({
                //     message: '添加成功！',
                //     type: 'success'
                // });
                // this.$router.push({name: 'Viewdetails'})
            },
            // 每页条数改变时触发 选择一页显示多少行
            handleSizeChange(val) {
@@ -757,33 +777,45 @@
                this.currentPage = val
                this.selectInspectsList()
            },
            //     //表单校验
            // validateForm(infoForm){
            //     console.log(this.infoForm);

            //     if (infoForm.checkdate == undefined) {
              //           alert('请输入检验时间');
            //         return false;
            //     }
            //     // 校验通过
            //     return true;
            // },
            //确定跳转
            QUEding() {
                // this.tableRow = a

                if (this.infoForm.checkdate[0] == undefined||this.infoForm.checkdate[1] == undefined) {
                    this.$message({
                    message: '请选择检验时间',
                    type: 'warning'
                    });
                    return;
                }
                this.Standardframe = true

                this.skipshow()
                this.chooseVer()

            },
            //新增的数据
            skipshow() {
                const data = this.inspectionTable.at(-1)
                this.listdata = data
            },
            //確定詳情頁
            GOfrom() {
                this.Standardframe = false
                // const data = {
                //   // mcode : this.tmp.mcode,
                //   // name:this.tmp.name,
                //   // specifications:this.tmp.specifications,
                //   version:this.tmp.id
                // }

                this.$router.push({
                    name: 'Viewdetails',
                    query: {
                        id: this.tmp.id
                    }
                })

            },
            async GOfrom() {
                    // this.addInspect()
                    this.addInspection()
                        // this.kk = res.data
                        console.log(this.kk)
                        // this.$router.push({name: 'Viewdetails',query: {id: res.data}})
                        // console.log(res);
			
            }
        }
    }
</script>