Merge remote-tracking branch 'origin/master'

value

2023-09-07 523d7a54fb07fdf756fbc4faa5eb7fef7263a556

 src/views/inspectionManagement/reportForInspection/index.vue

@@ -4,27 +4,27 @@
         <div class="top-bar">
            <el-form ref="form" :inline="true" :model="searchData">
               <el-form-item label="材料编码:" position="left" class="sermargin">
                  <el-input v-model="searchData.code" class="input-form" placeholder="请输入">
                  <el-input size="small" v-model="searchData.code" class="input-form" placeholder="请输入">
                  </el-input>
               </el-form-item>
               <el-form-item label="材料名称:" class="sermargin">
                  <el-input v-model="searchData.name" class="input-form" placeholder="请输入材料名称">
                  <el-input size="small" v-model="searchData.name" class="input-form" placeholder="请输入材料名称">
                  </el-input>
               </el-form-item>
               <el-form-item label="状态:" class="sermargin">
                  <el-select v-model="searchData.state" placeholder="全部">
                  <el-select size="small" v-model="searchData.state" placeholder="全部">
                     <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
                     </el-option>
                  </el-select>
               </el-form-item>
               <el-form-item label="来料日期:" style="margin-right: 20px;">
                  <el-date-picker value-format="yyyy-MM-dd" v-model="searchData.date" class="input-form" placeholder="请选择来料日期">
                  <el-date-picker size="small" value-format="yyyy-MM-dd" v-model="searchData.date" class="input-form" placeholder="请选择来料日期">
                  </el-date-picker>
               </el-form-item>
               <el-form-item>
                  <el-button type="primary" @click="search">查询</el-button>
                  <el-button type="primary" plain @click="reset">重置</el-button>
                  <el-button type="primary" icon="el-icon-plus" @click="addReportVisible = true">新增</el-button>
                  <el-button size="small" type="primary" @click="search">查询</el-button>
                  <el-button size="small" type="primary" plain @click="reset">重置</el-button>
                  <el-button size="small" type="primary" icon="el-icon-plus" @click="addReportVisible = true">新增</el-button>
               </el-form-item>
            </el-form>
         </div>
@@ -72,7 +72,9 @@
            <div class="table-box">
               <el-table ref="inspectionTable" :max-height="450" :cell-style="{textAlign: 'left'}"
                  :header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5',textAlign: 'left'}"
                  :data="inspectionTable" style="width: 100%" @selection-change="handleSelectionChange">
                  :data="inspectionTable" style="width: 100%" @selection-change="handleSelectionChange"
                  :default-sort = "{prop: 'createTime', order: 'descending'}"
                  >
                  <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="dateSurvey" label="来料日期" min-width="8%" />
@@ -83,6 +85,7 @@
                  <el-table-column prop="unit" label="单位" min-width="5%" />
                  <el-table-column prop="quantity" label="数量" min-width="5%" />
                  <el-table-column prop="inspectionDate" label="报检日期" min-width="8%" />
                  <el-table-column v-if="1===0" prop="createTime" label="日期" min-width="8%" />
                  <el-table-column prop="surveyor" label="检验人" min-width="8%" />
                  <el-table-column prop="type" label="状态" min-width="8%">
                     <template slot-scope="scope">
@@ -410,8 +413,7 @@
               "unit": val.unit,
               "version": this.addInspectionForm.version
               }
               // this.createReport(obj);
               console.log("obj---",obj);
               this.createReport(obj);
               this.addReportDialog = false;
            }
            }));