浏览代码

bug 修复

lilei 4 年之前
父节点
当前提交
0194c16d3d

+ 2 - 2
src/config/router.config.js

@@ -94,7 +94,7 @@ export const asyncRouterMap = [
                 }
               },
               {
-                path: 'add/:id/:sn',
+                path: 'add/:id/:sn/:priceType',
                 name: 'salesAdd',
                 component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/salesQuery/edit.vue'),
                 meta: {
@@ -105,7 +105,7 @@ export const asyncRouterMap = [
                 }
               },
               {
-                path: 'edit/:id/:sn',
+                path: 'edit/:id/:sn/:priceType',
                 name: 'salesEdit',
                 component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/salesQuery/edit.vue'),
                 meta: {

+ 2 - 2
src/views/common/editInput.js

@@ -6,7 +6,6 @@ const EditableCell = {
         </span>
         <div class="editable-cell-input-wrapper">
           <a-input-number 
-          size="small" 
           :min="min" 
           :max="max" 
           :value="value" 
@@ -18,7 +17,8 @@ const EditableCell = {
         <a-icon
           type="check"
           slot="suffix"
-          :style="{color: editable?'#08c':'#666', marginLeft: '10px' }"
+          :title="editable?'保存':''"
+          :style="{color: editable?'#08c':'#666', marginLeft: '5px' }"
           @click="check"
         />
       </div>

+ 2 - 2
src/views/salesManagement/salesQuery/edit.vue

@@ -15,7 +15,7 @@
     </a-page-header>
     <a-card size="small" :bordered="false" class="salesEdit-cont">
       <!-- 查询配件列表 -->
-      <queryPart :buyerSn="detailData&&detailData.buyerSn" :newLoading="isInster" @add="insterProduct"></queryPart>
+      <queryPart :buyerSn="detailData&&detailData.buyerSn" :priceType="$route.params.priceType" :newLoading="isInster" @add="insterProduct"></queryPart>
     </a-card>
     <a-card size="small" :bordered="false" class="salesEdit-cont">
       <!-- 总计 -->
@@ -73,7 +73,7 @@
       <s-table
         class="sTable"
         ref="table"
-        size="default"
+        size="small"
         :rowKey="(record) => record.id"
         :columns="columns"
         :data="loadData"

+ 2 - 2
src/views/salesManagement/salesQuery/list.vue

@@ -242,7 +242,7 @@ export default {
     },
     // 选择客户成功
     chooseCustomOk (data) {
-      this.$router.push({ name: 'salesAdd', params: { id: data.id, sn: data.salesBillSn } })
+      this.$router.push({ name: 'salesAdd', params: { id: data.id, sn: data.salesBillSn, priceType: data.priceType } })
     },
     //  审核
     handleEexamine (row) {
@@ -303,7 +303,7 @@ export default {
     },
     // 编辑
     handleEdit (row) {
-      this.$router.push({ name: 'salesEdit', params: { id: row.id, sn: row.salesBillSn } })
+      this.$router.push({ name: 'salesEdit', params: { id: row.id, sn: row.salesBillSn, priceType: row.priceType } })
     },
     // 删除
     handleDel (row) {

+ 2 - 2
src/views/salesManagement/salesQuery/productSalesRecordModal.vue

@@ -9,7 +9,7 @@
     @cancle="isShow=false"
     width="80%">
     <div>
-      <a-tabs type="card" v-model="curTab" @change="callback">
+      <a-tabs size="small" type="card" v-model="curTab" @change="callback">
         <a-tab-pane key="1" tab="当前客户">
         </a-tab-pane>
         <a-tab-pane key="2" tab="全部客户">
@@ -19,7 +19,7 @@
       <a-table
         class="sTable"
         ref="table"
-        size="default"
+        size="small"
         :data-source="list"
         :pagination="pagination"
         :loading="loading"

+ 7 - 1
src/views/salesManagement/salesQuery/queryPart.vue

@@ -95,7 +95,7 @@
     <s-table
       class="sTable"
       ref="table"
-      size="default"
+      size="small"
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"
@@ -182,6 +182,10 @@ export default {
       type: [Number, String],
       default: ''
     },
+    priceType: {
+      type: [Number, String],
+      default: ''
+    },
     newLoading: Boolean
   },
   data () {
@@ -202,6 +206,7 @@ export default {
       ],
       productType: [],
       queryParam: { //  查询条件
+        salePriceType: '',
         productCode: '', //  产品编码
         productName: '', //  产品名称
         productOrigCode: '', //  原厂编码
@@ -236,6 +241,7 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
+        this.queryParam.salePriceType = this.priceType
         return querySumByProductLocation(Object.assign(parameter, this.queryParam)).then(res => {
           const data = res.data
           const no = (data.pageNo - 1) * data.pageSize