1

src/views/purchasingManagement/procurementPlanAdd.vue

@@ -172,7 +172,6 @@
             <el-input
               v-model="dataList.buyerPhone"
               filterable
-              type="number"
               :filter-method="dataFilter"
               placeholder="请输入买方电话"
             ></el-input>
@@ -190,7 +189,7 @@
             <el-input v-model="dataList.waterContent" class="typeselect" placeholder="请输入水分占比" />
             <span class="unchangeable">*</span>
           </el-form-item>
-          <el-form-item label="容重(g/l)<=" span="1" prop="bulkDensity" >
+          <el-form-item label="容重(g/l)>=" span="1" prop="bulkDensity" >
             <el-input v-model="dataList.bulkDensity" class="typeselect" placeholder="请输入容重" />
             <span class="unchangeable">*</span>
           </el-form-item>
@@ -206,7 +205,7 @@
           <el-form-item label="不完善粒（%）<=" span="1" prop="imperfectGrain">
             <el-input v-model="dataList.imperfectGrain" maxlength="120" placeholder="请输入不完善粒占比" />
           </el-form-item>
-          <el-form-item label="蛋白（%）<=" span="1" prop="protein">
+          <el-form-item label="蛋白（%）>=" span="1" prop="protein">
             <el-input v-model="dataList.protein" class="typeselect" placeholder="请输入蛋白占比" />
           </el-form-item>
           <ws-form-item label="粒型" span="1" prop="grain">

src/views/purchasingManagement/procurementPlanEdit.vue

@@ -224,7 +224,7 @@
           </el-form-item>
 
           <!-- 容重 -->
-          <el-form-item label="容重(g/l)<=" span="1" prop="bulkDensity">
+          <el-form-item label="容重(g/l)>=" span="1" prop="bulkDensity">
             <el-input
               v-model="dataList.bulkDensity"
               class="typeselect"
@@ -263,7 +263,7 @@
             />
           </el-form-item>
           <!-- 蛋白（%）<= -->
-          <el-form-item label="蛋白（%）<=" span="1" prop="protein">
+          <el-form-item label="蛋白（%）>=" span="1" prop="protein">
             <el-input
               v-model="dataList.protein"
               class="typeselect"

src/views/purchasingManagement/procurementPlanLook.vue

@@ -102,7 +102,7 @@
             <el-input disabled v-model="dataList.waterContent" class="typeselect" />
           </el-form-item>
           <!-- 容重 -->
-          <el-form-item label="容重(g/l)<=">
+          <el-form-item label="容重(g/l)>=">
             <el-input disabled v-model="dataList.bulkDensity" class="typeselect" />
           </el-form-item>
           <!-- 热损伤 -->
@@ -122,7 +122,7 @@
             <el-input disabled v-model="dataList.imperfectGrain" maxlength="120" />
           </el-form-item>
           <!-- 蛋白（%）<= -->
-          <el-form-item label="蛋白（%）<=" span="1">
+          <el-form-item label="蛋白（%）>=" span="1">
             <el-input v-model="dataList.protein" placeholder class="typeselect" disabled />
           </el-form-item>
           <!--粒形-->

src/views/purchasingManagement/purchaseOrderList.vue

@@ -712,7 +712,7 @@
             class="deal"
           ></el-input>
         </el-form-item>
-        <el-form-item label="基差(元/吨)" :label-width="formLabelWidth">
+        <el-form-item v-if='aduitlist.procurementPlanType=="期货"' label="基差(元/吨)" :label-width="formLabelWidth">
           <el-input
             v-model="aduitlist.basis"
             autocomplete="off"
@@ -728,7 +728,7 @@
             class="deal"
           ></el-input>
         </el-form-item>
-        <el-form-item label="卸车费用(元/吨)" :label-width="formLabelWidth">
+        <el-form-item v-if='aduitlist.procurementPlanType=="期货"' label="卸车费用(元/吨)" :label-width="formLabelWidth">
           <el-input
             v-model="aduitlist.unloadingCharge"
             autocomplete="off"
@@ -1426,6 +1426,7 @@ export default {
       this.$set(this.aduitlist, 'totalDeposit', item.customerInfo.totalDeposit)
     },
     aduitconfirm() {
+      debugger
       if (!this.aduitlist.unitPrice) {
         this.$message({
           message: '单价不能为空！',
@@ -1475,8 +1476,9 @@ export default {
         })
         return
       }
-      if (
-        (this.aduitlist.basis &&
+      if(this.aduitlist.procurementPlanType != '现货'){
+        if (
+        (!this.aduitlist.basis &&
           String(this.aduitlist.basis).indexOf('.') != -1 &&
           String(this.aduitlist.basis).length -
             (String(this.aduitlist.basis).indexOf('.') + 1) >
@@ -1491,7 +1493,7 @@ export default {
         return
       }
       if (
-        (this.aduitlist.unloadingCharge &&
+        (!this.aduitlist.unloadingCharge &&
           String(this.aduitlist.unloadingCharge).indexOf('.') != -1 &&
           String(this.aduitlist.unloadingCharge).length -
             (String(this.aduitlist.unloadingCharge).indexOf('.') + 1) >
@@ -1505,14 +1507,15 @@ export default {
         })
         return
       }
-      this.aduitlist.unloadingCharge = '-' + this.aduitlist.unloadingCharge
-      this.aduitlist.basis = '-' + this.aduitlist.basis
+      }
       this.aduitlist.procurementPlanType = this.aduitlist.procurementPlanType
        if (this.aduitlist.procurementPlanType == '期货') {
            this.aduitlist.freezingDeposit = this.aduitlist.transactionsNumber*this.aduitlist.depositRatio
            if(this.aduitlist.invoiceFee){
              this.aduitlist.invoiceFee=-Math.abs(this.aduitlist.invoiceFee)
            }
+            this.aduitlist.unloadingCharge = '-' + this.aduitlist.unloadingCharge
+            this.aduitlist.basis = '-' + this.aduitlist.basis
        }
       this.dialogFormVisible4 = false
       this.$confirm(`审核通过后，将通知客户订单生效，是否确定通过审核？`, {

src/views/salesManagement/salesPlanAdd.vue

@@ -209,7 +209,6 @@
             <el-input
               v-model="dataList.sellerPhone"
               filterable
-              type="number"
               :filter-method="dataFilter"
               placeholder="请输入卖方电话"
             ></el-input>
@@ -231,7 +230,7 @@
             />
             <span class="unchangeable">*</span>
           </el-form-item>
-          <el-form-item label="容重(g/l)<=" span="1" prop="bulkDensity" >
+          <el-form-item label="容重(g/l)>=" span="1" prop="bulkDensity" >
             <el-input
               v-model="dataList.bulkDensity"
               class="typeselect"
@@ -266,7 +265,7 @@
               placeholder="请输入不完善粒占比"
             />
           </el-form-item>
-          <el-form-item label="蛋白（%）<=" span="1" prop="protein">
+          <el-form-item label="蛋白（%）>=" span="1" prop="protein">
             <el-input
               v-model="dataList.protein"
               class="typeselect"

src/views/salesManagement/salesPlanEdit.vue

@@ -195,7 +195,7 @@
             <el-input v-model="dataList.waterContent" class="typeselect" placeholder="请输入水分占比" />
           </el-form-item>
           <!-- 容重 -->
-          <el-form-item label="容重(g/l)<=" span="1" prop="bulkDensity">
+          <el-form-item label="容重(g/l)>=" span="1" prop="bulkDensity">
             <el-input v-model="dataList.bulkDensity" class="typeselect" placeholder="请输入容重" />
           </el-form-item>
           <!-- 热损伤 -->
@@ -215,7 +215,7 @@
             <el-input v-model="dataList.imperfectGrain" maxlength="120" placeholder="请输入不完善粒占比" />
           </el-form-item>
           <!-- 蛋白（%）<= -->
-          <el-form-item label="蛋白（%）<=" span="1" prop="protein">
+          <el-form-item label="蛋白（%）>=" span="1" prop="protein">
             <el-input v-model="dataList.protein" class="typeselect" placeholder="请输入蛋白占比" />
           </el-form-item>
           <!--粒型-->

src/views/salesManagement/salesPlanLook.vue

@@ -102,7 +102,7 @@
             <el-input disabled v-model="dataList.waterContent" class="typeselect" />
           </el-form-item>
           <!-- 容重 -->
-          <el-form-item label="容重(g/l)<=">
+          <el-form-item label="容重(g/l)>=">
             <el-input disabled v-model="dataList.bulkDensity" class="typeselect" />
           </el-form-item>
           <!-- 热损伤 -->
@@ -122,7 +122,7 @@
             <el-input disabled v-model="dataList.imperfectGrain" maxlength="120" />
           </el-form-item>
           <!-- 蛋白（%）<= -->
-          <el-form-item label="蛋白（%）<=" span="1">
+          <el-form-item label="蛋白（%）>=" span="1">
             <el-input v-model="dataList.protein" placeholder class="typeselect" disabled />
           </el-form-item>
           <!--粒形-->

src/views/salesManagement/salesPlanOrderList.vue

@@ -1572,8 +1572,9 @@ export default {
         })
         return
       }
-      if (
-        (this.aduitlist.salePlanType == '期货' &&
+      if(this.aduitlist.salePlanType != '现货'){
+         if (
+        (
           this.aduitlist.basis &&
           String(this.aduitlist.basis).indexOf('.') != -1 &&
           String(aduitlist.basis).length -
@@ -1590,7 +1591,7 @@ export default {
         return
       }
       if (
-        (this.aduitlist.invoiceFee &&
+        (this.aduitlist.invoiceFee && 
           String(this.aduitlist.invoiceFee).indexOf('.') != -1 &&
           String(aduitlist.invoiceFee).length -
             (String(this.aduitlist.invoiceFee).indexOf('.') + 1) >
@@ -1604,6 +1605,7 @@ export default {
         })
         return
       }
+      }
       if (this.aduitlist.salePlanType == '期货') {
         this.aduitlist.basis = '+' + this.aduitlist.basis
       }

src/views/warehouse/warehouseManagementAdd.vue

@@ -99,9 +99,9 @@
           />
         </ws-form-item>
 
-        <!--总吨量（吨）-->
+        <!--总储量（吨）-->
         <ws-form-item
-          label="总吨量（吨）"
+          label="总储量（吨）"
           span="1"
           prop="settlementMethod"
           v-show="radio == 1"
@@ -833,7 +833,7 @@ export default {
   background: #fff;
 }
 /deep/.ws-info-table .el-form-item .el-form-item__label {
-  width: 100px;
+  width: 115px;
   text-align: center;
   background: #fff;
   // border: 1px solid #cdd2dc;