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

src/views/houseSelfCollect/acquisitionManagementAdd.vue

@@ -298,7 +298,6 @@
           this.baseInfoForm.warehouseName = this.$route.query.warehouseName
           this.baseInfoForm.compId = this.$route.query.compId
           this.type = this.$route.query.type
-          console.log(this.baseInfoForm)
 
           this.priceList[0].detailList[0].water = this.baseInfoForm.waterMin
           this.priceList[0].detailList[2].water = this.baseInfoForm.waterBase
@@ -365,7 +364,6 @@
         purchasePriceLook({
           id: this.baseInfoForm.id
         }).toPromise().then((response) => {
-          console.log(response)
           this.baseInfoForm = response
           //构造查看priceList数据
           this.priceList = []
@@ -714,11 +712,11 @@
           }
           return false
         }
-        // console.log(this.priceList.length)
-        // if (this.priceList.length != 4) {
-        //   this.$message.error('粮价设置为4个等级！');
-        //   return false
-        // }
+        console.log(this.priceList.length)
+        if (this.checkList.length != 4) {
+          this.$message.error('粮价设置为4个等级！');
+          return false
+        }
         for (let i = 0; i < this.priceList.length; i++) {
           let _item = this.priceList[i]
           if (_item.basicUnitPrice == '' || _baseWaterValidate(0, 50, 2, '', "deductWeight", parseFloat(_item

src/views/outboundManagement/collectionManagement.vue

@@ -3,9 +3,18 @@
   <div>
     <BaseHeaderLayout :leftSpan="12">
       <template slot="left">
-        <ws-button type="primary">待收款</ws-button>
-        <ws-button type="primary">已收款</ws-button>
-        <ws-button type="primary">全部</ws-button>
+        <ws-button 
+            :type="searchType == 3 ? 'primary' : ''"
+            @click="handlestatus(3)"
+        >待收款</ws-button>
+        <ws-button 
+            :type="searchType == 4 ? 'primary' : ''"
+            @click="handlestatus(4)"
+        >已收款</ws-button>
+        <ws-button 
+            :type="searchType == '' ? 'primary' : ''"
+            @click="handlestatus('')"
+        >全部</ws-button>
         <ws-button type="primary" @click="adopt">备注</ws-button>
         <ws-button type="primary" @click="collect">收款</ws-button>
       </template>
@@ -14,6 +23,7 @@
           style="text-align: right; line-height: 60px; padding-right: 10px"
           :span="8"
         >
+        <div class="el-input el-input--small el-input--suffix">
           <el-select
             v-model="contractNo"
             placeholder="请选择合同"
@@ -25,6 +35,7 @@
             type="input"
             class="findValue"
           >
+       
             <el-option
               v-if="item.listStatus"
               v-for="item in options"
@@ -40,6 +51,7 @@
               :value="item.contractNo"
             />
           </el-select>
+             </div>
         </el-col>
       </template>
     </BaseHeaderLayout>
@@ -376,6 +388,10 @@ export default {
     whether(row) {
       row.identification = 'true'
     },
+    handlestatus(status) {
+      this.searchType = status
+      this.getList()
+    },
     // ,relationId :row.relationId
     collectment(index,row) {
       this.$router.push({ path: 'collectionment', 
@@ -392,9 +408,7 @@ export default {
         this.$message.warning('请选择一条要收款的条目')
       } else {
         for (var i = 0; i < this.modification.length; i++) {
-          this.allmoney1 += 
-          // this.modification[i].amountNotCollectable
-          this.modification[i].actualCollectionment - this.modification[i].amountEdPayable
+          this.allmoney1 += this.modification[i].actualCollectionment - this.modification[i].amountEdCollectionable
         }
         this.collectForm = true
       }
@@ -601,5 +615,18 @@ export default {
 .inputs {
   margin: 0 auto;
 }
+.el-col-8 {
+    width: 33.33333%;
+}
+/deep/.findValue .el-input__inner {
+  border-top-right-radius: 0px;
+  border-bottom-right-radius: 0px;
+  width: 385px;
+}
+/deep/.el-select .el-input .el-input--small .el-input--suffix {
+    display: block;
+    font-size: 13px;
+    margin-left: -67px;
+}
 </style>
 

src/views/outboundManagement/collectionment.vue

@@ -38,7 +38,7 @@
             </ws-form-item>
             <ws-form-item label="仓位号" span="1" prop="binNumber">
               <ws-input
-              v-model="collectionList.binNumber" 
+              v-model="collectionList.weighingManagement.binNumber" 
                 placeholder="请输入仓位号"
                 maxlength="100"
                 size="small"
@@ -53,9 +53,9 @@
                 size="small" 
                 disabled />
             </ws-form-item>
-            <ws-form-item label="囤位号" span="1" prop="storageTagNo">
+            <ws-form-item label="囤位号" span="1" prop="storageNumber">
               <ws-input 
-              v-model="collectionList.storageTagNo" 
+              v-model="collectionList.weighingManagement.storageNumber" 
               placeholder="请输入囤位号" maxlength="100" size="small" disabled />
             </ws-form-item>
             <ws-form-item label="单价(元/公斤)" span="1" prop="contractPrice">
@@ -161,7 +161,7 @@ export default {
         contractNo:'',
         binNumber:'',
         carNo:'',
-        storageTagNo:'',
+        storageNumber:'',
         contractPrice:'',
         weighingManagement:{},
         qualityInspectionManagement:{}
@@ -193,7 +193,7 @@ export default {
       .toPromise()
       .then((response) => {
           this.collectionList = response
-          this.qualityInspectionManagement = response
+          // this.qualityInspectionManagement = response
           // this.paymentList.qualityInspectionManagement.waterMin=this.$route.query.waterMin
           // this.paymentList.qualityInspectionManagement.weightDeduction=(this.paymentList.qualityInspectionManagement.waterContent-this.paymentList.qualityInspectionManagement.waterMin)*this.paymentList.buckleWeightRatio
           // this.paymentList.base=(100-this.paymentList.qualityInspectionManagement.weightDeduction)/100

src/views/platformaudit/grainpulseenterprisereview.vue

@@ -591,7 +591,7 @@ export default {
         })
         return
       }
-      if (this.companyList1.mainBusinessType.length<2) {
+      if (this.companyList1.mainBusinessType.length<1) {
         this.$message({
           message: '至少选择一个主营类型',
           type: 'warning',