Merge remote-tracking branch 'origin/master_hella' into master_hella

4 months ago · 7b3118435f
10 changed files with 90 additions and 44 deletions
--- a/src/views/qms/inspectionJob/inspectionJobMain.data.ts
+++ b/src/views/qms/inspectionJob/inspectionJobMain.data.ts
@ -444,7 +444,7 @@ export const InspectionJobMain = useCrudSchemas(
      isDetail: false,
      isForm: false,
      table: {
-        width: 200,
+        width: 250,
        fixed: 'right'
      }
    }
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
@ -123,6 +123,15 @@ const { tableObject, tableMethods } = useTable({
  toInventoryStatus.value = "HOLD"
  businessType.value = 'OkToHold'
  importFileName.value = '合格转隔离申请'
+}else if ( routeName.value == 'NoktoholdRequestMain') {
+  tableObject.params = {
+    fromInventoryStatus: 'NOK',
+    toInventoryStatus:'HOLD'
+  }
+  fromInventoryStatus.value = 'NOK'
+  toInventoryStatus.value = "HOLD"
+  businessType.value = 'NokToHold'
+  importFileName.value = '不合格转隔离申请'
 } else if ( routeName.value == 'HoldtookRequestMain') {
  tableObject.params = {
    fromInventoryStatus: 'HOLD',
@ -344,6 +353,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
          newRow['qty'] = item['packQty']
          if(routeName.value == 'OktoholdRequestMain'){
            newRow['toInventoryStatus'] = "HOLD"
+          }else if(routeName.value == 'NoktoholdRequestMain'){
+            newRow['toInventoryStatus'] = "HOLD"
          }else if ( routeName.value == 'HoldtookRequestMain') {
            newRow['toInventoryStatus'] = "OK"
          }else if ( routeName.value == 'HoldtoscrapRequestMain') {
@ -396,6 +407,8 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
      setV['uom'] = val[0]['uom']
      if(routeName.value == 'OktoholdRequestMain'){
        setV['toInventoryStatus'] = "HOLD"
+      }else  if(routeName.value == 'NoktoholdRequestMain'){
+        setV['toInventoryStatus'] = "HOLD"
      }else if ( routeName.value == 'HoldtookRequestMain') {
        setV['toInventoryStatus'] = "OK"
      }else if ( routeName.value == 'HoldtoscrapRequestMain') {
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts
@ -632,7 +632,8 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
      width: 150
    },
    tableForm: {
-      type: 'Select'
+      type: 'Select',
+      disabled: true
    },
    form: {
      componentProps: {
--- a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue
+++ b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue
@ -111,6 +111,7 @@ import * as ProductdismantleRequestDetailApi from '@/api/wms/productdismantleReq
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as BomDismantleApi from '@/api/wms/bomDismantle'
 import * as dismantleRequestDetailbApi from '@/api/wms/dismantleRequestDetailb'
+import * as BomApi from "@/api/wms/bom";


 // 制品拆解申请
@ -270,6 +271,21 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
        row['expireDate'] = val[0]['expireDate']
        row['bomVersion'] = ''
        row['childList'] = []
+        // 查看BOM版本
+        const param1 =  {
+          productItemCode: val[0]['itemCode'],
+          available: 'TRUE',
+          pageSize: 20,
+          pageNo: 1,
+          sort: '',
+          by: 'ASC',
+        }
+        BomApi.getBomPage(param1).then(res => {
+          console.log(res)
+          if(res?.list?.length>0){
+            row['bomVersion'] = res.list[0].version
+          }
+        })
      } else {
        val.forEach(item=>{
          const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
--- a/src/views/wms/productionManage/productionplan/productionMain/index.vue
+++ b/src/views/wms/productionManage/productionplan/productionMain/index.vue
@ -252,16 +252,16 @@ const butttondata = (row,$index) => {
    defaultButtons.mainListPlanResBtn({hide:isShowMainButton(row,['4']),hasPermi:'wms:production-main:resetting'}), // 重置
    defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:production-main:update'}), // 编辑
    // defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:production-main:delete'}), // 删除
-    {
-      label: '生成备料计划',
-      name: 'scbljh',
-      hide: isShowMainButton(row,['6']),
-      type: 'primary',
-      icon: 'Select',
-      hasPermi:'wms:production-main:publish',
-      link: true, // 文本展现按钮
-      color: ''
-    },
+    // {
+    //   label: '生成备料计划',
+    //   name: 'scbljh',
+    //   hide: isShowMainButton(row,['6']),
+    //   type: 'primary',
+    //   icon: 'Select',
+    //   hasPermi:'wms:production-main:publish',
+    //   link: true, // 文本展现按钮
+    //   color: ''
+    // },
    {
      label: '生成收货申请',
      name: 'scshsq',
--- a/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue
+++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue
@ -245,16 +245,16 @@ const butttondata = (row,$index) => {
    defaultButtons.mainListPlanResBtn({hide:isShowMainButton(row,['4']),hasPermi:'wms:production-main:resetting'}), // 重置
    defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:production-main:update'}), // 编辑
    // defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:production-main:delete'}), // 删除
-    {
-      label: '生成备料计划',
-      name: 'scbljh',
-      hide: isShowMainButton(row,['6']),
-      type: 'primary',
-      icon: 'Select',
-      hasPermi:'wms:production-main:publish',
-      link: true, // 文本展现按钮
-      color: ''
-    },
+    // {
+    //   label: '生成备料计划',
+    //   name: 'scbljh',
+    //   hide: isShowMainButton(row,['6']),
+    //   type: 'primary',
+    //   icon: 'Select',
+    //   hasPermi:'wms:production-main:publish',
+    //   link: true, // 文本展现按钮
+    //   color: ''
+    // },
    {
      label: '生成收货申请',
      name: 'scshsq',
--- a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue
+++ b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue
@ -245,16 +245,16 @@ const butttondata = (row,$index) => {
    defaultButtons.mainListPlanResBtn({hide:isShowMainButton(row,['4']),hasPermi:'wms:production-main:resetting'}), // 重置
    defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:production-main:update'}), // 编辑
    // defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:production-main:delete'}), // 删除
-    {
-      label: '生成备料计划',
-      name: 'scbljh',
-      hide: isShowMainButton(row,['6']),
-      type: 'primary',
-      icon: 'Select',
-      hasPermi:'wms:production-main:publish',
-      link: true, // 文本展现按钮
-      color: ''
-    },
+    // {
+    //   label: '生成备料计划',
+    //   name: 'scbljh',
+    //   hide: isShowMainButton(row,['6']),
+    //   type: 'primary',
+    //   icon: 'Select',
+    //   hasPermi:'wms:production-main:publish',
+    //   link: true, // 文本展现按钮
+    //   color: ''
+    // },
    {
      label: '生成收货申请',
      name: 'scshsq',
--- a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue
+++ b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue
@ -245,16 +245,16 @@ const butttondata = (row,$index) => {
    defaultButtons.mainListPlanResBtn({hide:isShowMainButton(row,['4']),hasPermi:'wms:production-main:resetting'}), // 重置
    defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:production-main:update'}), // 编辑
    // defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:production-main:delete'}), // 删除
-    {
-      label: '生成备料计划',
-      name: 'scbljh',
-      hide: isShowMainButton(row,['6']),
-      type: 'primary',
-      icon: 'Select',
-      hasPermi:'wms:production-main:publish',
-      link: true, // 文本展现按钮
-      color: ''
-    },
+    // {
+    //   label: '生成备料计划',
+    //   name: 'scbljh',
+    //   hide: isShowMainButton(row,['6']),
+    //   type: 'primary',
+    //   icon: 'Select',
+    //   hasPermi:'wms:production-main:publish',
+    //   link: true, // 文本展现按钮
+    //   color: ''
+    // },
    {
      label: '生成收货申请',
      name: 'scshsq',
--- a/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue
+++ b/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue
@ -116,6 +116,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as BomDismantleApi from '@/api/wms/bomDismantle'
 import * as dismantleRequestDetailbApi from "@/api/wms/dismantleRequestDetailb";
 import {updateProductscrapDetailRequestBom} from "@/api/wms/productrepairRequestMain";
+import * as BomApi from "@/api/wms/bom";


 // 制品返修申请
@ -246,6 +247,21 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
        row['fgFromLocationCode'] = val[0]['locationCode']
        row['bomVersion'] = ''
        row['childList'] = []
+          // 查看BOM版本
+          const param1 =  {
+          productItemCode: val[0]['itemCode'],
+          available: 'TRUE',
+          pageSize: 20,
+          pageNo: 1,
+          sort: '',
+          by: 'ASC',
+        }
+        BomApi.getBomPage(param1).then(res => {
+          console.log(res)
+          if(res?.list?.length>0){
+            row['bomVersion'] = res.list[0].version
+          }
+        })
      } else if(formField == 'productionLineCode'){
        row['productionLineCode'] = val[0]['code']
      } else if(formField == 'workStationCode'){
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
@ -987,7 +987,7 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
    isDetail: true,
  },
  {
-    label: '价税合计金额',
+    label: '价税合计',
    field: 'adTaxAmount',
    formatter: accountantFormart,
    
@ -1119,7 +1119,7 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
    }
  },
  {
-    label: '税额差异',
+    label: '税额差异（税额-系统税额）',
    field: 'taxAmountDiff',
    formatter: accountantFormart,