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

src/views/platformaudit/saletransactioninformationreview.vue

@@ -67,7 +67,7 @@
         <el-table-column prop="plannedSaleVolume" label="重量（吨）" > </el-table-column>
         <el-table-column prop="salePlanType" label="交易类型" > </el-table-column>
         <el-table-column prop="basisPrice" label="基差(元/吨)" > </el-table-column>
-        <el-table-column prop="unitPrice" label="价格(元/吨)" > </el-table-column>
+        <el-table-column prop="salePrice" label="价格(元/吨)" > </el-table-column>
         <el-table-column prop="sellerPhone" label="电话" > </el-table-column>
         <el-table-column prop="updateDate" label="更新时间" width="140"> </el-table-column>
         <el-table-column prop="" label="操作" width="180">

src/views/platformaudit/transactioninformationreview.vue

@@ -67,7 +67,7 @@
         <el-table-column prop="plannedPurchaseVolume" label="重量（吨）" > </el-table-column>
         <el-table-column prop="procurementPlanType" label="交易类型" > </el-table-column>
         <el-table-column prop="basisPrice" label="基差(元/吨)" > </el-table-column>
-        <el-table-column prop="unitPrice" label="价格(元/吨)" > </el-table-column>
+        <el-table-column prop="procurementPrice" label="价格(元/吨)" > </el-table-column>
         <el-table-column prop="buyerPhone" label="电话" > </el-table-column>
         <el-table-column prop="updateDate" label="更新时间" width="140"> </el-table-column>
         <el-table-column prop="" label="操作" width="180">

src/views/purchasingManagement/procurementPlanList.vue

@@ -92,17 +92,17 @@
           <div v-else>—</div>
         </template>
       </el-table-column>
-      <el-table-column class="table_td" prop="unitPrice" label="单价(元/吨)">
+      <el-table-column class="table_td" prop="procurementPrice" label="单价(元/吨)">
         <template slot-scope="scope">
           <div v-if="scope.row.procurementPlanType == '现货'">
             <div class="inputChenge">
               <!-- readonly -->
               <el-input
-                v-model="scope.row.unitPrice"
+                v-model="scope.row.procurementPrice"
                 v-if="scope.row.identification == 'true'"
               ></el-input>
               <div v-if="scope.row.identification == 'false'" class="inputs">
-                {{ scope.row.unitPrice }}
+                {{ scope.row.procurementPrice }}
               </div>
             </div>
             <img
@@ -588,7 +588,7 @@ export default {
           .then(() => {
             procurementEditOther({
               flag: 2,
-              unitPrice: row.unitPrice,
+              procurementPrice: row.procurementPrice,
               id: row.id,
             })
               .toPromise()

src/views/salesManagement/salesPlanList.vue

@@ -88,17 +88,17 @@
           <div v-else>—</div>
         </template>
       </el-table-column>
-      <el-table-column class="table_td" prop="unitPrice" label="单价(元/吨)">
+      <el-table-column class="table_td" prop="salePrice" label="单价(元/吨)">
         <template slot-scope="scope">
           <div v-if="scope.row.salePlanType == '现货'">
             <div class="inputChenge">
               <!-- readonly -->
               <el-input
-                v-model="scope.row.unitPrice"
+                v-model="scope.row.salePrice"
                 v-if="scope.row.identification == 'true'"
               ></el-input>
               <div v-if="scope.row.identification == 'false'" class="inputs">
-                {{ scope.row.unitPrice }}
+                {{ scope.row.salePrice }}
               </div>
             </div>
             <img
@@ -570,13 +570,13 @@ export default {
       }
       if(row.salePlanType == '现货'){
         if (
-        row.unitPrice > 100000 ||
-        row.unitPrice < 1 ||
-        (String(row.unitPrice).indexOf(
+        row.salePrice > 100000 ||
+        row.salePrice < 1 ||
+        (String(row.salePrice).indexOf(
           '.'
         ) != -1 &&
-          String(row.unitPrice).length -
-            (String(row.unitPrice).indexOf(
+          String(row.salePrice).length -
+            (String(row.salePrice).indexOf(
               '.'
             ) +
               1) >
@@ -624,7 +624,7 @@ export default {
           .then(() => {
             saleEditOther({
               flag: 2,
-              unitPrice: row.unitPrice,
+              salePrice: row.salePrice,
               id: row.id,
             })
               .toPromise()