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

zjj

5 天以前 9884e489c1ba7abbf412e99d4901a223ad2fbb53

 pages/listing/disc.vue

@@ -100,7 +100,7 @@
                        <view class="title text-blue"><text

                              class="text-red text-xl vertical-middle">*</text>组盘数量:

                        </view>

                        <input type="number" placeholder="请输入组盘数量" v-model="item.receiptQty"></input>

                        <input type="number" placeholder="请输入组盘数量" v-model="item.anfme"></input>

                     </view>

                  </view>

               </view>

@@ -142,7 +142,7 @@
      computed: {

         ...mapState('user', ['dynamicFields']),

         allCount() {

            return this.list.reduce((acc, row) => +row.receiptQty + acc, 0) || 0

            return this.list.reduce((acc, row) => +row.anfme + acc, 0) || 0

         }

      },

      mounted() {},

@@ -217,7 +217,8 @@
            const newArr = this.list.map(item => {

               return {

                  ...item,

                  receiptQty: item.receiptQty === null ? 0 : +item.receiptQty

                  anfme: item.anfme === null ? 0 : + item.anfme,

                  receiptQty: item.anfme === null ? 0 : + item.anfme

               };

            });