feat:销售执行明细汇总计算发货数量汇总

src/views/supply/implement/implement_total_list.vue

@@ -194,7 +194,8 @@
             type="primary"
             size="small"
             @click="handleEliminate"
-          >剔除账单</el-button>
+            >剔除账单</el-button
+          >
 
           <div class="fr">
             <ExportButton :ex-url="'retail/exec/listTotalExport'" :ex-params="exParams" />
@@ -213,10 +214,7 @@
             :summary-method="$getSummaries"
             @selection-change="handleSelectionChange"
           >
-            <el-table-column
-              type="selection"
-              width="55"
-            />
+            <el-table-column type="selection" width="55" />
             <el-table-column align="left" label="标识" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
                 <el-tag
@@ -225,20 +223,15 @@
                   size="mini"
                   style="cursor: pointer"
                   @click="openDisplaceDetail(scope.row)"
-                >置换
+                  >置换
                 </el-tag>
                 <el-tag v-if="scope.row.directTransferStatusName !== '非直调'" type="success" size="mini">直调</el-tag>
               </template>
             </el-table-column>
             <el-table-column align="left" label="是否置换过" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
-                <el-tag
-                  type="warning"
-                  size="mini"
-                  style="cursor: pointer"
-                  @click="openDisplaceDetail(scope.row)"
-                >
-                  {{ scope.row.isDisplaceOrder?'是':'否' }}
+                <el-tag type="warning" size="mini" style="cursor: pointer" @click="openDisplaceDetail(scope.row)">
+                  {{ scope.row.isDisplaceOrder ? '是' : '否' }}
                 </el-tag>
               </template>
             </el-table-column>
@@ -251,21 +244,12 @@
             />
             <el-table-column align="left" label="是否剔除" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
-                <el-tag
-                  type="warning"
-                  size="mini"
-                >
-                  {{ scope.row.isCost==='NO'?'否':'是' }}
+                <el-tag type="warning" size="mini">
+                  {{ scope.row.isCost === 'NO' ? '否' : '是' }}
                 </el-tag>
               </template>
             </el-table-column>
-            <el-table-column
-              align="left"
-              label="使用单位"
-              prop="refUseUnit"
-              min-width="200"
-              show-overflow-tooltip
-            />
+            <el-table-column align="left" label="使用单位" prop="refUseUnit" min-width="200" show-overflow-tooltip />
             <el-table-column
               align="left"
               label="货满有效期"
@@ -280,20 +264,8 @@
               min-width="200"
               show-overflow-tooltip
             />
-            <el-table-column
-              align="left"
-              label="制单日期"
-              prop="createTime"
-              min-width="160"
-              show-overflow-tooltip
-            />
-            <el-table-column
-              align="left"
-              label="订单日期"
-              prop="theTime"
-              min-width="160"
-              show-overflow-tooltip
-            />
+            <el-table-column align="left" label="制单日期" prop="createTime" min-width="160" show-overflow-tooltip />
+            <el-table-column align="left" label="订单日期" prop="theTime" min-width="160" show-overflow-tooltip />
             <el-table-column align="left" label="销售订单" prop="id" min-width="140" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copy-text="scope.row.id" />
@@ -318,13 +290,7 @@
                 <span>{{ scope.row.customerName }}</span>
               </template>
             </el-table-column>
-            <el-table-column
-              align="left"
-              label="销售类型"
-              prop="saleTypeName"
-              min-width="100"
-              show-overflow-tooltip
-            />
+            <el-table-column align="left" label="销售类型" prop="saleTypeName" min-width="100" show-overflow-tooltip />
             <el-table-column
               align="left"
               label="存货类别"
@@ -332,13 +298,7 @@
               min-width="100"
               show-overflow-tooltip
             />
-            <el-table-column
-              align="left"
-              label="金蝶部门"
-              prop="k3OrgName"
-              min-width="100"
-              show-overflow-tooltip
-            />
+            <el-table-column align="left" label="金蝶部门" prop="k3OrgName" min-width="100" show-overflow-tooltip />
             <el-table-column align="left" label="物料编码" prop="materialCode" min-width="120" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copy-text="scope.row.materialCode" />
@@ -376,13 +336,7 @@
               min-width="100"
               show-overflow-tooltip
             />
-            <el-table-column
-              align="left"
-              label="钱包"
-              prop="walletName"
-              min-width="100"
-              show-overflow-tooltip
-            />
+            <el-table-column align="left" label="钱包" prop="walletName" min-width="100" show-overflow-tooltip />
             <el-table-column
               align="right"
               label="返利钱包"
@@ -397,20 +351,8 @@
               min-width="120"
               show-overflow-tooltip
             />
-            <el-table-column
-              align="right"
-              label="总数量"
-              prop="qty"
-              min-width="100"
-              show-overflow-tooltip
-            />
-            <el-table-column
-              align="right"
-              label="退订数量"
-              prop="retiredQty"
-              min-width="100"
-              show-overflow-tooltip
-            />
+            <el-table-column align="right" label="总数量" prop="qty" min-width="100" show-overflow-tooltip />
+            <el-table-column align="right" label="退订数量" prop="retiredQty" min-width="100" show-overflow-tooltip />
             <el-table-column
               align="right"
               label="退货数量"
@@ -439,18 +381,12 @@
                 {{ scope.row.hasSendAmount | numToFixed }}
               </template>
             </el-table-column>
-            <el-table-column align="right" label="发货数量" prop="hasSendQty" min-width="100" show-overflow-tooltip>
+            <el-table-column align="right" label="发货数量" prop="fahuo" min-width="100" show-overflow-tooltip>
               <template v-slot="{ row }">
                 {{ row.qty - (row.refundableQty || 0) }}
               </template>
             </el-table-column>
-            <el-table-column
-              align="right"
-              label="出库数量"
-              prop="hasSendQty"
-              min-width="100"
-              show-overflow-tooltip
-            />
+            <el-table-column align="right" label="出库数量" prop="hasSendQty" min-width="100" show-overflow-tooltip />
             <el-table-column
               align="right"
               label="直调数量"
@@ -487,13 +423,7 @@
               </template>
             </el-table-column>
 
-            <el-table-column
-              align="left"
-              label="表头业务员"
-              prop="serviceName"
-              min-width="100"
-              show-overflow-tooltip
-            />
+            <el-table-column align="left" label="表头业务员" prop="serviceName" min-width="100" show-overflow-tooltip />
             <el-table-column
               align="left"
               label="表体业务员"
@@ -509,20 +439,8 @@
               show-overflow-tooltip
             />
             <!-- <el-table-column align="left" label="订单备注" prop="headerRemark" min-width="160" show-overflow-tooltip></el-table-column> -->
-            <el-table-column
-              align="left"
-              label="表头备注"
-              prop="remark"
-              min-width="160"
-              show-overflow-tooltip
-            />
-            <el-table-column
-              align="left"
-              label="表体备注"
-              prop="itemRemark"
-              min-width="160"
-              show-overflow-tooltip
-            />
+            <el-table-column align="left" label="表头备注" prop="remark" min-width="160" show-overflow-tooltip />
+            <el-table-column align="left" label="表体备注" prop="itemRemark" min-width="160" show-overflow-tooltip />
             <el-table-column align="left" label="销售政策名称" prop="policyTitle" min-width="250" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copy-text="scope.row.policyTitle" />
@@ -559,11 +477,7 @@
         </div>
       </div>
     </div>
-    <el-dialog
-      title="提示"
-      :visible.sync="dialogVisible"
-      width="30%"
-     >
+    <el-dialog title="提示" :visible.sync="dialogVisible" width="30%">
       <el-date-picker
         v-model="time"
         type="datetime"
@@ -571,12 +485,19 @@
         default-time="00:00:00"
         :picker-options="setDisabled"
         style="width: 100%"
-        placeholder="选择日期">
+        placeholder="选择日期"
+      >
       </el-date-picker>
       <span slot="footer" class="dialog-footer">
-    <el-button @click="dialogVisible = false;time =''">取 消</el-button>
-    <el-button type="primary" @click="onSbumit">确 定</el-button>
-  </span>
+        <el-button
+          @click="
+            dialogVisible = false
+            time = ''
+          "
+          >取 消</el-button
+        >
+        <el-button type="primary" @click="onSbumit">确 定</el-button>
+      </span>
     </el-dialog>
     <DisplaceDetail v-if="isShowDisplaceDetail" :list-item="queryItem" @backListFormDetail="backList" />
   </div>
@@ -678,9 +599,10 @@ export default {
       choiceDate: '',
       setDisabled: {
         disabledDate: time => {
-          return time.getTime() < new Date().setDate(new Date().getDate()-1)
-        },
-      }}
+          return time.getTime() < new Date().setDate(new Date().getDate() - 1)
+        }
+      }
+    }
   },
 
   computed: {
@@ -783,7 +705,16 @@ export default {
       }
       getTotalList(params).then(res => {
         res.data.records.forEach(item => {
-          item.sums1 = ['refundableQty', 'qty', 'retiredQty', 'hasSendQty', 'directTransferQty', 'refundProductQty']
+          item.fahuo = item.qty - (item.refundableQty || 0)
+          item.sums1 = [
+            'refundableQty',
+            'qty',
+            'retiredQty',
+            'hasSendQty',
+            'directTransferQty',
+            'refundProductQty',
+            'fahuo'
+          ]
           item.sums2 = ['payAmount', 'payRebateAmount', 'hasSendAmount', 'retiredAmount', 'refundProductAmount']
         })
         this.dataList = res.data.records
@@ -857,7 +788,7 @@ export default {
     },
     onSbumit() {
       const ids = this.recordSelected.map(k => k.orderItemId)
-      setUpdateOrderCost({ orderId: ids.toString(),time: this.time }).then(res => {
+      setUpdateOrderCost({ orderId: ids.toString(), time: this.time }).then(res => {
         this.dialogVisible = false
         this.$successMsg('剔除成功')
         this.getList()