Merge branch 'master' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui

src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue

@@ -140,10 +140,10 @@ const { tableObject: detatableDataBom, tableMethods: detatableMethodsBom } =useT
 })
 const { getList:getDetailListBom } = detatableMethodsBom
 /** bom 列表 表单 按钮 */
-const ButttondataBom = [
+const ButttondataBom = ref([
   defaultButtons.formSaveBtn(null), // 保存
   defaultButtons.formCloseBtn(null) // 关闭
-]
+])
 // bom 列表 表单 按钮
 const buttonBaseClickBom = async (val) => {
   // 保存
@@ -399,8 +399,15 @@ const openForm =async (type: string, row?: number) => {
 
 /** 详情操作 */
 const detailRef = ref()
+const mainStatus = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
   lsBomSave.value = false
+  mainStatus.value = row.status;
+  console.log("mainStatus.value：",mainStatus.value)
+  ButttondataBom.value = [
+    defaultButtons.formSaveBtn({ hide : mainStatus.value != 1 }), // 保存
+    defaultButtons.formCloseBtn(null) // 关闭
+  ]
   detailRef.value.openDetail(row, titleName, titleValue)
 }
 

src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue

@@ -145,10 +145,11 @@ const { tableObject: detatableDataBom, tableMethods: detatableMethodsBom } =useT
 })
 const { getList:getDetailListBom } = detatableMethodsBom
 /** bom 列表 表单 按钮 */
-const ButttondataBom = [
+
+const ButttondataBom = ref([
   defaultButtons.formSaveBtn(null), // 保存
   defaultButtons.formCloseBtn(null) // 关闭
-]
+])
 // bom 列表 表单 按钮
 const buttonBaseClickBom = (val) => {
   // 保存
@@ -433,7 +434,15 @@ const openForm =async (type: string, row?: number) => {
 
 /** 详情操作 */
 const detailRef = ref()
+const mainStatus = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
+  mainStatus.value = row.status;
+  console.log("mainStatus.value：",mainStatus.value)
+  // 弹窗按钮是否展示控制
+  ButttondataBom.value = [
+    defaultButtons.formSaveBtn({ hide : mainStatus.value != 1 }), // 保存
+    defaultButtons.formCloseBtn(null) // 关闭
+  ]
   lsBomSave.value = false
   detailRef.value.openDetail(row, titleName, titleValue)
 }
@@ -550,7 +559,6 @@ const searchFormClick = (searchData) => {
 
 // 查看 Bom 按钮回调事件
 const tableFormButton = async (val , row) => {
-  console.log("BBBBB",row.id);
   if (val == 'bom') { // 查看 bom
     bomModelVisible.value = true
     DialogTitle.value = '物品代码【' + row.itemCode + '】——Bom信息'
@@ -559,7 +567,6 @@ const tableFormButton = async (val , row) => {
        bomVersion: row.bomVersion,
        masterId: row.id
     }
-    console.log("AAAAA",row.id);
     rowId.value =  row.id
     await getDetailListBom()
   }

src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue

@@ -145,10 +145,10 @@ const { tableObject: detatableDataBom, tableMethods: detatableMethodsBom } =useT
 })
 const { getList:getDetailListBom } = detatableMethodsBom
 /** bom 列表 表单 按钮 */
-const ButttondataBom = [
+const ButttondataBom = ref([
   defaultButtons.formSaveBtn(null), // 保存
   defaultButtons.formCloseBtn(null) // 关闭
-]
+])
 // bom 列表 表单 按钮
 const buttonBaseClickBom = (val) => {
   // 保存
@@ -437,8 +437,15 @@ const openForm =async (type: string, row?: number) => {
 
 /** 详情操作 */
 const detailRef = ref()
+const mainStatus = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
   lsBomSave.value = false
+  mainStatus.value = row.status;
+  console.log("mainStatus.value：",mainStatus.value)
+  ButttondataBom.value = [
+    defaultButtons.formSaveBtn({ hide : mainStatus.value != 1 }), // 保存
+    defaultButtons.formCloseBtn(null) // 关闭
+  ]
   detailRef.value.openDetail(row, titleName, titleValue)
 }