2024.7.8 产品文档收集-转量产、所有、生产文档确认进度优化

2 years ago · d15b3bd911
4 changed files with 9 additions and 42 deletions
--- a/src/api/eam/eamProofing.js
+++ b/src/api/eam/eamProofing.js
@ -8,8 +8,6 @@ export const proofingInformationSearchForCheck= data => createAPI(`/pms/eamProof
 export const proofingInformationSave= data => createAPI(`/plm/proofingInformation/proofingInformationSave`,'post',data)
 //getProofDocument
 export const getProofDocument= data => createAPI(`/plm/proofingInformation/getProofDocument`,'post',data)
-//getDocumentList
-export const getDocumentList= data => createAPI(`/plm/proofingInformation/getDocumentList`,'post',data)

 export const deleteDocumentType= data => createAPI(`/plm/proofingInformation/deleteDocumentType`,'post',data)

--- a/src/views/modules/common/uploadFileList1.vue
+++ b/src/views/modules/common/uploadFileList1.vue
@ -314,11 +314,8 @@ export default {
        <el-form-item label=" ">
          <a href="javascript:void(0);" @click="triggerUpload">点击选择文件</a>
          <tr></tr>
-          <el-input v-model="this.fileName" readonly placeholder="文件名称" style="width: 300px"></el-input>
-          <el-form-item :label="label" v-if="isEditable" style="margin-top: -18px;margin-left: 10px">
-            <el-input v-model="no" :readonly="!isEditable" style="width: 110px"></el-input>
-          </el-form-item>
-          <el-form-item label="文件类型" v-if="isEditable" style="margin-top: -18px">
+          <el-input v-model="this.fileName" readonly placeholder="文件名称" style="width: 423px"></el-input>
+          <el-form-item label="文件类型" v-if="isEditable" style="margin-top: -18px;margin-left: 11px;">
            <el-input v-model="noType" :readonly="!isEditable" style="width: 170px"></el-input>
          </el-form-item>
          <el-button type="primary" @click="upload">上传</el-button>
--- a/src/views/modules/eam/com_project_proof_record.vue
+++ b/src/views/modules/eam/com_project_proof_record.vue
@ -53,7 +53,7 @@
                :data="proofDocumentList"
                border
                style="width: 100%;margin-top: 5px;"
-                :height="height - 47"
+                :height="height - 64"
                ref="proofDocumentTable"
                @row-click="uploadDocumentClickRow"
                @current-change="changeCurrentRow1"
@ -227,7 +227,7 @@
        <el-button type="primary" icon="el-icon-upload" style="margin-top: -5px" @click="addDocumentTypeFlag = true">新增</el-button>
        <el-table
          height="200"
-          :data="documentManifestDefinitionList"
+          :data="proofDocumentList"
          border
          style="width: 100%;">
          <el-table-column
@ -425,7 +425,7 @@
  import axios from "axios";
  import Chooselist from '@/views/modules/common/Chooselist'
  import { deleteFileInfo, saveFileInfo, updateUploadedFlag } from '@/api/test/fileService.js';
-  import {proofingInformationSearch,proofingDocumentNEW,getExtraDocumentList,editProofingRecord,proofingInformationSave,getProofDocument,getDocumentList,deleteDocumentType,proofingDocumentSave} from "@/api/eam/eamProofing.js";
+  import {proofingInformationSearch,proofingDocumentNEW,getExtraDocumentList,editProofingRecord,proofingInformationSave,getProofDocument,deleteDocumentType,proofingDocumentSave} from "@/api/eam/eamProofing.js";
  import row from "element-ui/packages/row";
  import UploadFileList1 from "../common/uploadFileList1.vue";
  import he from "element-ui/src/locale/lang/he";
@ -494,7 +494,6 @@
          page: 1,
          limit: 1000
        },
-        documentManifestDefinitionList:[],
        documentSelection: [],
        extraDocumentList:[],
        cProjectTypeDbList: [
@ -1166,7 +1165,6 @@
      },
      documentListVisibleFalse() {
        this.documentListVisible = false
-        this.documentManifestDefinitionList = []
      },
      addDocumentList(row) {
        this.documentListVisible = true
@ -1184,7 +1182,6 @@
          page: 1,
          limit: 1000
        }
-        this.getDocumentList()
        this.documentTypeData.proofingNo = row.proofingNo
        },
      updateProofingRecord(row) {
@ -1321,7 +1318,6 @@
          })
        })
        this.getProofDocument()
-        this.getDocumentList()
      },
      closeAddDocumentTypeFlag() {
        this.addDocumentTypeFlag = false
@ -1338,15 +1334,6 @@
        }
        this.extraDocumentList = []
      },
-      getDocumentList() {
-        getDocumentList(this.modalData).then(({data}) => {
-          if (data && data.code === 0) {
-            this.documentManifestDefinitionList = data.page.list
-          } else {
-            this.documentManifestDefinitionList = []
-          }
-        })
-      },
      newProofingDocument() {
        proofingDocumentSave(this.modalData).then(({data}) => {
          //区分请求成功和失败的状况
@ -1375,7 +1362,6 @@
              })
              //刷新表格
              this.getProofDocument()
-              this.getDocumentList()
            } else {
              this.$message({
                message: '删除失败',
--- a/src/views/modules/eam/eamProjectInfo.vue
+++ b/src/views/modules/eam/eamProjectInfo.vue
@ -896,7 +896,7 @@
      <el-button type="primary" icon="el-icon-upload" style="margin-top: -5px" @click="addProjectDocumentTypeFlag = true">新增</el-button>
      <el-table
        height="200"
-        :data="projectDocumentManifestDefinitionList"
+        :data="projectOtherDocumentList"
        border
        style="width: 100%;">
        <el-table-column
@ -982,7 +982,7 @@
      </el-footer>
    </el-dialog>

-    <el-dialog title="选择生产确认文档" :visible.sync="projectProductionValidationDocumentVisible" width="763px" style="margin-top: 10vh" :close-on-click-modal="false">
+    <el-dialog title="选择生产确认文档" :visible.sync="projectProductionValidationDocumentVisible" width="763px" style="margin-top: -5vh" :close-on-click-modal="false">
      <el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">
        <el-form-item label="项目编码" prop="projectId" class="red-label">
          <el-input v-model="modalData.projectId" readonly style="width: 110px;" class="red-text"></el-input>
@ -1026,7 +1026,7 @@
        <el-tab-pane label="文档选择" name="selectDocument" style="width: 104%">
          <el-table
            v-model="selectedDocumentItems"
-            :height="height + 105"
+            :height="height + 230"
            :data="projectAllDocumentList"
            border
            style="width: 100%;margin-top: -13px;margin-left: -14px !important; margin-right: 0 !important;"
@ -1247,7 +1247,6 @@ import UploadFileList1 from "../common/uploadFileList1.vue";
 import {
  deleteDocumentType,
  editProjectDocument,
-  getDocumentList,
  getExtraDocumentList,
  projectDocumentSave,
  proofingDocumentNEW,
@ -1337,7 +1336,6 @@ import {
        businessDataList6: [],
        dataList: [],
        dataListSelections: [],
-        projectDocumentManifestDefinitionList: [],
        //用于储存选中的行数据
        selectedDocumentItems: [],
        // ======== 复选数据集 ========
@ -3540,12 +3538,11 @@ import {
          page: 1
        }
        this.getProjectOtherDocument()
-        this.getProjectDocumentList()
+
        this.projectDocumentListVisible = true
      },
      projectDocumentListVisibleFalse() {
        this.projectDocumentListVisible = false
-        this.projectDocumentManifestDefinitionList = []
      },
      deleteProjectDocumentType(row) {
        this.$confirm('是否删除该文档清单?', '提示', {
@ -3559,7 +3556,6 @@ import {
                message: '删除成功',
                type: 'success'
              })
-              this.getProjectDocumentList()
              this.getProjectOtherDocument()
            } else {
              this.$message({
@ -3634,7 +3630,6 @@ import {
              this.addProjectDocumentTypeFlag = false
              //刷新表格
              this.getProjectOtherDocument()
-              this.getProjectDocumentList()
              this.refreshCurrentTabTable()
            } else {
              this.$message({
@ -3645,15 +3640,6 @@ import {
          })
        })
      },
-      getProjectDocumentList() {
-        getDocumentList(this.modalData).then(({data}) => {
-          if (data && data.code === 0) {
-            this.projectDocumentManifestDefinitionList = data.page.list
-          } else {
-            this.projectDocumentManifestDefinitionList = []
-          }
-        })
-      },
      searchProjectAllDocumentList () {
        let inData = {
          site: this.$store.state.user.site,