合同调整

src/HDrpManagement/contractManage/components/productList/addProduct.vue

@@ -216,7 +216,7 @@ export default {
                 "qty": data.qty,
                 "marketprice":data.marketprice,
                 "discountrate":data.discountrate,
-                "type":'折扣系数'
+                "type":'指定单价'
               }
             ]
         },
@@ -254,7 +254,8 @@ export default {
           "price": item.price,
           "qty": item.qty,
           "marketprice":item.marketprice,
-          "discountrate":item.discountrate
+          "discountrate":item.discountrate,
+          "type":'指定单价'
         }
       })
       console.log(item,'批量添加')

src/HDrpManagement/contractManage/components/toolList/addTool.vue

@@ -126,7 +126,8 @@ export default {
                 "itemid": data.itemid,
                 "price": data.marketprice,
                 "qty": 1,
-                "marketprice":data.marketprice
+                "marketprice":data.marketprice,
+                "type":'指定单价'
               }
             ]
         },
@@ -143,7 +144,8 @@ export default {
           "itemid": item.itemid,
           "price": item.marketprice,
           "qty": 1,
-          "marketprice":item.marketprice
+          "marketprice":item.marketprice,
+          "type":'指定单价'
         }
       })
       let res = await this.$api.requested({

src/SDrpManagement/QuotedPrice/detail/modules/productInventory/index.vue

@@ -221,7 +221,7 @@
             width="80"
             fixed="right">
           <template slot-scope="scope">
-            <i class="el-icon-check" v-if="scope.row.specialoffer === 1"  style="color: red;font-size: 20px"></i>
+            <i class="el-icon-check" v-if="scope.row.discountDifferenceAmount < 0"  style="color: red;font-size: 20px"></i>
             <p v-else>--</p>
           </template>
         </el-table-column>

src/components/productTable/indexQty.vue

@@ -92,7 +92,7 @@
       </el-table-column>
       <el-table-column
           prop="qty"
-          label="数量"
+          label="数量111"
           fixed="right"
           width="100">
         <template slot-scope="scope">
@@ -120,6 +120,9 @@
           <div v-else-if="scope.row.discountDifferenceAmount < 0 ">
             <p><span :style="[setDownColor]">{{Math.round((scope.row.discountrate * 100) * 100)/100}}</span></p>
           </div>
+          <div v-else>
+            <p><span >{{Math.round((scope.row.discountrate * 100) * 100)/100}}</span></p>
+          </div>
         </template>
       </el-table-column>
       <el-table-column
@@ -143,6 +146,9 @@
           <div v-else-if="(scope.row.discountDifferenceAmount < 0 )" >
             <p><span :style="[setDownColor]">{{tool.formatAmount(scope.row.price,2)}}</span></p>
           </div>
+          <div v-else>
+            <p><span >{{tool.formatAmount(scope.row.price,2)}}</span></p>
+          </div>
         </template>
       </el-table-column>
       <el-table-column
@@ -160,7 +166,16 @@
           fixed="right"
           width="80">
         <template slot-scope="scope">
-          <span >{{scope.row.amount?tool.formatAmount(scope.row.amount,2):'--'}}</span>
+          <div v-if="(scope.row.discountDifferenceAmount > 0)">
+            <p><span :style="[setTopColor]">{{tool.formatAmount(scope.row.amount,2)}}</span></p>
+          </div>
+          <div v-else-if="(scope.row.discountDifferenceAmount < 0 )" >
+            <p><span :style="[setDownColor]">{{tool.formatAmount(scope.row.amount,2)}}</span></p>
+          </div>
+          <div v-else>
+            <p><span >{{tool.formatAmount(scope.row.amount,2)}}</span></p>
+          </div>
+<!--          <span >{{scope.row.amount?tool.formatAmount(scope.row.amount,2):'&#45;&#45;'}}</span>-->
         </template>
       </el-table-column>
       <el-table-column
@@ -169,7 +184,7 @@
           fixed="right"
           width="100">
         <template slot-scope="scope">
-          <i class="el-icon-check" v-if="scope.row.specialoffer === 1"  style="color: red;font-size: 20px"></i>
+          <i class="el-icon-check" v-if="scope.row.discountDifferenceAmount < 0"  style="color: red;font-size: 20px"></i>
           <p v-else>--</p>
         </template>
       </el-table-column>