Merge branch 'feature/9月迭代'

src/assets/theme/index.css

@@ -15762,7 +15762,7 @@
     color: #606266;
     display: inline-block;
     font-size: inherit;
-    height: 32px !important;
+    height: 32px;
     line-height: 32px;
     outline: none;
     padding: 0 15px;

src/components/editCouponInfo.vue

@@ -58,7 +58,7 @@ export default {
             // }
             url = '/api-integral-mall/update-cash-cost';
           } else if (this.editInfoModal.type === '库存') {
-            params.stock = this.editInfoModal.num;
+            params.stock = this.editInfoModal.num - this.editInfoModal.currentNum;
             url = '/api-integral-mall/update-stock';
           }
 

src/components/getSkuList.vue

@@ -83,6 +83,7 @@ export default {
     this.giftProSkuIntegral = this.intergralModal.integralCost; //积分
     this.giftProSkuCode = this.intergralModal.proCode; //编码
     this.virtualStock = this.intergralModal.virtualStock; //库存
+    this.currentStock = this.intergralModal.virtualStock;
   },
   methods: {
     limitSkuCode() {
@@ -132,7 +133,7 @@ export default {
     },
     // spu库存
     limitVirtualStock() {
-      if (Number(this.virtualStock < 0)) {
+      if (Number(this.virtualStock <= 0)) {
         this.$message.error('请输入大于0的数字');
         this.virtualStock = '';
       } else if (!Number(this.virtualStock)) {
@@ -215,7 +216,7 @@ export default {
               if (this.intergralModal.type === 'cash') {
                 arrCash.push(this.intergralModal.tableSkuData[j][i].valueName);
               } else if (this.intergralModal.type === 'stock') {
-                stock.push(this.intergralModal.tableSkuData[j][i].valueName);
+                stock.push(this.intergralModal.tableSkuData[j][i].valueName - this.intergralModal.tableSkuData[j][i].currentStock);
               }
             }
             if (Number(i) === index1) {
@@ -277,7 +278,7 @@ export default {
         proCode: this.giftProSkuCode,
         integralCost: this.giftProSkuIntegral,
         cashCost: this.giftProSkuCash,
-        virtualStock: this.intergralModal.type === 'stock' ? this.virtualStock : '',
+        virtualStock: this.intergralModal.type === 'stock' ? this.virtualStock - this.currentStock : '',
         skuJson: skuJson ? JSON.stringify(skuJson) : ''
       };
       if (this.intergralModal.tableSkuData.length) {
@@ -293,11 +294,11 @@ export default {
       }
       if (this.intergralModal.type === 'stock') {
         //库存
-        if (!params.virtualStock) {
+        if (!params.virtualStock && params.virtualStock !== 0) {
           this.$message.error('请输入库存');
           return false;
         }
-        if (Number(params.virtualStock) === 0) {
+        if (Number(params.virtualStock) + Number(this.currentStock) === 0) {
           this.$message.error('库存为0不允许修改');
           return false;
         }

src/views/goods/coupon/coupon.vue

@@ -636,6 +636,7 @@ export default {
         this.editInfoModal.costValue = item.costValue;
       } else if (type === 3) {
         this.editInfoModal.num = item.virtualStock;
+        this.editInfoModal.currentNum = item.virtualStock;
         this.editInfoModal.type = '库存';
       }
 

src/views/goods/coupon/info.vue

@@ -706,6 +706,7 @@ export default {
           this.couponForm.cashCost = res.data.result.cashCost;
           //库存
           this.couponForm.virtualStock = res.data.result.virtualStock;
+          this.currentStock = res.data.result.virtualStock;
           this.couponForm.detailDescription = res.data.result.detailDescription; //图文详情
           // if (res.data.result.searchParams) {
           //   this.searchParams = res.data.result.searchParams; //会员筛选
@@ -1215,7 +1216,7 @@ export default {
             integralCost: this.couponForm.integralCost, //积分费用
             costValue: this.costValue, //礼品成本
             cashCost: this.couponForm.cashCost, //现金
-            virtualStock: this.couponForm.virtualStock, //库存
+            virtualStock: this.isEdit ? this.couponForm.virtualStock - (this.currentStock || 0) : this.couponForm.virtualStock, //库存
             gradeType: this.couponForm.gradeType,
             memberGrade: this.couponForm.memberGrade.join(','), //适用会员
             showStore: this.sendChildData.storeType, // 显示门店 0所有 1部分分类 2部分门店

src/views/goods/gift/addSku.vue

@@ -501,7 +501,7 @@ export default {
 
     // 库存
     limitStock() {
-      if (Number(this.stock) < 0) {
+      if (Number(this.stock) <= 0) {
         this.$message.error('请输入大于0的数字');
         this.stock = '';
       } else if (!Number(this.stock)) {

src/views/goods/gift/gift.vue

@@ -737,7 +737,8 @@ export default {
                 });
               } else if (type === 'stock') {
                 tem.push({
-                  valueName: list[i].stock //库存
+                  valueName: list[i].stock, //库存
+                  currentStock: list[i].stock
                 });
               }
 

src/views/goods/gift/info.vue

@@ -89,7 +89,7 @@
                       <el-input size="small" v-model.trim="giftForm.cashCost" placeholder="请输入内容" @blur="limitCash"></el-input>
                     </td>
                     <td style="width:120px">
-                      <el-input size="small" v-model.trim="giftForm.virtualStock" placeholder="请输入内容" :disabled="!giftType && stockDisabled" @blur="limitStock"></el-input>
+                      <el-input size="small" v-model.trim="giftForm.virtualStock" placeholder="请输入内容" :disabled="stockDisabled" @blur="limitStock"></el-input>
                     </td>
                     <td style="width:120px">
                       <el-input size="small" v-model.trim="giftForm.proCodeQuery" placeholder="请输入内容" @input="limintProCodeQuery" @blur="limitproCodeQueryType"></el-input>
@@ -536,7 +536,7 @@ export default {
       },
       // sendChildData: {}, // 向子元素传递的对象
       openFlag: false,
-      stockDisabled: true, //spu库存是否可输入
+      stockDisabled: false, //spu库存是否可输入
       refash: false,
       giftProStandardJson: [], //规格列表
       isStdImg: false, //图片上传的状态
@@ -1025,6 +1025,7 @@ export default {
           this.giftForm.integralCost = res.data.result.integralCost; //积分
           this.giftForm.cashCost = res.data.result.cashCost; //现金
           this.giftForm.virtualStock = res.data.result.virtualStock; //库存
+          this.currentStock = res.data.result.virtualStock;
           this.giftForm.proCodeQuery = res.data.result.proCodeQuery; //条形码
           this.giftForm.costValue = res.data.result.costValue; //礼品成本
           this.giftForm.marketPrice = res.data.result.marketPrice; //市场价
@@ -1263,7 +1264,8 @@ export default {
                 valueName: res.data.result.skuJsonList[i].giftProSkuCash //现金
               });
               tem.push({
-                valueName: res.data.result.skuJsonList[i].stock //库存
+                valueName: res.data.result.skuJsonList[i].stock, //库存
+                currentStock: res.data.result.skuJsonList[i].stock
               });
               tem.push({
                 valueName: res.data.result.skuJsonList[i].giftProSkuStandCode //规格编码
@@ -1397,7 +1399,7 @@ export default {
     },
     limitStock() {
       //库存
-      if (Number(this.giftForm.virtualStock) < 0) {
+      if (Number(this.giftForm.virtualStock) <= 0) {
         this.$message.error('请输入大于0的数字');
         this.giftForm.virtualStock = '';
       } else if (!Number(this.giftForm.virtualStock)) {
@@ -1752,10 +1754,12 @@ export default {
         }
       }
     },
-    getSkuList(val) {
+    async getSkuList(val) {
       console.log(val);
       if (val.length === 1 && val[0].length === 0) {
         this.submitSkuJson = [];
+        this.stockDisabled = false;
+        this.currentStock = 0
         return false;
       }
       this.skuList = val;
@@ -1767,16 +1771,19 @@ export default {
         this.setLadder();
       }
       this.submitLadderList = copy(this.list3);
+      await this.$nextTick();
       if (this.giftProStandardJson.length > 0) {
         if (this.skuList.length > 0) {
           //spu库存是否可输入
           this.stockDisabled = true;
         } else {
           this.stockDisabled = false;
+          this.currentStock = 0
         }
       } else {
         this.stockDisabled = false;
         this.giftForm.virtualStock = 0;
+        this.currentStock = 0
       }
     },
     IsAgreeUpload(val) {
@@ -1820,7 +1827,7 @@ export default {
             giftProSkuId: skuPrice[j][5] ? skuPrice[j][5].valueName : '',
             giftProSkuIntegral: skuPrice[j][0] ? skuPrice[j][0].valueName : '', //积分
             giftProSkuCash: skuPrice[j][1] ? skuPrice[j][1].valueName : '', //现金
-            stock: skuPrice[j][2] ? skuPrice[j][2].valueName : '', //库存
+            stock: this.isEdit ? (skuPrice[j][2] ? skuPrice[j][2].valueName - (skuPrice[j][2].currentStock || 0) : '') : (skuPrice[j][2] ? skuPrice[j][2].valueName : ''), //库存
             giftProSkuStandCode: skuPrice[j][3] ? skuPrice[j][3].valueName : '', //规格编码
             giftProGiftCode: skuPrice[j][4] ? skuPrice[j][4].valueName : '', //条形码
             giftPropValues: skuSta[j]
@@ -2109,7 +2116,7 @@ export default {
             proCodeQuery: this.giftForm.proCodeQuery, //条形码
             costValue: this.giftForm.changeType === 1 ? this.couponCostValue : this.giftForm.costValue, //卡券礼品成本
             marketPrice: this.giftForm.marketPrice, //市场价
-            virtualStock: this.giftForm.virtualStock, //库存
+            virtualStock: this.isEdit ? this.giftForm.virtualStock - (this.currentStock || 0) : this.giftForm.virtualStock, //库存
             timeZones: '', //部分时段
             proShowStatus: this.giftForm.proShowStatus, //显示状态
             releaseType: this.giftForm.releaseType, //上架状态