【修改】发货申请单加字段

src/views/supply/apply/apply_list.vue

@@ -77,18 +77,43 @@
           </div>
         </div>
         <div class="table">
-          <el-table v-loading="listLoading" :data="dataList" element-loading-text="Loading" border fit highlight-current-row stripe>
+          <el-table 
+            v-loading="listLoading" 
+            :data="dataList" 
+            element-loading-text="Loading" 
+            border 
+            fit 
+            highlight-current-row 
+            stripe
+            show-summary
+            :summary-method="$getSummaries">
             <el-table-column align="center" label="发货申请单" prop="id" min-width="180" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="发货申请日期" prop="createTime" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="仓库" prop="correspondName" min-width="120" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="订单号" prop="mainOrderId" min-width="200" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="经销商编码" prop="customerNumber" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="订单号" prop="mainOrderId" min-width="140" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="经销商编码" prop="customerNumber" min-width="120" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="经销商名称" prop="customerName" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="产品编码" prop="materialCode" min-width="140" 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="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="已退数量" prop="retiredQty" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="规格型号" prop="specification" min-width="200" 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="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="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="right" label="数量" prop="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="right" label="已退数量" prop="retiredQty" 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="createBy" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="制单日期" prop="createTime" min-width="160" show-overflow-tooltip></el-table-column>
@@ -258,6 +283,10 @@ export default {
         examineStatus: this.screenForm.status,
       };
       getApplyList(params).then((res) => {
+        res.data.records.forEach(item => {
+          item.sums1 = ['refundableQty', 'retiredQty'];
+          item.sums2 = ['payAmount', 'payRebateAmount', 'totalDiscAmount'];
+        })
         this.dataList = res.data.records;
         this.listTotal = res.data.total;
         this.listLoading = false;

src/views/supply/apply/engin_list.vue

@@ -77,20 +77,45 @@
           </div>
         </div>
         <div class="table">
-          <el-table v-loading="listLoading" :data="dataList" element-loading-text="Loading" border fit highlight-current-row stripe>
+          <el-table 
+            v-loading="listLoading" 
+            :data="dataList" 
+            element-loading-text="Loading" 
+            border 
+            fit 
+            highlight-current-row 
+            stripe
+            show-summary
+            :summary-method="$getSummaries">
             <el-table-column align="center" label="发货申请单" prop="id" min-width="180" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="发货申请日期" prop="createTime" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="仓库" prop="correspondName" min-width="120" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="订单号" prop="enginOrderNo" min-width="200" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="订单号" prop="enginOrderNo" min-width="140" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="工程登录编码" prop="refEnginRecordNo" min-width="200" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="工程名称" prop="refProjectName" min-width="120" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="使用单位" prop="refUseUnit" min-width="120" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="经销商编码" prop="customerNumber" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="经销商编码" prop="customerNumber" min-width="120" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="经销商名称" prop="customerName" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="产品编码" prop="materialCode" min-width="140" 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="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="规格型号" prop="specification" min-width="200" 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="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="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="right" label="数量" prop="refundableQty" 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="createBy" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="制单日期" prop="createTime" min-width="160" show-overflow-tooltip></el-table-column>
@@ -260,6 +285,10 @@ export default {
         examineStatus: this.screenForm.status,
       };
       getEnginList(params).then((res) => {
+        res.data.records.forEach(item => {
+          item.sums1 = ['refundableQty'];
+          item.sums2 = ['payAmount', 'payRebateAmount', 'totalDiscAmount'];
+        })
         this.dataList = res.data.records;
         this.listTotal = res.data.total;
         this.listLoading = false;

src/views/supply/pickup/check.vue

@@ -9,35 +9,35 @@
       <div>
         <el-form ref="screenForm" :model="screenForm" label-width="96px" size="small" label-position="right">
           <el-row :gutter="20">
-            <el-col :xs="24" :sm="12" :lg="6">
+            <el-col :xs="24" :sm="8" :lg="6">
               <el-form-item label="提货人手机号" prop="phone">
                 <el-input v-model="screenForm.phone" placeholder="请输入提货人手机号"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :xs="24" :sm="12" :lg="3">
+            <el-col :xs="24" :sm="3" :lg="3">
               <el-button size="small" type="primary" @click="getCode" :disabled="!screenForm.phone || countDown != 60">{{countDown == 60 ? getCodeText : '重新获取('+countDown+'s)'}}</el-button>
             </el-col>
-            <el-col :xs="24" :sm="12" :lg="8">
+            <el-col :xs="24" :sm="8" :lg="8">
               <el-form-item label="验证码" prop="code">
                 <el-input v-model="screenForm.code" placeholder="请输入验证码"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :xs="24" :sm="12" :lg="3">
+            <el-col :xs="24" :sm="3" :lg="3">
               <el-button size="small" type="primary" :disabled="!screenForm.phone || !screenForm.code" @click="getPickupManInfo">确 认</el-button>
             </el-col>
           </el-row>
           <el-row :gutter="20">
-            <el-col :xs="24" :sm="12" :lg="9">
+            <el-col :xs="24" :sm="11" :lg="9">
               <el-form-item label="提货人姓名" prop="name">
                 <el-input v-model="screenForm.name" placeholder="请通过手机验证获取" readonly></el-input>
               </el-form-item>
             </el-col>
-            <el-col :xs="24" :sm="12" :lg="8">
+            <el-col :xs="24" :sm="8" :lg="8">
               <el-form-item label="提货人身份证" prop="idCard">
                 <el-input v-model="screenForm.idCard" placeholder="请通过手机验证获取" readonly></el-input>
               </el-form-item>
             </el-col>
-            <el-col :xs="24" :sm="12" :lg="3">
+            <el-col :xs="24" :sm="3" :lg="3">
               <el-button size="small" type="primary" @click="getList">查 询</el-button>
             </el-col>
           </el-row>

src/views/supply/reserve/components/reserve_detail.vue

@@ -53,7 +53,7 @@
           <el-table-column align="center" label="经销商编码" prop="customerId" min-width="160" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="经销商名称" prop="customerName" min-width="160" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="物料代码" prop="materialOldNumber" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="产品编码" prop="materialNumber" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="产品编码" prop="materialCode" min-width="160" 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>