modified: .env.development modified: src/views/experiment/inspectionA...

zouyu

2023-09-01 2bd7979e7b7db44df83847f800695ee2188146a9

 src/views/inspectionManagement/commissionInspection/index.vue

@@ -67,7 +67,7 @@
                     <el-table-column prop="entrusted" label="委托单位" min-width="12%" />
                     <el-table-column prop="samples_number" label="样品数量" min-width="8%" />
                     <el-table-column prop="sample_name" label="样品名称" min-width="8%" />
                     <el-table-column prop="specifications_models" label="规格型号" min-width="12%" />
                     <el-table-column prop="speName" label="规格型号" min-width="12%" />
                     <el-table-column prop="inspectionTime" label="送样时间" min-width="8%" />
                     <el-table-column prop="completionDeadline" label="完成期限" min-width="8%" />
                     <el-table-column prop="contacts" label="委托编制人" min-width="8%" />
@@ -163,7 +163,8 @@
      selectViewUUID,
      delLink,
      chooseVersion,
      lookProByVer
      lookProByVer,
      addInspect
   } from '@/api/inspection/commisioninspection'
   export default {
      data() {
@@ -193,7 +194,7 @@
               value: '1',
               label: '部门1'
            }],
            radioValue: 0,
            radioValue: null,
            commisionTable: [{
               specifications_models: "GGXH-AAAAA",
               inspectionTime: "2023-08-03",
@@ -209,15 +210,15 @@
            }],
            conditionsOptions: [{
                  label: '全部',
                  value: 0
                  value: null
               },
               {
                  label: '已检验',
                  value: 1
                  value: 0
               },
               {
                  label: '待检验',
                  value: 2
                  value: 1
               }
            ],
            currentPage: 1,
@@ -264,30 +265,34 @@
         confirmBtn(formName) {
            this.$refs[formName].validate((valid)=>{
               if(valid){
               // let dateArr = this.addInspectionForm.inspectionDate;
               // //添加报检单
               // let val = this.checkData[0];
               // let obj = {
               //    "endTime": dateArr[1],
               //    "experiment": "",
               //    "formTime": val.createTime,
               //    "id": val.id,
               //    "mcode": val.materialCoding,
               //    "name": val.materialName,
               //    "num": val.quantity,
               //    "specifications": val.specificationsModels,
               //    "startTime": dateArr[0],
               //    "supplier": val.supplierName,
               //    "type": val.type,
               //    "unit": val.unit,
               //    "version": this.addInspectionForm.version
               // }
               // // this.createReport(obj);
               // this.addReportDialog = false;
               // this.initNewSelection();
               // this.showNewPage = true;
               let dateArr = this.addInspectionForm.inspectionDate;
               //添加报检单
               let val = this.checkData[0];
               let obj = {
                  "endTime": dateArr[1],
                  "mcode":"mcode",
                  "formTime": val.inspectionTime,
                  "id": val.id,
                  "name": val.sample_name,
                  "num": val.samples_number,
                  "specifications": val.speName,
                  "startTime": dateArr[0],
                  "supplier": val.entrusted,
                  "type": 2,
                  // "unit": "mm",
                  "version": this.addInspectionForm.version
               }
               this.createReport(obj);
               this.addReportDialog = false;
               }
            });
         },
         //生成报检单请求
         async createReport(param) {
            let res = await addInspect(param);
            if(res.data==null)return
            this.$message.success('报检成功')
            this.$router.push(`/experiment/Viewdetails/${res.data}`)
         },
         //生成报检单按钮
         addReportBtn() {
@@ -299,7 +304,7 @@
               } else {
                  let mcode = this.checkData[0].entrust_coding;
                  let name = this.checkData[0].sample_name;
                  let specifications = this.checkData[0].specifications_models;
                  let specifications = this.checkData[0].speName;
                  let id = this.checkData[0].id;
                  this.getChooseVersionFun(mcode,name,specifications,id);
                  this.addReportDialog = true;
@@ -309,7 +314,7 @@
         changeVersionFun(){
            let mCode = this.checkData[0].entrust_coding;
            let name = this.checkData[0].sample_name;
            let specifications = this.checkData[0].specifications_models;
            let specifications = this.checkData[0].speName;
            let version = this.addInspectionForm.version;
            let id = this.checkData[0].id;
            this.getProByVersion(mCode,name,specifications,version,id);
@@ -333,7 +338,7 @@
            var vm = this;
            this.chooseVersion = [];
            await chooseVersion({
            mcode : mCode,
            id : id,
            name : name,
            specifications : specifications
            }).then((res)=>{
@@ -401,8 +406,6 @@
         async radioclick() {
            // 处理点击radio的时间
            if (this.radioValue === 0) {
               this.getCommisionList()
            } else {
               const res = await getCommisionList({
                  pageNo: this.currentPage,
                  pageSize: this.pageSize,
@@ -410,6 +413,16 @@
               })
               this.commisionTable = res.data.row
               this.total = res.data.total
            } else if(this.radioValue === 1) {
               const res = await getCommisionList({
                  pageNo: this.currentPage,
                  pageSize: this.pageSize,
                  inspectionStatus: this.radioValue
               })
               this.commisionTable = res.data.row
               this.total = res.data.total
            }else{
               this.getCommisionList();
            }

         },