Merge remote-tracking branch 'origin/master'

10 months ago · ca8249c812
10 changed files with 108 additions and 37 deletions
--- a/src/api/wms/itembasic/index.ts
+++ b/src/api/wms/itembasic/index.ts
@ -78,3 +78,13 @@ export const importTemplate = () => {
 }
 // 导入地址
 export const importUrl = '/wms/itembasic/import'
+
+// 查询物品基本信息列表 
+export const selectItembasicPageToFgAndSemibasicPage = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return request.post({ url: '/wms/itembasic/itembasicPageToFgAndSemiSenior', data })
+  } else {
+    return await request.get({ url: `/wms/itembasic/ItembasicPageToFgAndSemi`, params })
+  }
+}
--- a/src/api/wms/supplierdeliverRecordMain/index.ts
+++ b/src/api/wms/supplierdeliverRecordMain/index.ts
@ -66,8 +66,13 @@ export const deleteSupplierdeliverRecordMain = async (id: number) => {

 // 导出供应商发货记录主 Excel
 export const exportSupplierdeliverRecordMain = async (params) => {
-  return await request.download({ url: `/wms/supplierdeliver-record-main/export-excel`, params })
-}
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/supplierdeliver-record-main/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/supplierdeliver-record-main/export-excel`, params })
+  }
+  }

 // 下载用户导入模板
 export const importTemplate = () => {
--- a/src/components/Detail/src/Detail.vue
+++ b/src/components/Detail/src/Detail.vue
@ -434,6 +434,12 @@ const openDetail = async (row: any, titleName: any, titleValue: any, tableName:
          defaultButtons.defaultFilterBtn(null) // 筛选
          ]
        }
+        //发货申请详情筛选
+        if (props.fromeWhere == 'DeliverRequestMain') {
+          HeadButttondata.value = [
+          defaultButtons.defaultFilterBtn(null) // 筛选
+          ]
+        }
      }

      // 动态显示操作列按钮
@ -448,6 +454,15 @@ const openDetail = async (row: any, titleName: any, titleValue: any, tableName:
          ...props.buttondataTable
        ]
      }
+      //发货申请详情筛选
+      if (props.fromeWhere == 'DeliverRequestMain') {
+          buttondata.value = [...[
+          defaultButtons.mainListEditBtn({
+            hide: isShowMainButton(row, ["1"])
+          })], // 编辑
+          ...props.buttondataTable
+        ]
+        }
    } finally {
      detailLoading.value = false
    }
--- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
@ -645,12 +645,7 @@ export const DeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
      searchField: 'code',
      searchTitle: '物品基础信息',
      searchAllSchemas: Itembasic.allSchemas,
-      searchPage: ItembasicApi.getItembasicPage,
-      searchCondition: [{
-        key: 'available',
-        value: 'TRUE',
-        isMainValue: false
-      }]
+      searchPage: ItembasicApi.selectItembasicPageToFgAndSemibasicPage,
    },
    form: {
      // labelMessage: '信息提示说明！！！',
@ -660,12 +655,7 @@ export const DeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
        searchField: 'code',
        searchTitle: '物品基础信息',
        searchAllSchemas: Itembasic.allSchemas,
-        searchPage: ItembasicApi.getItembasicPage,
-        searchCondition: [{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }]
+        searchPage: ItembasicApi.selectItembasicPageToFgAndSemibasicPage,
      }
    }
  },
--- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
+++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
@ -51,11 +51,13 @@
    :apiUpdate="DeliverRequestMainApi.updateDeliverRequestMain"
    :apiCreate="DeliverRequestMainApi.createDeliverRequestMain"
    :isBusiness="true"
+    fromeWhere="DeliverRequestMain"
    @handleAddTable="handleAddTable"
    @handleDeleteTable="handleDeleteTable"
    @searchTableSuccess="searchTableSuccess"
    @submitForm="submitForm"
    :isShowButton = isShowButton
+    :isShowReduceButton = isShowButton
  />

  <!-- 详情 -->
@ -70,8 +72,9 @@
    :apiPage="DeliverRequestDetailApi.getDeliverRequestDetailPage"
    :apiDelete="DeliverRequestDetailApi.deleteDeliverRequestDetail"
    :Echo="Echo"
+    fromeWhere="DeliverRequestMain"
    @searchTableSuccessDetail="searchTableSuccessDetail"
-    :detailButtonIsShow = trueFalse
+
  />

  <!-- 导入 -->
@ -99,8 +102,9 @@ routeName.value = route.name
 const tableColumns = ref(DeliverRequestMain.allSchemas.tableColumns)

 const isShowButton = ref(true)
+
 //定义  展示子表数据时是否显示新增/修改/删除按钮
-const trueFalse = ref(true)
+const trueFalse = ref(false)

 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
@ -318,9 +322,9 @@ const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
  console.log(999,row.deliverPlanNumber);
  if(row.deliverPlanNumber != null){
-        trueFalse.value = false
+        trueFalse.value = true
    }else {
-      trueFalse.value = true
+      trueFalse.value = false
    }
  detailRef.value.openDetail(row, titleName, titleValue,'requestDeliverMain')
 }
@ -377,12 +381,6 @@ const flag = ref(false)

 // 主子数据 提交
 const submitForm = async (formType, data) => {
-  if(tableData.value.length <= 0){
-    message.warning(`子表明细不能为空!`)
-      flag.value = true
-      formRef.value.formLoading = false
-      return;
-  }
  data.subList = tableData.value // 拼接子表数据参数
  data.subList.forEach(obj => {
    if(obj.qty == 0){
@ -397,6 +395,12 @@ const submitForm = async (formType, data) => {
  }
  try {
    if (formType === 'create') {
+      if(tableData.value.length <= 0){
+    message.warning(`子表明细不能为空!`)
+      flag.value = true
+      formRef.value.formLoading = false
+      return;
+  }
      await DeliverRequestMainApi.createDeliverRequestMain(data)
      message.success(t('common.createSuccess'))
    } else {
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
@ -257,6 +257,22 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
      }
    } else {
      const setV = {}
+      if (formField == 'fromWarehouseCode') {
+        if(InventorymoveRequestDetail.allSchemas.tableFormColumns.find(item => (item.field == 'fromPackingNumber')).tableForm.searchCondition.find(item => (item.key == 'warehouseCode')) == undefined){
+        InventorymoveRequestDetail.allSchemas.tableFormColumns.find(item => (item.field == 'fromPackingNumber')).tableForm.searchCondition.push({
+          key: 'warehouseCode',
+          value: val[0]["code"],
+          isMainValue: false
+        })
+      } else {
+        InventorymoveRequestDetail.allSchemas.tableFormColumns.find(item => (item.field == 'fromPackingNumber')).tableForm.searchCondition.find(item => {
+          if (item.key == 'warehouseCode') {
+            item.value = val[0]["code"]
+          }
+        })
+      }
+      // console.log(InventorymoveRequestDetail.allSchemas.tableFormColumns.find(item => (item.field == 'fromPackingNumber')).tableForm.searchCondition.find(item => (item.key == 'warehouseCode')));
+      }
      setV[formField] = val[0][searchField]
      formRef.setValues(setV)
    }
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts
@ -140,15 +140,6 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
      }
    },
  },
-  {
-    label: '从仓库代码',
-    field: 'fromWarehouseCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isForm: false,
-  },
  {
    label: '从库位类型范围',
    field: 'fromLocationTypes',
@ -542,7 +533,12 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
      searchTitle: '库存余额信息',
      searchAllSchemas: Balance.allSchemas,
      searchPage: BalanceApi.selectLocationTypeToBalance,
-      searchCondition: [{
+      searchCondition: [
+        {
+          key: 'warehouseCode',
+          value: 'fromWarehouseCode',
+          isMainValue: true
+        },{
        key: 'locationCode',
        value: 'businessType',
        isMainValue: true
@ -558,6 +554,11 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
        searchAllSchemas: Balance.allSchemas,
        searchPage: BalanceApi.selectLocationTypeToBalance,
        searchCondition: [{
+          key: 'warehouseCode',
+          value: 'fromWarehouseCode',
+          isMainValue: true
+        },
+        {
          key: 'locationCode',
          value: 'businessType',
          isMainValue: true
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
@ -387,12 +387,16 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
      searchField: 'itemCode',
      searchTitle: '供应商物品信息',
      searchAllSchemas: Supplieritem.allSchemas,
-      searchPage: SupplieritemApi.getSupplieritemPage,
+      searchPage: SupplieritemApi.selectItembasicTypeToSupplieritem,
      searchCondition: [{
        key:'supplierCode',
        value:'supplierCode',
        isMainValue: true
-      }]
+      },{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+        }]
    },
    form: {
      // labelMessage: '信息提示说明！！！',
@ -402,7 +406,7 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
        searchField: 'itemCode',
        searchTitle: '供应商物品信息',
        searchAllSchemas: Supplieritem.allSchemas,
-      searchPage: SupplieritemApi.getSupplieritemPage,
+      searchPage: SupplieritemApi.selectItembasicTypeToSupplieritem,
      searchCondition: [{
        key:'supplierCode',
        value:'supplierCode',
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@ -316,6 +316,27 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 //添加/修改操作
 const formRef = ref()
 const openForm = async (type: string, row?: number) => {
+  if(type == "update"){
+    SupplierdeliverRequestMain.allSchemas.formSchema.forEach((item) => {
+      if(item.field == 'supplierCode'){
+        item.componentProps.isSearchList = false
+        item.componentProps.disabled = true
+      }
+      if(item.field == 'ppNumber'){
+        item.componentProps.isSearchList = false
+        item.componentProps.disabled = true
+      }
+      if(item.field == 'asnNumber'){
+        item.componentProps.disabled = true
+      }
+      if(item.field == 'planArriveTime'){
+        item.componentProps.disabled = true
+      }
+    })
+  }else {
+    item.componentProps.isSearchList = true
+    item.componentProps.disabled = true
+  }
  tableData.value = [] // 重置明细数据
  formRef.value.open(type, row)
 }
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
@ -100,6 +100,11 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
            key: 'status',
            value: 4,
            isMainValue: false
+          },
+          {
+            key: 'available',
+            value: "TRUE",
+            isMainValue: false
          }]
      }
    }