2024.11.7 文档收集更新

src/api/inquiry/inquiryApplication.js

@@ -7,3 +7,7 @@ export const addInquiryApplicationInfo = data => createAPI("/inquiry/inquiryAppl
 export const updateInquiryApplicationInfo = data => createAPI("/inquiry/inquiryApplication/updateInquiryApplicationInfo", "post", data);
 
 export const deleteInquiryApplicationInfo = data => createAPI("/inquiry/inquiryApplication/deleteInquiryApplicationInfo", "post", data);
+
+export const searchUserAuthInquiryApplicationInfo = data => createAPI("/inquiry/inquiryApplication/searchUserAuthInquiryApplicationInfo", "post", data);
+
+export const searchInquiryUserAuthInfo = data => createAPI("/inquiry/inquiryApplication/searchInquiryUserAuthInfo", "post", data);

src/views/modules/auth/authRule.vue

@@ -1104,7 +1104,8 @@ export default {
         }
         if (val === 218 ) {
           strVal = this.ruleStepModalData.authGroupNo
-          this.$refs.baseList.init(val, strVal)
+          conSql = " and site = '" + this.$store.state.user.site + "'" + " and record_type = '" + this.ruleCurrentRow.recordType + "'"
+          this.$refs.baseList.init(val, strVal, conSql)
         }
       })
     },

src/views/modules/eam/com_project_proof_record.vue

@@ -39,9 +39,16 @@
                 :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>
+                  <div v-if="scope.row.projectPhase === 'Alpha' || scope.row.projectPhase === 'Beta' || scope.row.allUploaded === 'Y'">
+                    <span v-if="!item.columnHidden" style="color: #0033ff;">{{scope.row[item.columnProp]}}</span>
+                    <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
+                                                       style="width: 100px; height: 80px"/></span>
+                  </div>
+                  <div v-else>
+                      <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>
+                  </div>
                 </template>
               </el-table-column>
             </el-table>
@@ -1121,7 +1128,7 @@
         proofingInformationSearch(this.searchData).then(({data}) => {
           //区分请求成功和失败的状况
           if (data && data.code === 0) {
-            this.dataList = data.page.list
+            this.dataList = data.page
             if (this.dataList.length > 0) {
               this.isUpload = true
               // 设置选中行
@@ -1245,6 +1252,7 @@
           }
         })
       },
+
       getColumnValue(row, column) {
         // 根据列的配置信息决定显示的值
         if (column.columnProp === 'documentType') {

src/views/modules/eam/eamProjectInfo.vue

@@ -2730,7 +2730,6 @@ import {searchBusinessInfo7} from "../../../api/factory/site";
 
               // 判断是否全部存在数据
               if (this.totalPage > 0) {
-                console.log(this.projectPartCurrentRow)
                 if (this.projectPartCurrentRow === null || this.projectPartCurrentRow === undefined) {
                   // 设置选中行
                   this.$refs.mainTable.setCurrentRow(this.dataList[0])

src/views/modules/eam/eamProjectPartInfo.vue

@@ -211,7 +211,7 @@
             <a v-if="scope.row.status !== '草稿' && scope.row.status !== '已量产'" style="color: gray; pointer-events: none;">转正式料号</a>
             <a v-if="scope.row.status === '进行中' && scope.row.status !== '已量产'" style="color: gray; pointer-events: none;">转量产</a>
           </div>
-          <div v-else-if="scope.row.status !== '已量产'">
+          <div v-else-if="scope.row.status !== '已量产' && scope.row.status !== '正式量产'">
             <a v-if="scope.row.status === '草稿' && scope.row.status !== '已量产'" type="text" size="small" @click="updateModalStatus(scope.row)">下达</a>
             <a v-if="scope.row.status !== '草稿'" type="text" size="small" @click="addProofRecord(scope.row)">新增打样</a>
             <a v-if="scope.row.status !== '草稿' && scope.row.status !== '已量产'" type="text" size="small" @click="changeFormalPartNo(scope.row)">转正式料号</a>
@@ -4476,19 +4476,27 @@ import {EventBus} from "../../../main";
         })
       },
       getConfirmProgressPusherList() {
-        let inData = {
-          site: this.proofingCurrentRow.site,
-          orderRef1: this.proofingCurrentRow.projectId,
-          orderRef2: this.proofingCurrentRow.projectPartId,
-          page: 1,
-          limit: 1000
-        }
-        searchConfirmProgressPusherList(inData).then(({data}) => {
-          if (data && data.code === 0){
-            this.confirmProgressPusherList = data.page.list;
-          }
-        })
-      },
+        return new Promise((resolve, reject) => {
+          let inData = {
+            site: this.proofingCurrentRow.site,
+            orderRef1: this.proofingCurrentRow.projectId,
+            orderRef2: this.proofingCurrentRow.projectPartId,
+            page: 1,
+            limit: 1000
+          };
+
+          searchConfirmProgressPusherList(inData).then(({ data }) => {
+            if (data && data.code === 0) {
+              this.confirmProgressPusherList = data.page.list;
+              resolve(); // 成功时调用 resolve
+            } else {
+              reject(new Error(data.msg)); // 处理错误
+            }
+          }).catch(error => {
+            reject(error); // 处理请求错误
+          });
+        });
+      } ,
       confirmDocument(row) {
         // 将this.$store.state.user.id转为字符串
         let userId = this.$store.state.user.id.toString()
@@ -4598,7 +4606,37 @@ import {EventBus} from "../../../main";
           if (data.code === 0) {
             this.confirmVisible = false;
             this.getConfirmProgressDocumentList();
-            this.getConfirmProgressPusherList();
+            this.getConfirmProgressPusherList().then(() => {
+              // 判断 confirmProgressPusherList 中的 confirmFlag 是否全部为 Y
+              let flag = true;
+              for (let i = 0; i < this.confirmProgressPusherList.length; i++) {
+                if (this.confirmProgressPusherList[i].confirmFlag !== 'Y') {
+                  flag = false;
+                  break;
+                }
+              }
+
+              if (flag) {
+                this.proofingCurrentRow.status = '正式量产';
+                eamProjectPartInfoEdit(this.proofingCurrentRow).then(({ data }) => {
+                  this.dataList.forEach((item) => {
+                    if (item.projectPartId === this.proofingCurrentRow.projectPartId) {
+                      this.dataListIndex = this.dataList.indexOf(item)
+                    }
+                  })
+                  this.getDataList();
+                  if (data.code !== 0) {
+                    this.$alert(data.msg, '错误', {
+                      confirmButtonText: '确定'
+                    });
+                  }
+                });
+              }
+            }).catch(error => {
+              this.$alert('获取确认进度推送列表失败', '错误', {
+                confirmButtonText: '确定'
+              });
+            });
             EventBus.$emit('updateAgencyMatterForConfirm')
           }else {
             this.$alert(data.msg, '错误', {