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

src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue

@@ -69,6 +69,7 @@
     :apiDelete="ScrapRequestDetailApi.deleteScrapRequestDetail"
     :Echo="Echo"
     @searchTableSuccessDetail="searchTableSuccessDetail"
+    :detailValidate="detailValidate"
   />
 
   <!-- 导入 -->
@@ -348,6 +349,23 @@ const submitForm = async (formType, data) => {
   data.subList = tableData.value // 拼接子表数据参数
   try {
     if (formType === 'create') {
+      console.log("【报废出库子列表】",data.subList)
+      if(data.subList.length == 0){
+        message.warning("请添加子列表数据")
+        return;
+      }
+      let flag = false;
+      data.subList.forEach((item) => {
+          if(item.qty == 0){
+            message.warning("数量不能为0")
+            flag = true;
+            return;
+          }
+      })
+      if(flag){
+        formRef.value.formLoading = false
+        return
+      }
       await ScrapRequestMainApi.createScrapRequestMain(data)
       message.success(t('common.createSuccess'))
     } else {
@@ -362,6 +380,19 @@ const submitForm = async (formType, data) => {
   }
 }
 
+// 子表新增/编辑校验
+const detailValidate = (data) => {
+  let tag = false;
+  if(data.qty <= 0){
+    message.warning('数量必须大于0')
+    tag = false;
+    return tag;
+  }else {
+    tag = true;
+    return tag;
+  }
+}
+
 /** 导入 */
 const importFormRef = ref()
 const handleImport = () => {

src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts

@@ -514,13 +514,13 @@ export const ScrapRequestDetail = 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/inventoryjobManage/transferissue/transferissueRequestMain/index.vue

@@ -69,6 +69,7 @@
     :apiDelete="TransferissueRequestDetailApi.deleteTransferissueRequestDetail"
     :Echo="Echo"
     @searchTableSuccessDetail="searchTableSuccessDetail"
+    :detailValidate="detailValidate"
   />
 
   <!-- 导入 -->
@@ -361,7 +362,24 @@ const handleDeleteTable = (item, index) => {
 const submitForm = async (formType, data) => {
   data.subList = tableData.value // 拼接子表数据参数
   try {
+    console.log("【调拨出库子列表】",data.subList)
     if (formType === 'create') {
+      if(data.subList.length == 0){
+        message.warning("请添加子列表数据")
+        return;
+      }
+      let flag = false;
+      data.subList.forEach((item) => {
+          if(item.qty == 0){
+            message.warning("数量不能为0")
+            flag = true;
+            return;
+          }
+      })
+      if(flag){
+        formRef.value.formLoading = false
+        return
+      }
       await TransferissueRequestMainApi.createTransferissueRequestMain(data)
       message.success(t('common.createSuccess'))
     } else {
@@ -376,6 +394,19 @@ const submitForm = async (formType, data) => {
   }
 }
 
+// 子表新增/编辑校验
+const detailValidate = (data) => {
+  let tag = false;
+  if(data.qty <= 0){
+    message.warning('数量必须大于0')
+    tag = false;
+    return tag;
+  }else {
+    tag = true;
+    return tag;
+  }
+}
+
 /** 导入 */
 const importFormRef = ref()
 const handleImport = () => {

src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts

@@ -634,13 +634,13 @@ export const TransferissueRequestDetail = 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/inventoryjobManage/transferreceipt/transferreceiptRequestMain/index.vue

@@ -69,6 +69,7 @@
     :apiUpdate="TransferreceiptRequestDetailApi.updateTransferreceiptRequestDetail"
     :apiPage="TransferreceiptRequestDetailApi.getTransferreceiptRequestDetailPage"
     :apiDelete="TransferreceiptRequestDetailApi.deleteTransferreceiptRequestDetail"
+    :detailButtonIsShowAdd="false"
     :detailButtonIsShowEdit="false"
     :detailButtonIsShowDelete="false"
   />

src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue

@@ -69,6 +69,7 @@
     :apiDelete="UnplannedissueRequestDetailApi.deleteUnplannedissueRequestDetail"
     :Echo="Echo"
     @searchTableSuccessDetail="searchTableSuccessDetail"
+    :detailValidate="detailValidate"
   />
 
   <!-- 导入 -->
@@ -356,6 +357,23 @@ const submitForm = async (formType, data) => {
   data.subList = tableData.value // 拼接子表数据参数
   try {
     if (formType === 'create') {
+      console.log("【计划外出库子列表】",data.subList)
+      if(data.subList.length == 0){
+        message.warning("请添加子列表数据")
+        return;
+      }
+      let flag = false;
+      data.subList.forEach((item) => {
+          if(item.qty == 0){
+            message.warning("数量不能为0")
+            flag = true;
+            return;
+          }
+      })
+      if(flag){
+        formRef.value.formLoading = false
+        return
+      }
       await UnplannedissueRequestMainApi.createUnplannedissueRequestMain(data)
       message.success(t('common.createSuccess'))
     } else {
@@ -370,6 +388,19 @@ const submitForm = async (formType, data) => {
   }
 }
 
+// 子表新增/编辑校验
+const detailValidate = (data) => {
+  let tag = false;
+  if(data.qty <= 0){
+    message.warning('数量必须大于0')
+    tag = false;
+    return tag;
+  }else {
+    tag = true;
+    return tag;
+  }
+}
+
 /** 导入 */
 const importFormRef = ref()
 const handleImport = () => {

src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts

@@ -451,13 +451,13 @@ export const UnplannedissueRequestDetail = 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/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue

@@ -69,6 +69,7 @@
     :apiDelete="UnplannedreceiptRequestDetailApi.deleteUnplannedreceiptRequestDetail"
     :Echo="Echo"
     @searchTableSuccessDetail="searchTableSuccessDetail"
+    :detailValidate="detailValidate"
   />
 
   <!-- 创建标签 -->
@@ -479,6 +480,23 @@ const submitForm = async (formType, data) => {
   data.subList = tableData.value // 拼接子表数据参数
   try {
     if (formType === 'create') {
+      console.log("【计划外入库子列表】",data.subList)
+      if(data.subList.length == 0){
+        message.warning("请添加子列表数据")
+        return;
+      }
+      let flag = false;
+      data.subList.forEach((item) => {
+          if(item.qty == 0){
+            message.warning("数量不能为0")
+            flag = true;
+            return;
+          }
+      })
+      if(flag){
+        formRef.value.formLoading = false
+        return
+      }
       await UnplannedreceiptRequestMainApi.createUnplannedreceiptRequestMain(data)
       message.success(t('common.createSuccess'))
     } else {
@@ -493,6 +511,19 @@ const submitForm = async (formType, data) => {
   }
 }
 
+// 子表新增/编辑校验
+const detailValidate = (data) => {
+  let tag = false;
+  if(data.qty <= 0){
+    message.warning('数量必须大于0')
+    tag = false;
+    return tag;
+  }else {
+    tag = true;
+    return tag;
+  }
+}
+
 /** 导入 */
 const importFormRef = ref()
 const handleImport = () => {

src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts

@@ -513,13 +513,13 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
     form: {
       component: 'InputNumber',
       componentProps: {
-        min: 1,
+        min: 0,
         precision: 6,
       }
     },
     tableForm: {
       type: 'InputNumber',
-      min: 1,
+      min: 0,
       precision: 6,
     },
   },
@@ -563,7 +563,7 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
       }]
     },
     form: {
-      // labelMessage: '信息提示说明！！！',
+      // labelMessage: '信息提示说明！！！！',
       componentProps: {
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择库位代码', // 输入框占位文本

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

@@ -71,6 +71,7 @@
     @searchTableSuccessDetail="searchTableSuccessDetail"
     :buttondataTable="buttondataTable"
     @tableFormButton="tableFormButton"
+    :detailValidate="detailValidate"
   />
 
   <!-- bom列表 -->
@@ -494,6 +495,22 @@ const submitForm = async (formType, data) => {
   }
   try {
       if (formType === 'create') {
+        if(data.subList.length == 0){
+          message.warning("请添加子列表数据")
+          return;
+        }
+        let flag = false;
+        data.subList.forEach((item) => {
+            if(item.qty == 0){
+              message.warning("数量不能为0")
+              flag = true;
+              return;
+            }
+        })
+        if(flag){
+          formRef.value.formLoading = false
+          return
+        }
         await ProductdismantleRequestMainApi.createProductdismantleRequestMain(data)
         message.success(t('common.createSuccess'))
       } else {
@@ -508,6 +525,19 @@ const submitForm = async (formType, data) => {
   }
 }
 
+// 子表新增/编辑校验
+const detailValidate = (data) => {
+  let tag = false;
+  if(data.qty <= 0){
+    message.warning('数量必须大于0')
+    tag = false;
+    return tag;
+  }else {
+    tag = true;
+    return tag;
+  }
+}
+
 // 筛选提交
 const searchFormClick = (searchData) => {
   tableObject.params = {

src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts

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

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

@@ -71,6 +71,7 @@
     @searchTableSuccessDetail="searchTableSuccessDetail"
     :buttondataTable="buttondataTable"
     @tableFormButton="tableFormButton"
+    :detailValidate="detailValidate"
   />
 
   <!-- bom列表 -->
@@ -531,6 +532,22 @@ const submitForm = async (formType, data) => {
   }
   try {
     if (formType === 'create') {
+      if(data.subList.length == 0){
+        message.warning("请添加子列表数据")
+        return;
+      }
+      let flag = false;
+      data.subList.forEach((item) => {
+        if(item.qty == 0){
+          message.warning("数量不能为0")
+          flag = true;
+          return;
+        }
+      })
+      if(flag){
+        formRef.value.formLoading = false
+        return
+      }
       await ProductrepairRequestMainApi.createProductrepairRequestMain(data)
       message.success(t('common.createSuccess'))
     } else {
@@ -545,6 +562,19 @@ const submitForm = async (formType, data) => {
   }
 }
 
+// 子表新增/编辑校验
+const detailValidate = (data) => {
+  let tag = false;
+  if(data.qty <= 0){
+    message.warning('数量必须大于0')
+    tag = false;
+    return tag;
+  }else {
+    tag = true;
+    return tag;
+  }
+}
+
 /** 导入 */
 const importFormRef = ref()
 const handleImport = () => {

src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts

@@ -820,13 +820,13 @@ export const ProductrepairRequestDetaila = 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/productionManage/productscrap/productscrapRequestMain/index.vue

@@ -72,6 +72,7 @@
     @searchTableSuccessDetail="searchTableSuccessDetail"
     :buttondataTable="buttondataTable"
     @tableFormButton="tableFormButton"
+    :detailValidate="detailValidate"
   />
 
   <!-- bom列表 -->
@@ -532,6 +533,22 @@ const submitForm = async (formType, data) => {
   }
   try {
     if (formType === 'create') {
+      if(data.subList.length == 0){
+        message.warning("请添加子列表数据")
+        return;
+      }
+      let flag = false;
+      data.subList.forEach((item) => {
+        if(item.qty == 0){
+          message.warning("数量不能为0")
+          flag = true;
+          return;
+        }
+      })
+      if(flag){
+        formRef.value.formLoading = false
+        return
+      }
       await ProductscrapRequestMainApi.createProductscrapRequestMain(data)
       message.success(t('common.createSuccess'))
     } else {
@@ -546,6 +563,19 @@ const submitForm = async (formType, data) => {
   }
 }
 
+// 子表新增/编辑校验
+const detailValidate = (data) => {
+  let tag = false;
+  if(data.qty <= 0){
+    message.warning('数量必须大于0')
+    tag = false;
+    return tag;
+  }else {
+    tag = true;
+    return tag;
+  }
+}
+
 /** 导入 */
 const importFormRef = ref()
 const handleImport = () => {

src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts

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