chenrui 3 年之前
父节点
当前提交
f980cfd1ca

+ 27 - 16
src/views/financialManagement/financialCollection/list.vue

@@ -122,8 +122,17 @@
         :defaultLoadData="false"
         bordered>
         <!-- 单号 -->
-        <template slot="salesBillNo" slot-scope="text, record">
-          <span :class="$hasPermissions('B_salesDetail')?'active':'common'" @click="handleDetail(record)">{{ record.salesBillNo }}</span>
+        <template slot="bizNo" slot-scope="text, record">
+          <span :class="$hasPermissions('B_salesDetail')?'active':'common'"v-if="$hasPermissions('B_salesDetail')" @click="handleDetail(record)">{{ record.bizNo }}</span>
+        </template>
+        <!-- 下推单号 -->
+        <template slot="dispatchBillNo" slot-scope="text, record">
+          <span :class="$hasPermissions('B_dispatchDetail')?'active':'common'" v-if="$hasPermissions('B_dispatchDetail')" @click="handleBhDetail(record)">{{ record.dispatchBillNo || '--' }}</span>
+          <span v-else>{{ record.dispatchBillNo || '--' }}</span>
+        </template>
+        <!-- 单据状态 -->
+        <template slot="voidFlag" slot-scope="text, record">
+          <span>{{ record.voidFlag==1 ? '作废' : record.voidFlag==0 ? '有效' : '--' }}</span>
         </template>
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
@@ -177,18 +186,19 @@ export default {
       ], //  审核时间
       advanced: false,
       columns: [
-        { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
-        { title: '审核时间', dataIndex: 'auditDate', width: '11.5%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '销售单号', scopedSlots: { customRender: 'salesBillNo' }, width: '15%', align: 'center' },
-        { title: '经销商名称', dataIndex: 'buyerName', align: 'center', width: '12%', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '商户级别', dataIndex: 'dealerEntity.dealerLevelDictValue', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '审核时间', dataIndex: 'createDate', width: '9%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '销售单号', scopedSlots: { customRender: 'bizNo' }, width: '10%', align: 'center' },
+        { title: '备货单号', scopedSlots: { customRender: 'dispatchBillNo' }, width: '10%', align: 'center' },
+        { title: '经销商名称', dataIndex: 'settleClientName', align: 'left', width: '9%', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '商户级别', dataIndex: 'dealerEntity.dealerLevelDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '销售数量', dataIndex: 'totalQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '订单金额', dataIndex: 'totalAmount', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '收款时间', dataIndex: 'settleDate', width: '11.5%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '收款方式', dataIndex: 'settleStyleSnDictValue', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '备注', dataIndex: 'remarks', width: '8%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '业务状态', dataIndex: 'billStatusDictValue', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '财务状态', dataIndex: 'financialStatusDictValue', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '销售金额', dataIndex: 'totalAmount', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '收款时间', dataIndex: 'settleTime', width: '9%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '收款方式', dataIndex: 'settleStyleSnDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '备注', dataIndex: 'remark', width: '7%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '业务状态', dataIndex: 'billStatusDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '财务状态', dataIndex: 'financialStatusDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '单据状态', dataIndex: 'voidFlag', scopedSlots: { customRender: 'voidFlag' }, width: '6%', align: 'center' },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '4%', align: 'center' }
       ],
       // 加载数据方法 必须为 Promise 对象
@@ -247,9 +257,10 @@ export default {
     },
     // 详情
     handleDetail (row) {
-      if (this.$hasPermissions('B_salesDetail')) {
-        this.$router.push({ name: 'salesDetail', params: { sn: row.salesBillSn } })
-      }
+      this.$router.push({ name: 'salesDetail', params: { sn: row.salesBillSn } })
+    },
+    handleBhDetail (row) {
+      this.$router.push({ name: 'pushOrderDetail', params: { sn: row.dispatchBillSn, type: 'financialCollection' } })
     },
     // 收款
     handleAudit (row) {

+ 1 - 1
src/views/salesManagement/examineVerify/list.vue

@@ -279,7 +279,7 @@ export default {
     },
     //  详情
     handleDetail (row) {
-      this.$router.push({ name: 'pushOrderDetail', params: { sn: row.dispatchBillSn, type: 'pushOrder' } })
+      this.$router.push({ name: 'pushOrderDetail', params: { sn: row.dispatchBillSn, type: 'examineVerify' } })
     },
     //  省/市/区
     getArea (leve, sn) {

+ 7 - 1
src/views/salesManagement/pushOrderManagement/detail.vue

@@ -164,7 +164,13 @@ export default {
   methods: {
     //  返回
     handleBack () {
-      this.$router.push({ path: '/salesManagement/pushOrderManagement/list', query: { closeLastOldTab: true } })
+      if (this.$route.params.type == 'pushOrder') { // 下推
+        this.$router.push({ path: '/salesManagement/pushOrderManagement/list', query: { closeLastOldTab: true } })
+      } else if (this.$route.params.type == 'examineVerify') { // 备货审核
+        this.$router.push({ path: '/salesManagement/examineVerify/list', query: { closeLastOldTab: true } })
+      } else if (this.$route.params.type == 'financialCollection') { // 财务收款
+        this.$router.push({ path: '/financialManagement/financialCollection/list', query: { closeLastOldTab: true } })
+      }
     },
     //  详情
     getDetail () {