Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

src/api/V2/houseSelfCollect/index.js

@@ -85,4 +85,6 @@ export const API_GET_INSPECT_GETJURISDICTION = '/paymentManagement/selectTaskId'
 //财务开票
 export const API_POST_INVOICING = '/paymentManagement/api/readXmlManagement'
 export const API_POST_EXPORT = '/paymentManagement/export'
+// 车牌号
+export const API_GET_SHIPPINGINFOFORMATION = '/shippingInformation/selectShippingInformation'
 

src/components/mapdrag/indexMap.vue

@@ -160,7 +160,7 @@
         AMapLoader.load({
           "key": "211dd6f989e719022aaf47ddb0659c47", // 申请好的Web端开发者Key，首次调用 load 时必填
           "version": "2.0", // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
-          "plugins": ['plugin=AMap.Scale', 'AMap.ToolBar','AMap.AutoComplete', 'AMap.PlaceSearch', 'AMap.Geocoder', 'AMap.DistrictSearch'],
+          "plugins": ['plugin=AMap.Scale', 'AMap.ToolBar','AMap.AutoComplete', 'AMap.PlaceSearch', 'AMap.Geocoder', 'AMap.DistrictSearch','AMap.Geolocation', 'Geolocation'],
           "Loca": { // 是否加载 Loca， 缺省不加载
             "version": '2.0.0' // Loca 版本，缺省 1.3.2
           },

src/components/mapdrag/mapdrag.vue

@@ -184,7 +184,7 @@
         AMapLoader.load({
           "key": "211dd6f989e719022aaf47ddb0659c47", // 申请好的Web端开发者Key，首次调用 load 时必填
           "version": "2.0", // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
-          "plugins": ['plugin=AMap.Scale', 'AMap.ToolBar','AMap.AutoComplete', 'AMap.PlaceSearch', 'AMap.Geocoder', 'AMap.DistrictSearch'],
+          "plugins": ['plugin=AMap.Scale', 'AMap.ToolBar','AMap.AutoComplete', 'AMap.PlaceSearch', 'AMap.Geocoder', 'AMap.DistrictSearch','AMap.Geolocation', 'Geolocation'],
           "Loca": { // 是否加载 Loca， 缺省不加载
             "version": '2.0.0' // Loca 版本，缺省 1.3.2
           },

src/components/mapdrag/warehouseReceiptMap.vue

@@ -60,6 +60,7 @@
       listData: function(val1, val2) {
         this.listData = val1
         var that = this
+        
         this.map = new AMap.Map('mapContainer', {
           resizeEnable: true,
           zoom: 5,
@@ -72,14 +73,21 @@
     },
     async created() {
       // AMapLoader.reset();
-      // 已载入高德地图API，则直接初始化地图
       if (window.AMap && window.AMapUI) {
-        this.initMap()
         // 未载入高德地图API，则先载入API再初始化
       } else {
-        await remoteLoad(`http://webapi.amap.com/maps?v=1.3&key=${MapKey}&plugin=AMap.AutoComplete`)
-        await remoteLoad('http://webapi.amap.com/ui/1.0/main.js')
-        this.initMap()
+        // await remoteLoad(`http://webapi.amap.com/maps?v=1.3&key=${MapKey}&plugin=AMap.AutoComplete`)
+        // await remoteLoad('http://webapi.amap.com/ui/1.0/main.js')
+        //  AMapLoader.reset();
+        AMapLoader.load({
+          "key": "211dd6f989e719022aaf47ddb0659c47", // 申请好的Web端开发者Key，首次调用 load 时必填
+          "version": "2.0", // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
+          "plugins": ['plugin=AMap.Scale', 'AMap.ToolBar','AMap.AutoComplete', 'AMap.PlaceSearch', 'AMap.Geocoder', 'AMap.DistrictSearch','AMap.Geolocation', 'Geolocation'],
+          "Loca": { // 是否加载 Loca， 缺省不加载
+            "version": '2.0.0' // Loca 版本，缺省 1.3.2
+          },
+        }).then((AMap) => {
+        })
       }
     },
     mounted() {},
@@ -95,7 +103,6 @@
       loadmap(val) {
         let that = this
         //构造markersList
-        this.makeMarkersList()
         AMap.plugin(['AMap.DistrictSearch', 'AMap.Polygon'], function() {
           var geolocation = new AMap.Geolocation({
             // 是否使用高精度定位，默认：true
@@ -106,7 +113,7 @@
             buttonPosition: 'RB'
           })
           geolocation.getCurrentPosition()
-          AMap.event.addListener(geolocation, 'complete', e => {
+          geolocation.on( 'complete', e => {
             console.log(e) // 定位成功之后做的事 // 定位成功之后再定位处添加一个marker
             var infoWindow = new AMap.InfoWindow({
               offset: new AMap.Pixel(0, -30)
@@ -166,7 +173,7 @@
               // });
             }
           })
-          AMap.event.addListener(geolocation, 'error', e => {
+           geolocation.on( 'error', e => {
             console.log(e) // 定位失败
           })
         })

src/model/houseSelfCollect/index.js

@@ -44,7 +44,8 @@ import {
   API_GET_INSPECT_GETDRYGRAINPRICE,
   API_GET_INSPECT_GETJURISDICTION,
   API_POST_INVOICING,
-  API_POST_EXPORT
+  API_POST_EXPORT,
+  API_GET_SHIPPINGINFOFORMATION
 } from '@/api/V2/houseSelfCollect'
 //客户管理列表
 export const getCustomerManage = appRx.get(API_GET_CUSTOMER_MANAGE, errorCatcher, errorHandle, filter)
@@ -133,4 +134,6 @@ export const getJurisdiction  = appRx.get(API_GET_INSPECT_GETJURISDICTION, error
 //财务开票post
 export const invoicing  = appRx.post(API_POST_INVOICING, errorCatcher, errorHandle, filter)
 
-export const export1 = appRx.post(API_POST_EXPORT)
+export const export1 = appRx.post(API_POST_EXPORT)
+// 车牌号
+export const getshippinginfo  = appRx.get(API_GET_SHIPPINGINFOFORMATION, errorCatcher, errorHandle, filter)

src/views/contractManagement/futuresPurchaseContractAdd.vue

@@ -794,16 +794,6 @@
           })
           return
         }
-        if (
-          this.deptBudgetList.buyerPhone.length < 7 ||
-          this.deptBudgetList.buyerPhone.length > 20
-        ) {
-          this.$message({
-            message: '买方电话长度不符合要求,请输入7到20个字符之内！',
-            type: 'warning',
-          })
-          return
-        }
         if (!this.deptBudgetList.seller) {
           this.$message({
             message: '请输入卖方名称！',
@@ -832,16 +822,6 @@
           })
           return
         }
-        if (
-          this.deptBudgetList.buyerPhone.length < 7 ||
-          this.deptBudgetList.buyerPhone.length > 20
-        ) {
-          this.$message({
-            message: '卖方电话长度不符合要求,请输入7到20个字符之内！',
-            type: 'warning',
-          })
-          return
-        }
         if (!this.deptBudgetList.acceptanceMethod) {
           this.$message({
             message: '请选择验收方式',

src/views/contractManagement/futuresPurchaseContractEdit.vue

@@ -1121,16 +1121,6 @@ export default {
         })
         return
       }
-      if (
-        this.deptBudgetList.buyerPhone.length < 7 ||
-        this.deptBudgetList.buyerPhone.length > 20
-      ) {
-        this.$message({
-          message: '买方电话长度不符合要求,请输入7到20个字符之内！',
-          type: 'warning',
-        })
-        return
-      }
       if (!this.deptBudgetList.seller) {
         this.$message({
           message: '请输入卖方名称！',
@@ -1159,16 +1149,6 @@ export default {
         })
         return
       }
-      if (
-        this.deptBudgetList.buyerPhone.length < 7 ||
-        this.deptBudgetList.buyerPhone.length > 20
-      ) {
-        this.$message({
-          message: '卖方电话长度不符合要求,请输入7到20个字符之内！',
-          type: 'warning',
-        })
-        return
-      }
       if (!this.deptBudgetList.acceptanceMethod) {
         this.$message({
           message: '请选择验收方式',

src/views/contractManagement/futuresSalesContractAdd.vue

@@ -773,16 +773,6 @@
           })
           return
         }
-        if (
-          this.deptBudgetList.buyerPhone.length < 7 ||
-          this.deptBudgetList.buyerPhone.length > 20
-        ) {
-          this.$message({
-            message: '买方电话长度不符合要求,请输入7到20个字符之内！',
-            type: 'warning',
-          })
-          return
-        }
         if (!this.deptBudgetList.seller) {
           this.$message({
             message: '请输入卖方名称！',
@@ -811,16 +801,6 @@
           })
           return
         }
-        if (
-          this.deptBudgetList.buyerPhone.length < 7 ||
-          this.deptBudgetList.buyerPhone.length > 20
-        ) {
-          this.$message({
-            message: '卖方电话长度不符合要求,请输入7到20个字符之内！',
-            type: 'warning',
-          })
-          return
-        }
         if (!this.deptBudgetList.acceptanceMethod) {
           this.$message({
             message: '请选择验收方式',

src/views/contractManagement/futuresSalesContractEdit.vue

@@ -840,16 +840,6 @@
           })
           return
         }
-        if (
-          this.deptBudgetList.buyerPhone.length < 7 ||
-          this.deptBudgetList.buyerPhone.length > 20
-        ) {
-          this.$message({
-            message: '买方电话长度不符合要求,请输入7到20个字符之内！',
-            type: 'warning',
-          })
-          return
-        }
         if (!this.deptBudgetList.seller) {
           this.$message({
             message: '请输入卖方名称！',
@@ -878,16 +868,6 @@
           })
           return
         }
-        if (
-          this.deptBudgetList.buyerPhone.length < 7 ||
-          this.deptBudgetList.buyerPhone.length > 20
-        ) {
-          this.$message({
-            message: '卖方电话长度不符合要求,请输入7到20个字符之内！',
-            type: 'warning',
-          })
-          return
-        }
         if (!this.deptBudgetList.acceptanceMethod) {
           this.$message({
             message: '请选择验收方式',

src/views/contractManagement/priceConfirmationSheetAdd.vue

@@ -309,16 +309,6 @@
           })
           return
         }
-        if (
-          this.deptBudgetList.buyerPhone.length < 7 ||
-          this.deptBudgetList.buyerPhone.length > 20
-        ) {
-          this.$message({
-            message: '买方联络人电话输入错误!',
-            type: 'warning',
-          })
-          return
-        }
         if (isNaN(this.deptBudgetList.buyerPhone)) {
           this.$message({
             message: '卖方联络人电话输入有误!',
@@ -333,16 +323,6 @@
           })
           return
         }
-        if (
-          this.deptBudgetList.seller.length < 2 ||
-          this.deptBudgetList.seller.length > 20
-        ) {
-          this.$message({
-            message: '卖方联络人姓名输入错误!',
-            type: 'warning',
-          })
-          return
-        }
 
         if (!this.deptBudgetList.sellerPhone) {
           this.$message({
@@ -358,16 +338,6 @@
           })
           return
         }
-        if (
-          this.deptBudgetList.sellerPhone.length < 7 ||
-          this.deptBudgetList.sellerPhone.length > 20
-        ) {
-          this.$message({
-            message: '卖方联络人电话输入有误!',
-            type: 'warning',
-          })
-          return
-        }
         if (!this.deptBudgetList.transactionsNumberHand) {
           this.$message({
             message: '成交数量不能为空!',

src/views/contractManagement/priceConfirmationSheetEdit.vue

@@ -356,16 +356,6 @@ export default {
           })
           return
         }
-        if (
-          this.deptBudgetList.buyerPhone.length < 7 ||
-          this.deptBudgetList.buyerPhone.length > 20
-        ) {
-          this.$message({
-            message: '买方联络人电话输入错误!',
-            type: 'warning',
-          })
-          return
-        }
         if (isNaN(this.deptBudgetList.buyerPhone)) {
           this.$message({
             message: '卖方联络人电话输入有误!',
@@ -405,16 +395,6 @@ export default {
           })
           return
         }
-        if (
-          this.deptBudgetList.sellerPhone.length < 7 ||
-          this.deptBudgetList.sellerPhone.length > 20
-        ) {
-          this.$message({
-            message: '卖方联络人电话输入有误!',
-            type: 'warning',
-          })
-          return
-        }
         if (!this.deptBudgetList.transactionsNumberHand) {
           this.$message({
             message: '成交数量不能为空!',

src/views/contractManagement/purchaseContractAdd.vue

@@ -875,16 +875,6 @@
           })
           return
         }
-        if (
-          this.deptBudgetList.buyerPhone.length < 7 ||
-          this.deptBudgetList.buyerPhone.length > 20
-        ) {
-          this.$message({
-            message: '买方电话长度不符合要求,请输入7到20个字符之内！',
-            type: 'warning',
-          })
-          return
-        }
         if (!this.deptBudgetList.sellerPhone) {
           this.$message({
             message: '请输入卖方电话！',
@@ -899,16 +889,6 @@
           })
           return
         }
-        if (
-          this.deptBudgetList.sellerPhone.length < 7 ||
-          this.deptBudgetList.sellerPhone.length > 20
-        ) {
-          this.$message({
-            message: '卖方电话长度不符合要求,请输入7到20个字符之内！',
-            type: 'warning',
-          })
-          return
-        }
         if (!this.deptBudgetList.acceptanceMethod) {
           this.$message({
             message: '请选择验收方式',

src/views/contractManagement/purchaseContractEdit.vue

@@ -776,16 +776,6 @@
           })
           return
         }
-        if (
-          this.deptBudgetList.buyerPhone.length < 7 ||
-          this.deptBudgetList.buyerPhone.length > 20
-        ) {
-          this.$message({
-            message: '买方电话长度不符合要求,请输入7到20个字符之内！',
-            type: 'warning',
-          })
-          return
-        }
         if (!this.deptBudgetList.sellerPhone) {
           this.$message({
             message: '请输入卖方电话！',
@@ -800,16 +790,6 @@
           })
           return
         }
-        if (
-          this.deptBudgetList.sellerPhone.length < 7 ||
-          this.deptBudgetList.sellerPhone.length > 20
-        ) {
-          this.$message({
-            message: '卖方电话长度不符合要求,请输入7到20个字符之内！',
-            type: 'warning',
-          })
-          return
-        }
         if (!this.deptBudgetList.acceptanceMethod) {
           this.$message({
             message: '请选择验收方式',

src/views/contractManagement/salesContractAdd.vue

@@ -802,16 +802,6 @@
           })
           return
         }
-        if (
-          this.deptBudgetList.buyerPhone.length < 7 ||
-          this.deptBudgetList.buyerPhone.length > 20
-        ) {
-          this.$message({
-            message: '买方电话长度不符合要求,请输入7到20个字符之内！',
-            type: 'warning',
-          })
-          return
-        }
         if (!this.deptBudgetList.sellerPhone) {
           this.$message({
             message: '请输入卖方电话！',
@@ -826,16 +816,6 @@
           })
           return
         }
-        if (
-          this.deptBudgetList.sellerPhone.length < 7 ||
-          this.deptBudgetList.sellerPhone.length > 20
-        ) {
-          this.$message({
-            message: '卖方电话长度不符合要求,请输入7到20个字符之内！',
-            type: 'warning',
-          })
-          return
-        }
         if (!this.deptBudgetList.acceptanceMethod) {
           this.$message({
             message: '请选择验收方式',

src/views/contractManagement/salesContractEdit.vue

@@ -802,16 +802,6 @@
           })
           return
         }
-        if (
-          this.deptBudgetList.buyerPhone.length < 7 ||
-          this.deptBudgetList.buyerPhone.length > 20
-        ) {
-          this.$message({
-            message: '买方电话长度不符合要求,请输入7到20个字符之内！',
-            type: 'warning',
-          })
-          return
-        }
         if (!this.deptBudgetList.sellerPhone) {
           this.$message({
             message: '请输入卖方电话！',
@@ -826,16 +816,6 @@
           })
           return
         }
-        if (
-          this.deptBudgetList.sellerPhone.length < 7 ||
-          this.deptBudgetList.sellerPhone.length > 20
-        ) {
-          this.$message({
-            message: '卖方电话长度不符合要求,请输入7到20个字符之内！',
-            type: 'warning',
-          })
-          return
-        }
         if (!this.deptBudgetList.acceptanceMethod) {
           this.$message({
             message: '请选择验收方式',

src/views/customerFundManagement/customerFundAdd.vue

@@ -307,22 +307,22 @@ export default {
     bankSuccess2(e) {
       this.bankLows = 'bankLow'
       this.bank[1] = e.url
-      this.imageUrl4 = e.url
-      getBank({
-        bankImg: e.url,
-      })
-        .toPromise()
-        .then((response) => {
-          if (response.bankNameZhihang) {
-            this.bankList = response.bankNameZhihang
-          }
-          if (response.bankNo) {
-            this.$set(this.customerList, 'bankCard', response.bankNo)
-          }
-          if (response.bankName) {
-            this.$set(this.customerList, 'bankDeposit', response.bankName)
-          }
-        })
+      // this.imageUrl4 = e.url
+      // getBank({
+      //   bankImg: e.url,
+      // })
+      //   .toPromise()
+      //   .then((response) => {
+      //     if (response.bankNameZhihang) {
+      //       this.bankList = response.bankNameZhihang
+      //     }
+      //     if (response.bankNo) {
+      //       this.$set(this.customerList, 'bankCard', response.bankNo)
+      //     }
+      //     if (response.bankName) {
+      //       this.$set(this.customerList, 'bankDeposit', response.bankName)
+      //     }
+      //   })
     },
     commit() {
       if (!this.imageUrl3) {

src/views/customerFundManagement/customerFundEdit.vue

@@ -302,21 +302,21 @@ export default {
       this.bankLows = 'bankLow'
       this.bank[1] = e.url
       this.imageUrl4 = e.url
-      getBank({
-        bankImg: e.url,
-      })
-        .toPromise()
-        .then((response) => {
-          if (response.bankNameZhihang) {
-            this.bankList = response.bankNameZhihang
-          }
-          if (response.bankNo) {
-            this.$set(this.customerList, 'bankCard', response.bankNo)
-          }
-          if (response.bankName) {
-            this.$set(this.customerList, 'bankDeposit', response.bankName)
-          }
-        })
+      // getBank({
+      //   bankImg: e.url,
+      // })
+      //   .toPromise()
+      //   .then((response) => {
+      //     if (response.bankNameZhihang) {
+      //       this.bankList = response.bankNameZhihang
+      //     }
+      //     if (response.bankNo) {
+      //       this.$set(this.customerList, 'bankCard', response.bankNo)
+      //     }
+      //     if (response.bankName) {
+      //       this.$set(this.customerList, 'bankDeposit', response.bankName)
+      //     }
+      //   })
     },
     loaddata() {
       lookCustomer({ id: this.$route.query.id })

src/views/customerFundManagement/customerFundList.vue

@@ -57,15 +57,15 @@
             <span v-else>{{ scope.$index + 1 }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="customerType" label="客户类型" width="80"></el-table-column>
-        <el-table-column prop="compName" label="企业名称" width="200"></el-table-column>
-        <el-table-column prop="customerName" label="客户姓名" width="120"></el-table-column>
-        <el-table-column prop="customerPhone" label="电话" width="100"> </el-table-column>
-        <el-table-column prop="totalDeposit" label="定金（元）" width="110"></el-table-column>
-        <el-table-column prop="advancePayment" label="预付金（元）" width="110"></el-table-column>
-        <el-table-column prop="securityDeposit" label="保证金（元）" width="110"></el-table-column>
+        <el-table-column prop="customerType" label="客户类型" ></el-table-column>
+        <el-table-column prop="compName" label="企业名称" ></el-table-column>
+        <el-table-column prop="customerName" label="客户姓名" ></el-table-column>
+        <el-table-column prop="customerPhone" label="电话" > </el-table-column>
+        <el-table-column prop="totalDeposit" label="定金（元）" ></el-table-column>
+        <el-table-column prop="advancePayment" label="预付金（元）" ></el-table-column>
+        <el-table-column prop="securityDeposit" label="保证金（元）" ></el-table-column>
         <el-table-column prop="bankCard" label="账号" width="200"> </el-table-column>
-        <el-table-column prop="bankDeposit" label="开户行" width="280">
+        <el-table-column prop="bankDeposit" label="开户行" width="300">
           <template slot-scope="scope">
             {{ scope.row.bankDeposit }} - {{ scope.row.bankDepositBranch }}
           </template>
@@ -75,8 +75,8 @@
             {{ scope.row.bankDeposit }} - {{ scope.row.bankDepositBranch }}
           </template> 
         </el-table-column> -->
-        <el-table-column prop="payeeName" label="收款人姓名" width="150"> </el-table-column>
-        <el-table-column prop="seller" label="操作" width="150">
+        <el-table-column prop="payeeName" label="收款人姓名" > </el-table-column>
+        <el-table-column prop="seller" label="操作" width="200">
           <template slot-scope="scope">
             <el-button
               size="medium"
@@ -86,6 +86,7 @@
               @click="customerEdit(scope.row)"
               >编辑</el-button
             >
+             <el-divider direction="vertical"></el-divider>
             <el-button
               size="medium"
               type="text"
@@ -336,16 +337,17 @@ export default {
   position: relative;
   font-size: 14px;
 }
-.record:after {
-  position: absolute;
-  content: '';
-  display: block;
-  top: 5px;
-  right: -2px;
-  width: 1px;
-  height: 12px;
-  background: #e9ecf7;
-}
+// .record:after {
+//   position: absolute;
+//   content: '';
+//   display: block;
+//   top: 5px;
+//   right: -2px;
+//   width: 1px;
+//   height: 12px;
+//   background: #e9ecf7;
+// }
+
 //状态样式
 .executory,
 .inExecution,
@@ -382,23 +384,7 @@ export default {
 /deep/.el-table tr th.is-leaf:first-child {
   border-left: 1px solid #e9ecf7;
 }
-.record,
-.adjustment {
-  display: inline-block;
-  color: #5878e8;
-  padding: 0 4px !important;
-  position: relative;
-}
-.record:after {
-  position: absolute;
-  content: '';
-  display: block;
-  top: 5px;
-  right: -2px;
-  width: 1px;
-  height: 12px;
-  background: #e9ecf7;
-}
+
 .el-row {
   height: 60px;
 }

src/views/houseSelfCollect/inspectInfo.vue

@@ -27,19 +27,24 @@
                 <ws-option v-for="item in getbinNumberList" :key="item.value" :label="item.value" :value="item.value" />
               </ws-select>
             </ws-form-item>
-            <ws-form-item label="客户" span="1" prop="customerName">
-              <el-select v-model="inspect.customerName" clearable filterable  placeholder="请选择" class="typeselect" @change="customerChange"
-                :disabled="disabled1">
-                <el-option v-for="item in customerList" :key="item.valueKey" :label="item.value" :value="item.value" />
-              </el-select>
-            </ws-form-item>
+            
             <ws-form-item label="囤位号" span="1" prop="storageTagNo">
               <ws-input v-model="inspect.storageTagNo" placeholder="请输入囤位号" maxlength="15" size="small"
                 :disabled="disabled" />
             </ws-form-item>
             <ws-form-item label="车牌号" span="1" prop="carNumber">
-              <ws-input v-model="inspect.carNumber" placeholder="请输入车牌号" maxlength="10" size="small"
-                :disabled="disabled" />
+              <el-select v-model="inspect.carNumber" clearable filterable  placeholder="请选择" class="typeselect" @change="shipperNameChange"
+                :disabled="disabled1">
+                <el-option v-for="(item,index) in carNumberList" :key="index" :label="item.carNo" :value="index" />
+              </el-select>
+              <!-- <ws-input v-model="inspect.carNumber" placeholder="请输入车牌号" maxlength="10" size="small"
+                :disabled="disabled" /> -->
+            </ws-form-item>
+            <ws-form-item label="客户" span="1" prop="customerName">
+              <el-select v-model="inspect.customerName" clearable filterable  placeholder="请选择" class="typeselect" @change="customerChange"
+                :disabled="disabled1">
+                <el-option v-for="item in customerList" :key="item.valueKey" :label="item.value" :value="item.value" />
+              </el-select>
             </ws-form-item>
             <ws-form-item label="箱号-1" span="1" prop="boxNo">
             <ws-input :disabled="disabled" v-model="inspect.boxNo" placeholder="请输入箱号" maxlength="20"
@@ -58,8 +63,7 @@
               size="small" />
           </ws-form-item>
             <ws-form-item label="货名" span="1" prop="goodsName">
-              <ws-select v-model="inspect.goodsName" placeholder="" class="typeselect" :disabled="disabled1"
-                @change="waterContentChange">
+              <ws-select v-model="inspect.goodsName" placeholder="" class="typeselect" :disabled="disabledName" @change="waterContentChange">
                 <ws-option v-for="item in goodNameList" :key="item.goodsName" :label="item.goodsName"
                   :value="item.goodsName" />
               </ws-select>
@@ -169,7 +173,8 @@
     getinspectEdit,
     getamount,
     getCount,
-    getDryGrainPrice
+    getDryGrainPrice,
+    getshippinginfo
   } from '@/model/houseSelfCollect/index'
    import {
     packList
@@ -195,9 +200,11 @@
           paramType:1,
           type:'潮粮'
         },
+        carNumberList:[],
         disabled: false,
         disabled1: false,
         disabled2: false,
+        disabledName:false,
         types: '1',
         information: '添加初检',
         goodNameList: [],
@@ -247,18 +254,22 @@
       if (this.types == 2) {
         this.disabled = true
         this.disabled1 = true
+        this.disabledName = true
         this.information = '查看质检'
       } else if (this.types == 3) {
         this.disabled = false
         this.disabled1 = true
+        this.disabledName = true
         this.information = '编辑初检'
       }else if (this.types == 4) {
         this.disabled = true
         this.disabled1 = true
+        this.disabledName = true
         this.information = '编辑复检'
       }else if (this.types == 5) {
         this.disabled = false
         this.disabled1 = true
+        this.disabledName = false
         this.information = '确认质检'
       }
       else{
@@ -751,6 +762,47 @@
         })
 
       },
+      shipperNameChange(e){
+        this.$set(this.inspect,'customerName',this.carNumberList[e].shipperName)
+        this.$set(this.inspect,'carNumber',this.carNumberList[e].carNo)
+        this.$set(this.inspect,'customerPhone',this.carNumberList[e].shipperPhone)
+        for (let i = 0; i < this.customerList1.length; i++) {
+          if(this.customerList1[i].customerName==this.inspect.customerName){
+            this.inspect.customerNumberCard=this.customerList1[i].customerNumberCard
+          }
+        }
+        if(this.inspect.goodsName && this.inspect.customerName){
+          // //查看当前用户对应货名有未结算状态的送货
+        let count = 0
+        getCount({
+          compId: localStorage.getItem('ws-pf_compId'),
+          customerName: this.inspect.customerName,
+          goodsName: this.inspect.goodsName,
+          customerNumberCard:this.inspect.customerNumberCard
+        })  .toPromise()
+          .then((response) => {
+               count = response
+          })
+          //  客户下拉校验
+        getamount({
+          compId: localStorage.getItem('ws-pf_compId'),
+          customerName: this.inspect.customerName,
+          goodsName: this.inspect.goodsName,
+          customerNumberCard:this.inspect.customerNumberCard
+        })
+          .toPromise()
+          .then((response) => {
+            for (let i = 0; i < this.purchasePriceList.length; i++) {
+              if (this.inspect.goodsName == this.purchasePriceList[i].goodsName) {
+                if ((this.purchasePriceList[i].saleLimit - response/1000 < 50 || count > 0)&&this.tipFlag) {
+                  this.tipFlag = false
+                  this.$message('当前客户已累计销售我司' +this.inspect.goodsName + (response/1000).toFixed(2) +'吨，最高可售' +this.purchasePriceList[i].saleLimit +'吨。');
+                }
+              }
+            }
+          })
+        }
+      },
       customerChange(e) {
         let customers = e.split('(')
         this.inspect.customerName = customers[0]
@@ -933,6 +985,10 @@
               })
             }
           })
+          getshippinginfo({compId: localStorage.getItem('ws-pf_compId'),warehouseName:this.warehouseName}).toPromise()
+          .then((response) => {
+            this.carNumberList=response
+          })
         // 仓位
         getbinNumber({
             id: this.cangid

src/views/warehouse/warehouseManagementList.vue

@@ -433,11 +433,14 @@ export default {
         var strDate = date.getDate()
         this.parameter.startDate = ""+year+"-"+month+"-"+(strDate-1)
         this.parameter.endDate = ""+year+"-"+month+"-"+strDate
-      this.isShowPrintType = true
+        this.$forceUpdate();
+        this.isShowPrintType = true
     },
     removePrint(){
+      this.parameter.warehouseName = ""
+      this.parameter.proportion = ""
         this.isShowPrintType = false
-        this.parameter = {}
+        
     },
     async submitClick(){
       if(!this.parameter.radio && this.headerText == "打印记录"){
@@ -518,13 +521,11 @@ export default {
                   if(increment > 0){
                     let index = Math.round(Math.random()*response1.length - 1)
                     let pro = response1[index]  //取出假数据并设定值
-                    
-                    //  pro.inOutDate = warehousePrint[Math.round(Math.random()* warehousePrint.length - 1)].inOutDate
-                    //  pro.contractNo = warehousePrint[Math.round(Math.random()* warehousePrint.length - 1)].contractNo
-                    //  pro.companyName = warehousePrint[Math.round(Math.random()* warehousePrint.length - 1)].companyName
-                    //  pro.goodsName = warehousePrint[Math.round(Math.random()* warehousePrint.length - 1)].goodsName + "1"
-                    //  pro.boxNo = warehousePrint[Math.round(Math.random()* warehousePrint.length - 1)].boxNo
-                  console.log(warehousePrint)
+                     pro.inOutDate = warehousePrint[Math.round(Math.random()* warehousePrint.length - 1)].inOutDate
+                     pro.contractNo = warehousePrint[Math.round(Math.random()* warehousePrint.length - 1)].contractNo
+                     pro.companyName = warehousePrint[Math.round(Math.random()* warehousePrint.length - 1)].companyName
+                     pro.goodsName = warehousePrint[Math.round(Math.random()* warehousePrint.length - 1)].goodsName 
+                     pro.boxNo = warehousePrint[Math.round(Math.random()* warehousePrint.length - 1)].boxNo
                     pro.netWeight = Number((Math.random()*(70-10+1)+10).toFixed(2))
                      pro.tare = Number((Math.random()*(20-10+1)+10).toFixed(2))
                     pro.grossWeight = Number((pro.tare + pro.netWeight).toFixed(2))
@@ -532,11 +533,11 @@ export default {
                          increment = (increment - pro.netWeight).toFixed(2)  //所要增的量
                         if(increment < 10 && pro.netWeight <= 60){
                         pro.netWeight += Number(increment)
-                                 pro.grossWeight = Number((pro.tare + pro.netWeight).toFixed(2))
+                        pro.grossWeight = Number((pro.tare + pro.netWeight).toFixed(2))
                         increment = 0
                          warehousePrint.push(pro)
                           }else{
-                              warehousePrint.push(pro)
+                          warehousePrint.push(pro)
                           }
                       }else{
                           pro.netWeight = Number(increment.toFixed(2))