暂存

src/SDrpManagement/agentOrder/details/index.vue

@@ -168,17 +168,17 @@ export default {
           }
         },
         {
-          label:'折前金额',
-          value:this.mainData.defaultamount,
+          label:'折后金额',
+          value:this.mainData.amount,
           style:function () {
             let style = {color:"#ff0000"}
             return style
           }
         },
-        {
+        /*{
           label:'企业名称',
           value:this.mainData.enterprisename
-        },
+        },*/
         {
           label:'备注',
           value:this.mainData.remarks

src/SDrpManagement/agentOrder/details/tabs/defaultInfo.vue

@@ -5,7 +5,7 @@
       <el-descriptions-item label="账户名称">{{ mainData.accountclass?mainData.accountclass.accountname:"--" }}</el-descriptions-item>
       <el-descriptions-item label="使用金额">{{ mainData.accountclass?mainData.accountclass.amount:"--" }}</el-descriptions-item>
       <el-descriptions-item label="是否使用返利金">{{ mainData.accountclass?mainData.accountclass.rebate_used ? '是' : '否' : '--' }}</el-descriptions-item>
-      <el-descriptions-item label="返利金使用金额">{{ mainData.accountclass?mainData.accountclass.rebate_amount:"--" }}</el-descriptions-item>
+      <el-descriptions-item label="返利金使用金额">{{ mainData.rebateamount?mainData.rebateamount:"--" }}</el-descriptions-item>
     </el-descriptions>
     <el-descriptions  class="normal-margin" border :column="2" labelClassName="my-label" contentClassName="my-content">
       <div slot="title" class="my-label__title">开票信息</div>

src/SDrpManagement/agentOrder/modules/edit.vue

@@ -45,7 +45,8 @@
             <div v-if="checked" class="flex-align-center">
               <p class="inline-16"><b>返利金余额:{{tool.formatAmount(defaultData.rebatebalance,2)}}</b></p>
               <el-input class="inline-16" size="mini" style="width:150px" v-model="rebateamount" @blur="useRebate" placeholder="输入使用金额"></el-input>
-              <small>(返利金最高使用比例{{data.order_rebate_userate}},本单上限:{{tool.formatAmount(data.amount * data.order_rebate_userate / 100,2)}})</small>
+              <small>(返利金最高使用比例{{data.order_rebate_userate}})</small>
+<!--              <small>(返利金最高使用比例{{data.order_rebate_userate}},本单上限:{{tool.formatAmount(data.amount * data.order_rebate_userate / 100,2)}})</small>-->
             </div>
           </div>
         </div>

src/SDrpManagement/shopCart/modules/list.vue

@@ -37,46 +37,61 @@
       <el-table-column
         prop="itemname"
         label="产品名称"
-        width="180">
+        width="150">
       </el-table-column>
       <el-table-column
         prop="itemno"
         label="产品编号"
-        width="180">
+        width="150">
+      </el-table-column>
+      <el-table-column
+          label="型号">
+        <template slot-scope="scope">
+          <p><span>{{scope.row.model.length >10?scope.row.model.substring(0,9) + '...':scope.row.model}}</span></p>
+        </template>
       </el-table-column>
       <el-table-column
+          label="规格">
+        <template slot-scope="scope">
+          <p><span>{{scope.row.spec.length >10?scope.row.spec.substring(0,9) + '...':scope.row.spec}}</span></p>
+        </template>
+      </el-table-column>
+<!--      <el-table-column
         label="型号/规格">
         <template slot-scope="scope">
           <p><span>{{scope.row.model}}</span>&nbsp;/&nbsp;<span>{{scope.row.spec}}</span></p>
         </template>
-      </el-table-column>
+      </el-table-column>-->
       <el-table-column
         prop="gradeprice"
-        label="单价">
+        label="单价"
+        width="90">
         <template slot-scope="scope">
           <p style="color:red;font-weight:500">¥&nbsp;{{tool.formatAmount(scope.row.gradeprice,2)}}</p>
         </template>
       </el-table-column>
       <el-table-column
         label="数量"
-        width="200">
+        width="150">
         <template slot-scope="scope">
         <el-input-number size="mini" v-model="scope.row.qty" :min="scope.row.orderminqty" :step="scope.row.orderaddqty" label="输入数量" @change="qtyChange"></el-input-number>
         </template>
       </el-table-column>
       <el-table-column
-        label="计量单位">
+        label="计量单位"
+        width="80">
         <template slot-scope="scope">
           <el-tag>{{ scope.row.unitname }}</el-tag>
         </template>
       </el-table-column>
       <el-table-column
-        label="金额">
+        label="金额"
+        width="80">
         <template slot-scope="scope">
           <p style="color:red;font-weight:500">¥&nbsp;{{tool.formatAmount(scope.row.gradeprice * scope.row.qty,2)}}</p>
         </template>
       </el-table-column>
-      <el-table-column width="90">
+      <el-table-column width="90" label="操作">
         <template slot-scope="scope">
           <slot name="del" :data="scope.row"></slot>
         </template>