Merge branch 'dev' into 'master'

Dev

See merge request !118

components.d.ts

@@ -54,6 +54,7 @@ declare module 'vue' {
     ElTag: typeof import('element-plus/es')['ElTag']
     ElTag: typeof import('element-plus/es')['ElTag']
     ElTimeline: typeof import('element-plus/es')['ElTimeline']
     ElTimeline: typeof import('element-plus/es')['ElTimeline']
     ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem']
     ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem']
+    ElTimePicker: typeof import('element-plus/es')['ElTimePicker']
     ElTooltip: typeof import('element-plus/es')['ElTooltip']
     ElTooltip: typeof import('element-plus/es')['ElTooltip']
     ElTree: typeof import('element-plus/es')['ElTree']
     ElTree: typeof import('element-plus/es')['ElTree']
     ElUpload: typeof import('element-plus/es')['ElUpload']
     ElUpload: typeof import('element-plus/es')['ElUpload']

src/views/order/podCN/index.vue

@@ -806,7 +806,7 @@
           </span>
           </span>
           <span v-if="status === 'WAIT_SHIPMENT'" class="item">
           <span v-if="status === 'WAIT_SHIPMENT'" class="item">
             <ElButton type="warning" @click="showPrintSku"
             <ElButton type="warning" @click="showPrintSku"
-            >打印库存sku标签</ElButton
+              >打印库存sku标签</ElButton
             >
             >
           </span>
           </span>
         </ElFormItem>
         </ElFormItem>
@@ -2981,13 +2981,15 @@ const changeExceptionOrder = async () => {
 }
 }
 
 
 const showPrintSku = async () => {
 const showPrintSku = async () => {
-  if(!selection.value.length) {
+  if (!selection.value.length) {
     return ElMessage.warning('请选择数据')
     return ElMessage.warning('请选择数据')
   }
   }
-  await printWarehouseSkuDialogRef.value?.open(1,selection.value.map((item) => item.id).join(','))
+  await printWarehouseSkuDialogRef.value?.open(
+    1,
+    selection.value.map((item) => item.id).join(','),
+  )
 }
 }
 
 
-
 const handleExceptionConfirm = async () => {
 const handleExceptionConfirm = async () => {
   try {
   try {
     await exceptionFormRef.value.validate()
     await exceptionFormRef.value.validate()
@@ -3034,7 +3036,10 @@ const printNormal = async () => {
   }
   }
   selection.value.forEach((s) => {
   selection.value.forEach((s) => {
     const f =
     const f =
-      s.productList && s.productList.find((p) => p.productMark === 'normal')
+      s.productList &&
+      s.productList.find(
+        (p) => p.productMark === 'normal' || p.productMark === 'custom_normal',
+      )
     if (f) arr.push(s.id)
     if (f) arr.push(s.id)
   })
   })
   if (!arr.length) {
   if (!arr.length) {

src/views/warehouse/issueDoc.vue

@@ -1059,7 +1059,7 @@ const {
 })
 })
 
 
 const setCostPrice = (item: InterProductList) => {
 const setCostPrice = (item: InterProductList) => {
-  if (!item.costPrice) {
+  if (item.costPrice !== 0 && !item.costPrice) {
     ElMessage.warning('商品成本价为空，请完善商品成本价')
     ElMessage.warning('商品成本价为空，请完善商品成本价')
     return
     return
   }
   }

src/views/warehouse/receiptDoc.vue

@@ -1063,7 +1063,7 @@ const {
 })
 })
 
 
 const setCostPrice = (item: InterProductList) => {
 const setCostPrice = (item: InterProductList) => {
-  if (!item.costPrice) {
+  if (item.costPrice !== 0 && !item.costPrice) {
     ElMessage.warning('商品成本价为空，请完善商品成本价')
     ElMessage.warning('商品成本价为空，请完善商品成本价')
     return
     return
   }
   }

src/views/warehouse/stockingPlan.vue

@@ -1216,7 +1216,7 @@ const {
 })
 })
 
 
 const setCostPrice = (item: InterProductList) => {
 const setCostPrice = (item: InterProductList) => {
-  if (!item.costPrice) {
+  if (item.costPrice !== 0 && !item.costPrice) {
     ElMessage.warning('商品成本价为空，请完善商品成本价')
     ElMessage.warning('商品成本价为空，请完善商品成本价')
     return
     return
   }
   }