浏览代码

Merge branch 'deploy_0804' of http://git.chelingzhu.com/jianguan-web/qpls-md-html into deploy_0804

chenrui 3 年之前
父节点
当前提交
6966c347fa

+ 5 - 4
src/views/salesManagement/salesQuery/edit.vue

@@ -28,15 +28,13 @@
         <!-- 查询配件列表 -->
         <queryPart
           ref="partQuery"
-          :buyerSn="(detailData&&detailData.buyerSn&&detailData.salesBillSource&&detailData.salesBillSource=='PURCHASE')?'':detailData.buyerSn"
-          :priceType="$route.params.priceType"
           :newLoading="isInster"
           @add="insterProduct"
           @isCost="isCost"></queryPart>
       </a-card>
       <a-card size="small" :bordered="false" class="salesEdit-cont">
         <!-- 总计 -->
-        <a-alert style="margin-bottom: 10px;" type="info">
+        <a-alert v-if="detailData" style="margin-bottom: 10px;" type="info">
           <div slot="message" class="total-bar">
             <div>
               总售价:<strong>{{ detailData&&(detailData.totalAmount || detailData.totalAmount==0) ? '¥'+detailData.totalAmount : '--' }}</strong>;
@@ -536,6 +534,10 @@ export default {
       salesDetail({ id: this.$route.params.id }).then(res => {
         if (res.status == 200) {
           this.detailData = res.data
+          const vm = this
+          const buyerSn = (vm.detailData && vm.detailData.buyerSn && vm.detailData.salesBillSource && vm.detailData.salesBillSource == 'PURCHASE') ? '' : vm.detailData.buyerSn
+          const priceType = vm.$route.params.priceType
+          vm.$refs.partQuery.pageInit(buyerSn, priceType)
         }
       })
     },
@@ -559,7 +561,6 @@ export default {
       vm.getOrderDetail()
       if (!vm.disabled) {
         vm.resetForm()
-        vm.$refs.partQuery.resetSearchForm()
       }
     }
   },

+ 17 - 9
src/views/salesManagement/salesQuery/queryPart.vue

@@ -162,14 +162,14 @@ export default {
   name: 'QueryPart',
   components: { STable, VSelect, Upload, productSalesRecordModal },
   props: {
-    buyerSn: {
-      type: [Number, String],
-      default: ''
-    },
-    priceType: {
-      type: [Number, String],
-      default: ''
-    },
+    // buyerSn: {
+    //   type: [Number, String],
+    //   default: ''
+    // },
+    // priceType: {
+    //   type: [Number, String],
+    //   default: ''
+    // },
     newLoading: Boolean
   },
   data () {
@@ -191,6 +191,8 @@ export default {
         productTypeSn3: '', //  产品三级分类
         warehouseSn: undefined //  仓库
       },
+      priceType: '',
+      buyerSn: '',
       rules: {
         vinCode: [ { len: 17, message: '请输入正确的车架号(VIN)', trigger: 'change' } ]
       },
@@ -319,8 +321,14 @@ export default {
       this.queryParam.productCodeList = undefined
       this.queryParam.vinCode = ''
       this.productType = []
-      this.$refs.table.refresh(true)
       this.$refs.ruleForm.resetFields()
+      this.$refs.table.refresh(true)
+    },
+    pageInit (buyerSn, priceType) {
+      console.log(buyerSn, priceType)
+      this.priceType = priceType
+      this.buyerSn = buyerSn
+      this.resetSearchForm()
     },
     // 刷新当前页面
     resetCurForm () {

+ 14 - 6
src/views/salesManagement/salesReturn/queryPart.vue

@@ -84,13 +84,13 @@ export default {
   name: 'QueryPart',
   components: { STable, VSelect, rangeDate },
   props: {
-    buyerSn: {
-      type: [Number, String],
-      default: ''
-    },
+    // buyerSn: {
+    //   type: [Number, String],
+    //   default: ''
+    // },
     newLoading: Boolean,
-    grabFlag: [Number, String],
-    priceType: [Number, String]
+    grabFlag: [Number, String]
+    // priceType: [Number, String]
   },
   data () {
     return {
@@ -102,6 +102,8 @@ export default {
         productName: '', // 产品名称
         productCode: '' //  产品编码
       },
+      buyerSn: '',
+      priceType: '',
       disabled: false, //  查询、重置按钮是否可操作
       columns: [],
       // 加载数据方法 必须为 Promise 对象
@@ -191,6 +193,12 @@ export default {
       this.queryParam.productCode = ''
       this.$refs.table.refresh(true)
     },
+    pageInit (buyerSn, priceType) {
+      console.log(buyerSn, priceType)
+      this.buyerSn = buyerSn
+      this.priceType = priceType
+      this.resetSearchForm()
+    },
     refreshData () {
       if (this.listData.length > 0) {
         this.$refs.table.refresh(true)

+ 1 - 3
src/views/salesManagement/salesReturn/salesReturnEdit.vue

@@ -28,8 +28,6 @@
         <!-- 查询配件列表 -->
         <queryPart
           ref="queryPart"
-          :buyerSn="$route.params.buyerSn"
-          :priceType="ordeDetail&&ordeDetail.priceType||''"
           grabFlag="0"
           :newLoading="isInster"
           @add="saveProduct"></queryPart>
@@ -375,6 +373,7 @@ export default {
     getOrderDetail () {
       salesReturnDetail({ sn: this.orderSn }).then(res => {
         this.ordeDetail = res.data || null
+        this.$refs.queryPart.pageInit(this.buyerSn, this.ordeDetail && this.ordeDetail.priceType || '')
       })
     },
     // 打折
@@ -558,7 +557,6 @@ export default {
       this.getWarehouseCascade()
       if (!this.disabled) {
         this.resetForm()
-        this.$refs.queryPart.resetSearchForm()
       }
     }
   },

+ 2 - 2
src/views/salesManagement/salesReturn/salesReturnGrabEdit.vue

@@ -26,7 +26,7 @@
       </a-page-header>
       <a-card size="small" :bordered="false" class="pages-wrap">
         <!-- 查询配件列表 -->
-        <queryPart ref="queryPart" :buyerSn="$route.params.buyerSn" grabFlag="1" :newLoading="isInster" @add="saveProduct"></queryPart>
+        <queryPart ref="queryPart" grabFlag="1" :newLoading="isInster" @add="saveProduct"></queryPart>
       </a-card>
       <a-card size="small" :bordered="false" class="pages-wrap">
         <!-- alert -->
@@ -360,6 +360,7 @@ export default {
     getOrderDetail () {
       salesReturnDetail({ sn: this.orderSn }).then(res => {
         this.ordeDetail = res.data || null
+        this.$refs.queryPart.pageInit(this.buyerSn, this.ordeDetail && this.ordeDetail.priceType || '')
       })
     },
     // 打折
@@ -544,7 +545,6 @@ export default {
       this.getWarehouseCascade()
       if (!this.disabled) {
         this.resetForm()
-        this.$refs.queryPart.resetSearchForm()
       }
     }
   },