Finish Hotfix-mo-47

src/views/supply/implement/implement_list.vue

@@ -78,18 +78,27 @@
           </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="序号" type="index" width="50"></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="materialOldNumber" min-width="140" 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="theTime" min-width="160" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="销售订单" prop="id" min-width="200" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="销售订单" prop="id" 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="saleTypeName" min-width="100" 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="materialCode" 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="specification" min-width="200" show-overflow-tooltip></el-table-column>
             <el-table-column align="right" label="订单未发货数量" prop="refundableQty" min-width="120" show-overflow-tooltip></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="retiredQty" min-width="100" show-overflow-tooltip></el-table-column>
@@ -229,6 +238,10 @@ export default {
         enginRecordNo: this.screenForm.orderNum,
       };
       getList(params).then((res) => {
+        res.data.records.forEach(item => {
+          item.sums1 = ['refundableQty', 'qty', 'retiredQty', 'hasSendQty', 'directTransferQty'];
+          item.sums2 = ['payAmount', 'payRebateAmount', 'hasSendAmount', 'retiredAmount'];
+        })
         this.dataList = res.data.records;
         this.listTotal = res.data.total;
         this.listLoading = false;

src/views/supply/purchase/components/enter_detail.vue

@@ -37,28 +37,53 @@
       </div>
 
       <div class="table" style="margin-top: 20px; margin-bottom: 20px">
-        <el-table :data="detailData.kingDeePurchaseStockInItems" element-loading-text="Loading" border fit highlight-current-row stripe max-height="400">
+        <el-table
+          :data="detailData.kingDeePurchaseStockInItems"
+          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="center" label="存货编号" prop="materialNumber" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="存货名称" prop="materialName" min-width="180" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="规格型号" prop="model" min-width="120" 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="qty" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="原币含税单价" prop="taxPrice" min-width="120" 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="entryTaxAmount" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="原币价税合计" prop="billAllAmount" min-width="120" 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="140" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="规格型号" prop="uom" 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="auxUnitQty" min-width="100" show-overflow-tooltip></el-table-column>
+          <el-table-column align="right" label="原币含税单价" prop="taxPrice" min-width="120" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{scope.row.taxPrice | numToFixed}}
+            </template>
+          </el-table-column>
+          <el-table-column align="right" label="原币金额" prop="amount" min-width="100" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{scope.row.amount | numToFixed}}
+            </template>
+          </el-table-column>
+          <el-table-column align="right" label="原币税额" prop="entryTaxAmount" min-width="100" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{scope.row.entryTaxAmount | numToFixed}}
+            </template>
+          </el-table-column>
+          <el-table-column align="right" label="原币价税合计" prop="allAmount" min-width="120" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{scope.row.allAmount | numToFixed}}
+            </template>
+          </el-table-column>
           <el-table-column align="center" label="税率" prop="entryTaxRate" min-width="100" show-overflow-tooltip></el-table-column>
         </el-table>
       </div>
 
       <div class="diy-table-1">
         <el-row>
-          <el-col :span="8" class="item">
+          <el-col :span="12" class="item">
             <div class="label">制单人</div>
             <div class="value">{{detailData.createBy}}</div>
           </el-col>
-          <el-col :span="8" class="item">
+          <el-col :span="12" class="item">
             <div class="label">审核人</div>
             <div class="value">{{detailData.approverName}}</div>
           </el-col>
@@ -132,6 +157,12 @@ export default {
     // 获取详情
     getDetail() {
       getEnterDetail({id: this.listItem.id}).then(res => {
+        if(res.data.kingDeePurchaseStockInItems) {
+          res.data.kingDeePurchaseStockInItems.forEach(item => {
+            item.sums1 = ['auxUnitQty'];
+            item.sums2 = ['taxPrice', 'amount', 'entryTaxAmount', 'allAmount'];
+          })
+        }
         this.detailData = res.data;
       })
     },

src/views/supply/purchase/enter_list.vue

@@ -11,13 +11,13 @@
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="存货名称" prop="chName">
-                <el-input v-model="screenForm.chName" placeholder="请输入存货名称"></el-input>
+              <el-form-item label="产品名称" prop="chName">
+                <el-input v-model="screenForm.chName" placeholder="请输入产品名称"></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="存货编码" prop="chNum">
-                <el-input v-model="screenForm.chNum" placeholder="请输入存货编码"></el-input>
+              <el-form-item label="产品编码" prop="chNum">
+                <el-input v-model="screenForm.chNum" placeholder="请输入产品编码"></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
@@ -56,26 +56,51 @@
           </div>
         </div>
         <div class="table">
-          <el-table v-loading="listLoading" :data="dataList" element-loading-text="Loading" border fit highlight-current-row stripe>
-            <el-table-column align="center" label="入库单号" prop="billNo" min-width="160" show-overflow-tooltip></el-table-column>
+          <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="billNo" min-width="140" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="入库日期" prop="fdate" min-width="120" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{scope.row.fdate | dateToDayFilter}}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="仓库" prop="stockId" min-width="140" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="仓库" prop="stockId" min-width="120" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="供货单位" prop="supplyName" min-width="200" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="审核日期" prop="approveDate" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="备注" prop="abcdRemarks" min-width="160" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="存货编码" prop="materialNumber" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="存货名称" prop="materialName" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="规格型号" prop="uom" min-width="100" 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="auxUnitQty" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="原币含税单价" prop="taxPrice" min-width="120" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="原币金额" prop="amount" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="原币税额" prop="entryTaxAmount" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="原币价税合计" prop="allAmount" min-width="120" 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="140" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="规格型号" prop="uom" 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="auxUnitQty" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="right" label="原币含税单价" prop="taxPrice" min-width="120" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{scope.row.taxPrice | numToFixed}}
+              </template>
+            </el-table-column>
+            <el-table-column align="right" label="原币金额" prop="amount" min-width="100" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{scope.row.amount | numToFixed}}
+              </template>
+            </el-table-column>
+            <el-table-column align="right" label="原币税额" prop="entryTaxAmount" min-width="100" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{scope.row.entryTaxAmount | numToFixed}}
+              </template>
+            </el-table-column>
+            <el-table-column align="right" label="原币价税合计" prop="allAmount" min-width="120" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{scope.row.allAmount | numToFixed}}
+              </template>
+            </el-table-column>
             <el-table-column align="center" label="税率" prop="entryTaxRate" min-width="100" 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="approverId" min-width="100" show-overflow-tooltip></el-table-column>
@@ -139,7 +164,7 @@ export default {
       return {
         billNo: this.screenForm.orderNum,
         materialName: this.screenForm.chName,
-        materialNumber: this.screenForm.chNum,
+        materialCode: this.screenForm.chNum,
         startTime: this.screenForm.date ? this.screenForm.date[0] : '',
         endTime: this.screenForm.date ? this.screenForm.date[1] : '',
         supplyName: this.screenForm.company,
@@ -173,12 +198,16 @@ export default {
         pageSize: this.pageSize,
         billNo: this.screenForm.orderNum,
         materialName: this.screenForm.chName,
-        materialNumber: this.screenForm.chNum,
+        materialCode: this.screenForm.chNum,
         startTime: this.screenForm.date ? this.screenForm.date[0] : '',
         endTime: this.screenForm.date ? this.screenForm.date[1] : '',
         supplyName: this.screenForm.company,
       };
       getEnterList(params).then((res) => {
+        res.data.records.forEach(item => {
+          item.sums1 = ['auxUnitQty'];
+          item.sums2 = ['taxPrice', 'amount', 'entryTaxAmount', 'allAmount'];
+        })
         this.dataList = res.data.records;
         this.listTotal = res.data.total;
         this.listLoading = false;

src/views/supply/sales/sales_list.vue

@@ -82,7 +82,17 @@
           </div>
         </div>
         <div class="table">
-          <el-table v-loading="listLoading" :data="dataList" element-loading-text="Loading" border fit highlight-current-row stripe @selection-change="handleSelectionChange">
+          <el-table
+            v-loading="listLoading"
+            :data="dataList" 
+            element-loading-text="Loading" 
+            border 
+            fit 
+            highlight-current-row 
+            stripe
+            @selection-change="handleSelectionChange"
+            show-summary
+            :summary-method="$getSummaries">
             <el-table-column align="center" type="selection" width="55"></el-table-column>
             <el-table-column align="center" label="状态" prop="examineStatus" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
@@ -262,6 +272,10 @@ export default {
         endTime: this.screenForm.date ? this.screenForm.date[1] : '',
       };
       getList(params).then((res) => {
+        res.data.records.forEach(item => {
+          item.sums1 = ['refundableQty'];
+          item.sums2 = ['price', 'payAmount'];
+        })
         this.dataList = res.data.records;
         this.listTotal = res.data.total;
         this.listLoading = false;