Forráskód Böngészése

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

chenrui 1 éve
szülő
commit
f4bc23e41b

+ 0 - 11
src/config/router.config.js

@@ -1102,17 +1102,6 @@ export const asyncRouterMap = [
                   permission: 'B_eRdetail'
                 }
               },
-              {
-                path: 'add',
-                name: 'expenseReimbursementAdd',
-                component: () => import(/* webpackChunkName: "expenseManagement" */ '@/views/expenseManagement/expenseReimbursement/add.vue'),
-                meta: {
-                  title: '新增费用报销单',
-                  icon: 'monitor',
-                  hidden: true,
-                  permission: 'B_ERtEdit'
-                }
-              },
               {
                 path: 'edit/:sn',
                 name: 'expenseReimbursementEdit',

+ 7 - 5
src/views/expenseManagement/expenseReimbursement/add.vue

@@ -34,7 +34,7 @@
         </a-collapse-panel>
       </a-collapse>
       <!-- 费用明细 -->
-      <a-card :bordered="false" size="small" class="expenseReimbursementAddcont" v-if="$route.params.sn">
+      <a-card :bordered="false" size="small" class="expenseReimbursementAddcont">
         <div slot="title">
           <div style="display: flex;justify-content: space-between;align-items: center;">
             <div>费用明细</div>
@@ -51,7 +51,7 @@
         </a-alert>
         <!-- 列表 -->
         <s-table
-          class="sTable fixPagination"
+          class="sTable"
           ref="table"
           size="small"
           :rowKey="(record) => record.id"
@@ -156,7 +156,7 @@ import ImportGuideModal from './importGuideModal.vue'
 import chooseDepartUserModal from './chooseDepartUserModal.vue'
 import { expenseAccountDetail, expenseAcctDetailDelete, expenseAcctDetailFindList, expenseAccountSubmit, expenseInsertImport } from '@/api/expenseManagement.js'
 export default {
-  name: 'ExpenseReimbursementEdit',
+  name: 'expenseReimbursementEdit',
   mixins: [commonMixin],
   components: { VSelect, Upload, STable, epenseDetailModal, productInfoModal, baseDataModal, ImportGuideModal, chooseDepartUserModal },
   data () {
@@ -217,7 +217,7 @@ export default {
       this.openBaseModal = true
     },
     refashData () {
-      this.getDetail(1)
+      this.getDetail(true)
     },
     //  费用单基础详情
     getDetail (type) {
@@ -322,8 +322,10 @@ export default {
       this.$router.push({ name: 'expenseReimbursementList' })
     },
     pageInit () {
+      console.log(1)
       if (this.$route.params.sn) { //  编辑页
-        this.getDetail()
+        console.log(2)
+        this.getDetail(false)
       }
     }
   },

+ 8 - 9
src/views/salesManagement/salesQueryNew/comps/productList.vue

@@ -525,7 +525,7 @@
             _this.spinning = true
             deleteAll({ salesBillSn: _this.salesBillSn, salesPromoSn: _this.promo.salesPromoSn }).then(res => {
               if (res.status == 200) {
-                _this.resetSearchForm(true)
+                _this.$refs.table.refresh(true)
                 _this.$emit('insterOk','promo')
                 _this.$message.success(res.message)
               }
@@ -557,7 +557,7 @@
               salesBillDetailSnList: obj
             }).then(res => {
               if (res.status == 200) {
-                _this.resetSearchForm(true)
+                _this.$refs.table.refresh(false)
                 _this.$emit('insterOk','promo')
                 _this.$message.success(res.message)
               }
@@ -597,11 +597,10 @@
         updateWarehouse(data).then(res => {
           console.log(res)
           if (res.status == 200) {
-            _this.resetSearchForm(true)
             _this.$message.success(res.message)
           }
           _this.openWarehouseModal = false
-          _this.$refs.table.refresh(true)
+          _this.$refs.table.refresh(false)
           _this.spinning = false
         })
       },
@@ -641,10 +640,10 @@
             salesPromoSn: _this.promo.salesPromoSn
           }).then(res => {
             if (res.status == 200) {
-              _this.resetSearchForm(true)
               _this.$emit('insterOk','promo')
               _this.$message.success(res.message)
             }
+            _this.$refs.table.refresh(false)
             _this.spinning = false
           })
         } else {
@@ -665,7 +664,7 @@
             _this.spinning = true
             salesDetailDel({ salesBillDetailSn: row.salesBillDetailSn, salesBillSn: _this.salesBillSn, salesPromoSn: _this.promo.salesPromoSn }).then(res => {
               if (res.status == 200) {
-                _this.resetSearchForm(true)
+                _this.$refs.table.refresh(false)
                 _this.$emit('insterOk','promo')
                 _this.$message.success(res.message)
               }
@@ -689,7 +688,7 @@
       upAcitveSuccess(){
         this.spinning = false
         this.openUpActiveModal = false
-        this.resetSearchForm()
+        this.$refs.table.refresh(false)
       },
       // 添加产品
       insterProduct (row, promotionFlag, promoProductClz) {
@@ -729,7 +728,7 @@
         salesDetailInsert(params).then(res => {
           if (res.status == 200) {
             this.$message.success('产品添加成功', 2.5)
-            this.resetSearchForm()
+            this.resetSearchForm(true)
             this.$emit('insterOk','promo')
           }
           this.spinning = false
@@ -765,7 +764,7 @@
         salesBatchInsert(params).then(res => {
           if (res.status == 200) {
             this.$message.success('产品导入成功', 2.5)
-            this.resetSearchForm()
+            this.resetSearchForm(true)
             this.$emit('insterOk','promo')
           }
         })

+ 7 - 8
src/views/salesManagement/salesQueryNew/comps/productNormalList.vue

@@ -337,7 +337,7 @@
             _this.spinning = true
             deleteAll({ salesBillSn: _this.salesBillSn }).then(res => {
               if (res.status == 200) {
-                _this.resetSearchForm(true)
+                _this.$refs.table.refresh(false)
                 _this.$emit('insterOk','normal')
                 _this.$message.success(res.message)
               }
@@ -368,7 +368,7 @@
               salesBillDetailSnList: obj
             }).then(res => {
               if (res.status == 200) {
-                _this.resetSearchForm(true)
+                _this.$refs.table.refresh(false)
                 _this.$emit('insterOk','normal')
                 _this.$message.success(res.message)
               }
@@ -405,11 +405,10 @@
         _this.spinning = true
         updateWarehouse(data).then(res => {
           if (res.status == 200) {
-            _this.resetSearchForm(true)
             _this.$message.success(res.message)
           }
+          _this.$refs.table.refresh(false)
           _this.openWarehouseModal = false
-          _this.$refs.table.refresh(true)
           _this.spinning = false
         })
       },
@@ -445,10 +444,10 @@
             salesBillSn: _this.salesBillSn
           }).then(res => {
             if (res.status == 200) {
-              _this.resetSearchForm(true)
               _this.$emit('insterOk','normal')
               _this.$message.success(res.message)
             }
+            _this.$refs.table.refresh(false)
             _this.spinning = false
           })
         } else {
@@ -482,7 +481,7 @@
             salesDetailDel({ salesBillDetailSn: row.salesBillDetailSn, salesBillSn: _this.salesBillSn }).then(res => {
               if (res.status == 200) {
                 _this.$message.success(res.message)
-                _this.resetSearchForm()
+                _this.$refs.table.refresh(false)
                 _this.$emit('insterOk','normal')
               }
               _this.delLoading = false
@@ -523,7 +522,7 @@
         }).then(res => {
           if (res.status == 200) {
             this.$message.success('产品添加成功', 2.5)
-            this.resetSearchForm()
+            this.resetSearchForm(true)
             this.$emit('insterOk','normal')
           }
           this.spinning = false
@@ -546,7 +545,7 @@
         salesBatchInsert(params).then(res => {
           if (res.status == 200) {
             this.$message.success('产品导入成功', 2.5)
-            this.resetSearchForm()
+            this.resetSearchForm(true)
             this.$emit('insterOk','normal')
           }
         })