前端

src/views/houseSelfCollect/newWeighingManagement.vue

@@ -2299,19 +2299,18 @@ export default {
                       cang1.label = this.weighingList.buyer
                       if(this.warehouseName=='佳屹农仓储库'){
                         if (this.check(this.weighingList.buyer, 3)) {
-                          this.companyNameOptions.push(cang1)
+                          this.companyNameEWOptions.push(cang1)
                           this.companyName=this.weighingList.buyer
                         }
                       }else{
-                        if (this.check(this.weighingList.seller, 1)) {
+                        if (this.check(this.weighingList.buyer, 2)) {
+                        this.companyNameEWOptions.push(cang1)
+                      }
+                      }
+                      if (this.check(this.weighingList.seller, 1)) {
                           this.ewCustomerOptions.push(cang)
                         }
-                      }
                       
-                      
-                      if (this.check(this.weighingList.buyer, 2)) {
-                        this.companyNameEWOptions.push(cang1)
-                      }
                     }
                   }
                   if(this.warehouseName=='鲅鱼圈金信库'){

src/views/houseSelfCollect/paymentManagement.vue

@@ -45,7 +45,7 @@
         <el-select class="warehouse_select" v-model="goodNames" placeholder="请选择货名" @change="goodsNameChange" filterable
           clearable  multiple :multiple-limit="multipleLimit" style="margin: 0 10px">
           <el-option label="全部货名" value="全部货名"></el-option>
-          <el-option v-for="item in goodnameList" :key="item.id" :label="item.goodsName" :value="item.goodsName">
+          <el-option v-for="item in goodnameList" :key="item.id" :label="item.constValue" :value="item.constValue">
           </el-option>
         </el-select>
         <el-date-picker style="margin: 0 10px 0 0" value-format="yyyy-MM-dd" v-model="value2" @change="datechange"
@@ -434,6 +434,9 @@
     dayjs,
     EventBus
   } from 'base-core-lib'
+  import {
+    packList,
+  } from '@/model/contarct/index'
   import {
     downloadFile
   } from '@/utils/batchDown'
@@ -657,6 +660,14 @@
       this.pageSize =Number(sessionStorage.getItem('pageSize') ) || 10;
       console.log( this.currentPage,this.pageSize)
       this.getPassYearFormatDate()
+      // 货名
+      packList({
+            constId: 'CON2'
+          })
+          .toPromise()
+          .then((response) => {
+            this.goodnameList = response
+          })
       this.getWarehouse()
       this.compId=localStorage.getItem('ws-pf_compId')
       localStorage.setItem('pengyuPrint', false)
@@ -1572,7 +1583,7 @@
       getWarehouse() {
         let _wareHouse = localStorage.getItem('houseSelfCollect_house1')
         _wareHouse = JSON.parse(_wareHouse)
-        selectWarehouseSelf({
+        getwarehouse({
             compId: localStorage.getItem('ws-pf_compId'),
           })
           .toPromise()
@@ -1736,13 +1747,13 @@
       getList() {
         for (let _temp = 0; _temp < this.warehouseList.length; _temp++) {
           if (this.warehouseName == this.warehouseList[_temp].warehouseName) {
-            if(this.warehouseList[_temp].goodsNameInfos){
-              for (let _num = 0; _num < this.warehouseList[_temp].goodsNameInfos.length; _num++) {
-                const res = new Map()
-                this.goodnameList = this.warehouseList[_temp].goodsNameInfos.filter((arr) => !res.has(arr.goodsName) &&
-                  res.set(arr.goodsName, 1))
-              }
-            }
+            // if(this.warehouseList[_temp].goodsNameInfos){
+            //   for (let _num = 0; _num < this.warehouseList[_temp].goodsNameInfos.length; _num++) {
+            //     const res = new Map()
+            //     this.goodnameList = this.warehouseList[_temp].goodsNameInfos.filter((arr) => !res.has(arr.goodsName) &&
+            //       res.set(arr.goodsName, 1))
+            //   }
+            // }
             
           }
         }

src/views/houseSelfCollect/weightCheckRecord.vue

@@ -1236,14 +1236,14 @@
                   this.companyName=row.buyer
                 }
               }else{
-                if (this.check(row.seller, 1)) {
-                  this.ewCustomerOptions.push(cang)
+                if (this.check(row.buyer, 2)) {
+                  this.companyNameEWOptions.push(cang1)
                 }
               }
+              if (this.check(row.seller, 1)) {
+                  this.ewCustomerOptions.push(cang)
+                }
               
-              if (this.check(row.buyer, 2)) {
-                this.companyNameEWOptions.push(cang1)
-              }
             }
           }
           this.idPrint = row.id