12-2 bug

src/api/engin_deposit/refund_list.js

@@ -81,3 +81,12 @@ export function secondRefund(params) {
     data: params
   })
 }
+
+// 工程订单列表统计
+export function getDepositCountList(params) {
+  return request({
+    url: '/deposit-manage/count-list',
+    method: 'get',
+    params
+  })
+}

src/api/supply/engin.js

@@ -494,3 +494,12 @@ export function delItem(params) {
     params
   })
 }
+
+// 工程订单列表统计
+export function getEnginCountList(params) {
+  return request({
+    url: '/engin-order/count-list',
+    method: 'get',
+    params
+  })
+}

src/views/deposit_commerce/refund_list.vue

@@ -464,6 +464,13 @@
                 <span>{{ scope.row.confirmName }}</span>
               </template>
             </el-table-column>
+            <el-table-column
+              align="left"
+              label="资料审核日期"
+              prop="refDatumAcceptDate"
+              min-width="160"
+              show-overflow-tooltip
+            />
             <el-table-column align="right" label="金额" prop="totalPrice" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.totalPrice | numToFixed }}

src/views/deposit_home/refund_list.vue

@@ -270,6 +270,10 @@
           </template>
         </Collapse>
       </div>
+      <ul class="ulStyle">
+        <li class="title">金额：<span class="num">{{numSum.amountC || 0}}</span></li>
+        <li class="title">数量：<span class="num">{{numSum.totalC || 0}}</span></li>
+      </ul>
       <!-- 按钮 -->
       <div class="btn-group clearfix">
         <div class="fl">
@@ -478,6 +482,13 @@
                 <span>{{ scope.row.confirmName }}</span>
               </template>
             </el-table-column>
+            <el-table-column
+              align="left"
+              label="资料审核日期"
+              prop="refDatumAcceptDate"
+              min-width="160"
+              show-overflow-tooltip
+            />
             <el-table-column align="right" label="金额" prop="totalPrice" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.totalPrice | numToFixed }}
@@ -547,7 +558,8 @@ import {
   getDepositManageList,
   getDepositManageDate,
   getDepositManagExport,
-  secondRefund
+  secondRefund,
+  getDepositCountList
 } from '@/api/engin_deposit/refund_list'
 import { downloadFiles, handleImport } from '@/utils/util'
 import ExamineDialog from '@/components/Common/examine-dialog'
@@ -642,7 +654,8 @@ export default {
       examineForm: {
         status: 'OK',
         remark: ''
-      }
+      },
+      numSum:{}
     }
   },
   computed: {
@@ -651,6 +664,11 @@ export default {
     }
   },
   created() {
+    getDepositCountList({
+      enginOrderType: this.enginOrderType
+    }).then(res=>{
+      this.numSum = res.data
+    })
     this.getDataList({
       pageSize: this.pageSize,
       pageNum: this.currentPage,
@@ -935,4 +953,20 @@ export default {
     margin: 0 20px;
   }
 }
+.ulStyle{
+  list-style: none;
+  margin: 0;
+  padding: 10px 0;
+  background-color: #ffffff;
+  z-index: 1;
+}
+.title{
+  display: inline-block;
+  font-weight: 700;
+  margin-right: 20px;
+}
+.num{
+  padding-left: 6px;
+  font-weight: 400;
+}
 </style>

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

@@ -271,6 +271,41 @@
             <el-table-column align="left" label="业务员" prop="serviceName" min-width="100" show-overflow-tooltip />
           </el-table>
         </div>
+        <div class="table" style="margin-top: 20px" v-if="detailData.examineStatus =='OK'">
+          <el-table
+            :data="detailData.refundNoteList"
+            element-loading-text="Loading"
+            border
+            fit
+            highlight-current-row
+            stripe
+            max-height="400"
+            show-summary
+            :summary-method="$getSummaries"
+          >
+            <el-table-column align="center" label="序号" type="index" width="50"></el-table-column>
+            <el-table-column
+              align="left"
+              label="创建人"
+              prop="createBy"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="left"
+              label="创建时间"
+              prop="createTime"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="left"
+              label="退订说明"
+              prop="refundNote"
+              show-overflow-tooltip
+            ></el-table-column>
+
+          </el-table>
+        </div>
+
       </div>
 
       <div class="page-footer">

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

@@ -383,6 +383,41 @@
             ></el-table-column>
           </el-table>
         </div>
+        <div class="table" style="margin-top: 20px" v-if="detailData.examineStatus =='OK'">
+          <el-table
+            :data="detailData.refundNoteList"
+            element-loading-text="Loading"
+            border
+            fit
+            highlight-current-row
+            stripe
+            max-height="400"
+            show-summary
+            :summary-method="$getSummaries"
+          >
+            <el-table-column align="center" label="序号" type="index" width="50"></el-table-column>
+            <el-table-column
+              align="left"
+              label="创建人"
+              prop="createBy"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="left"
+              label="创建时间"
+              prop="createTime"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="left"
+              label="退订说明"
+              prop="refundNote"
+              show-overflow-tooltip
+            ></el-table-column>
+
+          </el-table>
+        </div>
+
       </div>
 
       <div class="page-footer">

src/views/supply/engin/home_list.vue

@@ -203,7 +203,10 @@
           </template>
         </Collapse>
       </div>
-
+      <ul class="ulStyle">
+        <li class="title">金额：<span class="num">{{numSum.amountC || 0}}</span></li>
+        <li class="title">数量：<span class="num">{{numSum.totalC || 0}}</span></li>
+      </ul>
       <div class="mymain-container">
         <div class="btn-group clearfix">
           <div class="fl">
@@ -592,7 +595,7 @@
 </template>
 
 <script>
-import { getOrderList, applyHome, withdrawHome, deleteHome, editDateHome, abandonHome } from '@/api/supply/engin'
+import { getOrderList, applyHome, withdrawHome, deleteHome, editDateHome, abandonHome,getEnginCountList } from '@/api/supply/engin'
 import { getSalesmanList, getTypeList } from '@/api/common'
 import HomeDetail from '@/views/supply/engin/components/home_detail'
 import HomeForm from '@/views/supply/engin/components/home_form'
@@ -685,7 +688,8 @@ export default {
       isCollapse: true,
       salesTypeList: [],
       NoRebateWalletList: [],
-      typeList: []
+      typeList: [],
+      numSum:{}
     }
   },
 
@@ -736,6 +740,9 @@ export default {
     this.getSalesTypeList()
     this.getSalesmanList()
     this.getList()
+    getEnginCountList().then(res=>{
+      this.numSum = res.data
+    })
   },
 
   methods: {
@@ -787,7 +794,6 @@ export default {
         endCreateTime: this.screenForm.date ? this.screenForm.date[1] : '',
         startOrderTime: this.screenForm.orderTime ? this.screenForm.orderTime[0] : '',
         endOrderTime: this.screenForm.orderTime ? this.screenForm.orderTime[1] : '',
-        saleTypeId: this.screenForm.saleType,
         createName: this.screenForm.createMan,
         confirmName: this.screenForm.examineMan,
         serviceId: this.screenForm.salesMan,
@@ -807,6 +813,7 @@ export default {
         refPromiseProvide: this.screenForm.refPromiseProvide,
         enginOrderType: 'HOME' // TRADE=商用 HOME=家用
       }
+
       getOrderList(params).then(res => {
         res.data.records.forEach(item => {
           item.sums1 = ['qty', 'directTransferQty', 'hasSendQty']
@@ -816,6 +823,7 @@ export default {
         this.listTotal = res.data.total
         this.listLoading = false
       })
+
     },
 
     // 提交筛选表单
@@ -946,7 +954,6 @@ export default {
     // 提交 修改订单日期
     submitDateForm() {
       editDateHome({
-        refEnginRecordNo: this.screenForm.loginNum,
         enginOrderId: this.editId,
         orderDate: this.dateForm.date + ' 00:00:00',
         refEnginRecordNo: this.screenForm.loginNum
@@ -960,4 +967,21 @@ export default {
 }
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.ulStyle{
+  list-style: none;
+  margin: 0;
+  padding: 10px 0;
+  background-color: #ffffff;
+  z-index: 1;
+}
+.title{
+  display: inline-block;
+  font-weight: 700;
+  margin-right: 20px;
+}
+.num{
+  padding-left: 6px;
+  font-weight: 400;
+}
+</style>

src/views/supply/implement/implement_list.vue

@@ -342,7 +342,7 @@
               show-overflow-tooltip
             >
               <template v-slot="{row}">
-                {{row.qty - (row.refundQty || 0)}}
+                {{row.qty - (row.refundableQty || 0)}}
               </template>
             </el-table-column>
             <el-table-column

src/views/supply/implement/implement_total_list.vue

@@ -361,7 +361,7 @@
               show-overflow-tooltip
             >
               <template v-slot="{row}">
-                {{row.qty - (row.refundQty || 0)}}
+                {{row.qty - (row.refundableQty || 0)}}
               </template>
             </el-table-column>
             <el-table-column