lilei 2 gadi atpakaļ
vecāks
revīzija
8c7acf570b

+ 10 - 3
src/views/salesReturnManagement/custConfirm/setPriceModal.vue

@@ -52,7 +52,7 @@
         <a-divider>请给以下产品设置新的退货单价</a-divider>
         <!-- 搜索条件 -->
         <div>
-          <a-form layout="inline" style="margin-bottom:10px;" @keyup.enter.native="searchProduct">
+          <a-form layout="inline" style="margin-bottom:10px;float:left;" @keyup.enter.native="searchProduct">
             <a-form-item label="产品编码">
               <a-input id="setPrice-productCode" v-model.trim="queryParam.productCode" placeholder="请输入产品编码" allowClear />
             </a-form-item>
@@ -64,6 +64,7 @@
               <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="setPrice-reset">重置</a-button>
             </a-form-item>
           </a-form>
+          <div style="float:right;color:#999;margin-top:10px;">说明:红色行表示收货时新增的产品;黄色表示客服确认时新增的产品</div>
         </div>
         <!-- 表格数据 -->
         <s-table
@@ -71,6 +72,7 @@
           ref="table"
           size="small"
           :rowKey="(record) => record.id"
+          :rowClassName="(record, index) => record.addFlag == '1' ? (record.addType == 'WAREHOUSE_RECEIVE'?'redBg-row':'orgBg-row'):''"
           :columns="columns"
           :data="loadData"
           :scroll="{ y: 400 }"
@@ -132,8 +134,7 @@ export default {
         { title: '坏件数量', dataIndex: 'badQty', align: 'center', width: '10%', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '良品数量', dataIndex: 'goodQty', align: 'center', width: '10%', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '返库数量', dataIndex: 'backStockQty', align: 'center', width: '10%', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '实际退货单价', dataIndex: 'price', align: 'center', width: '10%', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '实际退货金额', dataIndex: 'totalAmount', align: 'center', width: '10%', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '退货单价', dataIndex: 'price', align: 'center', width: '10%', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '退货单价说明', dataIndex: 'priceRemark', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '退货原因', dataIndex: 'returnReasonDictValue', width: '15%', align: 'center', customRender: function (text) { return text || '--' } }
       ],
@@ -266,5 +267,11 @@ export default {
         }
       }
     }
+    .redBg-row{
+      background-color: #f5beb4;
+    }
+    .orgBg-row{
+      background-color: #fffca2;
+    }
   }
 </style>