diff --git a/src/views/modules/common/uploadFileList1.vue b/src/views/modules/common/uploadFileList1.vue
index 9f4fda3..5c07ff1 100644
--- a/src/views/modules/common/uploadFileList1.vue
+++ b/src/views/modules/common/uploadFileList1.vue
@@ -254,6 +254,7 @@ export default {
           EventBus.$emit('updateAgencyMatterForUploads');
           EventBus.$emit('updateProjectPartDocumentInfo');
           EventBus.$emit('updateThisProjectPartDocumentInfo');
+          EventBus.$emit('getProjectOtherDocument');
           // this.$emit('get-document-list');
           // this.$emit('get-proof-document');
         } else {
diff --git a/src/views/modules/eam/com_project_proof_record.vue b/src/views/modules/eam/com_project_proof_record.vue
index 85389e4..5126631 100644
--- a/src/views/modules/eam/com_project_proof_record.vue
+++ b/src/views/modules/eam/com_project_proof_record.vue
@@ -9,7 +9,7 @@
               :data="dataList"
               border
               style="width: 100%;margin-top: -5px;"
-              :height="this.height - 38"
+              :height="this.height +10"
               highlight-current-row
               ref="proofingTable"
               @row-click="proofDocumentClickRow"
@@ -62,7 +62,7 @@
                 :data="proofDocumentList"
                 border
                 style="width: 100%;margin-top: 5px;"
-                :height="this.height - 79"
+                :height="this.height - 31"
                 ref="proofDocumentTable"
                 @row-click="uploadDocumentClickRow"
                 @current-change="changeCurrentRow1"
diff --git a/src/views/modules/eam/eamProjectPartInfo.vue b/src/views/modules/eam/eamProjectPartInfo.vue
index 9daf071..83bd890 100644
--- a/src/views/modules/eam/eamProjectPartInfo.vue
+++ b/src/views/modules/eam/eamProjectPartInfo.vue
@@ -297,6 +297,7 @@
       <el-tab-pane label="转量产阶段文档" name="massProductionStage">
         <el-button type="primary" icon="el-icon-upload" style="margin-top: -5px" @click="projectDocumentList()">文档清单定义</el-button>
           <el-button type="primary" v-if="this.proofingCurrentRow.status !== '草稿'" icon="el-icon-upload" style="margin-top: -5px" @click="uploadOtherDocument()">上传其他文档</el-button>
+        <el-button type="primary" v-if="this.sendMassMailFlag === true" style="margin-top: -5px" @click="sendMassMailHandle()">邮件提醒</el-button>
         <el-table
             :data="projectOtherDocumentList"
             border
@@ -364,10 +365,21 @@
           :data="projectAllDocumentList"
           border
           style="width: 100%;margin-top: 5px;"
-          :height="this.height + 110"
+          :height="this.height + 50"
           ref="projectAllDocumentDocumentTable"
           @row-click="projectAllDocumentClickRow"
           v-loading="dataListLoading">
+          <el-table-column
+            header-align="center"
+            fixed="left"
+            align="center"
+            width="80"
+            label="操作">
+            <template slot-scope="scope">
+              <a type="text" size="small" v-if="shouldShowDelete(scope.row) || scope.row.uploadedFlag === 'Y'" @click="viewMassDocumentFile(scope.row)">查看附件</a>
+              <a type="text" size="small" v-if="scope.row.uploadedFlag === 'N'" @click="uploadAllDocumentFile(scope.row)">上传文件</a>
+            </template>
+          </el-table-column>
           <el-table-column label="序号" type="index" align="center" :index="indexMethod">
             <template slot-scope="scope">
                     <span :style="{ color: scope.row.uploadedFlag === 'Y' ? 'green' : '' }">
@@ -405,17 +417,6 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column
-            header-align="center"
-            align="center"
-            width="80"
-            fixed="left"
-            label="操作">
-            <template slot-scope="scope">
-              <a type="text" size="small" v-if="shouldShowDelete(scope.row) || scope.row.uploadedFlag === 'Y'" @click="viewMassDocumentFile(scope.row)">查看附件</a>
-              <a type="text" size="small" v-if="scope.row.uploadedFlag === 'N'" @click="uploadAllDocumentFile(scope.row)">上传文件</a>
-            </template>
-          </el-table-column>
         </el-table>
       </el-tab-pane>
       <el-tab-pane label="生产文档确认进度" name="productionDocumentsConfirmProgress">
@@ -1164,7 +1165,20 @@ import {EventBus} from "../../../main";
         if (newVal) {
           this.activeName1 = 'selectDocument';
         }
-      }
+      },
+      // 如果projectOtherDocumentList改变，遍历projectOtherDocumentList
+      projectOtherDocumentList: {
+        deep: true,
+        handler: function (newV, oldV) {
+          const sendMassMailFlags = [];
+          this.projectOtherDocumentList.forEach(item => {
+            if (item.uploadedFlag === 'N') {
+              sendMassMailFlags.push(item.uploadedFlag)
+            }
+          })
+          this.sendMassMailFlag = sendMassMailFlags.includes('N');
+        }
+      },
     },
     data () {
       return {
@@ -1275,6 +1289,7 @@ import {EventBus} from "../../../main";
         projectConfirmatorFileList: [],
         viewDocumentFileVisible: false,
         viewMassDocumentFileVisible: false,
+        sendMassMailFlag: false,
         searchProjectDocumentTypeData: {
           site: this.$store.state.user.site,
           projectId: '',
@@ -2824,6 +2839,9 @@ import {EventBus} from "../../../main";
       EventBus.$on('updateThisProjectPartDocumentInfo', () => {
         this.searchProjectAllDocumentList()
       });
+      EventBus.$on('getProjectOtherDocument', () => {
+        this.getProjectOtherDocument()
+      });
     },
 
     created () {
@@ -3601,6 +3619,9 @@ import {EventBus} from "../../../main";
             });
           }
         } else if (row.status === '进行中' || '已量产') {
+          if (row.status === '进行中') {
+            this.modalData.status2 = '进行中'
+          }
           this.modalData.status = '已量产'
           this.modalData.closeDate = new Date()
           this.$confirm(`是否确认转量产?`, '提示', {
@@ -3618,18 +3639,6 @@ import {EventBus} from "../../../main";
                   duration: 1500,
                   onClose: () => {}
                 })
-                sendMailHandle(this.modalData).then(({data}) => {
-                  if (data && data.code === 0) {
-                    this.$message({
-                      message: '发送成功',
-                      type: 'success'
-                    })
-                  } else {
-                    this.$alert(data.msg, '错误', {
-                      confirmButtonText: '确定'
-                    })
-                  }
-                })
               } else {
                 this.$alert(data.msg, '错误', {
                   confirmButtonText: '确定'
@@ -3640,6 +3649,22 @@ import {EventBus} from "../../../main";
           })
         }
       },
+      sendMassMailHandle () {
+        let inData = this.proofingCurrentRow
+        inData.proofingId = -1
+        sendMailHandle(inData).then(({data}) => {
+          if (data && data.code === 0) {
+            this.$message({
+              message: '发送成功',
+              type: 'success'
+            })
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        })
+      },
       getRowProjectInfo(){
         let inData={
           site: this.proofingCurrentRow.site,
@@ -4016,7 +4041,7 @@ import {EventBus} from "../../../main";
           customerId: this.proofingCurrentRow.customerNo,
           customerDesc: this.proofingCurrentRow.customerDesc,
           page: 1,
-          limit: 1000
+          limit: -1
         }
         getProjectOtherDocument(tempData).then(({data}) => {
           if (data && data.code === 0) {
@@ -4028,19 +4053,19 @@ import {EventBus} from "../../../main";
               if (this.projectOtherDocumentList[i].documentTypeId !== 'N/A') {
                 this.proofDocumentListDefinition.push(this.projectOtherDocumentList[i])
               }
-              if (this.projectOtherDocumentList[i].responsibleDepartment === 'PM/Sales'){
+              if (this.projectOtherDocumentList[i].responsibleDepartment === 'PM/Sales') {
                 this.projectOtherDocumentList[i].projectLeader = this.proofingCurrentRow.projectManager.split("-")[1]
-              } else if(this.projectOtherDocumentList[i].responsibleDepartment === 'PjM'){
+              } else if (this.projectOtherDocumentList[i].responsibleDepartment === 'PjM') {
                 this.projectOtherDocumentList[i].projectLeader = this.proofingCurrentRow.projectOwner.split("-")[1]
-              } else if(this.projectOtherDocumentList[i].responsibleDepartment === 'Engineer'){
+              } else if (this.projectOtherDocumentList[i].responsibleDepartment === 'Engineer') {
                 this.projectOtherDocumentList[i].projectLeader = this.proofingCurrentRow.engineer.split("-")[1]
-              } else if(this.projectOtherDocumentList[i].responsibleDepartment === 'IPQC-Lam/Pri/Etch/Slit'){
+              } else if (this.projectOtherDocumentList[i].responsibleDepartment === 'IPQC-Lam/Pri/Etch/Slit') {
                 this.projectOtherDocumentList[i].projectLeader = this.proofingCurrentRow.cQualityEngineer1.split("-")[1]
-              } else if(this.projectOtherDocumentList[i].responsibleDepartment === 'IPQC-Converting'){
+              } else if (this.projectOtherDocumentList[i].responsibleDepartment === 'IPQC-Converting') {
                 this.projectOtherDocumentList[i].projectLeader = this.proofingCurrentRow.cQualityEngineer2.split("-")[1]
-              } else if(this.projectOtherDocumentList[i].responsibleDepartment === 'FQC1'){
+              } else if (this.projectOtherDocumentList[i].responsibleDepartment === 'FQC1') {
                 this.projectOtherDocumentList[i].projectLeader = this.proofingCurrentRow.cQualityEngineer3.split("-")[1]
-              } else if(this.projectOtherDocumentList[i].responsibleDepartment === 'MFQ'){
+              } else if (this.projectOtherDocumentList[i].responsibleDepartment === 'MFQ') {
                 this.projectOtherDocumentList[i].projectLeader = this.proofingCurrentRow.cManufactureEngineer.split("-")[1]
               } else if (this.projectOtherDocumentList[i].responsibleDepartment === 'SQE') {
                 if (this.proofingCurrentRow.cQualityEngineer4 != null && this.proofingCurrentRow.cQualityEngineer4 !== '') {
@@ -4050,15 +4075,13 @@ import {EventBus} from "../../../main";
                 if (this.proofingCurrentRow.cQualityEngineer5 != null && this.proofingCurrentRow.cQualityEngineer5 !== '') {
                   this.projectOtherDocumentList[i].projectLeader = this.proofingCurrentRow.cQualityEngineer5.split('-')[1] // 截取用户名
                 }
-              }
-              else if (this.projectOtherDocumentList[i].responsibleDepartment === 'IQC') {
+              } else if (this.projectOtherDocumentList[i].responsibleDepartment === 'IQC') {
                 if (this.proofingCurrentRow.cQualityEngineer6 != null && this.proofingCurrentRow.cQualityEngineer6 !== '') {
                   this.projectOtherDocumentList[i].projectLeader = this.proofingCurrentRow.cQualityEngineer6.split('-')[1] // 截取用户名
                 }
-              }
-              else if(this.projectOtherDocumentList[i].responsibleDepartment === 'DocEngineer'){
-                if (this.proofingCurrentRow.docEngineer != null && this.proofingCurrentRow.docEngineer !== ''){
-                  this.projectOtherDocumentList[i].projectLeader= this.proofingCurrentRow.docEngineer.split('-')[1] // 截取用户名
+              } else if (this.projectOtherDocumentList[i].responsibleDepartment === 'DocEngineer') {
+                if (this.proofingCurrentRow.docEngineer != null && this.proofingCurrentRow.docEngineer !== '') {
+                  this.projectOtherDocumentList[i].projectLeader = this.proofingCurrentRow.docEngineer.split('-')[1] // 截取用户名
                 }
               }
             }