暂存

src/HDrpManagement/orderManage/details/tabs/productlist.vue

@@ -139,24 +139,42 @@
             <el-tag size="mini" type="info" effect="plain">{{scope.row.unit}}</el-tag>
           </template>
         </el-table-column>
+        <el-table-column
+          prop="marketprice"
+          label="牌价"
+          width="100">
+        </el-table-column>
+        <el-table-column
+          prop="defaultprice"
+          label="折前价格"
+          width="100">
+        </el-table-column>
+        <el-table-column
+          prop="defaultamount"
+          label="折前金额"
+          width="100">
+          <template slot-scope="scope">
+            <p style="color:red;font-weight:500">¥&nbsp;{{tool.formatAmount(scope.row.defaultprice * scope.row.qty,2)}}</p>
+          </template>
+        </el-table-column>
         <el-table-column
           prop="price"
-          label="价格"
+          label="折后价格"
           width="100">
           <template slot-scope="scope">
             <el-input v-if="data.status === '新建' && data.type === '特殊订单'" v-model.number="scope.row.price" @input="onInput(scope.row,scope.$index)" placeholder="输入订单备注" size="mini" @change="rowChange(scope.row,scope.$index)"></el-input>
-            <p v-else style="color:red;font-weight:500">¥&nbsp;{{tool.formatAmount(scope.row.price,2)}}</p>
+            <p v-else>¥&nbsp;{{tool.formatAmount(scope.row.price,2)}}</p>
           </template>
         </el-table-column>
-        <el-table-column
+        <!-- <el-table-column
           label="折后价格"
           prop="totalprice">
           <template slot-scope="scope">
             <p style="color:red;font-weight:500">¥&nbsp;{{scope.row.price}}</p>
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column
-          label="小计"
+          label="折后金额"
           prop="totalprice">
           <template slot-scope="scope">
             <p style="color:red;font-weight:500">¥&nbsp;{{tool.formatAmount(scope.row.price * scope.row.qty,2)}}</p>

src/SDrpManagement/agentOrder/modules/productlist.vue

@@ -44,34 +44,36 @@
           <span v-else>{{scope.row.qty}}</span>
         </template>
       </el-table-column>
-      
+      <el-table-column
+        prop="marketprice"
+        label="牌价"
+        width="100">
+      </el-table-column>
       <el-table-column
         prop="defaultprice"
-        label="单价"
-        width="90">
-        <template slot-scope="scope">
-          <p style="color:red;font-weight:500">¥&nbsp;{{tool.formatAmount(scope.row.defaultprice,2)}}</p>
-        </template>
+        label="折前价格"
+        width="100">
       </el-table-column>
-        <el-table-column
-        label="金额"
-        width="150">
+      <el-table-column
+        prop="defaultamount"
+        label="折前金额"
+        width="100">
         <template slot-scope="scope">
-          <p style="color:red;font-weight:500">¥&nbsp;{{scope.row.defaultamount}}</p>
+          <p style="color:red;font-weight:500">¥&nbsp;{{tool.formatAmount(scope.row.defaultprice * scope.row.qty,2)}}</p>
         </template>
       </el-table-column>
       <el-table-column
         label="折后单价"
         prop="price">
         <template slot-scope="scope">
-          <p style="color:red;font-weight:500">¥&nbsp;{{scope.row.price}}</p>
+          <p>¥&nbsp;{{scope.row.price}}</p>
         </template>
       </el-table-column>
       <el-table-column
         label="折后金额"
         width="150">
         <template slot-scope="scope">
-          <p style="color:red;font-weight:500">¥&nbsp;{{scope.row.amount}}</p>
+          <p style="color:red;font-weight:500">¥&nbsp;{{tool.formatAmount(scope.row.price * scope.row.qty,2)}}</p>
         </template>
       </el-table-column>
       <el-table-column

src/SDrpManagement/salerOrder/modules/productlist.vue

@@ -96,23 +96,41 @@
           <el-tag size="mini" type="info" effect="plain">{{scope.row.unit}}</el-tag>
         </template>
       </el-table-column>
-      <el-table-column
+      <!-- <el-table-column
         prop="price"
         label="价格"
         width="90">
         <template slot-scope="scope">
           <p style="color:red;font-weight:500">¥&nbsp;{{tool.formatAmount(scope.row.price,2)}}</p>
         </template>
+      </el-table-column> -->
+      <el-table-column
+        prop="marketprice"
+        label="牌价"
+        width="100">
+      </el-table-column>
+      <el-table-column
+        prop="defaultprice"
+        label="折前价格"
+        width="100">
+      </el-table-column>
+      <el-table-column
+        prop="defaultamount"
+        label="折前金额"
+        width="100">
+        <template slot-scope="scope">
+          <p style="color:red;font-weight:500">¥&nbsp;{{tool.formatAmount(scope.row.defaultprice * scope.row.qty,2)}}</p>
+        </template>
       </el-table-column>
       <el-table-column
         label="折后价格"
         prop="totalprice">
         <template slot-scope="scope">
-          <p style="color:red;font-weight:500">¥&nbsp;{{scope.row.price}}</p>
+          <p>¥&nbsp;{{scope.row.price}}</p>
         </template>
       </el-table-column>
       <el-table-column
-        label="小计"
+        label="折后金额"
         width="150">
         <template slot-scope="scope">
           <p style="color:red;font-weight:500">¥&nbsp;{{tool.formatAmount(scope.row.price * scope.row.qty,2)}}</p>