feat:物流仓储模块

src/api/orderException.js

@@ -0,0 +1,17 @@
+import request, { postBlob } from '@/utils/request'
+
+export function getCostBillListTicketList(params) {
+  return request({
+    url: `/customer/costBill/listTicket?moduleId=${params.moduleId}`,
+    method: 'post',
+    data: params
+  })
+}
+
+export function exportCostBillListTicketList(data, name) {
+  return postBlob({
+    url: '/customer/costBill/listTicket/export',
+    data,
+    name
+  })
+}

src/api/reconciliation.js

@@ -0,0 +1,34 @@
+import request, { postBlob } from '@/utils/request'
+
+export function getCostBillListMerchantList(params) {
+  return request({
+    url: `/customer/costBill/listMerchant?moduleId=${params.moduleId}`,
+    method: 'post',
+    data: params
+  })
+}
+
+export function exportCostBillListMerchantList(data, name) {
+  return postBlob({
+    url: '/customer/costBill/listMerchant/export',
+    data,
+    name
+  })
+}
+
+export function costBillMerchantCheck(params) {
+  return request({
+    url: `/customer/costBill/merchantCheck`,
+    method: 'post',
+    params
+  })
+}
+
+export function ticketGoToReview(params) {
+  return request({
+    url: `/customer/costBill/ticketGoToReview`,
+    method: 'post',
+    data: params
+  })
+}
+

src/api/salesReconciliation.js

@@ -0,0 +1,26 @@
+import request, { postBlob } from '@/utils/request'
+
+export function getCostBillListSalesList(params) {
+  return request({
+    url: `/customer/costBill/listSales?moduleId=${params.moduleId}`,
+    method: 'post',
+    data: params
+  })
+}
+
+export function exportCostBillListSalesList(data, name) {
+  return postBlob({
+    url: '/customer/costBill/listSales/export',
+    data,
+    name
+  })
+}
+
+export function costBillSalesCheck(params) {
+  return request({
+    url: `/customer/costBill/salesCheck`,
+    method: 'post',
+    params
+  })
+}
+

src/views/logisticsBill/components/ExceptionBox.vue

@@ -0,0 +1,339 @@
+<template>
+  <el-dialog
+    title="账单异常"
+    append-to-body
+    :close-on-click-modal="false"
+    :visible.sync="visible"
+    width="50%"
+    @close="onClose"
+  >
+    <el-row style="margin: 20px 0">
+      <el-col :span="8">经销商：{{ detail.merchantName }}</el-col>
+      <el-col :span="8">对账月份：{{ detail.autoCheckTimeSupply }}</el-col>
+      <el-col v-if="detail.merchantCheckCode" :span="8">商家对账编码：{{ detail.merchantCheckCode }}</el-col>
+      <el-col v-if="detail.salesCheckCode" :span="8">销司对账编码：{{ detail.salesCheckCode }}</el-col>
+    </el-row>
+    <zj-table
+      ref="tableEl"
+      :is-drop="true"
+      :columns="columns"
+      :table-data="recordSelected"
+      :table-attributes="{
+        border: true
+      }"
+    />
+    <el-row type="flex" style="margin: 20px 0">
+      <el-col :span="2">备注： </el-col>
+      <el-col><el-input
+        v-model="comment"
+        type="textarea"
+        :rows="2"
+        placeholder="请输入备注"
+        :maxlength="-1"
+        :show-word-limit="false"
+        :autosize="{ minRows: 2, maxRows: 4 }"
+      />
+      </el-col>
+    </el-row>
+    <span slot="footer">
+      <el-button @click="onClose">取消</el-button>
+      <el-button type="primary" @click="onSbumit">确定</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import { ticketGoToReview } from '@/api/reconciliation'
+export default {
+  props: {
+    visible: {
+      type: Boolean,
+      default: false
+    },
+    recordSelected: {
+      type: Array,
+      default: () => []
+    },
+    detail: {
+      type: Object,
+      default: () => {
+        return {}
+      }
+    }
+  },
+  data() {
+    return {
+      comment: ''
+    }
+  },
+  computed: {
+    columns() {
+      return [
+        {
+          columnAttributes: {
+            label: '订单类型',
+            prop: 'orderType',
+            width: 200
+          },
+          render: (h, { row }) => {
+            const { orderType } = row
+            const typeObj = {
+              TOB: '商家机工程机类型',
+              ALL: '所有类型，广州的订单统一 开单价',
+              TOC: '佛山销售销售订单类型公司'
+            }
+            return <div>{typeObj[orderType]}</div>
+          }
+        },
+        {
+          columnAttributes: {
+            label: '实际是否卸货',
+            prop: 'isRealUnload',
+            width: 200
+          },
+          render: (h, { row }) => {
+            row.isRealUnload = row.isRealUnload === '是' ? 1 : 0
+
+            return (
+              <el-select
+                value={row.isRealUnload}
+                onInput={e => (row.isRealUnload = e)}
+                placeholder='请选择'
+                clearable
+                filterable
+                size='mini'
+              >
+                {[
+                  { label: '是', value: 1 },
+                  { label: '否', value: 0 }
+                ].map(k => {
+                  return <el-option key={k.value} label={k.label} value={k.value}></el-option>
+                })}
+              </el-select>
+            )
+          }
+        },
+        {
+          columnAttributes: {
+            label: '实际是否上楼',
+            prop: 'isRealUpstairs',
+            width: 200
+          },
+          render: (h, { row }) => {
+            row.isRealUpstairs = row.isRealUpstairs === '是' ? 1 : 0
+            return (
+              <el-select
+                value={row.isRealUpstairs}
+                onInput={e => (row.isRealUpstairs = e)}
+                placeholder='请选择'
+                clearable
+                filterable
+                size='mini'
+              >
+                {[
+                  { label: '是', value: 1 },
+                  { label: '否', value: 0 }
+                ].map(k => {
+                  return <el-option key={k.value} label={k.label} value={k.value}></el-option>
+                })}
+              </el-select>
+            )
+          }
+        },
+        {
+          columnAttributes: {
+            label: '订单时间',
+            prop: 'orderDate',
+            width: 200
+          }
+        },
+        {
+          columnAttributes: {
+            label: '运费结算系数',
+            prop: 'coefficient',
+            width: 200
+          },
+          render: (h, { row }) => {
+            return (
+              <el-input
+                value={row.coefficient}
+                onInput={e => (row.coefficient = e)}
+                placeholder='可修改内容'
+                size='mini'
+                clearable
+              ></el-input>
+            )
+          }
+        },
+        {
+          columnAttributes: {
+            label: '补贴结算系数',
+            prop: 'subsidyCoefficient',
+            width: 200
+          },
+          render: (h, { row }) => {
+            return (
+              <el-input
+                value={row.subsidyCoefficient}
+                onInput={e => (row.subsidyCoefficient = e)}
+                placeholder='可修改内容'
+                size='mini'
+                clearable
+              ></el-input>
+            )
+          }
+        },
+        {
+          columnAttributes: {
+            label: '账号对应物料数量',
+            prop: 'materialNumber',
+            width: 200
+          },
+          render: (h, { row }) => {
+            return (
+              <el-input
+                value={row.materialNumber}
+                onInput={e => (row.materialNumber = e)}
+                placeholder='可修改内容'
+                size='mini'
+                clearable
+              ></el-input>
+            )
+          }
+        },
+        {
+          columnAttributes: {
+            label: '物料开单价',
+            prop: 'materialPrice',
+            width: 200
+          },
+          render: (h, { row }) => {
+            return (
+              <el-input
+                value={row.materialPrice}
+                onInput={e => (row.materialPrice = e)}
+                placeholder='可修改内容'
+                size='mini'
+                clearable
+              ></el-input>
+            )
+          }
+        },
+        {
+          columnAttributes: {
+            label: '退货费用',
+            prop: 'returnOrderCost',
+            width: 200
+          },
+          render: (h, { row }) => {
+            return (
+              <el-input
+                value={row.returnOrderCost}
+                onInput={e => (row.returnOrderCost = e)}
+                placeholder='可修改内容'
+                size='mini'
+                clearable
+              ></el-input>
+            )
+          }
+        },
+        {
+          columnAttributes: {
+            label: '单价计算',
+            prop: 'unitPrice',
+            width: 200
+          },
+          render: (h, { row }) => {
+            return (
+              <el-input
+                value={row.unitPrice}
+                onInput={e => (row.unitPrice = e)}
+                placeholder='可修改内容'
+                size='mini'
+                clearable
+              ></el-input>
+            )
+          }
+        },
+        {
+          columnAttributes: {
+            label: '卸货上楼结算系数',
+            prop: 'unloadUpstairsCoefficient',
+            width: 200
+          },
+          render: (h, { row }) => {
+            return (
+              <el-input
+                value={row.unloadUpstairsCoefficient}
+                onInput={e => (row.unloadUpstairsCoefficient = e)}
+                placeholder='可修改内容'
+                size='mini'
+                clearable
+              ></el-input>
+            )
+          }
+        }
+      ]
+    }
+  },
+  methods: {
+    onClose() {
+      this.$emit('close')
+    },
+    onSbumit() {
+      let ticketType = null
+      let orderCode = null
+      if (this.detail.merchantCheckCode) {
+        ticketType = 'MERCHANT_CHECK'
+        orderCode = this.detail.merchantCheckCode
+      } else {
+        ticketType = 'SALES_CHECK'
+        orderCode = this.detail.salesCheckCode
+      }
+
+      const list = this.recordSelected.map(k => {
+        const {
+          orderType,
+          isRealUnload,
+          isRealUpstairs,
+          unloadUpstairsCoefficient,
+          unitPrice,
+          returnOrderCost,
+          materialPrice,
+          materialNumber,
+          subsidyCoefficient,
+          orderDate,
+          coefficient
+        } = k
+        return {
+          orderType,
+          isRealUnload,
+          isRealUpstairs,
+          unloadUpstairsCoefficient,
+          unitPrice,
+          returnOrderCost,
+          materialPrice,
+          materialNumber,
+          subsidyCoefficient,
+          orderDate,
+          coefficient
+        }
+      })
+      ticketGoToReview({
+        ticketType,
+        orderCode,
+        comment: this.comment,
+        modifiedCostBillList: list
+      }).then(res => {
+        this.$message({
+          type: 'success',
+          message: '成功'
+        })
+        this.onClose()
+      })
+    }
+  }
+}
+</script>
+
+<style lang="sass" scoped></style>

src/views/logisticsBill/components/reconciliationDetail.vue

@@ -1,25 +1,45 @@
 <template>
-  <template-page
-    ref="pageRef"
-    :get-list="getList"
-    :export-list="exportList"
-    :operation="operation()"
-    :options-evens-group="optionsEvensGroup"
-    :column-parsing="columnParsing"
-  >
-    <Popu v-if="visible" />
-  </template-page>
+  <div class="warp">
+    <template-page
+      ref="pageRefItem"
+      :get-list="getList"
+      :export-list="exportList"
+      :options-evens-group="optionsEvensGroup"
+      :column-parsing="columnParsing"
+      :table-attributes="tableAttributes"
+      :table-events="tableEvents"
+      :replace-or-not-map="false"
+    >
+      <ExceptionBox :visible="visible" :detail="detail" :record-selected="recordSelected" @close="handleClose" />
+    </template-page>
+  </div>
 </template>
 
 <script>
+import ExceptionBox from './ExceptionBox.vue'
 import TemplatePage from '@/components/template/template-page-1.vue'
 import import_mixin from '@/components/template/import_mixin.js'
 import add_callback_mixin from '@/components/template/add_callback_mixin.js'
-import Popu from '@/components/template/popu.vue'
-import { getDealerListV2, exportDealerListV2, importCustomerV2 } from '@/api/basic_data/dealer'
+import { getListCostBillV2 } from '@/api/logisticsBill'
 export default {
-  components: { TemplatePage, Popu },
+  components: { TemplatePage, ExceptionBox },
   mixins: [import_mixin, add_callback_mixin],
+  props: {
+    orderCode: {
+      type: String,
+      default: null
+    },
+    detail: {
+      type: Object,
+      default: () => {
+        return {}
+      }
+    },
+    param: {
+      type: String,
+      default: null
+    }
+  },
   data() {
     return {
       visible: false,
@@ -28,8 +48,14 @@ export default {
         [
           [
             {
-              name: '导入',
-              render: this.importButton(importCustomerV2)
+              name: '账单异常',
+              click: async() => {
+                if (this.recordSelected.length === 0) {
+                  this.$message.error('请选择需要处理的数据')
+                  return
+                }
+                this.visible = true
+              }
             }
           ]
         ]
@@ -51,10 +77,18 @@ export default {
     // 列表请求函数
     getList(...p) {
       this.recordSelected = []
-      return getDealerListV2(...p)
+      p[0].params = [
+        ...p[0].params,
+        {
+          param: this.param,
+          compare: '=',
+          value: this.orderCode
+        }
+      ]
+      return getListCostBillV2(...p)
     },
     // 列表导出函数
-    exportList: exportDealerListV2,
+    exportList: () => {},
     // 表格列解析渲染数据更改
     columnParsing(item, defaultData) {
       return defaultData
@@ -65,19 +99,22 @@ export default {
     },
     operation() {
       return (h, { row, index, column }) => {
-        return <div class='operation-btns'>
-
-        </div>
+        return <div class='operation-btns'></div>
       }
     },
     handleClose() {
-      this.addOff(() => {
-        this.visible = false
-      })()
+      this.visible = false
+      this.$refs.pageRefItem.refreshList()
     }
   }
 }
 </script>
 
-      <style lang="scss" scoped></style>
-
+<style lang="scss" scoped>
+.warp{
+  position: absolute;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  top: 50px;}
+</style>

src/views/logisticsBill/orderException.vue

@@ -0,0 +1,120 @@
+<template>
+  <template-page
+    ref="pageRef"
+    :get-list="getList"
+    :export-list="exportList"
+    :options-evens-group="optionsEvensGroup"
+    :column-parsing="columnParsing"
+    :operation="operation()"
+  >
+    <Popu v-if="visible">
+      <ReconciliationDetail :order-code="orderCode" />
+    </Popu>
+  </template-page>
+</template>
+
+<script>
+import ReconciliationDetail from './components/reconciliationDetail.vue'
+import TemplatePage from '@/components/template/template-page-1.vue'
+import import_mixin from '@/components/template/import_mixin.js'
+import add_callback_mixin from '@/components/template/add_callback_mixin.js'
+import Popu from '@/components/template/popu.vue'
+import { getCostBillListTicketList, exportCostBillListTicketList } from '@/api/orderException'
+export default {
+  components: { TemplatePage, Popu, ReconciliationDetail },
+  mixins: [import_mixin, add_callback_mixin],
+  data() {
+    return {
+      visible: false,
+      // 事件组合
+      optionsEvensGroup: [
+        // [
+        //   [
+        //     {
+        //       name: '导入',
+        //       render: this.importButton(importCustomerV2)
+        //     }
+        //   ]
+        // ]
+      ],
+      // 表格属性
+      tableAttributes: {
+        // 启用勾选列
+        selectColumn: true
+      }, // 关闭新增弹窗
+
+      // 表格事件
+      tableEvents: {
+        'selection-change': this.selectionChange
+      },
+      recordSelected: [],
+      dialogVisible: false,
+      orderCode: null
+    }
+  },
+  methods: {
+    // 列表请求函数
+    getList(...p) {
+      this.recordSelected = []
+      return getCostBillListTicketList(...p)
+    },
+    // 列表导出函数
+    exportList: exportCostBillListTicketList,
+    // 表格列解析渲染数据更改
+    columnParsing(item, defaultData) {
+      return defaultData
+    },
+    // 监听勾选变化
+    selectionChange(data) {
+      this.recordSelected = data
+    },
+    operation() {
+      return (h, { row, index, column }) => {
+        return <div class='operation-btns'>
+          <el-button
+            size='mini'
+            type='text'
+            onClick={ () => {
+              this.visible = true
+              this.orderCode = row.id
+            }}
+          >
+              对账
+          </el-button>
+          <el-button
+            size='mini'
+            type='text'
+            onClick={ () => {
+              this.$confirm('请确认本月对账账单数据正确，经确认后则不能回退对账结果', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+              }).then(() => {
+
+              }).catch(() => {
+                this.$message({
+                  type: 'info',
+                  message: '已取消完成对账'
+                })
+              })
+            }}
+          >
+          完成对账
+          </el-button>
+        </div>
+      }
+    },
+    handleClose() {
+      this.addOff(() => {
+        this.visible = false
+      })()
+    },
+    onSbumit() {
+
+    }
+  }
+}
+</script>
+
+    <style lang="scss" scoped></style>
+

src/views/logisticsBill/reconciliation.vue

@@ -5,33 +5,42 @@
     :export-list="exportList"
     :options-evens-group="optionsEvensGroup"
     :column-parsing="columnParsing"
+    :operation="operation()"
   >
-    <Popu v-if="visible" />
+    <Popu v-if="visible">
+      <el-page-header slot="head" content="对账" @back="handleClose" />
+      <ReconciliationDetail :order-code="orderCode" :detail="detail" param="merchan_check_code" @close="handleClose" />
+    </Popu>
   </template-page>
 </template>
 
 <script>
+import ReconciliationDetail from './components/reconciliationDetail.vue'
 import TemplatePage from '@/components/template/template-page-1.vue'
 import import_mixin from '@/components/template/import_mixin.js'
 import add_callback_mixin from '@/components/template/add_callback_mixin.js'
 import Popu from '@/components/template/popu.vue'
-import { getDealerListV2, exportDealerListV2, importCustomerV2 } from '@/api/basic_data/dealer'
+import {
+  getCostBillListMerchantList,
+  exportCostBillListMerchantList,
+  costBillMerchantCheck
+} from '@/api/reconciliation'
 export default {
-  components: { TemplatePage, Popu },
+  components: { TemplatePage, Popu, ReconciliationDetail },
   mixins: [import_mixin, add_callback_mixin],
   data() {
     return {
       visible: false,
       // 事件组合
       optionsEvensGroup: [
-        [
-          [
-            {
-              name: '导入',
-              render: this.importButton(importCustomerV2)
-            }
-          ]
-        ]
+        // [
+        //   [
+        //     {
+        //       name: '导入',
+        //       render: this.importButton(importCustomerV2)
+        //     }
+        //   ]
+        // ]
       ],
       // 表格属性
       tableAttributes: {
@@ -43,17 +52,20 @@ export default {
       tableEvents: {
         'selection-change': this.selectionChange
       },
-      recordSelected: []
+      recordSelected: [],
+      dialogVisible: false,
+      orderCode: null,
+      detail: {}
     }
   },
   methods: {
     // 列表请求函数
     getList(...p) {
       this.recordSelected = []
-      return getDealerListV2(...p)
+      return getCostBillListMerchantList(...p)
     },
     // 列表导出函数
-    exportList: exportDealerListV2,
+    exportList: exportCostBillListMerchantList,
     // 表格列解析渲染数据更改
     columnParsing(item, defaultData) {
       return defaultData
@@ -64,48 +76,56 @@ export default {
     },
     operation() {
       return (h, { row, index, column }) => {
-        return <div class='operation-btns'>
-          <el-button
-            size='mini'
-            type='text'
-            onClick={ () => {
-              this.visible = true
-              this.detailsId = row.id
-            }}
-          >
-              账单异常
-          </el-button>
-          <el-button
-            size='mini'
-            type='text'
-            onClick={ () => {
-              this.visible = true
-              this.detailsId = row.id
-            }}
-          >
-              已对账
-          </el-button>
-          <el-button
-            size='mini'
-            type='text'
-            onClick={ () => {
-              this.visible = true
-              this.detailsId = row.id
-            }}
-          >
-              详情
-          </el-button>
-        </div>
+        return (
+          <div class='operation-btns'>
+            <el-button
+              size='mini'
+              type='text'
+              onClick={() => {
+                this.visible = true
+                this.orderCode = row.merchantCheckCode
+                this.detail = row
+              }}
+            >
+              对账
+            </el-button>
+            <el-button
+              size='mini'
+              type='text'
+              onClick={() => {
+                this.$confirm('请确认本月对账账单数据正确，经确认后则不能回退对账结果', '提示', {
+                  confirmButtonText: '确定',
+                  cancelButtonText: '取消',
+                  type: 'warning'
+                })
+                  .then(() => {
+                    costBillMerchantCheck({ merchantCheckCode: row.merchantCheckCode }).then(res => {
+                      this.$message({
+                        type: 'success',
+                        message: '完成对账成功!'
+                      })
+                    })
+                  })
+                  .catch(() => {
+                    this.$message({
+                      type: 'info',
+                      message: '已取消完成对账'
+                    })
+                  })
+              }}
+            >
+              完成对账
+            </el-button>
+          </div>
+        )
       }
     },
     handleClose() {
-      this.addOff(() => {
-        this.visible = false
-      })()
-    }
+      this.visible = false
+    },
+    onSbumit() {}
   }
 }
 </script>
 
-    <style lang="scss" scoped></style>
-
+<style lang="scss" scoped></style>

src/views/logisticsBill/salesReconciliation.vue

@@ -0,0 +1,131 @@
+<template>
+  <template-page
+    ref="pageRef"
+    :get-list="getList"
+    :export-list="exportList"
+    :options-evens-group="optionsEvensGroup"
+    :operation="operation()"
+    :column-parsing="columnParsing"
+  >
+    <Popu v-if="visible">
+      <el-page-header slot="head" content="对账" @back="handleClose" />
+      <ReconciliationDetail :order-code="orderCode" :detail="detail" param="sales_check_code" @close="handleClose" />
+    </Popu>
+  </template-page>
+</template>
+
+<script>
+import ReconciliationDetail from './components/reconciliationDetail.vue'
+
+import TemplatePage from '@/components/template/template-page-1.vue'
+import import_mixin from '@/components/template/import_mixin.js'
+import add_callback_mixin from '@/components/template/add_callback_mixin.js'
+import Popu from '@/components/template/popu.vue'
+import { getCostBillListSalesList, exportCostBillListSalesList, costBillSalesCheck } from '@/api/salesReconciliation'
+export default {
+  components: { TemplatePage, Popu, ReconciliationDetail },
+  mixins: [import_mixin, add_callback_mixin],
+  data() {
+    return {
+      visible: false,
+      // 事件组合
+      optionsEvensGroup: [
+        // [
+        //   [
+        //     {
+        //       name: '导入',
+        //       render: this.importButton(importCustomerV2)
+        //     }
+        //   ]
+        // ]
+      ],
+      // 表格属性
+      tableAttributes: {
+        // 启用勾选列
+        selectColumn: true
+      }, // 关闭新增弹窗
+
+      // 表格事件
+      tableEvents: {
+        'selection-change': this.selectionChange
+      },
+      recordSelected: [],
+      formData: {},
+      dialogVisible: false,
+      orderCode: null,
+      detail: {}
+    }
+  },
+  methods: {
+    // 列表请求函数
+    getList(...p) {
+      this.recordSelected = []
+      return getCostBillListSalesList(...p)
+    },
+    // 列表导出函数
+    exportList: exportCostBillListSalesList,
+    // 表格列解析渲染数据更改
+    columnParsing(item, defaultData) {
+      return defaultData
+    },
+    // 监听勾选变化
+    selectionChange(data) {
+      this.recordSelected = data
+    },
+    operation() {
+      return (h, { row, index, column }) => {
+        return (
+          <div class='operation-btns'>
+            <el-button
+              size='mini'
+              type='text'
+              onClick={() => {
+                this.visible = true
+                this.orderCode = row.salesCheckCode
+                this.detail = row
+              }}
+            >
+              对账
+            </el-button>
+            <el-button
+              size='mini'
+              type='text'
+              onClick={() => {
+                this.$confirm('请确认本月对账账单数据正确，经确认后则不能回退对账结果', '提示', {
+                  confirmButtonText: '确定',
+                  cancelButtonText: '取消',
+                  type: 'warning'
+                })
+                  .then(() => {
+                    costBillSalesCheck({ merchantCheckCode: row.salesCheckCode }).then(res => {
+                      this.$message({
+                        type: 'success',
+                        message: '完成对账成功!'
+                      })
+                    })
+                  })
+                  .catch(() => {
+                    this.$message({
+                      type: 'info',
+                      message: '已取消完成对账'
+                    })
+                  })
+              }}
+            >
+              完成对账
+            </el-button>
+          </div>
+        )
+      }
+    },
+    handleClose() {
+      this.visible = false
+    },
+    onSbumit() {
+      costBillSalesCheck({ salesCheckCode: 11 }).then(res => {})
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped></style>