Преглед изворни кода

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

chenrui пре 1 година
родитељ
комит
407b34a7fc

+ 12 - 0
src/views/dealerManagement/rebateBinding/categoryList.vue

@@ -122,6 +122,16 @@ export default {
       }
       // 操作按钮
       const actionFormat = function (record, data, h) {
+        if (_this.isTeyue) {
+          return (<div>
+            <a-button
+              size="small"
+              type="link"
+              class="button-error"
+              onClick={(e) => _this.handleDel(record, e)}
+            >删除</a-button>
+          </div>)
+        }
         return (
           <div>
             <a-button
@@ -279,6 +289,8 @@ export default {
           dealerUpsDelete({ dealerUpsSn: record.dealerUpsSn }).then(res => {
             if (res.status == 200) {
               _this.$message.success(res.message)
+              const rowIndex = _this.dataSource.findIndex(item => item.dealerUpsSn == record.dealerUpsSn && item.dealerSn == record.dealerSn)
+              _this.dataSource.splice(rowIndex, 1)
               _this.$emit('del')
             }
             _this.spinning = false

+ 1 - 0
src/views/dealerManagement/rebateBinding/list.vue

@@ -149,6 +149,7 @@ export default {
       this.expandAll = !this.expandAll
     },
     resetGetData () {
+      this.expandAll = false
       this.$refs.categoryList.dataSource = []
       this.resetSearchForm()
     },

+ 2 - 1
src/views/salesManagement/salesQueryNew/comps/productList.vue

@@ -673,7 +673,8 @@ export default {
       const params = {
         salesBillDetailSn: editRow.salesBillDetailSn,
         salesBillSn: this.salesBillSn,
-        oldSalesPromoSn: this.promo.salesPromoSn
+        oldSalesPromoSn: this.promo.salesPromoSn,
+        priceLevel: editRow.priceLevel
       }
       // 更换活动
       this.$emit('upActive', this.promo, data, params)