Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc

src/views/houseSelfCollect/acquisitionManagement.vue

@@ -43,7 +43,7 @@
       </el-table-column>
       <el-table-column prop="waterBase" label="基准水分(%)"></el-table-column>
       <el-table-column prop="deductWeight" label="扣重比"></el-table-column>
-      <el-table-column prop="saleLimit" label="销量上限(年/吨)"></el-table-column>
+      <el-table-column prop="saleLimit" label="销量上限(吨/年)"></el-table-column>
       <el-table-column prop="dryGrainPrice" label="干粮收购价"></el-table-column>
       <el-table-column prop="status" label="状态">
         

src/views/outboundManagement/weighingManagementNew.vue

@@ -133,7 +133,7 @@
                           value-format="yyyy-MM-dd" />
                       </ws-form-item>
                       <ws-form-item label="运输方式" span="1" prop="outType">
-                        <el-select :disabled="tpyeNo == 2" v-model="weighingList.outType" placeholder="请选择运输方式">
+                        <el-select  v-model="weighingList.outType" placeholder="请选择运输方式">
                           <el-option v-for="item in multiSelector" :key="item.value" :label="item.name"
                             :value="item.name" />
                         </el-select>

src/views/taskManagement/supplyofgoods.vue

@@ -74,7 +74,7 @@
         </el-table-column>
         <el-table-column prop="surplusWeight" class="table_td" label="剩余重量（吨）"></el-table-column>
         <el-table-column prop="avgCost" class="table_td" label="平均成本（吨）"></el-table-column>
-        <el-table-column prop="issuingTime" class="table_td" label="入库单日期"></el-table-column>
+        <el-table-column prop="issuingTimeOther" class="table_td" label="入库单日期"></el-table-column>
         <el-table-column prop="outWeight" class="table_td" label="预计出库重量（吨）">
             <template slot-scope="scope">
                 <el-input @input='outweightchange' v-model="scope.row.estimateOutWarehouseWeight" placeholder="输入本次出库重量"></el-input>
@@ -387,31 +387,31 @@
       }
     },
       submit(){
-        for (let i = 0; i < this.multipleSelection.length; i++) {
-          if(!this.multipleSelection[i].estimateOutWarehouseWeight){
-              this.$message({
-              message: '预计出库重量不能为空',
-              type: 'error'
-              });
-              return
+        if(this.multipleSelection.length>0){
+          for (let i = 0; i < this.multipleSelection.length; i++) {
+            if(!this.multipleSelection[i].estimateOutWarehouseWeight){
+                this.$message({
+                message: '预计出库重量不能为空',
+                type: 'error'
+                });
+                return
 
+            }
+            if(this.multipleSelection[i].estimateOutWarehouseWeight>this.multipleSelection[i].surplusWeight){
+              this.$message({
+                message: '预计出库重量不能超过剩余重量',
+                type: 'error'
+                });
+                return
+            }
+            if(this.multipleSelection[i].estimateOutWarehouseWeight.indexOf('.')!=-1&&this.multipleSelection[i].estimateOutWarehouseWeight.substring(this.multipleSelection[i].estimateOutWarehouseWeight.indexOf('.')+1, this.multipleSelection[i].estimateOutWarehouseWeight.length).length>3){
+              this.$message({
+                message: '预计出库重量输入错误',
+                type: 'error'
+                });
+                return
+            } 
           }
-          if(this.multipleSelection[i].estimateOutWarehouseWeight>this.multipleSelection[i].surplusWeight){
-            this.$message({
-              message: '预计出库重量不能超过剩余重量',
-              type: 'error'
-              });
-              return
-          }
-          if(this.multipleSelection[i].estimateOutWarehouseWeight.indexOf('.')!=-1&&this.multipleSelection[i].estimateOutWarehouseWeight.substring(this.multipleSelection[i].estimateOutWarehouseWeight.indexOf('.')+1, this.multipleSelection[i].estimateOutWarehouseWeight.length).length>3){
-            this.$message({
-              message: '预计出库重量输入错误',
-              type: 'error'
-              });
-              return
-          }
-          
-        }
         var that=this
         this.$confirm(`确定提交货源信息？`, {
             confirmButtonText: '确定',
@@ -437,6 +437,12 @@
           //       // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
           //     })
           })
+        }else{
+          this.$message({
+            message: '未勾选货源',
+            type: 'warning'
+          });
+        }
       },
       returnsales(){
         this.$router.go(-1)

src/views/taskManagement/supplyofgoodsedit.vue

@@ -62,7 +62,7 @@
         </el-table-column>
         <el-table-column prop="surplusWeight" class="table_td" label="剩余重量（吨）"></el-table-column>
         <el-table-column prop="avgCost" class="table_td" label="平均成本（吨）"></el-table-column>
-        <el-table-column prop="issuingTime" class="table_td" label="入库单日期"></el-table-column>
+        <el-table-column prop="issuingTimeOther" class="table_td" label="入库单日期"></el-table-column>
         <el-table-column prop="outWeight" class="table_td" label="预计出库重量（吨）">
             <template slot-scope="scope">
                 <el-input  @input='outweightchange' v-model="scope.row.estimateOutWarehouseWeight" placeholder="输入本次出库重量"></el-input>

src/views/taskManagement/supplyofgoodslook.vue

@@ -29,7 +29,7 @@
         </el-table-column>
         <el-table-column prop="surplusWeight" class="table_td" label="剩余重量（吨）"></el-table-column>
         <el-table-column prop="avgCost" class="table_td" label="平均成本（吨）"></el-table-column>
-        <el-table-column prop="issuingTime" class="table_td" label="入库单日期"></el-table-column>
+        <el-table-column prop="issuingTimeOther" class="table_td" label="入库单日期"></el-table-column>
         <el-table-column prop="estimateOutWarehouseWeight" class="table_td" label="预计出库重量（吨）">
             <template slot-scope="scope">
                 <el-input disabled v-model="scope.row.estimateOutWarehouseWeight" placeholder="输入本次出库重量"></el-input>

src/views/warehousenew/warehouseManagementAdd.vue

@@ -64,7 +64,7 @@
             <ws-input v-model="item.binNumber" placeholder="请输入仓位编号" maxlength="20" size="small" />
           </ws-form-item>
           <ws-form-item label="容量（吨）" span="1" prop="contractNo">
-            <ws-input v-model="item.maxStorage" placeholder="请输入仓位最大容量" maxlength="100" size="small" />
+            <ws-input v-model="item.maxStorage" placeholder="请输入仓位最大容量" maxlength="6" size="small" />
           </ws-form-item>
           <!--备注（选项）-->
           <!-- <ws-form-item label="备注（选填）" span="1" prop="placeDelivery">