Merge remote-tracking branch 'origin/master'

zss

2024-03-11 d12fe5cd34a4ac05a7e8e40a4ee1cf2e69dc75e0

Merge remote-tracking branch 'origin/master'

 src/api/quality/attachment.js

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,36 @@
import request from '@/router/axios'

export function getProcessConfigFiles(data) {
    return request({
      url: '/mes/attachment/processConfigFiles',
      method: 'get',
      params: data
    })
  }

  export function deleteProcessConfigFile(id) {
    return request({
      url: '/mes/attachment/processConfigFile/'+id,
      method: 'delete',
    })
  }

  export function downloadProcessConfigFile(data) {
    return request({
      url: '/mes/attachment/processConfig/'+data.bucket+'/'+data.fileName,
      method: 'post',
      responseType: 'blob'
    }).then((response) => {
      // å¤„理返回的文件流
      const blob = response.data
      const link = document.createElement('a')
      link.href = URL.createObjectURL(blob)
      link.download = data.originalFileName
      document.body.appendChild(link)
      link.click()
      window.setTimeout(function() {
        URL.revokeObjectURL(blob)
        document.body.removeChild(link)
      }, 0)
    })
  }

 src/views/quality/finishedProductInspection/finishedProduct-form.vue

@@ -99,112 +99,191 @@
                </div>
            </el-form>
        </div>
        <div class="finishedProduct-detail">
            <el-row style="width:100%;z-index: 10;height:30px;">
                <el-col :span="12" class="inspectionProject_span">检验项目</el-col>
                <el-col v-if="resultVal==null" :span="12" class="inspectionProject_span" style="text-align: right;">
                    <el-button size="mini" @click="clickAddInspectionColumn()">添加检测值列</el-button>
                    <el-button size="mini" @click="clickDeleteInspectionColumn()">删除检测值列</el-button>
                </el-col>
            </el-row>
            <el-row style="width:100%;">
                <el-col :span="24">
                    <el-table border :data="inspectionItems" height="400"
                        :header-cell-style="{textAlign:'center',color:'black',backgroundColor:'#fafafa'}"
                        :cell-style="{textAlign:'center'}" row-key="iid" default-expand-all
                        style="width: 100%" ref="table" :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
                        <el-table-column type="index" prop="parentIndex" label="序号" width="60">
                            <template scope="scope">
                                <span v-if="scope.row.isIndex">{{scope.row.parentIndex}}</span>
                            </template>
                        </el-table-column>
                        <el-table-column label="项目" prop="father" show-overflow-tooltip width="140" ></el-table-column>
                        <el-table-column prop="iname" label="指标" show-overflow-tooltip width="140" ></el-table-column>
                        <el-table-column prop="iunit" label="单位" show-overflow-tooltip width="140" ></el-table-column>
                        <el-table-column prop="required" label="标准值" width="140" show-overflow-tooltip ></el-table-column>
                        <el-table-column prop="inspectionValue" v-for="(item, index) in empiricalValueAdd" :key="index" label="检测值"
                            width="140" style="text-align: center;">
                            <template slot-scope="scope">
                                <el-col v-if="scope.row.itype === '1'">
                                    <el-tooltip v-if="scope.row.iname!=null" :disabled="scope.row.eId != null"
                                        class="item" effect="dark" content="请先选择设备！"
                                            placement="top-start">
                                            <el-input :disabled="scope.row.eId == null" v-model="scope.row.empiricalValueAddss[index]"
                                                @blur="changeState(scope.row)" placeholder="请输入检测值"></el-input>
                                            <span v-if="resultVal != null" v-text="scope.row.empiricalValueAddss[index]"></span>
                                    </el-tooltip>
                                </el-col>
                                <el-col v-else>
                                        <el-tooltip v-if="scope.row.iname != null" :disabled="scope.row.eId != null"
                                            class="item" effect="dark" content="请先选择设备！" placement="top-start">
                                            <el-select style="width: 100%;" @change="changeState(scope.row)" :disabled="scope.row.eId == null" v-model="scope.row.empiricalValueAddss[index]" placeholder="请选择">
                                                <el-option v-for="item in dataVal" :key="item.value" :label="item.label"
                                                    :value="item.value">
                                                </el-option>
        <div>
            <el-tabs class="finishedProduct-detail" @tab-click="tabsClick">
                <el-tab-pane label="检验项目">
                    <el-row>
                        <el-col v-if="resultVal==null" :span="24" class="inspectionProject_span" style="text-align: right;">
                            <el-button size="mini" @click="clickAddInspectionColumn()">添加检测值列</el-button>
                            <el-button size="mini" @click="clickDeleteInspectionColumn()">删除检测值列</el-button>
                        </el-col>
                    </el-row>
                    <el-row>
                        <el-col :span="24">
                            <el-table border :data="inspectionItems" height="400"
                                :header-cell-style="{textAlign:'center',color:'black',backgroundColor:'#fafafa'}"
                                :cell-style="{textAlign:'center'}" row-key="iid" default-expand-all
                                style="width: 100%" ref="table" :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
                                <el-table-column type="index" prop="parentIndex" label="序号" width="60">
                                    <template scope="scope">
                                        <span v-if="scope.row.isIndex">{{scope.row.parentIndex}}</span>
                                    </template>
                                </el-table-column>
                                <el-table-column label="项目" prop="father" show-overflow-tooltip width="140" ></el-table-column>
                                <el-table-column prop="iname" label="指标" show-overflow-tooltip width="140" ></el-table-column>
                                <el-table-column prop="iunit" label="单位" show-overflow-tooltip width="140" ></el-table-column>
                                <el-table-column prop="required" label="标准值" width="140" show-overflow-tooltip ></el-table-column>
                                <el-table-column prop="inspectionValue" v-for="(item, index) in empiricalValueAdd" :key="index" label="检测值"
                                    width="140" style="text-align: center;">
                                    <template slot-scope="scope">
                                        <el-col v-if="scope.row.itype === '1'">
                                            <el-tooltip v-if="scope.row.iname!=null" :disabled="scope.row.eId != null"
                                                class="item" effect="dark" content="请先选择设备！"
                                                    placement="top-start">
                                                    <el-input :disabled="scope.row.eId == null" v-model="scope.row.empiricalValueAddss[index]"
                                                        @blur="changeState(scope.row)" placeholder="请输入检测值"></el-input>
                                                    <span v-if="resultVal != null" v-text="scope.row.empiricalValueAddss[index]"></span>
                                            </el-tooltip>
                                        </el-col>
                                        <el-col v-else>
                                                <el-tooltip v-if="scope.row.iname != null" :disabled="scope.row.eId != null"
                                                    class="item" effect="dark" content="请先选择设备！" placement="top-start">
                                                    <el-select style="width: 100%;" @change="changeState(scope.row)" :disabled="scope.row.eId == null" v-model="scope.row.empiricalValueAddss[index]" placeholder="请选择">
                                                        <el-option v-for="item in dataVal" :key="item.value" :label="item.label"
                                                            :value="item.value">
                                                        </el-option>
                                                    </el-select>
                                                    <span v-if="resultVal != null && processInspectVo.id != null"
                                                        v-text="scope.row.empiricalValueAddss[index]"></span>
                                                </el-tooltip>
                                            </el-col>
                                    </template>
                                </el-table-column>
                                <el-table-column prop="deviceName" label="试验设备" min-width="200">
                                    <template slot-scope="scope">
                                        <span v-if="resultVal!=null && processInspectVo.id!=null" v-text="scope.row.ename"></span>
                                        <div v-else>
                                            <el-select style="width:60%" v-model="scope.row.eId"
                                            v-if="scope.row.iname != null" filterable @change="updateDevice(scope.row)">
                                                <el-option v-for="(item,index) in deviceList"
                                                :key="index" :value="item.id" :label="item.code +'-'+ item.name"></el-option>
                                            </el-select>
                                            <span v-if="resultVal != null && processInspectVo.id != null"
                                                v-text="scope.row.empiricalValueAddss[index]"></span>
                                        </el-tooltip>
                                    </el-col>
                            </template>
                        </el-table-column>
                        <el-table-column prop="deviceName" label="试验设备" min-width="200">
                            <template slot-scope="scope">
                                <span v-if="resultVal!=null && processInspectVo.id!=null" v-text="scope.row.ename"></span>
                                <div v-else>
                                    <el-select style="width:60%" v-model="scope.row.eId"
                                    v-if="scope.row.iname != null" filterable @change="updateDevice(scope.row)">
                                        <el-option v-for="(item,index) in deviceList"
                                        :key="index" :value="item.id" :label="item.code +'-'+ item.name"></el-option>
                                    </el-select>
                                    <el-button
                                    size="small"
                                    slot="append"
                                    icon="el-icon-full-screen"
                                    v-if="scope.row.iname != null"
                                    @click="codeDevice(scope.row,scope.$index)"></el-button>
                                </div>
                            </template>
                        </el-table-column>
                        <el-table-column prop="inspectionValue"
                                label="检验描述" width="140" style="text-align: center;">
                                <template slot-scope="scope">
                                    <el-col v-if="scope.row.itype === '1'">
                                        <el-tooltip v-if="scope.row.iname != null" :disabled="scope.row.eId != null"
                                            class="item" effect="dark" content="请先选择设备！" placement="top-start">
                                            <el-button
                                            size="small"
                                            slot="append"
                                            icon="el-icon-full-screen"
                                            v-if="scope.row.iname != null"
                                            @click="codeDevice(scope.row,scope.$index)"></el-button>
                                        </div>
                                    </template>
                                </el-table-column>
                                <el-table-column prop="inspectionValue"
                                        label="检验描述" width="140" style="text-align: center;">
                                        <template slot-scope="scope">
                                            <el-col v-if="scope.row.itype === '1'">
                                                <el-tooltip v-if="scope.row.iname != null" :disabled="scope.row.eId != null"
                                                    class="item" effect="dark" content="请先选择设备！" placement="top-start">

                                            <el-input :disabled="scope.row.eId == null"
                                                v-model="scope.row.inote"
                                                @blur="changeState(scope.row)" placeholder="请输入检验描述"></el-input>
                                                    <el-input :disabled="scope.row.eId == null"
                                                        v-model="scope.row.inote"
                                                        @blur="changeState(scope.row)" placeholder="请输入检验描述"></el-input>

                                            <span v-if="resultVal != null && processInspectVo.id != null"
                                                v-text="scope.row.inote"></span>
                                        </el-tooltip>
                                    </el-col>
                                    <el-col v-else>
                                        <el-tooltip v-if="scope.row.iname != null" :disabled="scope.row.eId != null"
                                            class="item" effect="dark" content="请先选择设备！" placement="top-start">
                                            <el-input :disabled="scope.row.eId == null"
                                                v-model="scope.row.inote"
                                                @blur="changeState(scope.row)" placeholder="请输入检验描述"></el-input>
                                            <span v-if="resultVal != null && processInspectVo.id != null"
                                                v-text="scope.row.inote"></span>
                                        </el-tooltip>
                                    </el-col>
                                </template>
                            </el-table-column>
                        <el-table-column label="结论" fixed="right" min-width="100">
                                                    <span v-if="resultVal != null && processInspectVo.id != null"
                                                        v-text="scope.row.inote"></span>
                                                </el-tooltip>
                                            </el-col>
                                            <el-col v-else>
                                                <el-tooltip v-if="scope.row.iname != null" :disabled="scope.row.eId != null"
                                                    class="item" effect="dark" content="请先选择设备！" placement="top-start">
                                                    <el-input :disabled="scope.row.eId == null"
                                                        v-model="scope.row.inote"
                                                        @blur="changeState(scope.row)" placeholder="请输入检验描述"></el-input>
                                                    <span v-if="resultVal != null && processInspectVo.id != null"
                                                        v-text="scope.row.inote"></span>
                                                </el-tooltip>
                                            </el-col>
                                        </template>
                                    </el-table-column>
                                <el-table-column label="结论" fixed="right" min-width="100">
                                    <template slot-scope="scope">
                                        <div v-if="scope.row.iname!=null">
                                            <span style="color: #34BD66;" v-if="scope.row.iresult == 1">合格</span>
                                            <span style="color: #E84738;" v-else-if="scope.row.iresult == 0">不合格</span>
                                            <span v-else>暂无结论</span>
                                        </div>
                                    </template>
                                </el-table-column>
                            </el-table>
                        </el-col>
                    </el-row>
                </el-tab-pane>
                <el-tab-pane label="附件上传" type="card">
                    <div style="display: flex;justify-content:flex-end;">
                            <div></div>
                        </div>
                        <div
                        v-loading="progrecessFileLoading"
                        element-loading-text="请稍等，文件上传中"
                        >
                        <el-upload
                            drag
                            ref="upload"
                            action="/mes/attachment/upload"
                            :auto-upload="true"
                            :headers="headers"
                            :before-upload="submitUpload"
                            :on-success="uploadSuccess"
                            :data="paramData"
                            :with-credentials="true"
                            :show-file-list="false"
                        >
                            <i class="el-icon-upload"></i>
                            <div class="el-upload__text">
                            å°†æ–‡ä»¶æ‹–到此处，或<em>点击上传</em>
                            </div>
                        </el-upload>
                        </div>
                        <el-table :data="processConfigFileTableData" height="260px">
                        <el-table-column
                            prop="finishedInsNo"
                            align="center"
                            width="120"
                            label="产品检验编号"
                            show-overflow-tooltip
                        ></el-table-column>
                        <el-table-column
                            prop="originalFileName"
                            align="center"
                            label="原文件名"
                            width="200"
                        ></el-table-column>
                        <el-table-column prop="fileName" align="center" label="文件后缀"></el-table-column>
                        <el-table-column prop="createUser" align="center" label="上传人"></el-table-column>
                        <el-table-column
                            prop="createTime"
                            align="center"
                            label="上传时间"
                            show-overflow-tooltip
                        ></el-table-column>
                        <el-table-column prop="updateUser" align="center" label="更新人">
                        </el-table-column>
                        <el-table-column
                            prop="updateTime"
                            align="center"
                            label="更新时间"
                            show-overflow-tooltip
                        ></el-table-column>
                        <el-table-column align="center" label="操作">
                            <template slot-scope="scope">
                                <div v-if="scope.row.iname!=null">
                                    <span style="color: #34BD66;" v-if="scope.row.iresult == 1">合格</span>
                                    <span style="color: #E84738;" v-else-if="scope.row.iresult == 0">不合格</span>
                                    <span v-else>暂无结论</span>
                                </div>
                            <el-button
                                @click="delProcessConfigFile(scope.row)"
                                type="text"
                                size="small"
                                :disabled="(resultVal!=null && resultVal!='')"
                                >删除</el-button
                            >
                            <el-button
                                @click="downloadProcessConfigFile(scope.row)"
                                type="text"
                                size="small"
                                >下载</el-button
                            >
                            </template>
                        </el-table-column>
                    </el-table>
                </el-col>
            </el-row>
                        </el-table>
                </el-tab-pane>
            </el-tabs>

        </div>
        <div class="finishedProduct-result">
            <el-row style="width:100%">
@@ -260,15 +339,30 @@
    selectDeviceAPI,
    updateLocationIdById,
 } from '@/api/quality/finishedProduct'
 import {
    getProcessConfigFiles,
    deleteProcessConfigFile,
    downloadProcessConfigFile
 } from '@/api/quality/attachment'
 import { getIfsLocationByGroupCopyAll } from '@/api/warehouse/location'
 import { remote } from '@/api/admin/dict'
 import qrCodeApp from '@/views/common/qrCodeApp'
 import { getStore } from '@/util/store'
export default {
    components:{
        qrCodeApp
    },
    data() {
        return {
            progrecessFileLoading: false,
            processConfigFileTableData: [],
            headers: {
              Authorization: 'Bearer ' + getStore({ name: 'access_token' })
            },
            paramData: {
              no: '',
              lineNumber: '',
              type: 1,
            },
            row: null,
            proIndex: 0,
            deviceCode: false,
@@ -333,7 +427,50 @@
        this.init()
    },
    methods: {
        cancelDeviceCodeDialog(){
      delProcessConfigFile(row) {
          this.$confirm('是否删除该附件', '提示', {
            confirmButtonText: '确定',
            cancelButtonText: '取消',
            type: 'warning',
            closeOnClickModal: false
          }).then(function() {
            return deleteProcessConfigFile(row.id)
          }).then((data) => {
            this.getConfigFiles()
          })
      },
      getConfigFiles() {
        const param = {
          no: this.processInspectVo.finInsNo,
          lineNumber: this.processInspectVo.id,
          type: 1
        }
        getProcessConfigFiles(param).then((res) => {
          this.processConfigFileTableData = res.data.data
        })
      },
      downloadProcessConfigFile(row) {
        downloadProcessConfigFile({
            bucket: row.bucketName,
            fileName: row.fileName,
            originalFileName: row.originalFileName
        })
      },
      submitUpload() {
        this.paramData.no = this.processInspectVo.finInsNo
        this.paramData.lineNumber = this.processInspectVo.id
        this.progrecessFileLoading = true
      },
      uploadSuccess() {
        this.progrecessFileLoading = false
        this.getConfigFiles()
      },
      tabsClick(tab,even){
        if(tab.index == 1){
            this.getConfigFiles();
        }
      },
      cancelDeviceCodeDialog(){
        this.deviceCode = false
      },
      getDeviceResultInfo(val){
@@ -665,14 +802,14 @@
<style scoped>
.finishedProduct-detail {
  width: 100%;
  height: 500px;
  height: 520px;
  padding: 10px 20px;
  display: flex;
  border: 1px solid #ddd;
  background-color: #fff;
  margin-top: 10px;
  box-sizing: border-box;
  flex-wrap: wrap;
  /* display: flex;
  flex-wrap: wrap; */
}

basic.finishedProduct-result {

 src/views/quality/packageinspect/packageInspect-form.vue

@@ -62,87 +62,165 @@
            </el-row>
        </el-form>
      </div>
      <div class="packageInspect-detail">
        <el-row :gutter="10" style="width:100%;z-index: 10;height:30px;">
            <el-col :span="12">检验项目</el-col>
            <el-col :span="12" style="text-align: right;">
                <el-dropdown @command="handleCommand" v-if="isShow">
                    <el-button size="mini" style="margin-right: 10px;" type="primary" >
                        åˆ‡æ¢æ£€éªŒé¡¹æ¨¡æ¿<i class="el-icon-arrow-down el-icon--right"></i>
                    </el-button>
                    <el-dropdown-menu slot="dropdown">
                        <el-dropdown-item :key="index" v-for="(item,index) in inspectMoulds" :command="item.father">{{item.father}}</el-dropdown-item>
                    </el-dropdown-menu>
                </el-dropdown>
              <el-button v-if="resultVal=='' || resultVal==null" size="mini" @click="clickAddLine()">添加检验项目</el-button>
              <el-button v-if="resultVal=='' || resultVal==null" type="primary" size="mini"
              @click="savePackIns()">保存</el-button>
            </el-col>
        </el-row>
        <el-row style="width:100%;">
            <el-col :span="24">
                <el-table
                :header-cell-style="{textAlign:'center',color:'black',backgroundColor:'#fafafa'}"
                :cell-style="{textAlign:'center'}"
                ref="table"
                :data="list"
                border
                style="width: 100%;"
                height="400"
                row-key="randomId" class="l-mes"
                default-expand-all
                :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
                  <el-table-column type="index" prop="parentIndex" label="序号" width="60">
                    <template scope="scope">
                        <span v-if="scope.row.isIndex">{{scope.row.parentIndex}}</span>
                    </template>
                  </el-table-column>
                  <el-table-column prop="name" label="项目" width="160">
                    <template slot-scope="scope">
                        <el-input :readonly="resultVal!=null || !scope.row.isEdit" v-if="scope.row.children" class="inline-input" style="width:80%;" v-model="scope.row.name"
                          placeholder="请输入项目名称"></el-input>
                    </template>
                  </el-table-column>
                  <el-table-column prop="required" label="要求" width="160">
                    <template slot-scope="scope">
                      <div v-if="!scope.row.children">
                        <el-tooltip :content="scope.row.required">
                            <el-input :readonly="resultVal!=null || !scope.row.isEdit"
                            v-model="scope.row.required"
                              placeholder="请输入要求"></el-input>
                        </el-tooltip>
                      </div>
                    </template>
                  </el-table-column>
                  <el-table-column prop="note" label="检验描述" width="160">
                    <template slot-scope="scope">
                      <div v-if="!scope.row.children">
                        <el-input :readonly="resultVal!=null" v-model="scope.row.note" placeholder="检验描述"></el-input>
                      </div>
                    </template>
                  </el-table-column>
                  <el-table-column prop="testState" label="结论" min-width="150">
                    <template slot-scope="scope">
                        <el-select style="width:100%" :disabled="resultVal!=null" @change="changeResult" v-model="scope.row.result" v-if="!scope.row.children">
                            <el-option label="合格" value="合格"></el-option>
                            <el-option label="不合格" value="不合格"></el-option>
                            <el-option label="不适用" value="不适用"></el-option>
                        </el-select>
                    </template>
                  </el-table-column>
                  <el-table-column v-if="resultVal=='' || resultVal==null" fixed="right" style="background-color: white;" label="操作" width="200">
                    <template slot-scope="scope">
                      <el-button v-if="scope.row.children && scope.row.isEdit" icon="el-icon-circle-plus-outline" type="text" @click="clickAddChildren(scope.row,scope.$index)">添加行</el-button>
                      <el-button v-if="!scope.row.children && scope.row.isEdit" icon="el-icon-circle-close" type="text"
                      @click="clickDelLine(scope.row,scope.$index,scope.row.children!=null)">取消</el-button>
                      <el-button v-if="scope.row.children && scope.row.isEdit" icon="el-icon-circle-close" type="text"
                      @click="clickDelLine(scope.row,scope.$index,scope.row.children!=null)">删除项目</el-button>
      <div>
        <el-tabs class="packageInspect-detail" @tab-click="tabsClick">
            <el-tab-pane label="检验项目">
                <el-row>
                    <el-col :span="24" style="text-align: right;">
                        <el-dropdown @command="handleCommand" v-if="isShow && (resultVal==null || resultVal=='')">
                            <el-button size="mini" style="margin-right: 10px;" type="primary" >
                                åˆ‡æ¢æ£€éªŒé¡¹æ¨¡æ¿<i class="el-icon-arrow-down el-icon--right"></i>
                            </el-button>
                            <el-dropdown-menu slot="dropdown">
                                <el-dropdown-item :key="index" v-for="(item,index) in inspectMoulds" :command="item.father">{{item.father}}</el-dropdown-item>
                            </el-dropdown-menu>
                        </el-dropdown>
                    <el-button v-if="resultVal=='' || resultVal==null" size="mini" @click="clickAddLine()">添加检验项目</el-button>
                    <el-button v-if="resultVal=='' || resultVal==null" type="primary" size="mini"
                    @click="savePackIns()">保存</el-button>
                    </el-col>
                </el-row>
                <el-row>
                    <el-col :span="24">
                        <el-table
                        :header-cell-style="{textAlign:'center',color:'black',backgroundColor:'#fafafa'}"
                        :cell-style="{textAlign:'center'}"
                        ref="table"
                        :data="list"
                        border
                        style="width: 100%;"
                        height="400"
                        row-key="randomId" class="l-mes"
                        default-expand-all
                        :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
                        <el-table-column type="index" prop="parentIndex" label="序号" width="60">
                            <template scope="scope">
                                <span v-if="scope.row.isIndex">{{scope.row.parentIndex}}</span>
                            </template>
                        </el-table-column>
                        <el-table-column prop="name" label="项目" min-width="160">
                            <template slot-scope="scope">
                                <el-input :readonly="resultVal!=null || !scope.row.isEdit" v-if="scope.row.children" class="inline-input" style="width:80%;" v-model="scope.row.name"
                                placeholder="请输入项目名称"></el-input>
                            </template>
                        </el-table-column>
                        <el-table-column prop="required" label="要求" min-width="160">
                            <template slot-scope="scope">
                            <div v-if="!scope.row.children">
                                <el-tooltip :content="scope.row.required">
                                    <el-input :readonly="resultVal!=null || !scope.row.isEdit"
                                    v-model="scope.row.required"
                                    placeholder="请输入要求"></el-input>
                                </el-tooltip>
                            </div>
                            </template>
                        </el-table-column>
                        <el-table-column prop="note" label="检验描述" min-width="160">
                            <template slot-scope="scope">
                            <div v-if="!scope.row.children">
                                <el-input :readonly="resultVal!=null" v-model="scope.row.note" placeholder="检验描述"></el-input>
                            </div>
                            </template>
                        </el-table-column>
                        <el-table-column prop="testState" label="结论" min-width="150">
                            <template slot-scope="scope">
                                <el-select style="width:100%" :disabled="resultVal!=null" @change="changeResult" v-model="scope.row.result" v-if="!scope.row.children">
                                    <el-option label="合格" value="合格"></el-option>
                                    <el-option label="不合格" value="不合格"></el-option>
                                    <el-option label="不适用" value="不适用"></el-option>
                                </el-select>
                            </template>
                        </el-table-column>
                        <el-table-column v-if="resultVal=='' || resultVal==null" fixed="right" style="background-color: white;" label="操作" width="200">
                            <template slot-scope="scope">
                            <el-button v-if="scope.row.children && scope.row.isEdit" icon="el-icon-circle-plus-outline" type="text" @click="clickAddChildren(scope.row,scope.$index)">添加行</el-button>
                            <el-button v-if="!scope.row.children && scope.row.isEdit" icon="el-icon-circle-close" type="text"
                            @click="clickDelLine(scope.row,scope.$index,scope.row.children!=null)">取消</el-button>
                            <el-button v-if="scope.row.children && scope.row.isEdit" icon="el-icon-circle-close" type="text"
                            @click="clickDelLine(scope.row,scope.$index,scope.row.children!=null)">删除项目</el-button>

                            </template>
                        </el-table-column>
                        </el-table>
                    </el-col>
                </el-row>
            </el-tab-pane>
            <el-tab-pane label="附件上传" type="card">
                <div style="display: flex;justify-content:flex-end;">
                    <div></div>
                </div>
                <div
                v-loading="progrecessFileLoading"
                element-loading-text="请稍等，文件上传中"
                >
                <el-upload
                    drag
                    ref="upload"
                    action="/mes/attachment/upload"
                    :auto-upload="true"
                    :headers="headers"
                    :before-upload="submitUpload"
                    :on-success="uploadSuccess"
                    :data="paramData"
                    :with-credentials="true"
                    :show-file-list="false"
                >
                    <i class="el-icon-upload"></i>
                    <div class="el-upload__text">
                    å°†æ–‡ä»¶æ‹–到此处，或<em>点击上传</em>
                    </div>
                </el-upload>
                </div>
                <el-table :data="processConfigFileTableData" height="260px">
                <el-table-column
                    prop="rawInsNo"
                    align="center"
                    width="120"
                    label="原材料检验编号"
                    show-overflow-tooltip
                ></el-table-column>
                <el-table-column
                    prop="originalFileName"
                    align="center"
                    label="原文件名"
                    width="200"
                ></el-table-column>
                <el-table-column prop="fileName" align="center" label="文件后缀"></el-table-column>
                <el-table-column prop="createUser" align="center" label="上传人"></el-table-column>
                <el-table-column
                    prop="createTime"
                    align="center"
                    label="上传时间"
                    show-overflow-tooltip
                ></el-table-column>
                <el-table-column prop="updateUser" align="center" label="更新人">
                </el-table-column>
                <el-table-column
                    prop="updateTime"
                    align="center"
                    label="更新时间"
                    show-overflow-tooltip
                ></el-table-column>
                <el-table-column align="center" label="操作">
                    <template slot-scope="scope">
                    <el-button
                        @click="delProcessConfigFile(scope.row)"
                        type="text"
                        size="small"
                        :disabled="(resultVal!=null && resultVal!='')"
                        >删除</el-button
                    >
                    <el-button
                        @click="downloadProcessConfigFile(scope.row)"
                        type="text"
                        size="small"
                        >下载</el-button
                    >
                    </template>
                  </el-table-column>
                </el-table-column>
                </el-table>
            </el-col>
        </el-row>
            </el-tab-pane>
        </el-tabs>
      </div>
      <div class="packageInspect-result">
        <el-row>
@@ -197,7 +275,13 @@
  updatePackageInspectById,
  getCustomer,
} from '@/api/quality/packageInspect'
import {
    getProcessConfigFiles,
    deleteProcessConfigFile,
    downloadProcessConfigFile
 } from '@/api/quality/attachment'
import {getAllTemplateByEnable} from '@/api/quality/packageInspectTemp'
import { getStore } from '@/util/store'
export default {
    computed:{
    },
@@ -205,6 +289,16 @@
    },
    data(){
        return{
            progrecessFileLoading: false,
            processConfigFileTableData: [],
            headers: {
              Authorization: 'Bearer ' + getStore({ name: 'access_token' })
            },
            paramData: {
              rawInsNo: '',
              lineNumber: '',
              type: 4
            },
            inspectMoulds: [],
            isShow: true,
            submitData: {
@@ -269,6 +363,49 @@
      }
    },
    methods:{
      delProcessConfigFile(row) {
          this.$confirm('是否删除该附件', '提示', {
            confirmButtonText: '确定',
            cancelButtonText: '取消',
            type: 'warning',
            closeOnClickModal: false
          }).then(function() {
            return deleteProcessConfigFile(row.id)
          }).then((data) => {
            this.getConfigFiles()
          })
      },
      getConfigFiles() {
        const param = {
          no: this.dataForm.packInsNo,
          lineNumber: this.dataForm.id,
          type: 4
        }
        getProcessConfigFiles(param).then((res) => {
          this.processConfigFileTableData = res.data.data
        })
      },
      downloadProcessConfigFile(row) {
        downloadProcessConfigFile({
            bucket: row.bucketName,
            fileName: row.fileName,
            originalFileName: row.originalFileName
        })
      },
      submitUpload() {
        this.paramData.no = this.dataForm.packInsNo
        this.paramData.lineNumber = this.dataForm.id
        this.progrecessFileLoading = true
      },
      uploadSuccess() {
        this.progrecessFileLoading = false
        this.getConfigFiles()
      },
      tabsClick(tab,even){
        if(tab.index == 1){
            this.getConfigFiles();
        }
      },
      checkShowState(){
        let num = 0
        this.list.forEach(ele=>{
@@ -539,14 +676,14 @@
<style>
.packageInspect-detail {
  width: 100%;
  height: 490px;
  height: 520px;
  padding: 10px 20px;
  display: flex;
  border: 1px solid #ddd;
  background-color: #fff;
  margin-top: 10px;
  box-sizing: border-box;
  flex-wrap: wrap;
  /* display: flex;
  flex-wrap: wrap; */
}

.packageInspect-result {

 src/views/quality/processInspect/processInspect-form.vue

@@ -105,107 +105,186 @@
                    </div>
                </el-form>
            </div>
            <div class="finishedProduct-detail">
                <el-row style="width:100%;z-index: 10;height:30px;">
                    <el-col :span="12" class="inspectionProject_span">检验项目</el-col>
                    <el-col v-if="resultVal == null" :span="12" class="inspectionProject_span" style="text-align: right;">
                        <el-button size="mini" @click="clickAddInspectionColumn()">添加检测值列</el-button>
                        <el-button size="mini" @click="clickDeleteInspectionColumn()">删除检测值列</el-button>
                    </el-col>
                </el-row>
                <el-row style="width:100%;">
                    <el-col :span="24">
                        <el-table border
                            :data="inspectionItems"
                            height="400"
                            :header-cell-style="{ textAlign: 'center', color: 'black', backgroundColor: '#fafafa' }"
                            :cell-style="{ textAlign: 'center' }"
                            row-key="iid"
                            default-expand-all style="width: 100%"
                            ref="table"
                            :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
                            <el-table-column type="index" prop="parentIndex" label="序号" width="60">
                                <template scope="scope">
                                    <span v-if="scope.row.isIndex">{{scope.row.parentIndex}}</span>
                                </template>
                            </el-table-column>
                            <el-table-column label="项目" prop="father" show-overflow-tooltip width="140"></el-table-column>
                            <el-table-column prop="iname" label="指标" show-overflow-tooltip width="140"></el-table-column>
                            <el-table-column prop="iunit" label="单位" show-overflow-tooltip width="140"></el-table-column>
                            <el-table-column prop="required" label="标准值" width="140"></el-table-column>
                            <el-table-column prop="inspectionValue" v-for="(item, index) in empiricalValueAdd" :key="index"
                                label="检测值" width="140" style="text-align: center;">
                                <template slot-scope="scope">
                                    <el-col v-if="scope.row.itype === '1'">
                                        <el-tooltip v-if="scope.row.iname != null" :disabled="scope.row.eId != null"
                                            class="item" effect="dark" content="请先选择设备！" placement="top-start">
                                            <el-input :disabled="scope.row.eId == null"
                                                v-model="scope.row.empiricalValueAddss[index]"
                                                @blur="changeState(scope.row,true)" placeholder="请输入检测值"></el-input>
                                            <span v-if="resultVal != null && processInspectVo.id != null"
                                                v-text="scope.row.empiricalValueAddss[index]"></span>
                                        </el-tooltip>
                                    </el-col>
                                    <el-col v-else>
                                        <el-tooltip v-if="scope.row.iname != null" :disabled="scope.row.eId != null"
                                            class="item" effect="dark" content="请先选择设备！" placement="top-start">
                                            <el-select style="width: 100%;" @change="changeState(scope.row)" :disabled="scope.row.eId == null" v-model="scope.row.empiricalValueAddss[index]" placeholder="请选择">
                                                <el-option v-for="item in dataVal" :key="item.value" :label="item.label"
                                                    :value="item.value">
                                                </el-option>
                                            </el-select>
                                            <span v-if="resultVal != null && processInspectVo.id != null"
                                                v-text="scope.row.empiricalValueAddss[index]"></span>
                                        </el-tooltip>
                                    </el-col>
                                </template>
                            </el-table-column>
                            <el-table-column prop="deviceName" label="试验设备" min-width="200">
                                <template slot-scope="scope">
                                    <span v-if="resultVal != null && scope.row.iname != null"
                                        v-text="scope.row.ename"></span>
                                    <div v-else>
                                        <el-select style="width:60%" v-model="scope.row.eId" v-if="scope.row.iname != null"
                                            filterable @change="updateDevice(scope.row, scope.$index)">
                                            <el-option v-for="(item, index) in deviceList" :key="index" :value="item.id"
                                                :label="item.code + '-' + item.name"></el-option>
                                        </el-select>
                                        <el-button
                                    size="small"
                                    slot="append"
                                    icon="el-icon-full-screen"
                                    v-if="scope.row.iname != null"
                                    @click="codeDevice(scope.row,scope.$index)"></el-button>
                                    </div>
                                </template>
                            </el-table-column>
                            <el-table-column show-overflow-tooltip
                                label="检验描述" width="140" style="text-align: center;">
                                <template slot-scope="scope">
                                    <el-col>
                                        <el-tooltip v-if="scope.row.iname != null" :disabled="scope.row.eId != null"
                                            class="item" effect="dark" content="请先选择设备！" placement="top-start">
                                            <el-input :disabled="scope.row.eId == null"
                                                v-model="scope.row.inote"
                                                @blur="changeState(scope.row)" placeholder="请输入检验描述"></el-input>
                                            <span v-if="resultVal != null && processInspectVo.id != null"
                                                v-text="scope.row.inote"></span>
                                        </el-tooltip>
                                    </el-col>
                                </template>
                            </el-table-column>
                            <el-table-column label="结论" fixed="right" min-width="100">
                                <template slot-scope="scope">
                                    <div v-if="scope.row.iname != null">
                                        <span style="color: #34BD66;" v-if="scope.row.iresult == 1">合格</span>
                                        <span style="color: #E84738;" v-else-if="scope.row.iresult == 0">不合格</span>
                                        <span v-else>暂无结论</span>
                                    </div>
                                </template>
                            </el-table-column>
            <div>
                <el-tabs class="finishedProduct-detail" @tab-click="tabsClick">
                    <el-tab-pane label="检验项目">
                        <el-row>
                            <el-col v-if="resultVal == null" :span="24" class="inspectionProject_span" style="text-align: right;">
                                <el-button size="mini" @click="clickAddInspectionColumn()">添加检测值列</el-button>
                                <el-button size="mini" @click="clickDeleteInspectionColumn()">删除检测值列</el-button>
                            </el-col>
                        </el-row>
                        <el-row>
                            <el-col :span="24">
                                <el-table border
                                    :data="inspectionItems"
                                    height="400"
                                    :header-cell-style="{ textAlign: 'center', color: 'black', backgroundColor: '#fafafa' }"
                                    :cell-style="{ textAlign: 'center' }"
                                    row-key="iid"
                                    default-expand-all style="width: 100%"
                                    ref="table"
                                    :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
                                    <el-table-column type="index" prop="parentIndex" label="序号" width="60">
                                        <template scope="scope">
                                            <span v-if="scope.row.isIndex">{{scope.row.parentIndex}}</span>
                                        </template>
                                    </el-table-column>
                                    <el-table-column label="项目" prop="father" show-overflow-tooltip width="140"></el-table-column>
                                    <el-table-column prop="iname" label="指标" show-overflow-tooltip width="140"></el-table-column>
                                    <el-table-column prop="iunit" label="单位" show-overflow-tooltip width="140"></el-table-column>
                                    <el-table-column prop="required" label="标准值" width="140"></el-table-column>
                                    <el-table-column prop="inspectionValue" v-for="(item, index) in empiricalValueAdd" :key="index"
                                        label="检测值" width="140" style="text-align: center;">
                                        <template slot-scope="scope">
                                            <el-col v-if="scope.row.itype === '1'">
                                                <el-tooltip v-if="scope.row.iname != null" :disabled="scope.row.eId != null"
                                                    class="item" effect="dark" content="请先选择设备！" placement="top-start">
                                                    <el-input :disabled="scope.row.eId == null"
                                                        v-model="scope.row.empiricalValueAddss[index]"
                                                        @blur="changeState(scope.row,true)" placeholder="请输入检测值"></el-input>
                                                    <span v-if="resultVal != null && processInspectVo.id != null"
                                                        v-text="scope.row.empiricalValueAddss[index]"></span>
                                                </el-tooltip>
                                            </el-col>
                                            <el-col v-else>
                                                <el-tooltip v-if="scope.row.iname != null" :disabled="scope.row.eId != null"
                                                    class="item" effect="dark" content="请先选择设备！" placement="top-start">
                                                    <el-select style="width: 100%;" @change="changeState(scope.row)" :disabled="scope.row.eId == null" v-model="scope.row.empiricalValueAddss[index]" placeholder="请选择">
                                                        <el-option v-for="item in dataVal" :key="item.value" :label="item.label"
                                                            :value="item.value">
                                                        </el-option>
                                                    </el-select>
                                                    <span v-if="resultVal != null && processInspectVo.id != null"
                                                        v-text="scope.row.empiricalValueAddss[index]"></span>
                                                </el-tooltip>
                                            </el-col>
                                        </template>
                                    </el-table-column>
                                    <el-table-column prop="deviceName" label="试验设备" min-width="200">
                                        <template slot-scope="scope">
                                            <span v-if="resultVal != null && scope.row.iname != null"
                                                v-text="scope.row.ename"></span>
                                            <div v-else>
                                                <el-select style="width:60%" v-model="scope.row.eId" v-if="scope.row.iname != null"
                                                    filterable @change="updateDevice(scope.row, scope.$index)">
                                                    <el-option v-for="(item, index) in deviceList" :key="index" :value="item.id"
                                                        :label="item.code + '-' + item.name"></el-option>
                                                </el-select>
                                                <el-button
                                            size="small"
                                            slot="append"
                                            icon="el-icon-full-screen"
                                            v-if="scope.row.iname != null"
                                            @click="codeDevice(scope.row,scope.$index)"></el-button>
                                            </div>
                                        </template>
                                    </el-table-column>
                                    <el-table-column show-overflow-tooltip
                                        label="检验描述" width="140" style="text-align: center;">
                                        <template slot-scope="scope">
                                            <el-col>
                                                <el-tooltip v-if="scope.row.iname != null" :disabled="scope.row.eId != null"
                                                    class="item" effect="dark" content="请先选择设备！" placement="top-start">
                                                    <el-input :disabled="scope.row.eId == null"
                                                        v-model="scope.row.inote"
                                                        @blur="changeState(scope.row)" placeholder="请输入检验描述"></el-input>
                                                    <span v-if="resultVal != null && processInspectVo.id != null"
                                                        v-text="scope.row.inote"></span>
                                                </el-tooltip>
                                            </el-col>
                                        </template>
                                    </el-table-column>
                                    <el-table-column label="结论" fixed="right" min-width="100">
                                        <template slot-scope="scope">
                                            <div v-if="scope.row.iname != null">
                                                <span style="color: #34BD66;" v-if="scope.row.iresult == 1">合格</span>
                                                <span style="color: #E84738;" v-else-if="scope.row.iresult == 0">不合格</span>
                                                <span v-else>暂无结论</span>
                                            </div>
                                        </template>
                                    </el-table-column>
                                </el-table>
                            </el-col>
                        </el-row>
                    </el-tab-pane>
                    <el-tab-pane label="附件上传" type="card">
                        <div style="display: flex;justify-content:flex-end;">
                            <div></div>
                        </div>
                        <div
                        v-loading="progrecessFileLoading"
                        element-loading-text="请稍等，文件上传中"
                        >
                        <el-upload
                            :disabled="processInspectVo.proInsNo==null || (resultVal!=null && resultVal!='')"
                            drag
                            ref="upload"
                            action="/mes/rawInsProduct/upload"
                            :auto-upload="true"
                            :headers="headers"
                            :before-upload="submitUpload"
                            :on-success="uploadSuccess"
                            :data="paramData"
                            :with-credentials="true"
                            :show-file-list="false"
                        >
                            <i class="el-icon-upload"></i>
                            <div class="el-upload__text">
                            å°†æ–‡ä»¶æ‹–到此处，或<em>点击上传</em>
                            </div>
                        </el-upload>
                        </div>
                        <el-table :data="processConfigFileTableData" height="260px">
                        <el-table-column
                            prop="rawInsNo"
                            align="center"
                            width="120"
                            label="原材料检验编号"
                            show-overflow-tooltip
                        ></el-table-column>
                        <el-table-column
                            prop="originalFileName"
                            align="center"
                            label="原文件名"
                            width="200"
                        ></el-table-column>
                        <el-table-column prop="fileName" align="center" label="文件后缀"></el-table-column>
                        <el-table-column prop="createUser" align="center" label="上传人"></el-table-column>
                        <el-table-column
                            prop="createTime"
                            align="center"
                            label="上传时间"
                            show-overflow-tooltip
                        ></el-table-column>
                        <el-table-column prop="updateUser" align="center" label="更新人">
                        </el-table-column>
                        <el-table-column
                            prop="updateTime"
                            align="center"
                            label="更新时间"
                            show-overflow-tooltip
                        ></el-table-column>
                        <el-table-column align="center" label="操作">
                            <template slot-scope="scope">
                            <el-button
                                @click="delProcessConfigFile(scope.row)"
                                type="text"
                                size="small"
                                :disabled="(resultVal!=null && resultVal!='')"
                                >删除</el-button
                            >
                            <el-button
                                @click="downloadProcessConfigFile(scope.row)"
                                type="text"
                                size="small"
                                >下载</el-button
                            >
                            </template>
                        </el-table-column>
                        </el-table>
                    </el-col>
                </el-row>
                    </el-tab-pane>
                </el-tabs>
            </div>
            <div class="finishedProduct-result">
                <el-row style="width:100%">
@@ -273,16 +352,32 @@
    updateProcessInsProduct,
    updateProcessInspectsById,
} from '@/api/quality/processInspect'
import {
    getProcessConfigFiles,
    deleteProcessConfigFile,
    downloadProcessConfigFile
 } from '@/api/quality/attachment'
import processPart from '@/views/common/processinspect-part'
import { selectDevice } from '@/api/quality/processInspect'
import qrCodeApp from '@/views/common/qrCodeApp'
import { validatePositiveInteger } from '@/util/validate'
import { getStore } from '@/util/store'
export default {
    components:{
        qrCodeApp,processPart
    },
    data() {
        return {
            progrecessFileLoading: false,
            processConfigFileTableData: [],
            headers: {
              Authorization: 'Bearer ' + getStore({ name: 'access_token' })
            },
            paramData: {
              rawInsNo: '',
              lineNumber: '',
              type: 2
            },
            paramObj:{},
            qrcode: false,
            row: null,
@@ -348,12 +443,55 @@
        this.init()
    },
    methods: {
        delProcessConfigFile(row) {
          this.$confirm('是否删除该附件', '提示', {
            confirmButtonText: '确定',
            cancelButtonText: '取消',
            type: 'warning',
            closeOnClickModal: false
          }).then(function() {
            return deleteProcessConfigFile(row.id)
          }).then((data) => {
            this.getConfigFiles()
          })
      },
      getConfigFiles() {
        const param = {
          no: this.processInspectVo.rawInsNo,
          lineNumber: this.processInspectVo.id,
          type: 2
        }
        getProcessConfigFiles(param).then((res) => {
          this.processConfigFileTableData = res.data.data
        })
      },
      downloadProcessConfigFile(row) {
        downloadProcessConfigFile({
            bucket: row.bucketName,
            fileName: row.fileName,
            originalFileName: row.originalFileName
        })
      },
      submitUpload() {
        this.paramData.no = this.processInspectVo.proInsNo
        this.paramData.lineNumber = this.processInspectVo.id
        this.progrecessFileLoading = true
      },
      uploadSuccess() {
        this.progrecessFileLoading = false
        this.getConfigFiles()
      },
      tabsClick(tab,even){
        if(tab.index == 1){
          if(this.processInspectVo.proInsNo==null){
            this.$message.error("请先保存过程检验信息")
            return
          }
            this.getConfigFiles();
        }
      },
      queryCode(){
        this.workshop = true
        console.log(this.workshop);
        // this.paramObj = {
        //   code: this.dataForm.code
        // }
      },
      cancelCodeDialog(){
        this.qrcode = false
@@ -710,14 +848,12 @@
<style scoped>
.finishedProduct-detail {
    width: 100%;
    height: 470px;
    height: 520px;
    padding: 10px 20px;
    display: flex;
    border: 1px solid #ddd;
    background-color: #fff;
    margin-top: 10px;
    box-sizing: border-box;
    flex-wrap: wrap;
}

.finishedProduct-result {

 src/views/quality/rawMaterial/rawMaterial-form.vue

@@ -255,7 +255,7 @@
                :disabled="dataForm.rawInsNo==null || (resultVal!=null && resultVal!='')"
                drag
                ref="upload"
                action="/mes/rawInsProduct/upload"
                action="/mes/attachment/upload"
                :auto-upload="true"
                :headers="headers"
                :before-upload="submitUpload"
@@ -270,7 +270,6 @@
                </div>
              </el-upload>
            </div>

            <el-table :data="processConfigFileTableData" height="260px">
              <el-table-column
                prop="rawInsNo"
@@ -400,10 +399,12 @@
  getObj,
  updateRawInsProduct,
  updateRawInspectsById,
  getProcessConfigFiles,
  downloadProcessConfigFile,
  deleteProcessConfigFile,
  updateDeviceById, chooseIFS} from '@/api/quality/rawMaterial'
  import {
    getProcessConfigFiles,
    deleteProcessConfigFile,
    downloadProcessConfigFile
 } from '@/api/quality/attachment'
  import rawMaterialPartDialog from '@/views/common/rawMaterial-part'
  import { getStore } from '@/util/store'
  import qrCodeApp from '@/views/common/qrCodeApp'
@@ -422,8 +423,9 @@
              Authorization: 'Bearer ' + getStore({ name: 'access_token' })
            },
            paramData: {
              rawInsNo: '',
              lineNumber: ''
              no: '',
              lineNumber: '',
              type: 0
            },
            row: null,
            proIndex: 0,
@@ -519,8 +521,9 @@
      },
      getConfigFiles() {
        const param = {
          rawInsNo: this.dataForm.rawInsNo,
          lineNumber: this.dataForm.id
          no: this.dataForm.rawInsNo,
          lineNumber: this.dataForm.id,
          type: 0
        }
        getProcessConfigFiles(param).then((res) => {
          this.processConfigFileTableData = res.data.data
@@ -546,7 +549,7 @@
          })
      },
      submitUpload() {
        this.paramData.rawInsNo = this.dataForm.rawInsNo
        this.paramData.no = this.dataForm.rawInsNo
        this.paramData.lineNumber = this.dataForm.id
        this.progrecessFileLoading = true
      },

 src/views/quality/rawMaterial/testValue-select.vue

ÎļþÒÑɾ³ý