2024.7.26 ①产品文档收集-项目信息进一步优化

②代办事宜功能第一版

src/views/modules/eam/eamProjectInfo.vue

@@ -297,12 +297,7 @@
         highlight-current-row
         border
         @row-dblclick="projectManagerRowDblclick"
-        @selection-change="selectionBusiness"
         style="width: 100%;">
-        <el-table-column
-          type="selection"
-          width="55">
-        </el-table-column>
         <el-table-column
           prop="username"
           header-align="center"
@@ -323,7 +318,6 @@
         </el-table-column>
       </el-table>
       <el-footer style="height:40px;margin-top: 10px;text-align:center">
-        <el-button type="primary" @click="saveSelectionInfo()">确定</el-button>
         <el-button @click="projectManagerFlag = false">关闭</el-button>
       </el-footer>
     </el-dialog>
@@ -354,12 +348,7 @@
         highlight-current-row
         border
         @row-dblclick="projectOwnerRowDblclick"
-        @selection-change="selectionBusiness"
         style="width: 100%;">
-        <el-table-column
-          type="selection"
-          width="55">
-        </el-table-column>
         <el-table-column
           prop="username"
           header-align="center"
@@ -412,12 +401,7 @@
         highlight-current-row
         border
         @row-dblclick="engineer6RowDblclick"
-        @selection-change="selectionBusiness"
         style="width: 100%;">
-        <el-table-column
-          type="selection"
-          width="55">
-        </el-table-column>
         <el-table-column
           prop="username"
           header-align="center"
@@ -471,12 +455,7 @@
         highlight-current-row
         border
         @row-dblclick="engineerRowDblclick"
-        @selection-change="selectionBusiness"
         style="width: 100%;">
-        <el-table-column
-          type="selection"
-          width="55">
-        </el-table-column>
         <el-table-column
           prop="username"
           header-align="center"
@@ -530,12 +509,7 @@
         highlight-current-row
         border
         @row-dblclick="IPQCRowDblclick"
-        @selection-change="selectionBusiness"
         style="width: 100%;">
-        <el-table-column
-          type="selection"
-          width="55">
-        </el-table-column>
         <el-table-column
           prop="username"
           header-align="center"
@@ -587,12 +561,7 @@
         highlight-current-row
         border
         @row-dblclick="FQCRowDblclick"
-        @selection-change="selectionBusiness"
         style="width: 100%;">
-        <el-table-column
-          type="selection"
-          width="55">
-        </el-table-column>
         <el-table-column
           prop="username"
           header-align="center"
@@ -644,12 +613,7 @@
         highlight-current-row
         border
         @row-dblclick="MFGRowDblclick"
-        @selection-change="selectionBusiness"
         style="width: 100%;">
-        <el-table-column
-          type="selection"
-          width="55">
-        </el-table-column>
         <el-table-column
           prop="username"
           header-align="center"
@@ -1570,7 +1534,7 @@ import {EventBus} from "../../../main";
             columnProp: 'projectDesc',
             headerAlign: "center",
             align: "center",
-            columnLabel: '项目',
+            columnLabel: '项目名称',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
@@ -3425,158 +3389,44 @@ import {EventBus} from "../../../main";
         this.businessDataList5 = []
         this.MFGlag = false
       },
-      projectManagerRowDblclick (row) {
-        this.modalData.projectManager = row.username + '-' + row.userDisplay
-        this.modalData.projectManagerName = row.projectManager.split('-')[1] // 截取用户名
-        this.projectManagerFlag = false
+      projectManagerRowDblclick(row) {
+        if (row && row.username && row.userDisplay) {
+          this.modalData.projectManager = row.username + '-' + row.userDisplay;
+          if (this.modalData.projectManager) {
+            this.modalData.projectManagerName = this.modalData.projectManager.split('-')[1];
+          }
+        }
+        this.projectManagerFlag = false;
       },
       projectOwnerRowDblclick (row) {
         this.modalData.projectOwner = row.username + '-' + row.userDisplay
-        this.modalData.projectOwnerName = row.projectOwner.split('-')[1] // 截取用户名
+        this.modalData.projectOwnerName = this.modalData.projectOwner.split('-')[1] // 截取用户名
         this.projectOwnerFlag = false
       },
       engineerRowDblclick (row) {
         this.modalData.cQualityEngineer1 = row.username + '-' + row.userDisplay
-        this.modalData.cQualityEngineer1Name = row.cQualityEngineer1.split('-')[1] // 截取用户名
+        this.modalData.cQualityEngineer1Name = this.modalData.cQualityEngineer1.split('-')[1] // 截取用户名
         this.engineerFlag = false
       },
       engineer6RowDblclick (row) {
         this.modalData.engineer = row.username + '-' + row.userDisplay
-        this.modalData.engineerName = row.engineer.split('-')[1] // 截取用户名
+        this.modalData.engineerName = this.modalData.engineer.split('-')[1] // 截取用户名
         this.engineer6Flag = false
       },
       IPQCRowDblclick (row) {
         this.modalData.cQualityEngineer2 = row.username + '-' + row.userDisplay
-        this.modalData.cQualityEngineer2Name = row.userDisplay
+        this.modalData.cQualityEngineer2Name = this.modalData.cQualityEngineer2.split('-')[1] // 截取用户名
         this.IPQCFlag = false
       },
       FQCRowDblclick (row) {
         this.modalData.cQualityEngineer3 = row.username + '-' + row.userDisplay
-        this.modalData.cQualityEngineer3Name = row.userDisplay
-        this.FQCFlag = false
+        this.modalData.cQualityEngineer3Name = this.modalData.cQualityEngineer3.split('-')[1] // 截取用户名
       },
       MFGRowDblclick (row) {
         this.modalData.cManufactureEngineer = row.username + '-' + row.userDisplay
-        this.modalData.cManufactureEngineerName = row.userDisplay
-        this.MFGlag = false
-      },
-      selectionBusiness (val) {
-        this.businessSelections = val
-        this.$refs.selectDiv.init(this.businessSelections)
-      },
-      saveSelectionInfo () {
-        let str = ''
-        let strName = ''
-        this.businessSelections.forEach((item, index) => {
-          if (index === this.businessSelections.length - 1) {
-            str += item.username + '-' + item.userDisplay
-            strName += item.userDisplay
-          } else {
-            str += item.username + '-' + item.userDisplay + ','
-            strName += item.userDisplay + ','
-          }
-        })
-        this.modalData.projectManager = str
-        this.modalData.projectManagerName = strName
-        this.projectManagerFlag = false
-      },
-      saveSelectionInfo1 () {
-        let str = ''
-        let strName = ''
-        this.businessSelections.forEach((item, index) => {
-          if (index === this.businessSelections.length - 1) {
-            str += item.username + '-' + item.userDisplay
-            strName += item.userDisplay
-          } else {
-            str += item.username + '-' + item.userDisplay + ','
-            strName += item.userDisplay + ','
-          }
-        })
-        this.modalData.projectOwner = str
-        this.modalData.projectOwnerName = strName
-        this.projectOwnerFlag = false
-      },
-      saveSelectionInfo2 () {
-        let str = ''
-        let strName = ''
-        this.businessSelections.forEach((item, index) => {
-          if (index === this.businessSelections.length - 1) {
-            str += item.username + '-' + item.userDisplay
-            strName += item.userDisplay
-          } else {
-            str += item.username + '-' + item.userDisplay + ','
-            strName += item.userDisplay + ','
-          }
-        })
-        this.modalData.cQualityEngineer1 = str
-        this.modalData.cQualityEngineer1Name = strName
-        this.engineerFlag = false
-      },
-      saveSelectionInfo3 () {
-        let str = ''
-        let strName = ''
-        this.businessSelections.forEach((item, index) => {
-          if (index === this.businessSelections.length - 1) {
-            str += item.username + '-' + item.userDisplay
-            strName += item.userDisplay
-          } else {
-            str += item.username + '-' + item.userDisplay + ','
-            strName += item.userDisplay + ','
-          }
-        })
-        this.modalData.cQualityEngineer2 = str
-        this.modalData.cQualityEngineer2Name = strName
-        this.IPQCFlag = false
-      },
-      saveSelectionInfo4 () {
-        let str = ''
-        let strName = ''
-        this.businessSelections.forEach((item, index) => {
-          if (index === this.businessSelections.length - 1) {
-            str += item.username + '-' + item.userDisplay
-            strName += item.userDisplay
-          } else {
-            str += item.username + '-' + item.userDisplay + ','
-            strName += item.userDisplay + ','
-          }
-        })
-        this.modalData.cQualityEngineer3 = str
-        this.modalData.cQualityEngineer3Name = strName
-        this.FQCFlag = false
-      },
-      saveSelectionInfo5 () {
-        let str = ''
-        let strName = ''
-        this.businessSelections.forEach((item, index) => {
-          if (index === this.businessSelections.length - 1) {
-            str += item.username + '-' + item.userDisplay
-            strName += item.userDisplay
-          } else {
-            str += item.username + '-' + item.userDisplay + ','
-            strName += item.userDisplay + ','
-          }
-        })
-        this.modalData.cManufactureEngineer = str
-        this.modalData.cManufactureEngineerName = strName
+        this.modalData.cManufactureEngineerName = this.modalData.cManufactureEngineer.split('-')[1] // 截取用户名
         this.MFGlag = false
       },
-      saveSelectionInfo6 () {
-        let str = ''
-        let strName = ''
-        this.businessSelections.forEach((item, index) => {
-          if (index === this.businessSelections.length - 1) {
-            str += item.username + '-' + item.userDisplay
-            strName += item.userDisplay
-          } else {
-            str += item.username + '-' + item.userDisplay + ','
-            strName += item.userDisplay + ','
-          }
-        }
-        )
-        this.modalData.engineer = str
-        this.modalData.engineerName = strName
-        this.engineer6Flag = false
-      },
       closeClear () {
         this.modalData.bu = ''
         this.modalData.projectId = ''

src/views/modules/eam/eamProjectInfoForConfirm.vue

@@ -4,7 +4,22 @@
               border
               style="height: 100%;width: 100%;margin-top: 0px;">
       <el-table-column label="序号" type="index" align="center" :index="indexMethod"></el-table-column>
-      <el-table-column header-align="center" align="center" prop="projectId" label="项目编码"></el-table-column>
+      <el-table-column
+        v-for="(item,index) in columnProjectList" :key="index"
+        :sortable="item.columnSortable"
+        :prop="item.columnProp"
+        :header-align="item.headerAlign"
+        :show-overflow-tooltip="item.showOverflowTooltip"
+        :align="item.align"
+        :fixed="item.fixed==''?false:item.fixed"
+        :min-width="item.columnWidth"
+        :label="item.columnLabel">
+        <template slot-scope="scope">
+          <span v-if="!item.columnHidden"> {{scope.row[item.columnProp]}}</span>
+          <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
+                                             style="width: 100px; height: 80px"/></span>
+        </template>
+      </el-table-column>
       <el-table-column header-align="center" align="center" prop="documentType" label="文档类型"></el-table-column>
       <el-table-column header-align="center" align="center" width="70" prop="userDisplay" label="指定确认人"></el-table-column>
       <el-table-column header-align="center" align="center" :formatter="formatDate" prop="wantedConfirmDate" label="要求确认日期"></el-table-column>
@@ -100,11 +115,397 @@ export default {
         site: this.$store.state.user.site,
         userId: this.$store.state.user.id,
       },
+      columnProjectList: [
+        {
+          userId: this.$store.state.user.name,
+          functionId: 101001013,
+          serialNumber: '101001013Table1BuDesc',
+          tableId: "101001013Table1",
+          tableName: "BU文档清单表",
+          columnProp: 'buDesc',
+          headerAlign: "center",
+          align: "center",
+          columnLabel: 'BU',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 101001014,
+          serialNumber: '101001014Table1ProjectId',
+          tableId: "101001014Table1",
+          tableName: "项目信息表",
+          columnProp: 'projectId',
+          headerAlign: "center",
+          align: "center",
+          columnLabel: '项目编码',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 101001014,
+          serialNumber: '101001014Table1ProjectDesc',
+          tableId: "101001014Table1",
+          tableName: "项目信息表",
+          columnProp: 'projectDesc',
+          headerAlign: "center",
+          align: "center",
+          columnLabel: '项目名称',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 101001014,
+          serialNumber: '101001014Table1TestPartNo',
+          tableId: "101001014Table1",
+          tableName: "项目信息表",
+          columnProp: 'testPartNo',
+          headerAlign: "center",
+          align: "center",
+          columnLabel: '料号',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 101001014,
+          serialNumber: '101001014Table1customerNo',
+          tableId: "101001014Table1",
+          tableName: "项目信息表",
+          columnProp: "customerNo",
+          headerAlign: "center",
+          align: "left",
+          columnLabel: "客户编码",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 101001014,
+          serialNumber: '101001014Table1customerDesc',
+          tableId: "101001014Table1",
+          tableName: "项目信息表",
+          columnProp: "customerDesc",
+          headerAlign: "center",
+          align: "left",
+          columnLabel: "客户名称",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 150
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 101001014,
+          serialNumber: '101001014Table1ProjectCreationDate',
+          tableId: "101001014Table1",
+          tableName: "项目信息表",
+          columnProp: "projectCreationDate",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "立项日期",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 101001014,
+          serialNumber: '101001014Table1ProjectCategory',
+          tableId: "101001014Table1",
+          tableName: "项目信息表",
+          columnProp: 'projectCategory',
+          headerAlign: "center",
+          align: "left",
+          columnLabel: '项目分类',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 101001014,
+          serialNumber: '101001014Table1Priority',
+          tableId: "101001014Table1",
+          tableName: "项目信息表",
+          columnProp: 'priority',
+          headerAlign: "center",
+          align: "left",
+          columnLabel: '优先级',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80,
+        },
+        //区域
+        {
+          userId: this.$store.state.user.name,
+          functionId: 101001014,
+          serialNumber: '101001014Table1CProjectRegion',
+          tableId: "101001014Table1",
+          tableName: "项目信息表",
+          columnProp: 'cProjectRegion',
+          headerAlign: "center",
+          align: "left",
+          columnLabel: '区域',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 101001014,
+          serialNumber: '101001014Table1ProjectManager',
+          tableId: "101001014Table1",
+          tableName: "项目信息表",
+          columnProp: 'projectManagerName',
+          headerAlign: "center",
+          align: "left",
+          columnLabel: 'PM/Sales',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 101001014,
+          serialNumber: '101001014Table1ProjectOwner',
+          tableId: "101001014Table1",
+          tableName: "项目信息表",
+          columnProp: 'projectOwnerName',
+          headerAlign: "center",
+          align: "left",
+          columnLabel: 'PjM',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 101001014,
+          serialNumber: '101001014Table1Engineer',
+          tableId: "101001014Table1",
+          tableName: "项目信息表",
+          columnProp: 'engineerName',
+          headerAlign: "center",
+          align: "left",
+          columnLabel: 'Engineer',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 101001014,
+          serialNumber: '101001014Table1CQualityEngineer1',
+          tableId: "101001014Table1",
+          tableName: "项目信息表",
+          columnProp: 'cQualityEngineer1Name',
+          headerAlign: "center",
+          align: "left",
+          columnLabel: 'IPQC-Lam/Pri/Etch/Slit',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 101001014,
+          serialNumber: '101001014Table1CQualityEngineer2',
+          tableId: "101001014Table1",
+          tableName: "项目信息表",
+          columnProp: 'cQualityEngineer2Name',
+          headerAlign: "center",
+          align: "left",
+          columnLabel: 'IPQC-Converting',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 101001014,
+          serialNumber: '101001014Table1CQualityEngineer3',
+          tableId: "101001014Table1",
+          tableName: "项目信息表",
+          columnProp: 'cQualityEngineer3Name',
+          headerAlign: "center",
+          align: "left",
+          columnLabel: 'FQC',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 101001014,
+          serialNumber: '101001014Table1CManufactureEngineer',
+          tableId: "101001014Table1",
+          tableName: "项目信息表",
+          columnProp: 'cManufactureEngineerName',
+          headerAlign: "center",
+          align: "left",
+          columnLabel: 'MFG',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 101001014,
+          serialNumber: '101001014Table1Status',
+          tableId: "101001014Table1",
+          tableName: "项目信息表",
+          columnProp: 'status',
+          headerAlign: "center",
+          align: "left",
+          columnLabel: '项目状态' ,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 101001014,
+          serialNumber: '101001014Table1NeedDate',
+          tableId: "101001014Table1",
+          tableName: "项目信息表",
+          columnProp: 'needDate',
+          headerAlign: "center",
+          align: "center",
+          columnLabel: '预计完成日期',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 101001014,
+          serialNumber: '101001014Table1ProjectCloseDate',
+          tableId: "101001014Table1",
+          tableName: "项目信息表",
+          columnProp: 'projectCloseDate',
+          headerAlign: "center",
+          align: "left",
+          columnLabel: '结案日期',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 101001014,
+          serialNumber: '101001014Table1FinalPartNo',
+          tableId: "101001014Table1",
+          tableName: "项目信息表",
+          columnProp: 'finalPartNo',
+          headerAlign: "center",
+          align: "left",
+          columnLabel: 'ERP正式料号',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120,
+        },
+      ]
     };
   },
   created() {
     this.getDataList()
   },
+  activated() {
+    if (this.$route.query.flag) {
+      this.getDataList()
+    }
+  },
   methods: {
     // 获取数据列表
     getDataList () {
@@ -112,6 +513,15 @@ export default {
         searchConfirmProgressList(this.searchData).then(({data}) => {
           if (data.code === 0) {
             this.dataList = data.list
+            this.dataList.forEach((item) => {
+              item.projectManagerName = item.projectManager.split('-')[1]
+              item.projectOwnerName = item.projectOwner.split('-')[1]
+              item.engineerName = item.engineer.split('-')[1]
+              item.cQualityEngineer1Name = item.cQualityEngineer1.split('-')[1]
+              item.cQualityEngineer2Name = item.cQualityEngineer2.split('-')[1]
+              item.cQualityEngineer3Name = item.cQualityEngineer3.split('-')[1]
+              item.cManufactureEngineerName = item.cManufactureEngineer.split('-')[1]
+            })
             // 判断是否全部存在数据
           }
         })
@@ -119,6 +529,15 @@ export default {
         searchOverConfirmProgressList(this.searchData).then(({data}) => {
           if (data.code === 0) {
             this.dataList = data.list
+            this.dataList.forEach((item) => {
+              item.projectManagerName = item.projectManager.split('-')[1]
+              item.projectOwnerName = item.projectOwner.split('-')[1]
+              item.engineerName = item.engineer.split('-')[1]
+              item.cQualityEngineer1Name = item.cQualityEngineer1.split('-')[1]
+              item.cQualityEngineer2Name = item.cQualityEngineer2.split('-')[1]
+              item.cQualityEngineer3Name = item.cQualityEngineer3.split('-')[1]
+              item.cManufactureEngineerName = item.cManufactureEngineer.split('-')[1]
+            })
             // 判断是否全部存在数据
           }
         })

src/views/modules/eam/eamProjectInfoForUploads.vue

@@ -53,9 +53,27 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 101001013,
-          serialNumber: '101001013Table1ProjectId',
+          serialNumber: '101001013Table1BuDesc',
           tableId: "101001013Table1",
           tableName: "BU文档清单表",
+          columnProp: 'buDesc',
+          headerAlign: "center",
+          align: "center",
+          columnLabel: 'BU',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 101001014,
+          serialNumber: '101001014Table1ProjectId',
+          tableId: "101001014Table1",
+          tableName: "项目信息表",
           columnProp: 'projectId',
           headerAlign: "center",
           align: "center",
@@ -66,17 +84,360 @@ export default {
           sortLv: 0,
           status: true,
           fixed: '',
+          columnWidth: 100,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 101001014,
+          serialNumber: '101001014Table1ProjectDesc',
+          tableId: "101001014Table1",
+          tableName: "项目信息表",
+          columnProp: 'projectDesc',
+          headerAlign: "center",
+          align: "center",
+          columnLabel: '项目名称',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 101001014,
+          serialNumber: '101001014Table1TestPartNo',
+          tableId: "101001014Table1",
+          tableName: "项目信息表",
+          columnProp: 'testPartNo',
+          headerAlign: "center",
+          align: "center",
+          columnLabel: '料号',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 101001014,
+          serialNumber: '101001014Table1customerNo',
+          tableId: "101001014Table1",
+          tableName: "项目信息表",
+          columnProp: "customerNo",
+          headerAlign: "center",
+          align: "left",
+          columnLabel: "客户编码",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 101001014,
+          serialNumber: '101001014Table1customerDesc',
+          tableId: "101001014Table1",
+          tableName: "项目信息表",
+          columnProp: "customerDesc",
+          headerAlign: "center",
+          align: "left",
+          columnLabel: "客户名称",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 150
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 101001014,
+          serialNumber: '101001014Table1ProjectCreationDate',
+          tableId: "101001014Table1",
+          tableName: "项目信息表",
+          columnProp: "projectCreationDate",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "立项日期",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 101001014,
+          serialNumber: '101001014Table1Priority',
+          tableId: "101001014Table1",
+          tableName: "项目信息表",
+          columnProp: 'priority',
+          headerAlign: "center",
+          align: "left",
+          columnLabel: '优先级',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
           columnWidth: 80,
         },
+        //区域
         {
           userId: this.$store.state.user.name,
-          functionId: 101001013,
-          serialNumber: '101001013Table1ProofingId',
-          tableId: "101001013Table1",
-          tableName: "BU文档清单表",
-          columnProp: 'proofingId',
+          functionId: 101001014,
+          serialNumber: '101001014Table1CProjectRegion',
+          tableId: "101001014Table1",
+          tableName: "项目信息表",
+          columnProp: 'cProjectRegion',
+          headerAlign: "center",
+          align: "left",
+          columnLabel: '区域',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 101001014,
+          serialNumber: '101001014Table1ProjectManager',
+          tableId: "101001014Table1",
+          tableName: "项目信息表",
+          columnProp: 'projectManagerName',
+          headerAlign: "center",
+          align: "left",
+          columnLabel: 'PM/Sales',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 101001014,
+          serialNumber: '101001014Table1ProjectOwner',
+          tableId: "101001014Table1",
+          tableName: "项目信息表",
+          columnProp: 'projectOwnerName',
+          headerAlign: "center",
+          align: "left",
+          columnLabel: 'PjM',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 101001014,
+          serialNumber: '101001014Table1Engineer',
+          tableId: "101001014Table1",
+          tableName: "项目信息表",
+          columnProp: 'engineerName',
+          headerAlign: "center",
+          align: "left",
+          columnLabel: 'Engineer',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 101001014,
+          serialNumber: '101001014Table1CQualityEngineer1',
+          tableId: "101001014Table1",
+          tableName: "项目信息表",
+          columnProp: 'cQualityEngineer1Name',
+          headerAlign: "center",
+          align: "left",
+          columnLabel: 'IPQC-Lam/Pri/Etch/Slit',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 101001014,
+          serialNumber: '101001014Table1CQualityEngineer2',
+          tableId: "101001014Table1",
+          tableName: "项目信息表",
+          columnProp: 'cQualityEngineer2Name',
+          headerAlign: "center",
+          align: "left",
+          columnLabel: 'IPQC-Converting',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 101001014,
+          serialNumber: '101001014Table1CQualityEngineer3',
+          tableId: "101001014Table1",
+          tableName: "项目信息表",
+          columnProp: 'cQualityEngineer3Name',
+          headerAlign: "center",
+          align: "left",
+          columnLabel: 'FQC',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 101001014,
+          serialNumber: '101001014Table1CManufactureEngineer',
+          tableId: "101001014Table1",
+          tableName: "项目信息表",
+          columnProp: 'cManufactureEngineerName',
+          headerAlign: "center",
+          align: "left",
+          columnLabel: 'MFG',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 101001014,
+          serialNumber: '101001014Table1Status',
+          tableId: "101001014Table1",
+          tableName: "项目信息表",
+          columnProp: 'status',
+          headerAlign: "center",
+          align: "left",
+          columnLabel: '项目状态' ,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 101001014,
+          serialNumber: '101001014Table1NeedDate',
+          tableId: "101001014Table1",
+          tableName: "项目信息表",
+          columnProp: 'needDate',
           headerAlign: "center",
           align: "center",
+          columnLabel: '预计完成日期',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 101001014,
+          serialNumber: '101001014Table1ProjectCloseDate',
+          tableId: "101001014Table1",
+          tableName: "项目信息表",
+          columnProp: 'projectCloseDate',
+          headerAlign: "center",
+          align: "left",
+          columnLabel: '结案日期',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 101001014,
+          serialNumber: '101001014Table1FinalPartNo',
+          tableId: "101001014Table1",
+          tableName: "项目信息表",
+          columnProp: 'finalPartNo',
+          headerAlign: "center",
+          align: "left",
+          columnLabel: 'ERP正式料号',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 103001,
+          serialNumber: '103001Table1RequiredDeliveryDate',
+          tableId: '103001Table1',
+          tableName: '打样记录表',
+          columnProp: 'planStartDate',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '打样开始日期',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 103001,
+          serialNumber: '103001Table1ProofingNo',
+          tableId: '103001Table1',
+          tableName: '打样记录表',
+          columnProp: 'proofingNo',
+          headerAlign: 'center',
+          align: 'center',
           columnLabel: '打样单号',
           columnHidden: false,
           columnImage: false,
@@ -84,8 +445,82 @@ export default {
           sortLv: 0,
           status: true,
           fixed: '',
+          columnWidth: 80
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 103001,
+          serialNumber: '103001Table1ProofingNumber',
+          tableId: '103001Table1',
+          tableName: '打样记录表',
+          columnProp: 'proofingNumber',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '数量',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 101001014,
+          serialNumber: '101001014Table1CProjectTypeDb',
+          tableId: "101001014Table1",
+          tableName: "项目信息表",
+          columnProp: 'cProjectTypeDb',
+          headerAlign: "center",
+          align: "left",
+          columnLabel: '项目分类',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
           columnWidth: 80,
         },
+        //日期requiredDeliveryDate
+        {
+          userId: this.$store.state.user.name,
+          functionId: 103001,
+          serialNumber: '103001Table1RequiredDeliveryDate',
+          tableId: '103001Table1',
+          tableName: '打样记录表',
+          columnProp: 'requiredDeliveryDate',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '预计完成日期',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80
+        },
+        //日期requiredDeliveryDate
+        {
+          userId: this.$store.state.user.name,
+          functionId: 103001,
+          serialNumber: '103001Table1ActualityDeliveryDate',
+          tableId: '103001Table1',
+          tableName: '打样记录表',
+          columnProp: 'actualityDeliveryDate',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '实际完成日期',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80
+        },
         {
           userId: this.$store.state.user.name,
           functionId: 101001013,
@@ -140,24 +575,6 @@ export default {
           fixed: '',
           columnWidth: 70,
         },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 101001014,
-          serialNumber: '101001014Table1DocumentGroupDesc',
-          tableId: "101001014Table1",
-          tableName: "打样文档表",
-          columnProp: 'documentGroupDesc',
-          headerAlign: "center",
-          align: "center",
-          columnLabel: '文档种类',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 70,
-        },
         {
           userId: this.$store.state.user.name,
           functionId: 103001,
@@ -167,7 +584,7 @@ export default {
           columnProp: 'createDate',
           headerAlign: 'center',
           align: 'center',
-          columnLabel: '创建时间',
+          columnLabel: '文档创建时间',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -185,7 +602,7 @@ export default {
           columnProp: 'createdBy',
           headerAlign: 'center',
           align: 'center',
-          columnLabel: '创建人',
+          columnLabel: '文档创建人',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -200,6 +617,11 @@ export default {
   created() {
     this.getDataList()
   },
+  activated() {
+    if (this.$route.query.flag) {
+      this.getDataList()
+    }
+  },
   methods: {
     // 获取数据列表
     getDataList () {
@@ -207,14 +629,30 @@ export default {
         searchProjectUploadsDocumentList(this.searchData).then(({data}) => {
           if (data.code === 0) {
             this.dataList = data.list
-            // 判断是否全部存在数据
+            this.dataList.forEach((item) => {
+              item.projectManagerName = item.projectManager.split('-')[1]
+              item.projectOwnerName = item.projectOwner.split('-')[1]
+              item.engineerName = item.engineer.split('-')[1]
+              item.cQualityEngineer1Name = item.cQualityEngineer1.split('-')[1]
+              item.cQualityEngineer2Name = item.cQualityEngineer2.split('-')[1]
+              item.cQualityEngineer3Name = item.cQualityEngineer3.split('-')[1]
+              item.cManufactureEngineerName = item.cManufactureEngineer.split('-')[1]
+            })
           }
         })
       }else {
         searchProjectOverUploadsDocumentList(this.searchData).then(({data}) => {
           if (data.code === 0) {
             this.dataList = data.list
-            // 判断是否全部存在数据
+            this.dataList.forEach((item) => {
+              item.projectManagerName = item.projectManager.split('-')[1]
+              item.projectOwnerName = item.projectOwner.split('-')[1]
+              item.engineerName = item.engineer.split('-')[1]
+              item.cQualityEngineer1Name = item.cQualityEngineer1.split('-')[1]
+              item.cQualityEngineer2Name = item.cQualityEngineer2.split('-')[1]
+              item.cQualityEngineer3Name = item.cQualityEngineer3.split('-')[1]
+              item.cManufactureEngineerName = item.cManufactureEngineer.split('-')[1]
+            })
           }
         })
       }