Merge remote-tracking branch 'origin/develop' into hotfix/Hotfix-zh-175

src/views/supply/retail/components/retail_detail.vue

@@ -84,25 +84,25 @@
           show-summary
           :summary-method="$getSummaries">
           <el-table-column align="center" label="序号" type="index" width="50"></el-table-column>
-          <el-table-column align="center" label="销售类型" prop="saleTypeName" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="物料编码" prop="materialCode" min-width="120" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="产品编码" prop="materialOldNumber" min-width="120" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="文件编号" prop="fileNo" min-width="100" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="销售类型" prop="saleTypeName" min-width="100" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="物料编码" prop="materialCode" min-width="120" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="产品编码" prop="materialOldNumber" min-width="120" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="文件编号" prop="fileNo" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="right" label="单价" prop="price" min-width="100" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ scope.row.price | numToFixed }}
             </template>
           </el-table-column>
-          <el-table-column align="right" label="数量" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
+          <el-table-column align="right" label="数量" prop="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="right" label="订单金额" prop="totalAmount" min-width="100" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ scope.row.totalAmount | numToFixed }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="返利类型" prop="customerWalletName2" min-width="140" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="返利类型" prop="customerWalletName2" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="right" label="返利金额" prop="payRebateAmount" min-width="100" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ scope.row.payRebateAmount | numToFixed }}
@@ -113,21 +113,21 @@
               {{ scope.row.totalDiscAmount | numToFixed }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="现金钱包" prop="customerWalletName" min-width="140" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="现金钱包" prop="customerWalletName" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="right" label="实付金额" prop="payAmount" min-width="100" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ scope.row.payAmount | numToFixed }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="是否直调" prop="isDirectTransfer" min-width="100" show-overflow-tooltip>
+          <el-table-column align="left" label="是否直调" prop="isDirectTransfer" min-width="100" show-overflow-tooltip>
             <template slot-scope="scope">
-              {{scope.row.isDirectTransfer ? '是':'否'}}
+              {{ scope.row.isDirectTransfer ? "是" : "否" }}
             </template>
           </el-table-column>
           <el-table-column align="right" label="直调数量" prop="directTransferQty" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="right" label="原订单数量" prop="oldQty" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="税率" prop="tax" min-width="100" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="right" label="税率" prop="tax" min-width="100" show-overflow-tooltip></el-table-column>
         </el-table>
       </div>
 

src/views/supply/retail/components/retail_examine.vue

@@ -70,165 +70,51 @@
         show-summary
         :summary-method="$getSummaries"
       >
-        <el-table-column
-          align="center"
-          label="序号"
-          type="index"
-          width="50"
-        ></el-table-column>
-        <el-table-column
-          align="center"
-          label="销售类型"
-          prop="saleTypeName"
-          min-width="100"
-          show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column
-          align="center"
-          label="物料编码"
-          prop="materialCode"
-          min-width="120"
-          show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column
-          align="center"
-          label="产品编码"
-          prop="materialOldNumber"
-          min-width="120"
-          show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column
-          align="center"
-          label="产品名称"
-          prop="materialName"
-          min-width="160"
-          show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column
-          align="center"
-          label="规格型号"
-          prop="specification"
-          min-width="160"
-          show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column
-          align="center"
-          label="单位"
-          prop="unit"
-          min-width="100"
-          show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column
-          align="center"
-          label="文件编号"
-          prop="fileNo"
-          min-width="100"
-          show-overflow-tooltip
-        ></el-table-column>
-
-        <el-table-column
-          align="right"
-          label="单价"
-          prop="price"
-          min-width="100"
-          show-overflow-tooltip
-        >
+        <el-table-column align="center" label="序号" type="index" width="50"></el-table-column>
+        <el-table-column align="left" label="销售类型" prop="saleTypeName" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="left" label="物料编码" prop="materialCode" min-width="120" show-overflow-tooltip></el-table-column>
+        <el-table-column align="left" label="产品编码" prop="materialOldNumber" min-width="120" show-overflow-tooltip></el-table-column>
+        <el-table-column align="left" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>
+        <el-table-column align="left" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip></el-table-column>
+        <el-table-column align="left" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="left" label="文件编号" prop="fileNo" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="right" label="单价" prop="price" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.price | numToFixed }}
           </template>
         </el-table-column>
-        <el-table-column
-          align="right"
-          label="数量"
-          prop="refundableQty"
-          min-width="100"
-          show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column
-          align="right"
-          label="订单金额"
-          prop="totalAmount"
-          min-width="100"
-          show-overflow-tooltip
-        >
+        <el-table-column align="right" label="数量" prop="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="right" label="订单金额" prop="totalAmount" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.totalAmount | numToFixed }}
           </template>
         </el-table-column>
-        <el-table-column
-          align="center"
-          label="返利类型"
-          prop="customerWalletName2"
-          min-width="140"
-          show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column
-          align="right"
-          label="返利金额"
-          prop="rebateAmount"
-          min-width="100"
-          show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column
-          align="right"
-          label="格力折扣"
-          prop="totalDiscAmount"
-          min-width="100"
-          show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column
-          align="center"
-          label="现金钱包"
-          prop="customerWalletName"
-          min-width="140"
-          show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column
-          align="right"
-          label="实付金额"
-          prop="payAmount"
-          min-width="100"
-          show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column
-          align="center"
-          label="是否直调"
-          prop="isDirectTransfer"
-          min-width="100"
-          show-overflow-tooltip
-        >
+        <el-table-column align="left" label="返利类型" prop="customerWalletName2" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="right" label="返利金额" prop="payRebateAmount" min-width="100" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row.payRebateAmount | numToFixed }}
+          </template>
+        </el-table-column>
+        <el-table-column align="right" label="格力折扣" prop="totalDiscAmount" min-width="100" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row.totalDiscAmount | numToFixed }}
+          </template>
+        </el-table-column>
+        <el-table-column align="left" label="现金钱包" prop="customerWalletName" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="right" label="实付金额" prop="payAmount" min-width="100" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row.payAmount | numToFixed }}
+          </template>
+        </el-table-column>
+        <el-table-column align="left" label="是否直调" prop="isDirectTransfer" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.isDirectTransfer ? "是" : "否" }}
           </template>
         </el-table-column>
-        <el-table-column
-          align="right"
-          label="直调数量"
-          prop="directTransferQty"
-          min-width="100"
-          show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column
-          align="right"
-          label="原订单数量"
-          prop="oldQty"
-          min-width="100"
-          show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column
-          align="center"
-          label="备注"
-          prop="remark"
-          min-width="160"
-          show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column
-          align="center"
-          label="税率"
-          prop="tax"
-          min-width="100"
-          show-overflow-tooltip
-        ></el-table-column>
+        <el-table-column align="right" label="直调数量" prop="directTransferQty" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="right" label="原订单数量" prop="oldQty" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="left" label="备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
+        <el-table-column align="right" label="税率" prop="tax" min-width="100" show-overflow-tooltip></el-table-column>
       </el-table>
     </div>
 
@@ -323,21 +209,8 @@ export default {
       getDetail({ id: this.listItem.id }).then((res) => {
         if (res.data.retailOrderItemList) {
           res.data.retailOrderItemList.forEach((item) => {
-            item.sums1 = [
-              "directTransferQty",
-              "qty",
-              "refundableQty",
-              "oldQty",
-              "tdQty",
-            ];
-            item.sums2 = [
-              "totalAmount",
-              "payAmount",
-              "price",
-              "discAmount",
-              "totalDiscAmount",
-              "rebateAmount",
-            ];
+            item.sums1 = ['directTransferQty', 'qty', 'refundableQty', 'oldQty'];
+            item.sums2 = ['totalAmount', 'payAmount', 'price', 'payRebateAmount', 'discAmount', 'totalDiscAmount'];
           });
         }
         this.detailData = res.data;