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

src/api/wms/supplierinvoiceRequestMain/index.ts

@@ -82,5 +82,9 @@ export const genRecordsSupplierinvoiceRequestMain = async (id) => {
 }
 // 导出供应商发票申请主 Excel
 export const exportSupplierinvoiceRequestMain = async (params) => {
-  return await request.download({ url: `/wms/supplierinvoice-request-main/export-excel`, params })
+  if(params.isSearch){
+    return await request.downloadPost({ url: `/wms/supplierinvoice-request-main/export-excel-senior`, params })
+  }else {
+    return await request.download({ url: `/wms/supplierinvoice-request-main/export-excel`, params })
+  }
 }

src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts

@@ -497,6 +497,9 @@ export const CustomerreturnRequestMainRules = reactive({
   customerCode: [
     { required: true, message: '请选择客户代码', trigger: 'blur' }
   ],
+  Customerdock: [
+    { required: true, message: '请选择客户月台代码', trigger: 'blur' }
+  ],
   departmentCode: [
     { required: true, message: '请输入部门', trigger: 'blur' }
   ],
@@ -737,13 +740,13 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     form: {
       component: 'InputNumber',
       componentProps: {
-        min: 1,
+        min: 0,
         precision: 6
       }
     },
     tableForm: {
       type: 'InputNumber',
-      min: 1,
+      min: 0,
       precision: 6
     }
   },
@@ -952,4 +955,5 @@ export const CustomerreturnRequestDetailRules = reactive({
   remark:  [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
+  
 })

src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue

@@ -69,6 +69,7 @@
     :apiDelete="CustomerreturnRequestDetailApi.deleteCustomerreturnRequestDetail"
     :Echo="Echo"
     @searchTableSuccessDetail="searchTableSuccessDetail"
+    :detailButtonIsShow = trueFalse
   />
 
   <!-- 导入 -->
@@ -176,7 +177,7 @@ const { tableObject, tableMethods } = useTable({
 
 // 获得表格的各种操作
 const { getList, setSearchParams } = tableMethods
-
+const trueFalse = ref()
 // 列表头部按钮
 const HeadButttondata = [
   defaultButtons.defaultAddBtn({hasPermi:'wms:customerreturn-request-main:create'}), // 新增——需要手动修改下权限
@@ -302,6 +303,12 @@ const openForm =async (type: string, row?: number) => {
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
+  console.log(999,row.deliverPlanNumber);
+  if(row.deliverPlanNumber != null){
+        trueFalse.value = false
+    }else {
+      trueFalse.value = true
+    }
   detailRef.value.openDetail(row, titleName, titleValue)
 }
 
@@ -352,9 +359,22 @@ const handleDeleteTable = (item, index) => {
   tableData.value.splice(index, 1)
 }
 
+//为true表示子表数据中存在数量为0的数据
+const flag = ref()
+
 // 主子数据 提交
 const submitForm = async (formType, data) => {
   data.subList = tableData.value // 拼接子表数据参数
+  data.subList.forEach(obj => {
+    if(obj.qty == 0){
+      message.error(`数量不能为0!`)
+      flag.value = true
+      return;
+    }
+  })
+  if(flag){
+    return
+  }
   try {
     if (formType === 'create') {
       await CustomerreturnRequestMainApi.createCustomerreturnRequestMain(data)

src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/index.vue

@@ -69,6 +69,7 @@
     :apiDelete="CustomersettleRequestDetailApi.deleteCustomersettleRequestDetail"
     :Echo="Echo"
     @searchTableSuccessDetail="searchTableSuccessDetail"
+    :detailButtonIsShow = true
   />
 
   <!-- 导入 -->
@@ -203,7 +204,7 @@ const butttondata = (row) => {
         defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:customersettle-request-main:refused'}), // 驳回
         defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:customersettle-request-main:agree'}), // 审批通过
         defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:customersettle-request-main:handle'}), // 处理
-        defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:customersettle-request-main:update'}), // 编辑
+        // defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:customersettle-request-main:update'}), // 编辑
     ]
 }
 

src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts

@@ -724,13 +724,13 @@ export const DeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'InputNumber',
       componentProps: {
-        min: 1,
+        min: 0,
         precision: 6
       }
     },
     tableForm: {
       type: 'InputNumber',
-      min: 1,
+      min: 0,
       precision: 6
     }
   },

src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue

@@ -373,9 +373,22 @@ const handleDeleteTable = (item, index) => {
   tableData.value.splice(index, 1)
 }
 
+//为true表示子表数据中存在数量为0的数据
+const flag = ref()
+
 // 主子数据 提交
 const submitForm = async (formType, data) => {
   data.subList = tableData.value // 拼接子表数据参数
+  data.subList.forEach(obj => {
+    if(obj.qty == 0){
+      message.error(`数量不能为0!`)
+      flag.value = true
+      return;
+    }
+  })
+  if(flag){
+    return
+  }
   try {
     if (formType === 'create') {
       await DeliverRequestMainApi.createDeliverRequestMain(data)

src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts

@@ -433,13 +433,13 @@ export const DeliverPlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'InputNumber',
       componentProps: {
-        min: 1,
+        min: 0,
         precision: 6
       }
     },
     tableForm: {
       type: 'InputNumber',
-      min: 1,
+      min: 0,
       precision: 6
     }
   },

src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue

@@ -323,9 +323,22 @@ const handleDeleteTable = (item, index) => {
   tableData.value.splice(index, 1)
 }
 
+//为true表示子表数据中存在数量为0的数据
+const flag = ref()
+
 // 主子数据 提交
 const submitForm = async (formType, data) => {
   data.subList = tableData.value // 拼接子表数据参数
+  data.subList.forEach(obj => {
+    if(obj.qty == 0){
+      message.error(`数量不能为0!`)
+      flag.value = true
+      return;
+    }
+  })
+  if(flag){
+    return
+  }
  var isHave =DeliverPlanMain.allSchemas.formSchema.some(function (item) {
         return item.field === 'beginTime' || item.field === 'endTime';
       });

src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue

@@ -277,6 +277,19 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'delete') { // 删除
     handleDelete(row.id)
   } else if( val == 'cjbq'){// 创建标签
+    // 判断 是否已创建标签
+    let isCreateLabel = false
+    await PackageApi.getPackagePage({
+      requestNumber: row.number
+    }).then(res => {
+      if (res) {
+        if (res.list.length > 0) isCreateLabel = true
+      }
+    })
+    if (isCreateLabel) {
+      message.warning('已创建过标签！！！')
+      return
+    }
     console.log("列表-操作按钮事件-创建标签")
     detatableData.params = {
       masterId:row.id

src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue

@@ -360,9 +360,22 @@ const handleDeleteTable = (item, index) => {
   tableData.value.splice(index, 1)
 }
 
+//为true表示子表数据中存在数量为0的数据
+const flag = ref()
+
 // 主子数据 提交
 const submitForm = async (formType, data) => {
   data.subList = tableData.value // 拼接子表数据参数
+  data.subList.forEach(obj => {
+    if(obj.toQty == 0){
+      message.error(`到数量不能为0!`)
+      flag.value = true
+      return;
+    }
+  })
+  if(flag){
+    return
+  }
   try {
     if (formType === 'create') {
       console.log(data)

src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts

@@ -447,6 +447,9 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    tableForm: {
+      disabled: true
+    },
     form: {
       componentProps: {
         disabled: true
@@ -503,12 +506,13 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     form: {
       component: 'InputNumber',
       componentProps: {
-        min:1,
+        min:0,
         precision: 6
       }
     },
     tableForm: {
       type: 'InputNumber',
+      min:0,
       precision: 6
     },
   },
@@ -920,6 +924,9 @@ export const InventorychangeRequestDetailRules = reactive({
   toInventoryStatus: [
     { required: true, message: '请选择到库存状态', trigger: 'change' }
   ],
+  fromPackingNumber: [
+    { required: true, message: '请选择到从包装号', trigger: 'change' }
+  ],
   remark:  [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],

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

@@ -490,15 +490,27 @@ const handleDeleteTable = (item, index) => {
   tableData.value.splice(index, 1)
 }
 
+//为true表示子表数据中存在数量为0的数据
+const flag = ref()
+
 // 主子数据 提交
 const submitForm = async (formType, data) => {
-  data.subList = tableData.value // 拼接子表数据参数
+  data.subList = tableData.value // 拼接子表数据参数  
   data.subList.forEach(item => {
+    console.log(556565,item);
     if(fromInventoryStatus.value){
       item.fromInventoryStatus = fromInventoryStatus.value
       item.toInventoryStatus = toInventoryStatus.value
-    }    
+    }   
+    if(item.qty == 0){
+      message.error(`到数量不能为0!`)
+      flag.value = true
+      return;
+    } 
           })
+  if(flag){
+    return
+  }
   try {
     if (formType === 'create') {
       await InventorymoveRequestMainApi.createInventorymoveRequestMain(data)

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

@@ -611,13 +611,13 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     form: {
       component: 'InputNumber',
       componentProps: {
-        min: 1,
+        min: 0,
         precision: 6
       }
     },
     tableForm: {
       type: 'InputNumber',
-      min: 1,
+      min: 0,
       precision: 6
     }
   },

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

@@ -115,7 +115,7 @@
 
   // 列表头部按钮
   const HeadButttondata = [
-    defaultButtons.defaultAddBtn({ hasPermi: 'wms:inspect-request-main:create' }), // 新增——需要手动修改下权限
+    // defaultButtons.defaultAddBtn({ hasPermi: 'wms:inspect-request-main:create' }), // 新增——需要手动修改下权限
     // defaultButtons.defaultImportBtn({hasPermi:'wms:inspect-request-main:import'}), // 导入
     defaultButtons.defaultExportBtn({ hasPermi: 'wms:inspect-request-main:export' }), // 导出
     defaultButtons.defaultFreshBtn(null), // 刷新

src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue

@@ -145,7 +145,7 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'wms:putaway-request-main:create'}), // 新增——需要手动修改下权限
+  // defaultButtons.defaultAddBtn({hasPermi:'wms:putaway-request-main:create'}), // 新增——需要手动修改下权限
   // defaultButtons.defaultImportBtn({hasPermi:'wms:putaway-request-main:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:putaway-request-main:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新

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

@@ -35,7 +35,8 @@
     :apiUpdate="PurchaseclaimRequestMainApi.updatePurchaseclaimRequestMain"
     :apiCreate="PurchaseclaimRequestMainApi.createPurchaseclaimRequestMain" :isBusiness="true"
     @handleAddTable="handleAddTable" @handleDeleteTable="handleDeleteTable" @searchTableSuccess="searchTableSuccess"
-    @submitForm="submitForm" />
+    @submitForm="submitForm"
+    @inputStringBlur="inputStringBlur"/>
 
   <!-- 详情 -->
   <Detail ref="detailRef" :isBasic="false" :allSchemas="PurchaseclaimRequestMain.allSchemas"
@@ -430,6 +431,14 @@
     }
     getList() // 刷新当前列表
   }
+  const inputStringBlur =(headerItem,index,row) =>{
+    console.log("headerItem:",headerItem)
+    console.log("row:",row)
+    if(headerItem == 'singlePrice'){
+      // 输入完单价离开事件（金额 = 数量 乘以 单价）
+      row.amount = row.qty * row.singlePrice
+    }
+  }
 
   /** 初始化 **/
   onMounted(async () => {

src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/purchaseclaimRequestMain.data.ts

@@ -371,6 +371,13 @@ export const PurchaseclaimRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
       width: 150
     },
   },
+  {
+    label: '批次',
+    field: 'batch',
+    table: {
+      width: 150
+    },
+  },
   {
      label: '物品代码',
      field: 'itemCode',
@@ -409,35 +416,29 @@ export const PurchaseclaimRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     }
   },
   {
-    label: '批次',
+    label: '单价',
-    field: 'batch',
+    field: 'singlePrice',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '原因',
-    field: 'reason',
-    // dictType: DICT_TYPE.PURCHASE_RETURN_REASON,
-    dictClass: 'string',
     table: {
       width: 150
     },
   },
   {
-    label: '单价',
+    label: '金额',
-    field: 'singlePrice',
+    field: 'amount',
     table: {
       width: 150
     },
   },
   {
-    label: '金额',
+    label: '原因',
-    field: 'amount',
+    field: 'reason',
+    // dictType: DICT_TYPE.PURCHASE_RETURN_REASON,
+    dictClass: 'string',
     table: {
       width: 150
     },
   },
+
   {
     label: '单据号',
     field: 'number',

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

@@ -314,7 +314,7 @@
       await message.exportConfirm()
       // 发起导出
       exportLoading.value = true
-      const data = await SupplierinvoiceRequestMainApi.exportSupplierinvoiceRequestMain(setSearchParams)
+      const data = await SupplierinvoiceRequestMainApi.exportSupplierinvoiceRequestMain(tableObject.params)
       download.excel(data, '供应商发票申请主.xlsx')
     } catch {
     } finally {