Merge remote-tracking branch 'origin/master'

value

2023-09-05 9b26870265cbbc75bcd32529e46b229a49ec30a0

 src/views/experiment/inspectionApplication/index.vue

@@ -39,20 +39,10 @@
               </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;max-height: 600px;" :height="600"
                     :cell-style="{textAlign: 'center'}"
                     :header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5',textAlign: 'center'}"
                     :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="160px" />
@@ -348,10 +338,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>
@@ -619,8 +607,12 @@
         },
         reset() {
            this.countSize = 1;
            this.pageSize = 8;
            this.searchData = {};
            this.pageSize = 10;
            this.searchData = {
               applicationnumber: '',
               type: '',
               state: '',
            };
            this.selectInspectsList();
         },
         //被选中的信息 单选
@@ -655,7 +647,10 @@
                        checkdate.push(item['updateTime'])
                        item['checkdate'] = checkdate // 检验日期
                     })
                     this.rawMaterialTable = res.data
                     let arr = res.data.filter((val)=>{
                        return val.type === 0;
                     })
                     this.rawMaterialTable = arr
                  })
               } else if (this.type === 1) {
                  this.commisionVisible = true
@@ -780,12 +775,18 @@
            this.addInspection()
         },
         delInspect(row){
            delInspect({
               id: row.id
            }).then(res=>{
               this.$message.success('已作废')
               this.selectInspectsList()
            })
            this.$confirm('您确认删除这条数据吗?', '提示', {
               confirmButtonText: '确定',
               cancelButtonText: '取消',
               type: 'warning'
            }).then(() => {
               delInspect({
                  id: row.id
               }).then(()=>{
                  this.$message.success('已作废')
                  this.selectInspectsList()
               })
            }).catch(() => {});
         }
      }
   }
@@ -874,16 +875,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;