Merge remote-tracking branch 'origin/dev' into dev

src/views/ecw/box/shippingAir/nodePage/checkout.vue

@@ -69,7 +69,7 @@
       </el-form-item>
 
       <el-form-item :label="$t('出仓影像')">
-        <ImageUpload :limit="1" :isShowTip=false v-model="airCheckoutObj.checkoutFiles" />
+        <ImageUpload :limit="1" :isShowTip=false v-model="airCheckoutObj.checkoutFiles" @input="saveImage" />
       </el-form-item>
 
       <el-form-item :label="$t('备注')">
@@ -176,6 +176,27 @@ export default {
     closeDialog1() {
       this.dialogVisible = false;
     },
+    //自动保存图片
+    saveImage() {
+      const { ldPictures } = this.airCheckoutObj;
+      let pictures = ldPictures?.split(",") ?? [];
+      let newPictures = [];
+      for (const item of pictures) {
+        if (item) {
+          newPictures.push({
+            type: "image",
+            url: item,
+          });
+        }
+      }
+      airCheckoutCreate({
+        ...this.airCheckoutObj,
+            shipmentId: this.$attrs.shipmentObj.id,
+        operateType: 1,
+      }).then(()=>{
+        this.$emit("getBoxInfo");
+      })
+    }
   },
 };
 </script>

src/views/ecw/box/shippingAir/nodePage/checkout/startCheckout.vue

@@ -21,12 +21,10 @@
               <el-table-column :label="$t('序号')" align="center" width="50" prop="tidanNum" />
               <el-table-column :label="$t('订单号')" align="center" prop="orderNo">
                 <template slot-scope="scope">
-                  <div>
-                    <a href="javascript:void(0);" class="order-href" @click="orderClick(scope.row)">{{ scope.row.orderNo }}</a>
-                  </div>
-                  <div style="color:blue;fontWeight:bold;">
-                    {{ scope.row.isExternalWarehouse === 1 ? '(' + $t('外部仓') + ')' : ''}}
-                  </div>
+                  <router-link :to="{path: '/order/detail',query: {orderId: scope.row.orderId}}" class="link-type">
+                      <span>{{ scope.row.orderNo }}</span>
+                    </router-link>
+
                 </template>
               </el-table-column>
               <el-table-column :label="$t('货物信息')" align="center" prop="goodsList">