高敬炎 2 년 전
부모
커밋
49e1ca0751
3개의 변경된 파일33개의 추가작업 그리고 4개의 파일을 삭제
  1. 3 1
      src/api/V2/houseSelfCollect/index.js
  2. 4 1
      src/model/houseSelfCollect/index.js
  3. 26 2
      src/views/houseSelfCollect/inspectionManagementNew.vue

+ 3 - 1
src/api/V2/houseSelfCollect/index.js

@@ -33,7 +33,9 @@ export const API_POST_INSPECT_ADD = '/qualityInspectionManagement/api/addQuality
     //质检仓位下拉
     //质检仓位下拉
 export const API_GET_INSPECT_GETBINNUMBER = '/warehouseBaseInfo/getWarehouse'
 export const API_GET_INSPECT_GETBINNUMBER = '/warehouseBaseInfo/getWarehouse'
     //客户下拉
     //客户下拉
-export const API_GET_INSPECT_GETCUSTOMER = '/identityAuthenticationInfo/identityAuthenticationInfoCustomerNew'
+export const API_GET_INSPECT_GETCUSTOMER = '/identityAuthenticationInfo/identityAuthenticationInfoCustomer'
+   //客户下拉新
+   export const API_GET_INSPECT_GETCUSTOMER_NEW = '/identityAuthenticationInfo/identityAuthenticationInfoCustomerNew'
     //获取二维码
     //获取二维码
 export const API_GET_INSPECT_GETQRCODE = '/identityAuthenticationInfo/generateQRCodeImage'
 export const API_GET_INSPECT_GETQRCODE = '/identityAuthenticationInfo/generateQRCodeImage'
     //质检列表
     //质检列表

+ 4 - 1
src/model/houseSelfCollect/index.js

@@ -73,7 +73,8 @@ import {
     API_POST_GETOKEN,
     API_POST_GETOKEN,
     API_POST_GEROM,
     API_POST_GEROM,
     API_GETQUALITY,
     API_GETQUALITY,
-    API_POST_UPLOADSELF
+    API_POST_UPLOADSELF,
+    API_GET_INSPECT_GETCUSTOMER_NEW
 } from '@/api/V2/houseSelfCollect'
 } from '@/api/V2/houseSelfCollect'
 //客户管理列表
 //客户管理列表
 export const getCustomerManage = appRx.get(API_GET_CUSTOMER_MANAGE, errorCatcher, errorHandle, filter)
 export const getCustomerManage = appRx.get(API_GET_CUSTOMER_MANAGE, errorCatcher, errorHandle, filter)
@@ -111,6 +112,8 @@ export const inspectAdd = appRx.post(API_POST_INSPECT_ADD, errorCatcher, errorHa
 export const getbinNumber = appRx.get(API_GET_INSPECT_GETBINNUMBER, errorCatcher, errorHandle, filter)
 export const getbinNumber = appRx.get(API_GET_INSPECT_GETBINNUMBER, errorCatcher, errorHandle, filter)
     //客户下拉
     //客户下拉
 export const getcustomer = appRx.get(API_GET_INSPECT_GETCUSTOMER, errorCatcher, errorHandle, filter)
 export const getcustomer = appRx.get(API_GET_INSPECT_GETCUSTOMER, errorCatcher, errorHandle, filter)
+    //客户下拉新
+    export const getcustomernew = appRx.get(API_GET_INSPECT_GETCUSTOMER_NEW, errorCatcher, errorHandle, filter)
     //获取二维码
     //获取二维码
 export const getQRCode = appRx.get(API_GET_INSPECT_GETQRCODE, errorCatcher, errorHandle, filter)
 export const getQRCode = appRx.get(API_GET_INSPECT_GETQRCODE, errorCatcher, errorHandle, filter)
     //质检列表
     //质检列表

+ 26 - 2
src/views/houseSelfCollect/inspectionManagementNew.vue

@@ -691,7 +691,8 @@ import {
   getshippinginfo,
   getshippinginfo,
   postCheck,
   postCheck,
   getcontract,
   getcontract,
-  getquality
+  getquality,
+  getcustomernew
 } from '@/model/houseSelfCollect/index'
 } from '@/model/houseSelfCollect/index'
 import {
 import {
   pullDown,
   pullDown,
@@ -1278,10 +1279,33 @@ export default {
     waterContentChange(type) {
     waterContentChange(type) {
       //客户
       //客户
       if (this.serviceManagementType == 3) {
       if (this.serviceManagementType == 3) {
-        getcustomer({
+        if(localStorage.getItem('ws-pf_compName')=='黑龙江中天昊元贸易有限公司'){
+          getcustomernew({
           warehouseId: this.cangid,
           warehouseId: this.cangid,
           goodsName: this.deptBudgetList.goodsName,
           goodsName: this.deptBudgetList.goodsName,
           buyer:this.buyer
           buyer:this.buyer
+        }).toPromise()
+          .then((response) => {
+            this.customerList1 = response
+            this.customerList = []
+            let customer = response
+            for (let i = 0; i < response.length; i++) {
+              if (response[i].supplier) {
+                customer = response[i].customerName + '(' + response[i].bankCard + ')' + '-' + response[i]
+                  .supplier
+              } else {
+                customer = response[i].customerName + '(' + response[i].bankCard + ')'
+              }
+              this.customerList.push({
+                valueKey: i,
+                value: customer,
+              })
+            }
+          })
+        }
+        getcustomer({
+          warehouseId: this.cangid,
+          goodsName: this.deptBudgetList.goodsName
         })
         })
           .toPromise()
           .toPromise()
           .then((response) => {
           .then((response) => {