Merge remote-tracking branch 'origin/master'

value

2023-08-31 5d9fb7a0c20ea66d5900341fb6e972da4c6bb3b5

 src/views/inspectionManagement/reportForInspection/index.vue

@@ -1,6 +1,6 @@
<template>
   <div class="content-main">
      <div class="rawPage" v-if="!showNewPage">
      <div class="rawPage">
         <div class="top-bar">
            <el-form ref="form" :inline="true" :model="searchData">
               <el-form-item label="材料编码:" position="left" class="sermargin">
@@ -137,105 +137,6 @@
            <el-button type="primary" @click="confirmBtn('addInspectionForm')">确 定</el-button>
         </div>
      </el-dialog>

      <!-- 生成报检单 -->
      <div class="newPage" v-if="showNewPage">
         <!-- 新增页面 -->
         <div class="inspectionForm">
            <el-form :model="inspectionForm" label-position="right" label-width="100px" size="mini">
               <div class="formwrapper">
                  <el-row>
                     <el-col :span="8">
                        <el-form-item label="来料日期：">
                           <el-input style="width: 180px;" :value="inspectionForm.formTime" disabled autocomplete="off" />
                        </el-form-item>
                     </el-col>
                     <el-col :span="8">
                        <el-form-item label="供应商名称：">
                           <el-input style="width: 180px;" :value="inspectionForm.supplier" disabled autocomplete="off" />
                        </el-form-item>
                     </el-col>
                     <el-col :span="8">
                        <el-form-item label="样品编号：">
                           <el-input style="width: 180px;" :value="inspectionForm.code" disabled autocomplete="off" />
                        </el-form-item>
                     </el-col>
                  </el-row>
                  <el-row>
                     <el-col :span="8">
                        <el-form-item label="样品名称：">
                           <el-input style="width: 180px;" :value="inspectionForm.name" disabled autocomplete="off" />
                        </el-form-item>
                     </el-col>
                     <el-col :span="8">
                        <el-form-item label="规格型号：">
                           <el-input style="width: 180px;" :value="inspectionForm.specifications" disabled autocomplete="off" />
                        </el-form-item>
                     </el-col>
                     <el-col :span="8">
                        <el-form-item label="单位：">
                           <el-input style="width: 180px;" :value="inspectionForm.unit" disabled autocomplete="off" />
                        </el-form-item>
                     </el-col>
                  </el-row>
                  <el-row>
                     <el-col :span="8">
                        <el-form-item label="数量：">
                           <el-input style="width: 180px;" :value="inspectionForm.num" disabled autocomplete="off" />
                        </el-form-item>
                     </el-col>
                     <el-col :span="8">
                        <el-form-item label="报检日期：">
                           <el-input style="width: 180px;" :value="inspectionForm.endTime" disabled autocomplete="off" />
                        </el-form-item>
                     </el-col>
                     <el-col :span="8">
                        <el-form-item label="报检人：">
                           <el-input style="width: 180px;" :value="inspectionForm.userName" disabled autocomplete="off" />
                        </el-form-item>
                     </el-col>
                  </el-row>
               </div>
            </el-form>
         </div>
         <div class="inspectionProject">
            <div class="header">
               <span style="font-size: 14px">检验项目</span>
               <div>
                  <!-- <el-button  type="primary" plain size="mini">保存</el-button> -->
                  <el-button @click="showNewPage = false" type="primary" plain size="mini" icon="el-icon-back">返回</el-button>
               </div>
            </div>
            <el-table :max-height="800" :cell-style="{textAlign: 'center'}"
               :header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5',textAlign: 'center'}"
               :data="inspectionItems">
               <el-table-column type="index" label="序号" width="60"></el-table-column>
               <el-table-column prop="name" label="项目" width="250"></el-table-column>
               <el-table-column prop="unit" label="单位" width="125"></el-table-column>
               <el-table-column prop="required" label="标准值" width="125"></el-table-column>
               <el-table-column prop="internal" label="内测值" width="125"></el-table-column>
               <el-table-column prop="testValue" label="检验值" width="125"></el-table-column>
               <el-table-column prop="userName" label="检验人">
                  <template slot-scope="scope">
                     <el-select @blur="blurOptions(scope.row)" v-model="scope.row.check" size="small" slot="append"
                        style="width: 260px;">
                        <el-option v-for="(item,index) in checkeroptions" :key="index" :value="item.id"
                           :label="item.name"></el-option>
                     </el-select>
                  </template>
               </el-table-column>
               <el-table-column prop="device" label="试验设备">
                  <template slot-scope="scope">
                     <el-select @blur="blurOptions(scope.row)" v-model="scope.row.device" size="small" slot="append"
                        style="width: 260px;">
                        <el-option v-for="(item,index) in deviceoptions" :key="index" :value="item.id"
                           :label="item.equipmentName"></el-option>
                     </el-select>
                  </template>
               </el-table-column>
            </el-table>
         </div>
      </div>
   </div>
</template>

@@ -258,8 +159,6 @@
         return {
        standardLibraryData:[],
        chooseVersion: [],
            userName: "",
            devices: "",
            addInspectionForm: {
               inspectionDate: [],
               version: null
@@ -315,20 +214,6 @@
               value: 0,
               label: '未报检'
            }],
            deviceoptions: [{
               value: 0,
               label: '拉力机'
            }, {
               value: 1,
               label: '拖拉机'
            }],
            checkeroptions: [{
               value: 0,
               label: '黄小明'
            }, {
               value: 1,
               label: '张三'
            }],
            radioOptions: [{
               label: '全部',
               value: null
@@ -345,18 +230,6 @@
            pageSize: 10,
            total: 20,
            data: '',
            showNewPage: false,
            inspectionForm: {},
            inspectionItems: [{
               index: 1,
               name: "aaa",
               unit: "KB",
               required: "1",
               internal: "2",
               testValue: "3",
               userName: "",
               device: ""
            }],
            insertRule: {
               fromDate: [{
                  required: true,
@@ -416,14 +289,6 @@
            }).catch(error => {
               this.$message.error(error.message);
            });
         },
         blurOptions(row) {
         },
         async initNewSelection() {
            const res = await selectUser();
            const res2 = await selectEquipment();
            this.checkeroptions = res.data;
            this.deviceoptions = res2.data;
         },
         resetForm(formName) {
            this.addInspectionForm.inspectionDate = [],
@@ -530,10 +395,8 @@
              "unit": val.unit,
              "version": this.addInspectionForm.version
            }
            // this.createReport(obj);
            this.createReport(obj);
            this.addReportDialog = false;
            this.initNewSelection();
            this.showNewPage = true;
          }
        }));
         },