Merge branch 'master' of http://114.132.189.42:9002/r/mom-before

zouyu

2023-09-24 c9af6bb994e96776d796480dd21ff0a95e1212cd

 src/components/view/processInspection.vue

@@ -8,6 +8,7 @@
                  <el-button @click="handleAddNew" type="primary" size="mini" icon="el-icon-plus"
                     style="background: #004EA2; ">新增</el-button>
                  <el-button icon="el-icon-download" size="mini">导出</el-button>
            <el-button @click="report" icon="el-icon-download" size="mini">生成报告</el-button>
               </el-col>
            </el-row>
         </div>
@@ -25,16 +26,17 @@
            <el-input size="small" style="width: 224px;margin-right: 30px;" v-model="search.techfather"
               placeholder="请输入工序"></el-input>
            <el-button size="mini"><span>重 置</span></el-button>
            <el-button size="mini" @click="searchPro" type="primary" style="background: #004EA2;"><span>查
                  询</span></el-button>
        <el-button size="mini" @click="searchPro" type="primary" style="background: #004EA2;"><span>查 询</span></el-button>
         </div>
         <div class="content-body">
            <div class="inspectionTable">
               <el-table ref="inspectionTable" height="calc(100vh - 320px)" :header-cell-style="{
          <el-table ref="inspectionTable" height="calc(100vh - 320px)" :cell-style="{ textAlign: 'center' }"
            :header-cell-style="{
              border: '0px',
              background: '#f5f7fa',
              color: '#606266',
              boxShadow: 'inset 0 1px 0 #ebeef5',
              textAlign: 'center'
            }" border :data="inspectionTable" style="width: 100%">
                  <el-table-column type="selection" width="50"> </el-table-column>
                  <el-table-column label="序号" type="index" width="60"></el-table-column>
@@ -45,23 +47,21 @@
                  <el-table-column prop="techname" label="工艺名称" min-width="70" />
                  <el-table-column prop="unit" label="单位" min-width="50" />
                  <el-table-column prop="quantity" label="数量" min-width="50" />
                  <el-table-column prop="createTime" label="报检日期" min-width="70" />
            <el-table-column prop="createTime" label="报检日期" min-width="60" />
                  <el-table-column prop="name" label="报检人" min-width="50" />
                  <el-table-column prop="updateTime" label="检测日期" min-width="70" />
                  <el-table-column prop="result" label="合格状态" min-width="60">
            <el-table-column prop="updateTime" label="检测日期" min-width="60" />
            <el-table-column prop="result" label="合格状态" min-width="80">
                     <template slot-scope="scope">
                        <span style="color: #34BD66;" v-if="scope.row.result == 1">合格</span>
                        <span style="color: #E84738;" v-else-if="scope.row.result == 0">不合格</span>
                     </template>
                  </el-table-column>
                  <el-table-column label="操作" min-width="75">
            <el-table-column label="操作" min-width="80">
                     <template slot-scope="scope">
                        <el-button type="text" size="small" @click="handleClick(scope.row)" style="margin-left: 0;"><span
                              style="font-size: 8px;">详情</span></el-button>
                        <el-button type="text" size="small" style="margin-left: 0;"><span
                              style="font-size: 8px;">查看</span></el-button>
                <el-button type="text" size="small" @click="handleClick(scope.row)" style="margin-left: 0;">详情</el-button>
                <el-button type="text" size="small">查看</el-button>
                        <el-button v-if="scope.row.result == null" type="text" size="small" style="margin-left: 0;"
                           @click="updateInsInfo(scope.row)"><span style="font-size: 8px;">编辑</span></el-button>
                  @click="updateInsInfo(scope.row)">编辑</el-button>
                     </template>
                  </el-table-column>
               </el-table>
@@ -69,8 +69,8 @@
            <!-- 分页器 -->
            <div class="pagination">
               <el-pagination :current-page="currentPage" :page-sizes="[10, 20, 30, 40]" :page-size="pageSize"
                  layout="total, sizes, prev, pager, next, jumper" :total="inspectionTableTotal"
                  @size-change="handleSizeChange" @current-change="handleCurrentChange" />
            layout="total, sizes, prev, pager, next, jumper" :total="inspectionTableTotal" @size-change="handleSizeChange"
            @current-change="handleCurrentChange" />
            </div>
         </div>
      </div>
@@ -99,10 +99,9 @@
                     </el-col>
                     <el-col :span="7">
                        <el-form-item label="产品名称：">
                           <el-select style="width: 210px;" size="small" @change="selectSample"
                              v-model="processInspectVo.material" placeholder="请选择产品">
                              <el-option v-for="item in optionsSamplename" :key="item.value" :label="item.name"
                                 :value="item.name">
                  <el-select style="width: 210px;" size="small" @change="selectSample" v-model="processInspectVo.material"
                    placeholder="请选择产品">
                    <el-option v-for="item in optionsSamplename" :key="item.value" :label="item.name" :value="item.name">
                              </el-option>
                           </el-select>
                        </el-form-item>
@@ -150,8 +149,7 @@
                     </el-col>
                     <el-col :span="7">
                        <el-form-item label="数量：">
                           <el-input style="width: 210px;" size="small" v-model="processInspectVo.quantity"
                              placeholder="请输入数量" />
                  <el-input style="width: 210px;" size="small" v-model="processInspectVo.quantity" placeholder="请输入数量" />
                        </el-form-item>
                     </el-col>
                     <el-col :span="10" style="display: flex;justify-content: end;">
@@ -195,16 +193,21 @@
               </el-table-column>
               <el-table-column prop="dname" label="试验设备" min-width="100">
                  <template slot-scope="scope">
                     <el-button type="text" @click="clickTableSelect(scope)">{{
                       scope.row.deviceId == null ? "请选择" : scope.row.deviceName
              <el-button v-if="!scope.row.isSelectDevice" type="text" @click="clickTableSelect(scope)">{{
                scope.row.dname == null ? "请选择" : scope.row.dname
                     }}</el-button>
              <el-select v-if="scope.row.isSelectDevice" style="width: 100%;" @change="clickNodeSure(scope.row)"
                v-model="filterText" placeholder="请选择">
                <el-option v-for="item in materialOptions" :key="item.id" :label="item.device" :value="item.id">
                </el-option>
              </el-select>
                  </template>
               </el-table-column>
               <el-table-column label="结论">
                  <template slot-scope="scope">
                     <span style="color: #34BD66;" v-if="scope.row.result === 1">合格</span>
                     <span style="color: #E84738;" v-else-if="scope.row.result === 0">不合格</span>
                     <span v-show="scope.row.result === null">{{null}}</span>
              <span v-show="scope.row.result === null">暂未结论</span>
                  </template>
               </el-table-column>
               <!-- <el-table-column v-if="detailId == null" label="操作" width="100">
@@ -239,22 +242,150 @@
      <div class="newPage" v-if="showLook">
         <processInspectionLook :rowInfo="rowInfp" />
      </div>
    <!-- <div class="newPage" v-if="reportlook">
      <index />
    </div> -->
    <el-dialog
     title="过程检验报告" :visible.sync="reportlook"  width="40%">
     <template>
    <div ref="print">
  
      <div style="margin:0 auto;">
          <!-- <div style="text-align:center;margin-top:10px;">过程检验报告</div> -->
    <table class="table table-striped table-bordered" align="center" border style="width: 100%;height: 700px;" valign="center">
      <tr>
        <td class="column" colspan="2" rowspan="2" > <img src="../view/report/logo-2.png" style="width:100%;" /></td>
        <td class="column" colspan="2" ><p>记录名称：检验记录表</p>Table: Inspection Record</td>
        <td class="column" colspan="2"><p>保存期限：25年</p> Storage Life: 25 years</td>
      </tr>
      <tr>
          <td  class="column" colspan="2" > 记录编号</td>
          <td  class="column" colspan="2" > 归档部门</td>
      </tr>
      <tr>
        <td class="column"><p>零件名称</p> Part Description</td>
        <td  class="value"></td>
        <td class="column"><p>型号</p> Model</td>
        <td class="value"></td>
        <td class="column"><p>加工单号</p> Order No</td>
        <td class="value"></td>
      </tr>
      <tr>
        <td class="column"><p>检验仪器</p> Inspection instrument</td>
        <td class="value"></td>
        <td class="column"><p>检验数量</p> Quantity to check</td>
        <td class="value"></td>
        <td class="column"><p>供货单位</p> Supplier</td>
        <td class="value"></td>
      </tr>
      <tr>
        <td class="column"><p>检验项目</p> Inspection Item</td>

        <td class="column" colspan="3"><p><p>检验结果(实测值)</p> Test result (Measured value)</p></td>

        <td class="column" rowspan="2" colspan="2"><p>判定</p> Conclusion</td>
      </tr>
      <tr>
        <td class="column"><p>技术要求</p> Technical Requirement</td>
        <td class="column"><p>公差</p> TOL</td>
        <!-- <td class="daughter" >01</td> -->
      </tr>
      <tr>
        <td class="column"  rowspan="9" colspan="0.5">尺寸</td>
        <td class="value" ></td>
        <td class="column"></td>
        <td class="value" ></td>
  
      </tr>
      <tr>
        <td class="column"></td>
        <td class="value" colspan="3"></td>
        <td class="column"></td>
  
      </tr>
      <tr>
        <td class="value" colspan="2"></td>
        <td class="value" colspan="2"></td>
        <td class="value" colspan="2"></td>
      </tr>
      <tr>
        <td class="value" colspan="2"></td>
        <td class="value" colspan="2"></td>
        <td class="value" colspan="2"></td>
      </tr>
  
      <tr>
        <td class="column" colspan="6"></td>
      </tr>
      <tr>
        <td class="value" colspan="2"></td>
        <td class="value" colspan="2"></td>
        <td class="value" colspan="2"></td>
      </tr>
      <tr>
        <td class="value" colspan="2"></td>
        <td class="value" colspan="2"></td>
        <td class="value" colspan="2"></td>
      </tr>
      <tr>
        <td class="value" colspan="2"></td>
        <td class="value" colspan="2"></td>
        <td class="value" colspan="2"></td>
      </tr>
       <tr>
        <td class="value" colspan="2"></td>
        <td class="value" colspan="2"></td>
        <td class="value" colspan="2"></td>
      </tr>
  
      <tr>
        <td class="column">材质</td>
        <td class="value" colspan="5"></td>
      </tr>
      <tr >
        <td class="column" >外观性能</td>
        <td class="value" colspan="5" style="text-align:left;">
          <br>
          <br>
          <br>
          <br>
        </td>
      </tr>
      <tr>
        <td class="column">备注</td>
        <td class="value" colspan="5">
          <br>
          <br>
          <br>
          <br>
        </td>
      </tr>
  
  
    </table>
      </div>
    </div>
  </template>
    </el-dialog>`
   </div>
</template>

<script>
   import processInspectionUpdate from '../view/processInspectionUpdate.vue'
   import processInspectionLook from '../view/processInspectionLook.vue'
// import index from '../view/report/index.vue'
   export default {
      components: {
         processInspectionUpdate,
         processInspectionLook
    processInspectionLook,
    // index
      },
      data() {
         return {
            showUp: false,
            isAddProject: false,
            showLook: false,
      reportlook: false,
            detailId: 28,
            rowInfp: {},
            search: {
@@ -290,7 +421,8 @@
               unit: null
            },
            InspectioniD: null,
            addInspectionform: [{
      addInspectionform: [
        {
               number: "",
               username: "",
               projectname: "",
@@ -303,15 +435,18 @@
               group: "",
               worker: "",
               machine: ""
            }],
        }]
      ,
            inspectionItems: [], // 新增检验项目表格
            inspectionResultForm: [{
      inspectionResultForm: [
        {
               id: "",
               name: "",
               inspecter: "",
               conclusion: "",
               operation: ""
            }],
        }
      ],
            options: [],
            value: "",
            rowList: [],
@@ -346,6 +481,12 @@
         // this.getOptions();
      },
      methods: {
    report() {
      this.reportlook = true
      // this.$nextTick(() => {
      //          this.$print(this.$refs.print);
      //      })     
    },
         handleClick(row) {
            this.rowInfp = row
            this.showLook = true
@@ -403,7 +544,10 @@
         },
         // 点击表格选择触发
         clickTableSelect(scope) {
            this.centerDialogVisible = true;
      // this.centerDialogVisible = true;
      if (this.clickSelectDevice.index != null) {
        this.$set(this.inspectionItems[this.clickSelectDevice.index], 'isSelectDevice', false)
      }
            this.clickSelectDevice.index = scope.$index;
            this.clickSelectDevice.rpId = scope.row.id;
            this.getOptions(scope.row)
@@ -463,9 +607,7 @@
                  inspectionItemId: row.id,
                  inspectionValue: str.slice(0, -1)
               }, {
                  headers: {
                     "Content-Type": "application/json"
                  }
          headers: { "Content-Type": "application/json" }
               }).then(res => {
                  if (res.message === '内控值输入格式有问题!') {
                     this.$message({
@@ -489,12 +631,7 @@
            this.search.countSize = val;
            this.defaultInitializationTable();
         },
         handleSpanMethod({
            row,
            column,
            rowIndex,
            columnIndex
         }) {
    handleSpanMethod({ row, column, rowIndex, columnIndex }) {
            if (columnIndex === 0) {
               const _row = this.spanArr[rowIndex];
               const _col = _row > 0 ? 1 : 0;
@@ -553,11 +690,10 @@
               techfather: val.techfather,
               techname: val.techname,
               techId: Number(val.technologyId),
        mtId: Number(val.technologyId),
               unit: val.unit
            }, {
               headers: {
                  "Content-Type": "application/json"
               }
        headers: { "Content-Type": "application/json" }
            }).then(res => {
               if (res.code === 201) {
                  this.$message({
@@ -693,7 +829,8 @@
         },
         // 删除检验值列
         clickDeleteInspectionColumn() {
            if (this.empiricalValueAdd - 1 === 0) {} else {
      if (this.empiricalValueAdd - 1 === 0) {
      } else {
               if (this.empiricalValueAddMaxNumber != this.empiricalValueAdd - 1) {
                  this.empiricalValueAdd = this.empiricalValueAdd - 1;
                  this.inspectionItems.forEach(i => {
@@ -793,4 +930,40 @@
      float: right;
      font-size: 13px !important;
   }

/* .table{
  border-collapse: collapse;
  border-spacing: 0;
  background-color: transparent;
  display: table;
  width: 100%;
  max-width: 100%;
  width: 800px;
  margin:0 auto;
} */
/* .table td{
  text-align:center;
  vertical-align:middle;
  font-size: 14px;
  font-family: 'Arial Normal', 'Arial';
  color: #333333;
  padding: 8px 12px;
} */
/* .table-bordered {
  border: 1px solid #ddd;
}  */
.column{
  width:auto;
  height:30px;
  font-size: 12px;
  text-align:center
  /* border:1px solid #333;
  background: #f1f1f1; */
}
.value{
  width:70px;
  height:30px;
  border:1px solid #333;
}

</style>