Merge remote-tracking branch 'origin/master'

王震

2023-09-14 d46f3b348ab5f913cd15be977ce16137ee4343d0

 src/components/view/processInspection.vue

@@ -81,7 +81,7 @@
            <!-- 点击返回，当前页面值为false -->
            <el-button type="primary" size="mini" style="background: #004EA2; "
              icon="el-icon-circle-plus-outline">新增</el-button>
            <el-button @click="showAddPage = false" type="primary" size="mini" icon="el-icon-back"
            <el-button @click="combackIndex" type="primary" size="mini" icon="el-icon-back"
              style="background: #004EA2; ">返回</el-button>
          </el-col>
        </el-row>
@@ -171,7 +171,7 @@
            > -->
          </el-col>
        </el-row>
        <el-table :data="inspectionItems" max-height="420" :span-method="handleSpanMethod" height="calc(100vh - 550px)"
        <el-table border :data="inspectionItems" max-height="420" :span-method="handleSpanMethod" height="calc(100vh - 550px)"
          style="width: 100%">
          <el-table-column type="index" label="序号" width="60"></el-table-column>
          <el-table-column label="项目" prop="father"></el-table-column>
@@ -355,6 +355,10 @@
      this.rowInfp=row
      this.showLook=true
    },
    combackIndex(){
      this.showAddPage=false
      this.defaultInitializationTable()
    },
    updateInsInfo(row){
      this.rowInfp=row
      this.showUp=true