Merge remote-tracking branch 'origin/master'

zss

2024-03-11 d12fe5cd34a4ac05a7e8e40a4ee1cf2e69dc75e0

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

@@ -62,11 +62,12 @@
            </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">
      <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>
@@ -79,7 +80,7 @@
              @click="savePackIns()">保存</el-button>
            </el-col>
        </el-row>
        <el-row style="width:100%;">
                <el-row>
            <el-col :span="24">
                <el-table
                :header-cell-style="{textAlign:'center',color:'black',backgroundColor:'#fafafa'}"
@@ -97,13 +98,13 @@
                        <span v-if="scope.row.isIndex">{{scope.row.parentIndex}}</span>
                    </template>
                  </el-table-column>
                  <el-table-column prop="name" label="项目" width="160">
                        <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="要求" width="160">
                        <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">
@@ -114,7 +115,7 @@
                      </div>
                    </template>
                  </el-table-column>
                  <el-table-column prop="note" label="检验描述" width="160">
                        <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>
@@ -143,6 +144,83 @@
                </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>
            </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 {