Quellcode durchsuchen

Merge branch 'develop_yh49_1' of jianguan-web/jg-ocs-html into pre-release

刘俊俊 vor 7 Monaten
Ursprung
Commit
ba1cbb77f5

+ 1 - 1
src/views/easyPassManagement/promotionalActivities/detailModal.vue

@@ -253,7 +253,7 @@ export default {
     getDetail () {
       shopPromoDetail({ sn: this.itemSn }).then(res => {
         if (res.status == 200) {
-          this.form = res.data
+          this.form = { ...this.form, ...res.data }
           this.$nextTick(() => {
             this.$refs.table.refresh(true)
           })

+ 1 - 2
src/views/easyPassManagement/promotionalActivities/edit.vue

@@ -435,7 +435,7 @@ export default {
       const _this = this
       const res = await shopPromoDetail(ajaxData)
       if (res.status == 200) {
-        _this.form = res.data
+        _this.form = { ..._this.form, ...res.data }
         _this.form.productNum = 0
         if (_this.$route.params.pageType === 'edit') {
           _this.pageType = res.data.promoType
@@ -498,7 +498,6 @@ export default {
       delete formData.productNum
       _this.spinning = true
       formData.saveType = 'all'
-      formData.validScope = '1'
       saveShopPromo(formData).then(res => {
         if (res.status == 200) {
           _this.spinning = false