【修改】

bug
家用工程订单

src/views/supply/engin/components/home_form.vue

@@ -561,6 +561,9 @@ export default {
 
     // 工程登录列表 - 打开弹窗
     openShareDetail() {
+      if(!this.mainForm.saleType) {
+        return this.$errorMsg('请先选择销售类型');
+      }
       this.isShowDialog = true;
       this.dialogTable_currentPage = 1;
       this.getHomeLoginList();
@@ -587,12 +590,15 @@ export default {
 
     // 选择工程登录
     chooseItem(id) {
-      getHomeLoginDetail({recordNo: id}).then(res => {
+      getHomeLoginDetail({
+        recordNo: id,
+        saleTypeId: this.mainForm.saleType,
+      }).then(res => {
         this.isShowDialog = false;
         let data = res.data;
         this.mainForm.type = data.productCategory;
         this.mainForm.loginUserId = data.userid
-        this.mainForm.saleType = '';
+        // this.mainForm.saleType = '';
         this.mainForm.loginNum = data.recordNo;
         this.mainForm.enginName = data.projectName;
         this.mainForm.loginType = data.promiseStatus;

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

@@ -75,10 +75,10 @@
         <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="price" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="数量" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="数量" prop="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="订单金额" prop="totalAmount" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="返利类型" prop="customerWalletName2" min-width="160" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="返利金额" prop="rebateAmount" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="返利金额" prop="payRebateAmount" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="格力折扣" prop="totalDiscAmount" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="现金钱包" prop="customerWalletName" min-width="160" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="实付金额" prop="payAmount" min-width="100" show-overflow-tooltip></el-table-column>