Merge branch 'dev' into 'master'

Dev

See merge request !282

src/views/order/factoryOrderNew/index.vue

@@ -461,14 +461,14 @@
               </ElButton>
               </ElButton>
               <ElButton @click="reset"> 重置 </ElButton>
               <ElButton @click="reset"> 重置 </ElButton>
             </ElFormItem>
             </ElFormItem>
-            <ElFormItem v-if="status === 'ALL'">
-              <ElButton type="success" @click="exportData"> 导出 </ElButton>
-            </ElFormItem>
           </ElForm>
           </ElForm>
         </div>
         </div>
       </div>
       </div>
       <!-- ====== 操作按钮栏 ====== -->
       <!-- ====== 操作按钮栏 ====== -->
       <div v-if="!isSpecialLayout" class="operation-list">
       <div v-if="!isSpecialLayout" class="operation-list">
+        <span v-if="status === 'ALL'" class="item">
+          <ElButton type="success" @click="exportData"> 导出 </ElButton>
+        </span>
         <span v-if="status === 'PENDING_RECEIVE'" class="item">
         <span v-if="status === 'PENDING_RECEIVE'" class="item">
           <ElButton type="success" @click="handleConfirmOrder">
           <ElButton type="success" @click="handleConfirmOrder">
             {{
             {{

src/views/order/podUs/PodMakeOrder.vue

@@ -694,7 +694,8 @@ watch(
           ) {
           ) {
             el.previewImgs = [{ url: el.variantImage || '' }]
             el.previewImgs = [{ url: el.variantImage || '' }]
           } else {
           } else {
-            el.previewImgs = el.imageAry
+            el.previewImgs =
+              el.imageAry && JSON.parse(el.imageAry).length > 0
                 ? JSON.parse(el.imageAry)
                 ? JSON.parse(el.imageAry)
                 : [{ url: el.variantImage }]
                 : [{ url: el.variantImage }]
           }
           }
@@ -1032,7 +1033,8 @@ const getPackingData = async (code: string) => {
           ) {
           ) {
             el.previewImgs = [{ url: el.variantImage || '' }]
             el.previewImgs = [{ url: el.variantImage || '' }]
           } else {
           } else {
-            el.previewImgs = el.imageAry
+            el.previewImgs =
+              el.imageAry && JSON.parse(el.imageAry).length > 0
                 ? JSON.parse(el.imageAry)
                 ? JSON.parse(el.imageAry)
                 : [{ url: el.variantImage }]
                 : [{ url: el.variantImage }]
           }
           }
@@ -1219,7 +1221,8 @@ const initOrderDetailBox = async (type: 'scan' | 'manual' = 'manual') => {
           ) {
           ) {
             el.previewImgs = [{ url: el.variantImage || '' }]
             el.previewImgs = [{ url: el.variantImage || '' }]
           } else {
           } else {
-            el.previewImgs = el.imageAry
+            el.previewImgs =
+              el.imageAry && JSON.parse(el.imageAry).length > 0
                 ? JSON.parse(el.imageAry)
                 ? JSON.parse(el.imageAry)
                 : [{ url: el.variantImage }]
                 : [{ url: el.variantImage }]
           }
           }