chenrui 3 gadi atpakaļ
vecāks
revīzija
fa82cd74ad

+ 9 - 34
src/views/salesManagement/salesReturn/salesReturnGrabEdit.vue

@@ -7,11 +7,6 @@
           <a id="salesReturnEdit-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
           <span style="margin: 0 15px;color: #666;">客户名称:{{ ordeDetail&&ordeDetail.buyerName || '--' }}</span>
         </template>
-        <!-- 操作区,位于 title 行的行尾 -->
-        <!-- <template slot="extra">
-          <a-button key="2" id="salesReturnEdit-preview-btn">打印预览</a-button>
-          <a-button key="1" type="primary" id="salesReturnEdit-print-btn">快速打印</a-button>
-        </template> -->
       </a-page-header>
       <a-card size="small" :bordered="false" class="salesReturnEdit-cont" v-if="ordeDetail&&ordeDetail.salesReturnBillSource=='SALES'">
         <!-- 查询配件列表 -->
@@ -23,8 +18,8 @@
           <div slot="message" class="total-bar">
             <div style="position: relative;width: 100%;">
               <div>
-                <span>退货总金额:{{ ordeDetail&&(ordeDetail.totalAmount || ordeDetail.totalAmount==0) ? ordeDetail.totalAmount : '--' }}元;</span>
-                <span>退货总数量:{{ ordeDetail&&(ordeDetail.totalQty || ordeDetail.totalQty==0) ? ordeDetail.totalQty : '--' }};</span>
+                <span>退货总金额:<strong>{{ ordeDetail&&(ordeDetail.totalAmount || ordeDetail.totalAmount==0) ? ordeDetail.totalAmount : '--' }}</strong>元;</span>
+                <span>退货总数量:<strong>{{ ordeDetail&&(ordeDetail.totalQty || ordeDetail.totalQty==0) ? ordeDetail.totalQty : '--' }}</strong>;</span>
               </div>
               <div style="position: absolute;right: 0;top: -2px;">
                 <a-button size="small" id="salesReturnEdit-import-btn" @click="openGuideModal=true">导入产品</a-button>
@@ -96,7 +91,7 @@
         id="salesReturn-handleSubmit">提交</a-button>
     </div>
     <!-- 导入产品 -->
-    <importGuideModal :openModal="openGuideModal" :params="{salesReturnBillSn: $route.params.sn, grabFlag: ordeDetail.grabFlag}" @close="openGuideModal=false" @ok="hanldeOk" />
+    <importGuideModal :openModal="openGuideModal" :params="{salesReturnBillSn: $route.params.sn, grabFlag: ordeDetail&&ordeDetail.grabFlag || ''}" @close="openGuideModal=false" @ok="hanldeOk" />
   </div>
 </template>
 
@@ -106,22 +101,10 @@ import ImportGuideModal from './importGuideModal.vue'
 import queryPart from './queryPart.vue'
 import EditableCell from '@/views/common/editInput.js'
 import { salesReturnDetail, salesReturnSubmit, salesReturnBatchInsert } from '@/api/salesReturn'
-import {
-  salesReturnDetailList,
-  salesReturnDetailDel,
-  salesReturnDetailInsert,
-  salesReturnDetailUpdateQty,
-  salesReturnDetailUpdateReason
-} from '@/api/salesReturnDetail'
+import { salesReturnDetailList, salesReturnDetailDel, salesReturnDetailInsert, salesReturnDetailUpdateQty, salesReturnDetailUpdateReason } from '@/api/salesReturnDetail'
 export default {
   name: 'SalesReturnGrabEdit',
-  components: {
-    STable,
-    VSelect,
-    queryPart,
-    EditableCell,
-    ImportGuideModal
-  },
+  components: { STable, VSelect, queryPart, EditableCell, ImportGuideModal },
   data () {
     return {
       spinning: false,
@@ -130,7 +113,7 @@ export default {
       buyerSn: null,
       disabled: false,
       isInster: false, // 是否正在添加产品
-      ordeDetail: { discountAmount: 0 },
+      ordeDetail: null,
       delLoading: false,
       // 已选产品
       dataSource: [],
@@ -158,6 +141,7 @@ export default {
         // 查询总计
         this.productForm.salesReturnBillSn = this.$route.params.sn
         return salesReturnDetailList(Object.assign(parameter, this.productForm)).then(res => {
+          this.getOrderDetail()
           const data = res.data
           const no = (data.pageNo - 1) * data.pageSize
           for (var i = 0; i < data.list.length; i++) {
@@ -234,13 +218,9 @@ export default {
         this.spinning = false
       })
     },
-    // 重置列表
-    resetForm () {
-      this.$refs.table.refresh(true)
-    },
     // 获取单据详细
     getOrderDetail () {
-      salesReturnDetail({ sn: this.orderSn }).then(res => {
+      salesReturnDetail({ sn: this.$route.params.sn }).then(res => {
         this.ordeDetail = res.data || null
       })
     },
@@ -269,11 +249,9 @@ export default {
     //  重置
     resetSearchForm (flag) {
       this.$refs.table.refresh(!!flag)
-      this.getOrderDetail()
     },
     // 添加或修改产品
     saveProduct (row) {
-      console.log(row)
       // 防止多次添加产品
       if (this.isInster) {
         return
@@ -325,12 +303,9 @@ export default {
   mounted () {
     this.orderSn = this.$route.params.sn
     this.buyerSn = this.$route.params.buyerSn
-    this.getOrderDetail()
   },
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      console.log('beforeRouteEnter')
-    })
+    next(vm => {})
   }
 }
 </script>