Merge branch 'dev' into songshankun/add-token

songshankun

2023-10-12 94ad4de767b25b0e6b2486287da90a7cb78ad3d3

Merge branch 'dev' into songshankun/add-token

 src/views/sales/refundForm/AddRefundFormDialog.vue

@@ -484,7 +484,9 @@
          refundDate: data.refundDate || "",
          sourceId: this.sourceId || 0,
          sourceType: 1
        }
        },
        codeRule:this.codeRule,

      }
      return params
    },

 src/views/sales/salesDetails/AddSalesDetailsDialog.vue

@@ -560,7 +560,8 @@
        wechatOrderStatus: data.wechatOrderStatus || 0,
        logisticCompany: data.logisticCompany || "",
        logisticCost: data.logisticCost || 0,
        logisticNumber: data.logisticNumber || ""
        logisticNumber: data.logisticNumber || "",
        codeRule:this.codeRule,
      }
      let params = {}
      if (this.editConfig.title === "新建") {

 src/views/sales/salesReturn/AddSalesReturnDialog.vue

@@ -419,7 +419,8 @@
          salesReturnStatusId: data.salesReturnStatusId || 0,
          sourceId: this.SalesDetailsId,
          sourceType: 1
        }
        },
        codeRule:this.codeRule,
      }
      return params
    },