Merge remote-tracking branch 'origin/master'

value

2023-09-07 523d7a54fb07fdf756fbc4faa5eb7fef7263a556

 src/views/experiment/inspectionApplication/index.vue

@@ -5,85 +5,76 @@
            <div class="top-bar">
               <el-form ref="form" :inline="true" :model="searchData">
                  <el-form-item label="申请单号:">
                     <el-input v-model="searchData.applicationnumber" class="input-form" placeholder="请输入申请单号"
                     <el-input size="small" v-model="searchData.applicationnumber" class="input-form" placeholder="请输入申请单号"
                        style="width: 200px; margin-right: 20px;">
                        <i slot="prefix" class="el-input__icon el-icon-search" />
                     </el-input>
                  </el-form-item>
                  <el-form-item label="检验类型:">
                     <el-select v-model="searchData.type" placeholder="全部" style="width: 100px;margin-right: 20px;">
                  <el-form-item label="检验类型:" width="200">
                     <el-select size="small" v-model="searchData.type" placeholder="全部" style="width: 100px;margin-right: 20px;">
                        <el-option v-for="item in typeoptions" :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-select v-model="searchData.state" placeholder="全部" style="width: 100px;margin-right: 20px;">
                  <el-form-item label="检验结果:" width="200">
                     <el-select size="small" v-model="searchData.state" placeholder="全部" style="width: 100px;margin-right: 20px;">
                        <el-option v-for="item in stateoptions" :key="item.value" :label="item.label" :value="item.value">
                        </el-option>
                     </el-select>
                  </el-form-item>
                  <el-form-item>
                     <el-button type="primary" @click="searchInspections">查询</el-button>
                     <el-button type="primary" plain @click="reset">重置</el-button>
                     <el-button size="small" type="primary" @click="searchInspections">查询</el-button>
                     <el-button size="small" type="primary" plain @click="reset">重置</el-button>
                  </el-form-item>
               </el-form>
               <el-form class="rightBtn">
                  <el-form-item class="createBtn">
                     <el-button type="primary" icon="el-icon-document-add" @click="checkTypeVisible = true"
                     <el-button size="small" type="primary" icon="el-icon-document-add" @click="checkTypeVisible = true"
                        style="background-color: rgb(1, 102, 226);">新增检验单</el-button>
                  </el-form-item>
                  <el-form-item class="getDataBtn">
                     <el-button type="primary" icon="el-icon-download"
                     <el-button size="small" type="primary" icon="el-icon-download"
                        style="background-color: rgb(1, 102, 226);">导出检验单</el-button>
                  </el-form-item>
               </el-form>
            </div>
            <div class="library-table">
               <div class="table-header">
                  <div class="search-bar">
                     <el-radio-group v-model="radioValue">
                        <el-radio-button label="全部" />
                        <el-radio-button label="待提交" />
                        <el-radio-button label="已提交" />
                        <el-radio-button label="已作废" />
                     </el-radio-group>
                  </div>
               </div>
               <div class="table-box">
                  <el-table ref="inspectionTable" style="width: 100%;overflow-y: auto;min-height: calc(100% - 50px)"
                     max-height="calc(100% - 50px)" :cell-style="{textAlign: 'center'}"
                     :header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5',textAlign: 'center'}"
                  <el-table ref="inspectionTable" style="width: 100%;overflow-y: auto;max-height: 600px;" :height="600"
                     :cell-style="{textAlign: 'left'}"
                     :header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5',textAlign: 'left'}"
                     :data="inspectionTable">
                     <el-table-column type="selection" min-width="30px" />
                     <el-table-column prop="icode" label="申请单号" min-width="150px" />
                     <el-table-column prop="type" label="检验类型" min-width="80px">
                     <el-table-column prop="icode" label="申请单号" min-width="160px" />
                     <el-table-column prop="type" label="检验类型" min-width="100px">
                        <template slot-scope="scope">
                           <div v-if="scope.row.type === 0"><span>原材料检验</span></div>
                           <div v-if="scope.row.type === 1"><span>委托检验</span></div>
                           <div v-if="scope.row.type === 2"><span>成品检验</span></div>
                           <div v-if="scope.row.type === 0"><el-tag type="success">原材料检验</el-tag></div>
                           <div v-if="scope.row.type === 2"><el-tag>委托检验</el-tag></div>
                           <div v-if="scope.row.type === 1"><el-tag type="warning">成品检验</el-tag></div>
                        </template>
                     </el-table-column>
                     <el-table-column prop="formTime" label="来料日期" min-width="80px" />
                     <el-table-column prop="supplier" label="供应商名称" min-width="150px" />
                     <el-table-column prop="mcode" label="原材料编码" min-width="150px" />
                     <el-table-column prop="name" label="原材料名称" min-width="80px" />
                     <el-table-column prop="formTime" label="来料日期" min-width="90px" />
                     <el-table-column prop="supplier" label="供应商名称" min-width="150px" show-overflow-tooltip />
                     <el-table-column prop="mcode" label="原材料编码" min-width="170px" />
                     <el-table-column prop="name" label="原材料名称" min-width="90px" />
                     <el-table-column prop="specifications" label="规格型号" min-width="160px" />
                     <el-table-column prop="unit" label="单位" min-width="50px" />
                     <el-table-column prop="num" label="数量" min-width="50px" />
                     <el-table-column prop="createTime" label="登记日期" min-width="80px" />
                     <el-table-column prop="inspection_status" label="检验结果" min-width="80px">
                     <el-table-column prop="createTime" label="登记日期" min-width="90px" />
                     <el-table-column prop="inspection_status" label="检验结果" min-width="95px">
                        <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" effect="dark" type="danger" disable-transitions
                              v-if="scope.row.inspection_status == 0">不合格</el-tag>
                           <el-tag class="tag" effect="dark" 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" />
                     <el-table-column prop="checkdate" label="检验日期" min-width="150px" />
                     <el-table-column label="操作" min-width="150" fixed="right">
                     <el-table-column prop="checkdate" label="检验日期" min-width="170px" />
                     <el-table-column label="操作" min-width="120" fixed="right">
                        <template slot-scope="scope">
                           <el-button type="text" size="small" @click="handleClick(scope.row)">查看</el-button>
                           <!-- <el-button type="text" size="small" >提交</el-button> -->
                           <el-button type="text" size="small">作废</el-button>
                           <el-button type="text" size="small" @click="delInspect(scope.row)">作废</el-button>
                        </template>
                     </el-table-column>
                  </el-table>
@@ -114,14 +105,13 @@
                        <el-row :gutter="100">
                           <el-col :span="10">
                              <el-form-item label="来料日期：">
                                 <!-- <el-input style="width: 300px" type="text" :value="infoForm.startTime" placeholder="请输入来料日期" autocomplete="off" /> -->
                                 <el-date-picker style="width: 300px" v-model="infoForm.formTime" type="date" placeholder="选择日期">
                                 <el-date-picker style="width: 300px" disabled v-model="infoForm.formTime" type="date" placeholder="选择日期">
                                 </el-date-picker>
                              </el-form-item>
                           </el-col>
                           <el-col :span="10">
                              <el-form-item label="供应商名称：">
                                 <el-input style="width: 300px" type="text" :value="infoForm.supplier" placeholder="请输入供应商名称"
                                 <el-input style="width: 300px" type="text" disabled :value="infoForm.supplier" placeholder="请输入供应商名称"
                                    autocomplete="off" />
                              </el-form-item>
                           </el-col>
@@ -129,13 +119,13 @@
                        <el-row :gutter="100">
                           <el-col :span="10">
                              <el-form-item label="原材料编码：">
                                 <el-input style="width: 300px" type="text" :value="infoForm.mcode" placeholder="请输入原材料编码"
                                 <el-input style="width: 300px" type="text" disabled :value="infoForm.mcode" placeholder="请输入原材料编码"
                                    autocomplete="off" />
                              </el-form-item>
                           </el-col>
                           <el-col :span="10">
                              <el-form-item label="原材料名称：">
                                 <el-input style="width: 300px" type="text" :value="infoForm.name" placeholder="请输入原材料名称"
                                 <el-input style="width: 300px" type="text" disabled :value="infoForm.name" placeholder="请输入原材料名称"
                                    autocomplete="off" />
                              </el-form-item>
                           </el-col>
@@ -143,13 +133,13 @@
                        <el-row :gutter="100">
                           <el-col :span="10">
                              <el-form-item label="规格型号：">
                                 <el-input style="width: 300px" type="text" :value="infoForm.specifications" placeholder="请输入规格型号"
                                 <el-input style="width: 300px" type="text" disabled :value="infoForm.specifications" placeholder="请输入规格型号"
                                    autocomplete="off" />
                              </el-form-item>
                           </el-col>
                           <el-col :span="10">
                              <el-form-item label="单位：">
                                 <el-input style="width: 300px" type="text" :value="infoForm.unit" placeholder="请输入单位"
                                 <el-input style="width: 300px" type="text" disabled :value="infoForm.unit" placeholder="请输入单位"
                                    autocomplete="off" />
                              </el-form-item>
                           </el-col>
@@ -157,13 +147,13 @@
                        <el-row :gutter="100">
                           <el-col :span="10">
                              <el-form-item label="数量：">
                                 <el-input style="width: 300px" type="text" :value="infoForm.num" placeholder="请输入数量"
                                 <el-input style="width: 300px" type="text" disabled :value="infoForm.num" placeholder="请输入数量"
                                    autocomplete="off" />
                              </el-form-item>
                           </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>
@@ -177,13 +167,13 @@
                        <el-row :gutter="100">
                           <el-col :span="10">
                              <el-form-item label="委托编号">
                                 <el-input style="width: 300px" type="text" :value="commisionSelection.entrust_coding"
                                 <el-input style="width: 300px" type="text" disabled :value="commisionSelection.entrust_coding"
                                    placeholder="请输入来料日期" autocomplete="off" />
                              </el-form-item>
                           </el-col>
                           <el-col :span="10">
                              <el-form-item label="委托单位">
                                 <el-input style="width: 300px" type="text" :value="commisionSelection.supplier"
                                 <el-input style="width: 300px" type="text" disabled :value="commisionSelection.supplier"
                                    placeholder="请输入委托单位" autocomplete="off" />
                              </el-form-item>
                           </el-col>
@@ -191,13 +181,13 @@
                        <el-row :gutter="100">
                           <el-col :span="10">
                              <el-form-item label="样品编号">
                                 <el-input style="width: 300px" type="text" :value="commisionSelection.mcode" placeholder="请输入样品编号"
                                 <el-input style="width: 300px" type="text" disabled :value="commisionSelection.mcode" placeholder="请输入样品编号"
                                    autocomplete="off" />
                              </el-form-item>
                           </el-col>
                           <el-col :span="10">
                              <el-form-item label="样品名称">
                                 <el-input style="width: 300px" type="text" :value="commisionSelection.name" placeholder="请输入样品名称"
                                 <el-input style="width: 300px" type="text" disabled :value="commisionSelection.name" placeholder="请输入样品名称"
                                    autocomplete="off" />
                              </el-form-item>
                           </el-col>
@@ -205,13 +195,13 @@
                        <el-row :gutter="100">
                           <el-col :span="10">
                              <el-form-item label="规格型号：">
                                 <el-input style="width: 300px" type="text" :value="commisionSelection.specifications"
                                 <el-input style="width: 300px" type="text" disabled :value="commisionSelection.specifications"
                                    placeholder="请输入型号规格" autocomplete="off" />
                              </el-form-item>
                           </el-col>
                           <el-col :span="10">
                              <el-form-item label="送达时间">
                                 <el-input style="width: 300px" type="text" :value="commisionSelection.supplier"
                                 <el-input style="width: 300px" type="text" disabled :value="commisionSelection.supplier"
                                    placeholder="请输入单位" autocomplete="off" />
                              </el-form-item>
                           </el-col>
@@ -219,7 +209,7 @@
                        <el-row :gutter="100">
                           <el-col :span="10">
                              <el-form-item label="完成期限">
                                 <el-input style="width: 300px" type="text" :value="commisionSelection.completionDeadline"
                                 <el-input style="width: 300px" type="text" disabled :value="commisionSelection.completionDeadline"
                                    placeholder="请输入数量" autocomplete="off" />
                              </el-form-item>
                           </el-col>
@@ -239,27 +229,27 @@
                        <el-row :gutter="100">
                           <el-col :span="10">
                              <el-form-item label="来料日期：">
                                 <el-input style="width: 300px" type="text" v-model="finishedTable.deliverydate"
                                 <el-input style="width: 300px" type="text" disabled v-model="finishedTable.deliverydate"
                                    placeholder="请输入来料日期" autocomplete="off" />
                              </el-form-item>
                           </el-col>
                           <el-col :span="10">
                              <el-form-item label="供应商名称：">
                                 <el-input style="width: 300px" type="text" v-model="finishedTable.supplier" placeholder="请输入供应商名称"
                                 <el-input style="width: 300px" type="text" disabled v-model="finishedTable.supplier" placeholder="请输入供应商名称"
                                    autocomplete="off" />
                              </el-form-item>
                           </el-col>
                        </el-row>
                        <el-row :gutter="100">
                           <el-col :span="10">
                              <el-form-item label="原材料编码：">
                                 <el-input style="width: 300px" type="text" v-model="finishedTable.code" placeholder="请输入原材料编码"
                              <el-form-item label="成品编码：">
                                 <el-input style="width: 300px" type="text" disabled v-model="finishedTable.code" placeholder="请输入成品编码"
                                    autocomplete="off" />
                              </el-form-item>
                           </el-col>
                           <el-col :span="10">
                              <el-form-item label="原材料名称：">
                                 <el-input style="width: 300px" type="text" v-model="finishedTable.name" placeholder="请输入原材料名称"
                              <el-form-item label="成品名称：">
                                 <el-input style="width: 300px" type="text" disabled v-model="finishedTable.name" placeholder="请输入成品名称"
                                    autocomplete="off" />
                              </el-form-item>
                           </el-col>
@@ -267,13 +257,13 @@
                        <el-row :gutter="100">
                           <el-col :span="10">
                              <el-form-item label="规格型号：">
                                 <el-input style="width: 300px" type="text" v-model="finishedTable.modelandspecification"
                                 <el-input style="width: 300px" type="text" disabled v-model="finishedTable.modelandspecification"
                                    placeholder="请输入规格型号" autocomplete="off" />
                              </el-form-item>
                           </el-col>
                           <el-col :span="10">
                              <el-form-item label="单位：">
                                 <el-input style="width: 300px" type="text" v-model="finishedTable.unit" placeholder="请输入单位"
                                 <el-input style="width: 300px" type="text" disabled v-model="finishedTable.unit" placeholder="请输入单位"
                                    autocomplete="off" />
                              </el-form-item>
                           </el-col>
@@ -281,7 +271,7 @@
                        <el-row :gutter="100">
                           <el-col :span="10">
                              <el-form-item label="数量：">
                                 <el-input style="width: 300px" type="text" v-model="finishedTable.amount" placeholder="请输入数量"
                                 <el-input style="width: 300px" type="text" disabled v-model="finishedTable.amount" placeholder="请输入数量"
                                    autocomplete="off" />
                              </el-form-item>
                           </el-col>
@@ -297,7 +287,6 @@
                  </div>
                  <span slot="footer" class="dialog-footer">
                     <el-button @click="checkTypeVisible = false">取 消</el-button>
                     <!-- <el-button type="primary" @click="addInspection">确 定</el-button> -->
                     <el-button type="primary" @click="QUEding">确 定</el-button>
                  </span>
               </el-dialog>
@@ -308,40 +297,20 @@
            <el-card>
               <template slot-scope="scope">
                  <span>版本选择：</span>
                  <el-select @change="ccc" v-model="selectedValue" size="small" slot="append" style="width: 220px;">
                     <el-option v-for="item in BANben" :key="item" :label="item" :value="item"></el-option>
                  <el-select @change="getProductVerison" v-model="version" size="small" slot="append" style="width: 220px;">
                     <el-option v-for="(item,index) in BANben" :key="index" :label="item.label" :value="item.value"></el-option>
                  </el-select>
               </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 :data="tableData" style="width: 100%; margin-bottom: 20px;overflow-y: auto;" row-key="id" border height="40vh"
               default-expand-all ref="multipleTable" :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
               <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 prop="name" label="项目名称" sortable>
               </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 prop="required" label="标准值" sortable>
               </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">
@@ -350,9 +319,9 @@
            </span>
         </el-dialog>
         <!-- 原材料检验模态框 -->
         <el-dialog title="原材料检验" :visible.sync="rawmaterialVisible" width="60%">
         <el-dialog title="原材料检验" :visible.sync="rawmaterialVisible" width="60%" top="100px">
            <div class="table-box">
               <el-table ref="multipleTable" :max-height="800" :cell-style="{textAlign: 'center'}"
               <el-table ref="multipleTable" :max-height="600" :cell-style="{textAlign: 'center'}"
                  :header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5',textAlign: 'center'}"
                  :data="rawMaterialTable" style="width: 100%" @selection-change="handleSelectionChange">
                  <el-table-column type="selection" min-width="10%" />
@@ -368,10 +337,8 @@
                  <el-table-column prop="surveyor" label="检验人" min-width="8%" />
                  <el-table-column prop="startTime" label="检验日期" min-width="8%" />
                  <el-table-column prop="type" label="状态" min-width="8%">
                     <template slot-scope="scope">
                        <span :style="{ color: scope.row.state === type ? 'green' : 'red' }">
                           {{ scope.row.state===1 ? '已检测':'待检测' }}
                        </span>
                     <template>
                        <span style="color: red">待检验</span>
                     </template>
                  </el-table-column>
               </el-table>
@@ -433,7 +400,8 @@
      selectAll,
      addInspect,
      chooseVer,
      lookProByVer
      lookProByVer,
      delInspect
   } from '@/api/experiment/planAssignments'
   export default {
      data() {
@@ -460,7 +428,7 @@
               amount: '',
               checkdate: []
            },
            selectedValue: 1,
            selectedValue: null,
            infoForm: {},
            commisionSelection: {
               entrust_coding: '',
@@ -502,7 +470,7 @@
            pageSize: 10, // 每页的数据条数
            radioValue: '全部',
            checkTypeVisible: false,
            type: 0, // 默认不选中的状态
            type: 2, // 默认不选中的状态
            rawmaterialVisible: false,
            commisionVisible: false,
            tmp: {},
@@ -510,16 +478,14 @@
            tableData: [],
            tableRow: {},
            BANben: [],
            select_1: [],
            aa: {}
            version: null,
            listdata: [],
            ddd: {}
         }
      },
      watch: {
         $route: {
            handler(val, oldval) {
               console.log(val) // 新路由信息
               console.log(oldval) // 老路由信息
            },
            handler(val, oldval) {},
            // 深度观察监听
            deep: true
         }
@@ -544,47 +510,44 @@
            this.commisionTable = res.data
         },
         async handleClick(row) {
            this.inspectionTable = row;
            this.id = row.id
            this.$router.push({
               name: 'Viewdetails',
               query: {
                  id: row.id
               }
            });
            this.selectInspectsList()
            // this.$router.push({
            //    name: 'Viewdetails',
            //    query: {
            //       id: row.id
            //    }
            // });
            this.$router.push(`Viewdetails/${row.id}`);
         },
         // validateInput() {
         //   if (this.inputValue.trim() === '') {
         //  }
         // },      // 输入值为空，弹出提示信息或进行其他处理
         //     alert('输入值不能为空');
         //     return;

         //版本库
         async chooseVer() {
            const res = await chooseVer({
               mcode: this.tmp.mcode,
               name: this.tmp.name,
               specifications: this.tmp.specifications
               specifications: this.tmp.specificationsId
            })
            this.BANben = res.data
            this.aa = this.BANben[0]
            this.lookProByVer()
            this.BANben = []
            res.data.forEach(a => {
               this.BANben.push({
                  label: "V" + a,
                  value: a
               })
            })
            this.version = this.BANben[0].value;
            this.lookProByVerFun()
         },
         //标准库
         async lookProByVer() {
         async lookProByVerFun() {
            const res = await lookProByVer({
               mcode: this.tmp.mcode,
               name: this.tmp.name,
               specifications: this.tmp.specifications,
               version: this.aa
               specifications: this.tmp.specificationsId,
               version: this.version
            })
            this.tableData = res.data
         },
         ccc(val) {
            this.aa = val
            this.lookProByVer()
         getProductVerison(val) {
            this.version = val
            this.lookProByVerFun()
         },
         async selectInspectsList() {
            // 获取分页列表
@@ -593,14 +556,13 @@
               pageSize: this.currentPage,
               message: this.id
            })
            // this.inspectionTable = data
            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 // 登记日期
@@ -616,11 +578,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 // 登记日期
@@ -647,8 +609,12 @@
         },
         reset() {
            this.countSize = 1;
            this.pageSize = 8;
            this.searchData = {};
            this.pageSize = 10;
            this.searchData = {
               applicationnumber: '',
               type: '',
               state: '',
            };
            this.selectInspectsList();
         },
         //被选中的信息 单选
@@ -665,6 +631,7 @@
         },
         handleRawMaterialSelection() {
            this.infoForm = this.tmp
            console.log(this.infoForm);
            this.rawmaterialVisible = false
         },
         handleRadioChange() {
@@ -675,24 +642,30 @@
                  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 // 检验日期
                     // })
                     this.rawMaterialTable = res.data
                     var data = res.data
                     data.forEach((item) => {
                        var checkdate = []
                        checkdate.push(item['createTime'])
                        checkdate.push(item['updateTime'])
                        item['checkdate'] = checkdate // 检验日期
                     })
                     let arr = res.data.filter((val)=>{
                        return val.type === 0;
                     })
                     this.rawMaterialTable = arr
                  })

                  // this.infoForm = res.data
                  // this.$router.push({ name: 'ReportForInspection' });
               } else if (this.type === 1) {
                  this.commisionVisible = true
                  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
                  })
               }
@@ -701,17 +674,27 @@
         // 新增检验
         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,
                  specificationId: this.infoForm.specificationsId,
                  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.version
               }).then(res => {
                  this.$message({
                     message: '添加成功！',
                     type: 'success'
                  });
                  this.$router.push(`Viewdetails/${res.data}`)
               }).catch(error=>{
                  this.$message.error(error.message);
               })
            }
            if (this.type === 1) {
@@ -725,7 +708,8 @@
                  startTime: this.commisionSelection.checkdate[0],
                  supplier: this.commisionSelection.supplier,
                  type: this.type,
                  unit: this.commisionSelection.unit
                  unit: this.commisionSelection.unit,
                  version: this.version
               })
            }
            if (this.type === 2) {
@@ -739,15 +723,17 @@
                  startTime: '2023-08-14',
                  supplier: this.finishedTable.supplier,
                  type: this.type,
                  unit: this.finishedTable.unit
                  unit: this.finishedTable.unit,
                  version: this.version
               })
            }
            this.type = 0
            this.checkTypeVisible = false
            this.$message({
               message: '添加成功！',
               type: 'success'
            });
            // this.$message({
            //    message: '添加成功！',
            //    type: 'success'
            // });
            // this.$router.push({name: 'Viewdetails'})
         },
         // 每页条数改变时触发 选择一页显示多少行
         handleSizeChange(val) {
@@ -760,33 +746,53 @@
            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.addInspection()
         },
         delInspect(row){
            this.$confirm('您确认删除这条数据吗?', '提示', {
               confirmButtonText: '确定',
               cancelButtonText: '取消',
               type: 'warning'
            }).then(() => {
               delInspect({
                  id: row.id
               }).then(()=>{
                  this.$message.success('已作废')
                  this.selectInspectsList()
               })
            }).catch(() => {});
         }
      }
   }
</script>
@@ -841,7 +847,7 @@
      background: #fff;
      display: flex;
      justify-content: space-between;
      padding: 5px 24px 0px 24px;
      padding: 20px 24px 0px 24px;
   }

   .input-form {
@@ -874,16 +880,6 @@
      margin-top: 50px;
      display: flex;
      flex-direction: column;

      .table-header {
         padding: 20px;
         display: flex;
         justify-content: space-between;

         .el-form-item {
            margin-bottom: 30px !important;
         }
      }

      .table-box {
         padding: 0px 20px;
@@ -922,7 +918,6 @@

   .pagination {
      display: flex;
      margin-top: 20px;
      justify-content: end;
   }