Finish Hotfix-mo-91

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

@@ -29,14 +29,18 @@
             <div class="label">单据状态</div>
             <div class="value">{{detailData.examineStatus | statusFilter}}</div>
           </el-col>
-          <el-col :span="16" class="item">
-            <div class="label">备注</div>
-            <div class="value">{{detailData.remark}}</div>
-          </el-col>
           <el-col :span="8" class="item">
             <div class="label">业务员</div>
             <div class="value">{{detailData.k3ServiceName}}</div>
           </el-col>
+          <el-col :span="16" class="item">
+            <div class="label">文件编号</div>
+            <div class="value">{{detailData.fileNo}}</div>
+          </el-col>
+          <el-col :span="24" class="item">
+            <div class="label">备注</div>
+            <div class="value">{{detailData.remark}}</div>
+          </el-col>
           <el-col :span="8" class="item">
             <div class="label">制单人</div>
             <div class="value">{{detailData.createName}}</div>

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

@@ -20,14 +20,18 @@
           <div class="label">单据状态</div>
           <div class="value">{{detailData.examineStatus | statusFilter}}</div>
         </el-col>
-        <el-col :span="16" class="item">
-          <div class="label">备注</div>
-          <div class="value">{{detailData.remark}}</div>
-        </el-col>
         <el-col :span="8" class="item">
           <div class="label">业务员</div>
           <div class="value">{{detailData.k3ServiceName}}</div>
         </el-col>
+        <el-col :span="16" class="item">
+          <div class="label">文件编号</div>
+          <div class="value">{{detailData.fileNo}}</div>
+        </el-col>
+        <el-col :span="24" class="item">
+          <div class="label">备注</div>
+          <div class="value">{{detailData.remark}}</div>
+        </el-col>
         <el-col :span="8" class="item">
           <div class="label">制单人</div>
           <div class="value">{{detailData.createName}}</div>

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

@@ -49,7 +49,12 @@
             <el-input v-model="mainForm.jxsName" placeholder="请输入经销商名称" disabled></el-input>
           </el-form-item>
         </el-col>
-        <el-col :xs="24" :sm="24" :lg="24">
+        <el-col :xs="24" :sm="12" :lg="8">
+          <el-form-item label="文件编号" prop="fileNum">
+            <el-input v-model="mainForm.fileNum" placeholder="请输入文件编号"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :xs="24" :sm="12" :lg="16">
           <el-form-item label="表头备注" prop="remark">
             <el-input v-model="mainForm.remark" placeholder="请输入表头备注"></el-input>
           </el-form-item>
@@ -83,18 +88,18 @@
           </template>
         </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="price" min-width="100" show-overflow-tooltip>
+        <el-table-column align="right" label="单价" prop="price" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-input v-model="scope.row.price" size="small" type="number" v-if="listItem && !isDealer"></el-input>
             <div v-else>{{scope.row.price}}</div>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="数量" prop="qty" min-width="100" show-overflow-tooltip>
+        <el-table-column align="right" label="数量" prop="qty" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-input v-model="scope.row.qty" size="small" type="number"></el-input>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="订单金额" min-width="100" show-overflow-tooltip>
+        <el-table-column align="right" label="订单金额" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             {{scope.row.price * scope.row.qty}}
           </template>
@@ -111,12 +116,17 @@
             </el-select>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="使用返利金额" min-width="120" show-overflow-tooltip>
+        <el-table-column align="right" label="可用返利" min-width="100" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{scope.row.rebateAmount}}
+          </template>
+        </el-table-column>
+        <el-table-column align="right" label="使用返利金额" min-width="120" show-overflow-tooltip>
           <template slot-scope="scope">
             {{(scope.row.price * scope.row.qty * (scope.row.rebateRate * 100)) / 100}}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="格力折扣" min-width="100" show-overflow-tooltip>
+        <el-table-column align="right" label="格力折扣" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             {{scope.row.qty * scope.row.discAmount}}
           </template>
@@ -133,7 +143,7 @@
             </el-select>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="实付金额" prop="qty" min-width="100" show-overflow-tooltip>
+        <el-table-column align="right" label="实付金额" prop="qty" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             {{((scope.row.price * scope.row.qty) * 100 - ((scope.row.price * scope.row.qty * (scope.row.rebateRate * 100)) / 100) * 100 - ((scope.row.qty * (scope.row.discAmount * 100)) / 100) * 100) / 100}}
           </template>
@@ -143,7 +153,7 @@
             <el-checkbox v-model="scope.row.isDirectTransfer"></el-checkbox>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="直调数量" prop="directTransferQty" min-width="100"></el-table-column>
+        <el-table-column align="right" label="直调数量" prop="directTransferQty" min-width="100"></el-table-column>
         <el-table-column align="center" label="备注" prop="remark" min-width="160">
           <template slot-scope="scope">
             <el-input v-model="scope.row.remark" size="small"></el-input>
@@ -315,6 +325,7 @@ export default {
         // type: '',
         jxsNum: '',
         jxsName: '',
+        fileNum: '',
         remark: '',
         salesMan: '',
       },
@@ -436,6 +447,7 @@ export default {
         this.mainForm.salesMan = data.k3ServiceId;
         this.mainForm.jxsNum = data.customerNumber;
         this.mainForm.jxsName = data.customerName;
+        this.mainForm.fileNum = data.fileNo;
         this.mainForm.remark = data.remark;
         data.retailOrderItemList.forEach(item => {
           item.status1 = '';
@@ -651,8 +663,10 @@ export default {
       if(this.goodsList[index].customerWalletId2) {
         let obj = this.goodsList[index].rebateWallets.find(o => o.customerWalletId == this.goodsList[index].customerWalletId2);
         this.goodsList[index].rebateRate = obj.rebateRate;
+        this.goodsList[index].rebateAmount = obj.amount;
       }else {
         this.goodsList[index].rebateRate = '';
+        this.goodsList[index].rebateAmount = '';
       }
     },
 
@@ -717,6 +731,7 @@ export default {
             // mainName,
             k3ServiceId: this.mainForm.salesMan,
             k3ServiceName: saleManItem.nickName,
+            fileNo: this.mainForm.fileNum,
             remark: this.mainForm.remark,
             type: 1, // 1:普通零售单，2:政策零售单
             retailOrderItemList: goodsList

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

@@ -20,14 +20,18 @@
           <div class="label">单据状态</div>
           <div class="value">{{detailData.examineStatus | statusFilter}}</div>
         </el-col>
-        <el-col :span="16" class="item">
-          <div class="label">备注</div>
-          <div class="value">{{detailData.remark}}</div>
-        </el-col>
         <el-col :span="8" class="item">
           <div class="label">业务员</div>
           <div class="value">{{detailData.k3ServiceName}}</div>
         </el-col>
+        <el-col :span="16" class="item">
+          <div class="label">文件编号</div>
+          <div class="value">{{detailData.fileNo}}</div>
+        </el-col>
+        <el-col :span="24" class="item">
+          <div class="label">备注</div>
+          <div class="value">{{detailData.remark}}</div>
+        </el-col>
         <el-col :span="8" class="item">
           <div class="label">制单人</div>
           <div class="value">{{detailData.createName}}</div>