Merge branch 'dev' into 'master'

Dev

See merge request !207

src/views/order/components/PodMakeOrder.vue

@@ -192,11 +192,7 @@
             <span v-else>验货中。。。</span>
           </div>
           <div class="box-top-item-btn">
-            <ElButton
-              type="primary"
-              @click="manualPrint"
-              >手动打印
-            </ElButton>
+            <ElButton type="primary" @click="manualPrint">手动打印 </ElButton>
             <ElButton type="primary" @click="printNormal">普货拣货 </ElButton>
             <ElButton type="success" @click="handlePrintFinish"
               >打单完成
@@ -605,9 +601,9 @@ const messageChange = (data: WebSocketMessage) => {
   }
 }
 
-const manualPrint = ()=>{
-  if(podOrderDetailsData.value){
-    print(podOrderDetailsData.value, true )
+const manualPrint = () => {
+  if (podOrderDetailsData.value) {
+    print(podOrderDetailsData.value, true)
     productionOrderRef.value.focus()
   }
 }
@@ -645,7 +641,6 @@ const printNormal = async () => {
   ElMessage.success('操作成功')
   productionOrderRef.value.focus()
   window.open(filePath + res.message)
-
 }
 const initPrintDevice = () => {
   const lodop = getCLodop(null, null)
@@ -795,6 +790,9 @@ const initOrderDetailBox = async () => {
   if (!factoryNo) {
     return
   }
+  if (!warehouseId.value) {
+    return ElMessage.warning('请选择仓库')
+  }
   const loading = ElLoading.service({
     fullscreen: true,
     text: '加载中...',
@@ -1056,6 +1054,9 @@ const print = (data: OrderData, forcePrint = false, callback?: () => void) => {
     }
     const factoryNo = userStore.user?.factory.id
     if (!factoryNo) return
+    if (!warehouseId.value) {
+      return ElMessage.warning('请选择仓库')
+    }
     orderStore.setPodBoxList({
       boxList: item ? item.data : null,
       factoryNo,

src/views/order/podUs/PodMakeOrder.vue

@@ -406,7 +406,11 @@ const podOrderDetailsColumns = computed(() => [
                 <div>
                   {operationNo}
                   {statusText && (
-                    <ElTag size="small" type={type} style={{ marginLeft: '6px', ...style }}>
+                    <ElTag
+                      size="small"
+                      type={type}
+                      style={{ marginLeft: '6px', ...style }}
+                    >
                       {statusText}
                     </ElTag>
                   )}
@@ -879,6 +883,9 @@ const initOrderDetailBox = async () => {
   if (!factoryNo) {
     return
   }
+  if (!warehouseId.value) {
+    return ElMessage.warning('请选择仓库')
+  }
   const loading = ElLoading.service({
     fullscreen: true,
     text: '加载中...',
@@ -1159,6 +1166,9 @@ const print = (data: OrderData, forcePrint = false, callback?: () => void) => {
     }
     const factoryNo = userStore.user?.factory.id
     if (!factoryNo) return
+    if (!warehouseId.value) {
+      return ElMessage.warning('请选择仓库')
+    }
     orderStore.setPodBoxList({
       url: props.initUrl,
       fromUser: userStore.user ? userStore.user.id : 0,