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

src/api/wms/location/index.ts

@@ -76,5 +76,11 @@ export const importTemplate = () => {
 }
 
 export const selectBusinessTypeToLocation = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/location/pageBusinessTypeToLocationSenior', data })
+  } else {
     return request.get({ url: `/wms/location/pageBusinessTypeToLocation`, params })
   }
+}

src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts

@@ -700,7 +700,7 @@ export const InventorymoveJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '从库存状态',
+    label: '库存状态',
     field: 'inventoryStatus',
     dictType: DICT_TYPE.INVENTORY_STATUS,
     dictClass: 'string',
@@ -710,17 +710,17 @@ export const InventorymoveJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
-  {
-    label: '到库存状态',
-    field: 'toInventoryStatus',
-    dictType: DICT_TYPE.INVENTORY_STATUS,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
+  // {
+  //   label: '到库存状态',
+  //   field: 'toInventoryStatus',
+  //   dictType: DICT_TYPE.INVENTORY_STATUS,
+  //   dictClass: 'string',
+  //   isTable: true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
   {
     label: '订单号',
     field: 'poNumber',

src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue

@@ -151,6 +151,11 @@ const { tableObject, tableMethods } = useTable({
   fromInventoryStatus.value = null
   businessType.value = 'InventorymoveRequest'
   console.log(146 , businessType.value)
+}else {
+  tableObject.params = {
+    fromInventoryStatus: 'OK',
+    toInventoryStatus:'SCRAP'
+  }
 }
 
 // 修改 tableform 属性
@@ -186,13 +191,6 @@ InventorymoveRequestDetail.allSchemas.tableFormColumns.map(item => {
       delete item.tableForm.searchCondition
     }
   }
-  if(item.field == "toInventoryStatus"){
-    if (fromInventoryStatus.value) {
-      item.tableForm.disabled = true
-    } else {
-      item.tableForm.disabled = false
-    }
-  }
   if(item.field == "toLocationCode"){
     if (toInventoryStatus.value) {
       item.tableForm.searchCondition = [
@@ -252,7 +250,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
         }else if ( routeName.value == 'ScraptoholdRequestMain') {
           row['toInventoryStatus'] = "HOLD"
         }else{
-          row['toInventoryStatus'] = null
+          row['toInventoryStatus'] = val[0]['inventoryStatus']
         }
       } else {
         row[formField] = val[0][searchField]
@@ -287,7 +285,7 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
         }else if ( routeName.value == 'ScraptoholdRequestMain') {
           setV['toInventoryStatus'] = "HOLD"
         }else{
-          setV['toInventoryStatus'] = null
+          setV['toInventoryStatus'] = val[0]['inventoryStatus']
         }
     } else {
       setV[formField] = val[0][searchField]
@@ -454,7 +452,20 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await InventorymoveRequestMainApi.exportInventorymoveRequestMain(setSearchParams)
+    if(routeName.value == 'OktoholdRequestMain'){
+      download.excel(data, '合格转隔离申请主.xlsx')
+        }else if ( routeName.value == 'HoldtookRequestMain') {
+          download.excel(data, '隔离转合格申请主.xlsx')
+        }else if ( routeName.value == 'HoldtoscrapRequestMain') {
+          download.excel(data, '隔离转报废申请主.xlsx')
+        }else if ( routeName.value == 'OktoscrapRequestMain') {
+          download.excel(data, '合格转报废申请主.xlsx')
+        }else if ( routeName.value == 'ScraptoholdRequestMain') {
+          download.excel(data, '报废转隔离申请主.xlsx')
+        }else{
           download.excel(data, '库存转移申请主.xlsx')
+        }
+    
   } catch {
   } finally {
     exportLoading.value = false

src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts

@@ -152,8 +152,8 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库位类型范围',
     field: 'fromLocationTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
-    dictClass: 'string',
+    // dictType: DICT_TYPE.LOCATION_TYPE,
+    // dictClass: 'string',
     isTable: true,
     sort: 'custom',
     table: {
@@ -182,8 +182,8 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库位类型范围',
     field: 'toLocationTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
-    dictClass: 'string',
+    // dictType: DICT_TYPE.LOCATION_TYPE,
+    // dictClass: 'string',
     isTable: true,
     sort: 'custom',
     table: {
@@ -726,8 +726,14 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
       width: 150
     },
     tableForm: {
+      disabled: true,
       type: 'Select'
     },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
   },
   {
     label: '从货主代码',

src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue

@@ -71,25 +71,33 @@
   // 查询页面返回
   const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
     nextTick(() => {
+      const setV = {}
       if (type == 'tableForm') {
         // 明细查询页赋值
-        row[formField] = val[0][searchField]
-        row['itemCode'] = val[0]['code']
+        if(formField == 'fromLocationCode'){
+          row['fromLocationCode'] = val[0]['code']
+        }else if(formField == 'itemCode'){
+          row['itemCode'] = val[0]['itemCode']
+        }
       } else {
-        const setV = {}
         setV[formField] = val[0][searchField]
         setV['purchaseReceiptRecordNumber'] = val[0]['number']
         // setV['supplierCode'] = val[0]['supplierCode']
-        formRef.setValues(setV)
       }
+      formRef.setValues(setV)
     })
   }
   // 查询页面返回——详情
   const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
     nextTick(() => {
       const setV = {}
+      if(formField == 'fromLocationCode'){
+        setV['fromLocationCode'] = val[0]['code']
+      }else if(formField == 'itemCode'){
+        setV['itemCode'] = val[0]['itemCode']
+      }else {
         setV[formField] = val[0][searchField]
-      setV['itemCode'] = val[0]['code']
+      }
       formRef.setValues(setV)
     })
   }

src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/inspectRequestMain.data.ts

@@ -591,19 +591,10 @@ export const InspectRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       disabled: true,
       isInpuFocusShow: true,
       earchListPlaceholder: '请选择包装号',
-      searchField: 'packingNumber',
+      searchField: 'itemCode',
       searchTitle: '库存余额信息',
       searchAllSchemas: Balance.allSchemas,
-      searchPage: BalanceApi.getBalancePagePutaway,
-      searchCondition: [{
-        key: 'available',
-        value: 'TRUE',
-        isMainValue: false
-      }, {
-        key: 'workshopCode',
-        value: 'workshopCode',
-        isMainValue: true
-      }]
+      searchPage: BalanceApi.getBalancePagePutaway
     },
   },
   {

src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue

@@ -103,7 +103,7 @@ import * as PurchasereturnRequestMainApi from '@/api/wms/purchasereturnRequestMa
 import * as PurchasereturnRequestDetailApi from '@/api/wms/purchasereturnRequestDetail'
 import * as PurchasereceiptRecordDetailApi from '@/api/wms/purchasereceiptRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-import { log } from 'console'
+
 
 // 采购退货申请
 defineOptions({ name: 'PurchasereturnRequestMain' })
@@ -346,11 +346,28 @@ const formRef = ref()
 const openForm = async (type: string, row?: number) => {
   tableData.value = [] // 重置明细数据
   isShowButton.value = true
+  if(type == 'create'){
+    PurchasereturnRequestMain.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'supplierCode') {
+        item.componentProps.disabled = false
+      }
+      if(item.field == 'purchaseReceiptRecordNumber'){
+        item.componentProps.disabled = true
+        item.componentProps.isSearchList = true
+      }
+    })
+  }
+  if(type == 'update'){
     PurchasereturnRequestMain.allSchemas.formSchema.forEach((item) => {
       if (item.field == 'supplierCode') {
         item.componentProps.disabled = false
       }
+      if(item.field == 'purchaseReceiptRecordNumber'){
+        item.componentProps.disabled = true
+        item.componentProps.isSearchList = false
+      }
     })
+  }
   formRef.value.open(type, row)
 }
 

src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts

@@ -494,10 +494,6 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       searchAllSchemas: Balance.allSchemas,
       searchPage: BalanceApi.getBalancePageReturn,
       searchCondition:[{
-        key: 'available',
-        value: 'TRUE',
-        isMainValue: false
-      },{
         key: 'workshopCode',
         value: 'workshopCode',
         isMainValue: true

src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts

@@ -115,7 +115,7 @@ export const DemandforecastingMain = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false,
   },
   {
-    label: '单据号11',
+    label: '单据号',
     field: 'number',
     sort: 'custom',
     table: {

src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts

@@ -396,6 +396,10 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
         key: 'available',
         value: 'TRUE',
         isMainValue: false
+      },{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
       }]
     },
     form: {

src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue

@@ -61,6 +61,7 @@
   import * as defaultButtons from '@/utils/disposition/defaultButtons'
   import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
   import TableHead from '@/components/TableHead/src/TableHead.vue'
+  import {mainListDocumentPrintBtn} from "@/utils/disposition/defaultButtons";
 
   // 供应商索赔申请
   defineOptions({ name: 'PurchaseclaimRequestMain' })
@@ -191,7 +192,7 @@
       defaultButtons.mainListPlanTurBtn({ hide: isShowMainButton(row, ['2']) }), // 驳回按钮
       defaultButtons.mainListEditBtn({ hide: isShowMainButton(row, ['1']), hasPermi: 'wms:purchaseclaim-request-main:update' }), // 编辑
       defaultButtons.mainListDeleteBtn({ hide: isShowMainButton(row, ['1']), hasPermi: 'wms:purchaseclaim-request-main:delete' }), // 删除
-      defaultButtons.mainListPointBtn(null), // 打印
+      defaultButtons.mainListDocumentPrintBtn(null), // 打印
       // 生成记录
       {
         label: '处理',
@@ -234,7 +235,7 @@
       openForm('update', row)
     } else if (val == 'delete') { // 删除
       handleDelete(row.id)
-    } else if (val == 'point') { // 打印
+    } else if (val == 'documentPrint') { // 打印
       handlePoint(row.id)
     }
   }

src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue

@@ -90,6 +90,10 @@
           row['poNumber'] = val[0]['poNumber']
           row['poLine'] = val[0]['poLine']
           row['itemCode'] = val[0]['itemCode']
+          row['ownerCode'] = val[0]['ownerCode']
+          row['batch'] = val[0]['batch']
+          row['singlePrice'] = val[0]['singlePrice']
+          row['amount'] = val[0]['amount']
         }
       } else {
         const setV = {}

src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts

@@ -576,10 +576,6 @@ export const SupplierinvoiceRequestDetailRules = reactive({
   packingNumber: [
     { required: true, message: '请输入包装号', trigger: 'blur' }
   ],
-  batch: [
-    { required: true, message: '请输入批次', trigger: 'blur' },
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
-  ],
   poNumber: [
     { required: true, message: '请输入订单号', trigger: 'blur' }
   ],
@@ -597,17 +593,5 @@ export const SupplierinvoiceRequestDetailRules = reactive({
   ],
   itemCode: [
     { required: true, message: '请输入物品代码', trigger: 'blur' }
-  ],
-  ownerCode:  [
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
-  ],
-  singlePrice:  [
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
-  ],
-  amount:  [
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
-  ],
-  remark:  [
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
-  ],
+  ]
 })