Merge branch 'release' into 'jd_dev'

Release合并到jd分支20241220

See merge request !11

src/pages/loading/patch.vue

@@ -215,6 +215,7 @@ export default {
       /* 发货ID */
       shipmentId: "",
       destWarehouseId: "", // 目的地
+      isTally: 0,
       // loadDetail: {},
       status: "more",
       contentText: {
@@ -280,6 +281,7 @@ export default {
         ),
         secId: this.pathToList[this.pathToSelected].id,
         shipmentId: this.shipmentId,
+        isTally: this.isTally,
       };
       createGoods({ ...params, relationStatus: 2, singleLoad }).then((res) => {
         this.showPatch = false
@@ -482,6 +484,7 @@ export default {
         ),
         secId: this.pathToList[this.pathToSelected].id,
         shipmentId: this.shipmentId,
+        isTally: this.isTally,
       }).then((data) => {
         if(data !== null && data?.data !== null) {
           this.$store.dispatch(types.SHOW_TOAST, {
@@ -527,6 +530,7 @@ export default {
     if ("id" in option) {
       this.shipmentId = option.id;
       this.destWarehouseId = option.destWarehouseId;
+      this.isTally = option.isTally;
       await this.getCountry()
       this.getLoadDetail();
     }

src/pages/mergePkg/patch.vue

@@ -249,6 +249,7 @@ export default {
       /* 发货ID */
       shipmentId: "",
       destWarehouseId: "", // 目的地
+      isTally: 0,
       // loadDetail: {},
       status: "more",
       contentText: {
@@ -335,6 +336,7 @@ export default {
         ),
         secId: this.pathToList[this.pathToSelected].id,
         shipmentId: this.shipmentId,
+        isTally: this.isTally,
       };
       createAir({ ...params, relationStatus: 2, singleLoad }).then((res) => {
         this.showPatch = false
@@ -547,6 +549,7 @@ export default {
         ),
         secId: this.pathToList[this.pathToSelected].id,
         shipmentId: this.shipmentId,
+        isTally: this.isTally,
       }).then((data) => {
         if(data !== null && data?.data !== null) {
           this.$store.dispatch(types.SHOW_TOAST, {
@@ -596,6 +599,7 @@ export default {
     if ("id" in option) {
       this.shipmentId = option.id;
       this.destWarehouseId = option.destWarehouseId;
+      this.isTally = option.isTally;
       // 查询出货详情
       await this.getShipment()
       await this.getCountry()

src/pages/tally/detail.vue

@@ -546,7 +546,7 @@ export default {
     toPatch() {
       const { boxInfo } = this.loadData;
       uni.navigateTo({
-        url: `../loading/patch?id=${this.shipmentId}&destWarehouseId=${boxInfo.destWarehouseId}`,
+        url: `../loading/patch?id=${this.shipmentId}&destWarehouseId=${boxInfo.destWarehouseId}&isTally=1`,
       });
     },
     /* 理货完成 */

src/pages/tallyAir/detail.vue

@@ -808,7 +808,7 @@ export default {
     toPatch() {
       const { boxInfo } = this.loadData;
       uni.navigateTo({
-        url: `../mergePkg/patch?id=${this.shipmentId}&selfNo=${boxInfo.selfNo}`,
+        url: `../mergePkg/patch?id=${this.shipmentId}&selfNo=${boxInfo.selfNo}&isTally=1`,
       });
     },
     /* 理货完成 */