From 30f17a88378b8835ff8ff1c01010a6de4b4119eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Wed, 10 Jul 2024 16:53:08 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90nev-pc=E3=80=91=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=E6=9A=82=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fe/PC/src/utils/tableColumns/index.js                  |  2 +-
 fe/PC/src/utils/tabsDesTions/index.js                  |  2 +-
 .../basicData/itemGuideBookManage/itemGuideBook.vue    |  2 +-
 fe/PC/src/views/padManage/isPadForKittingPack.vue      | 10 +++++++++-
 .../views/rawMaterialManage/quality/InspectRequest.vue | 10 +++++-----
 .../rawMaterialManage/quality/InspectRequest_new.vue   | 10 +++++-----
 .../rawMaterialManage/quality/InspectRequest_old.vue   | 10 +++++-----
 7 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js
index f9fe049e6..cf0683701 100644
--- a/fe/PC/src/utils/tableColumns/index.js
+++ b/fe/PC/src/utils/tableColumns/index.js
@@ -704,7 +704,7 @@ export const Shift = [
   { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" },
 ]
 
-// 作业指导书信息 
+// 供应商自检报告 
 export const ItemGuideBook = [
   {
     label: _Names.itemCode,
diff --git a/fe/PC/src/utils/tabsDesTions/index.js b/fe/PC/src/utils/tabsDesTions/index.js
index 2a2ff003d..e7e0d0a84 100644
--- a/fe/PC/src/utils/tabsDesTions/index.js
+++ b/fe/PC/src/utils/tabsDesTions/index.js
@@ -509,7 +509,7 @@ export const Shift =  [
   { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" },
 ]
 
-// 作业指导书信息 
+// 供应商自检报告信息 
 export const ItemGuideBook = [
   { label: _Names.itemCode, prop: "itemCode" },
   { label: _Names.itemName, prop: "itemName" },
diff --git a/fe/PC/src/views/basicData/itemGuideBookManage/itemGuideBook.vue b/fe/PC/src/views/basicData/itemGuideBookManage/itemGuideBook.vue
index c448719ea..4cf9b0e6d 100644
--- a/fe/PC/src/views/basicData/itemGuideBookManage/itemGuideBook.vue
+++ b/fe/PC/src/views/basicData/itemGuideBookManage/itemGuideBook.vue
@@ -256,7 +256,7 @@ export default {
                 }
                 fileStorageCreate(params).then( createRes => {
                   that.CreateFormData.pictureBlobName =  createRes
-                  // 创建作业指导书接口
+                  // 创建供应商自检报告接口
                   postCreate(that.CreateFormData, that.URL).then(res => {
                     that.Loading.newAndEdiLoading = false
                     that.FormResult("success")
diff --git a/fe/PC/src/views/padManage/isPadForKittingPack.vue b/fe/PC/src/views/padManage/isPadForKittingPack.vue
index e773b264d..8e2598e7d 100644
--- a/fe/PC/src/views/padManage/isPadForKittingPack.vue
+++ b/fe/PC/src/views/padManage/isPadForKittingPack.vue
@@ -319,6 +319,10 @@ export default {
         // 初始化中间和右侧数据数据：
         // 如果不够chassisQty条，则不分开
         if(res.items.length<Number(this.currentKittingInfo.chassisQty)){
+          res.items.forEach(item=>{ 
+            item.canSelect = true
+            item.isSelect = false
+          })
           this.centerChassisList = res.items
         }
         // 如果够chassisQty条:前三条数据，放到右上方，第四条数据开始显示在中间位置
@@ -333,7 +337,7 @@ export default {
             }
           })
         }
-        this.centerChassisList[0].canSelect = true
+        if(this.centerChassisList && this.centerChassisList.length > 0)this.centerChassisList[0].canSelect = true
         // 初始化右下数据
         let _ChassisBomData = {}
         let _Chassis_index = {}
@@ -445,6 +449,10 @@ export default {
         this.isLock=true
         return
       }
+      if(!this.rightTopChassisGroup || this.rightTopChassisGroup.length <= 0){
+        this.$warningMsg('请选择底盘数据')
+        return
+      }
       this.$confirm('是否确定完成该组底盘？', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
diff --git a/fe/PC/src/views/rawMaterialManage/quality/InspectRequest.vue b/fe/PC/src/views/rawMaterialManage/quality/InspectRequest.vue
index 4df1aeafa..4b9d61dbe 100644
--- a/fe/PC/src/views/rawMaterialManage/quality/InspectRequest.vue
+++ b/fe/PC/src/views/rawMaterialManage/quality/InspectRequest.vue
@@ -106,7 +106,7 @@
           </curren-Form>
         </el-col>
         <el-col :span="10" >
-          <div style="padding-bottom:10px">作业指导书：</div>
+          <div style="padding-bottom:10px">供应商自检报告:</div>
           <curren-descriptions
             border
             :column="1"
@@ -343,11 +343,11 @@ export default {
       inspectNoticeDetailsShow: false,
       summaryCurrentRow:null,
       loading:false,
-      // 作业指导书loading
+      // 供应商自检报告loading
       guideBookLoading:false,
-      // 作业指导书数据
+      // 供应商自检报告数据
       guideBookData:{},
-      // 作业指导书临时存储文件编号 防止重复请求图片
+      // 供应商自检报告临时存储文件编号 防止重复请求图片
       blobName: '',
       // 主表ID
       masterID: '',
@@ -471,7 +471,7 @@ export default {
       // supplierHandle: [
       //   { label: "取消", name: "cancel" },
       // ],
-      // 作业指导书
+      // 供应商自检报告
       tabsDesTionsGuideBook:[
         { label: "图片", prop: "pictureBlobName", type: "uploadPictureCard", limit: 1, picExt: ".png,.jpg", },
         { label: "步骤", prop: "step", type:'textarea', rows: 5  },
diff --git a/fe/PC/src/views/rawMaterialManage/quality/InspectRequest_new.vue b/fe/PC/src/views/rawMaterialManage/quality/InspectRequest_new.vue
index 4df1aeafa..65a037939 100644
--- a/fe/PC/src/views/rawMaterialManage/quality/InspectRequest_new.vue
+++ b/fe/PC/src/views/rawMaterialManage/quality/InspectRequest_new.vue
@@ -106,7 +106,7 @@
           </curren-Form>
         </el-col>
         <el-col :span="10" >
-          <div style="padding-bottom:10px">作业指导书：</div>
+          <div style="padding-bottom:10px">供应商自检报告：</div>
           <curren-descriptions
             border
             :column="1"
@@ -343,11 +343,11 @@ export default {
       inspectNoticeDetailsShow: false,
       summaryCurrentRow:null,
       loading:false,
-      // 作业指导书loading
+      // 供应商自检报告loading
       guideBookLoading:false,
-      // 作业指导书数据
+      // 供应商自检报告数据
       guideBookData:{},
-      // 作业指导书临时存储文件编号 防止重复请求图片
+      // 供应商自检报告临时存储文件编号 防止重复请求图片
       blobName: '',
       // 主表ID
       masterID: '',
@@ -471,7 +471,7 @@ export default {
       // supplierHandle: [
       //   { label: "取消", name: "cancel" },
       // ],
-      // 作业指导书
+      // 供应商自检报告
       tabsDesTionsGuideBook:[
         { label: "图片", prop: "pictureBlobName", type: "uploadPictureCard", limit: 1, picExt: ".png,.jpg", },
         { label: "步骤", prop: "step", type:'textarea', rows: 5  },
diff --git a/fe/PC/src/views/rawMaterialManage/quality/InspectRequest_old.vue b/fe/PC/src/views/rawMaterialManage/quality/InspectRequest_old.vue
index eb3985431..efc8c6a8f 100644
--- a/fe/PC/src/views/rawMaterialManage/quality/InspectRequest_old.vue
+++ b/fe/PC/src/views/rawMaterialManage/quality/InspectRequest_old.vue
@@ -104,7 +104,7 @@
           </curren-Form>
         </el-col>
         <el-col :span="10" >
-          <div style="padding-bottom:10px">作业指导书：</div>
+          <div style="padding-bottom:10px">供应商自检报告：</div>
           <curren-descriptions
             border
             :column="1"
@@ -332,11 +332,11 @@ export default {
       inspectNoticeDetailsShow: false,
       summaryCurrentRow:null,
       loading:false,
-      // 作业指导书loading
+      // 供应商自检报告loading
       guideBookLoading:false,
-      // 作业指导书数据
+      // 供应商自检报告数据
       guideBookData:{},
-      // 作业指导书临时存储文件编号 防止重复请求图片
+      // 供应商自检报告临时存储文件编号 防止重复请求图片
       blobName: '',
       // 主表ID
       masterID: '',
@@ -459,7 +459,7 @@ export default {
       // supplierHandle: [
       //   { label: "取消", name: "cancel" },
       // ],
-      // 作业指导书
+      // 供应商自检报告
       tabsDesTionsGuideBook:[
         { label: "图片", prop: "pictureBlobName", type: "uploadPictureCard", limit: 1, picExt: ".png,.jpg", },
         { label: "步骤", prop: "step", type:'textarea', rows: 5  },