Bläddra i källkod

Merge branch 'develop_yh31' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_yh31

chenrui 1 år sedan
förälder
incheckning
a1efa887bf

BIN
public/templ/费用明细模板.xlsx


+ 1 - 1
src/views/common/otherTransactions.js

@@ -27,7 +27,7 @@ const Employee = {
     },
     placeholder: {
       type: String,
-      default: '请选择其它往来机构'
+      default: '请选择其他往来单位'
     },
     enableFlag: {
       type: String,

+ 1 - 1
src/views/salesManagement/salesQueryNew/comps/detailProductList.vue

@@ -230,7 +230,7 @@
             ])
             
             if(this.showConvertPromoGifts){
-              arr.push({ title: '转采购额数量', field: 'convertPromoGiftsQty', width: 100,key: "z", align: 'center',operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return numsFormat(row[column.field])} })
+              arr.push({ title: '转采购额数量', field: 'convertPromoGiftsQty', width: 100,key: "z", align: 'center',operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return row.convertPromoGiftsFlag ? numsFormat(row[column.field]) : '--'} })
             }
             arr.push({ title: '已取消数', field: 'cancelQty', width: 80,key: "q", align: 'center',operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return numsFormat(row[column.field])} })
           return arr

+ 10 - 2
src/views/salesManagement/waitDispatchNew/queryPart.vue

@@ -350,7 +350,7 @@ export default {
                   {_this.$hasPermissions('B_salesEdit_salesPrice')&&record.promo&&record.total&&record.total.lossAmount ? (<span>优惠金额:<strong>{record.total.lossAmount}</strong>;</span>):('')}
                   {_this.$hasPermissions('B_salesEdit_salesPrice')&&record.promo&&record.total&&record.total.cgejyAmount>0&&!isBuyPSendP ? (<span>采购额结余:<strong>{_this.toThousands(record.total.cgejyAmount)}</strong>;</span>):('')}
                   {_this.$hasPermissions('B_salesEdit_salesPrice')&&record.promo&&record.total&&record.total.cgejyAmount<0&&!isBuyPSendP ? (<span>采购额超出:<strong>{_this.toThousands(record.total.cgeccAmount)}</strong>;</span>):('')}
-                  {_this.$hasPermissions('B_salesEdit_salesPrice')&&record.promo&&record.total&&record.total.totalPromoGiftsAmount&&isBuyPSendP ? (<span>促销产品转采购额金额:<strong>{record.total&&record.total.totalPromoGiftsAmount||'--'}</strong>;</span>):('')}
+                  {_this.$hasPermissions('B_salesEdit_salesPrice')&&record.promo&&record.total&&record.total.totalPromoGiftsAmount&&isBuyPSendP ? (<span>促销产品转采购额金额:<strong>{_this.toThousands(record.total&&record.total.totalPromoGiftsAmount)||'--'}</strong>;</span>):('')}
                   {record.expenseAccountFlag!='WAIT' ? record.expenseAccountFlagDictValue : ''}
                 </div>
               </div>
@@ -435,11 +435,19 @@ export default {
     selectedRowChange({ row, isSelected, selectedRowKeys }){
       // console.log(row, isSelected, selectedRowKeys);
       this.selectedRowKeys = selectedRowKeys;
+      if(!isSelected){
+        row.convertPromoGiftsQty = row.bakConvertPromoGiftsQty
+      }
     },
     // 全选行
     selectedAllChange({ isSelected, selectedRowKeys }){
-      // console.log(isSelected, selectedRowKeys);
       this.selectedRowKeys = selectedRowKeys;
+      // 取消全选后,重置数量
+      if(!isSelected && this.showConvertPromoGifts){
+        this.dataSource.filter(item=>item.convertPromoGiftsQty).map(item => {
+          item.convertPromoGiftsQty = item.bakConvertPromoGiftsQty
+        })
+      }
     },
     // 获取销售单参与的活动列表
     getActiveList(){