lilei 2 vuotta sitten
vanhempi
commit
bbb70d7021

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1659325388338
+  "version": 1659336020969
 }

+ 3 - 3
src/views/numsGoodsShelves/settlementManagement/list.vue

@@ -5,12 +5,12 @@
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
           <a-row :gutter="15">
-            <a-col :md="6" :sm="24">
+            <a-col :md="4" :sm="24">
               <a-form-item label="货架名称">
                 <shelfList v-model="queryParam.shelfSn"></shelfList>
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24">
+            <a-col :md="4" :sm="24">
               <a-form-item label="关联客户">
                 <custList ref="custList" @change="custChange" v-model="queryParam.customerName"></custList>
               </a-form-item>
@@ -245,7 +245,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 265
+      this.tableHeight = window.innerHeight - tableSearchH - 245
     },
     pageInit () {
       const _this = this

+ 3 - 3
src/views/numsGoodsShelves/settlementManagement/unSettlementDetail.vue

@@ -8,7 +8,7 @@
         </template>
       </a-page-header>
       <!-- 额度统计 授信结算类型 显示-->
-      <a-card size="small" :bordered="false" style="margin-bottom: 10px;" v-if="this.$route.params.settleType=='CREDIT'">
+      <a-card size="small" :bordered="false" style="margin-bottom: 10px;" v-if="$route.params.settleType=='CREDIT'">
         <a-collapse :activeKey="['1']">
           <a-collapse-panel key="1" >
             <template slot="header">
@@ -75,7 +75,7 @@
           :style="{ height: tableHeight+77+'px' }"
           ref="table"
           size="small"
-          rowKey="id"
+          :rowKey="(record) => record.id"
           :columns="columns"
           :data="loadData"
           :defaultLoadData="false"
@@ -221,7 +221,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 300
+      this.tableHeight = window.innerHeight - tableSearchH - (this.$route.params.settleType == 'CREDIT' ? 415 : 300)
     }
   },
   mounted () {

+ 13 - 1
src/views/salesManagement/salesQuery/list.vue

@@ -23,7 +23,7 @@
             <template v-if="advanced">
               <a-col :md="6" :sm="24">
                 <a-form-item label="客户名称" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
-                  <custList ref="custList" v-model="queryParam.buyerName"></custList>
+                  <custList ref="custList" @change="custChange"></custList>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -251,6 +251,7 @@ export default {
         outWarehouseBeginDate: '',
         outWarehouseEndDate: '',
         buyerName: undefined, //  客户名称
+        buyerSn: undefined,
         salesBillNo: '', //  销售单号
         purchaseBillNo: '', //  采购单号
         payType: undefined, //  支付方式
@@ -328,6 +329,16 @@ export default {
       this.queryParam.outWarehouseBeginDate = date[0]
       this.queryParam.outWarehouseEndDate = date[1]
     },
+    custChange (v, row) {
+      console.log(v, row)
+      if (row && row.customerSn) {
+        this.queryParam.buyerSn = row.customerSn
+        this.queryParam.buyerName = undefined
+      } else {
+        this.queryParam.buyerName = v
+        this.queryParam.buyerSn = undefined
+      }
+    },
     // 新增
     handleAdd () {
       this.openModal = true
@@ -435,6 +446,7 @@ export default {
       this.queryParam.outWarehouseEndDate = ''
 
       this.queryParam.buyerName = undefined
+      this.queryParam.buyerSn = undefined
       this.queryParam.salesBillNo = ''
       this.queryParam.purchaseBillNo = ''
       this.queryParam.payType = undefined