删除订单管理界面

src/api/shengde/group/order/orderManagement.js

@@ -26,3 +26,21 @@ export function batchEditTaxRate(params) {
     params: params,
   })
 }
+
+// 版本管理 列表
+export function versionList(data) {
+  return request({
+    url: '/saas-group/saas/group/version/list',
+    method: 'post',
+    data: data,
+  })
+}
+
+// 版本管理 列表-条数
+export function versionListCount(data) {
+  return request({
+    url: '/saas-group/saas/group/version/list/count',
+    method: 'post',
+    data: data,
+  })
+}

src/page/index/index.vue

@@ -132,6 +132,7 @@ export default {
         'CheckCancellation',
         'MakeCancellation',
         'dailyBoard',
+        'alreadyRemoved',
       ],
     }
   },

src/views/shengde/group/order/alreadyRemoved/index.vue

@@ -0,0 +1,195 @@
+<template>
+  <el-card class="box-card">
+    <el-table
+      :data="tableList"
+      :cell-style="{ padding: '0' }"
+      :row-style="{ height: '35px' }"
+      header-row-class-name="tableHeader"
+      v-loading="loading"
+      element-loading-background="rgba(0, 0, 0, 0.3)"
+    >
+      <el-table-column label="事业部" :formatter="subsidiaryIdFormat" />
+      <el-table-column label="订单号" prop="contractCode">
+        <template slot-scope="scope">
+          <div>
+            <span style="cursor: pointer; color: #409eff" @click="clickCode(scope.row)"> {{ scope.row.contractCode }}</span>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column label="万里牛订单号" prop="tradeNo" />
+      <el-table-column label="快递单号" prop="waybillNo" />
+      <el-table-column label="订单状态" prop="status">
+        <template slot-scope="scope">
+          <span> {{ showStatus(scope.row.status) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="结算状态" prop="settlementStatus">
+        <template slot-scope="scope">
+          <span> {{ showSettleStatus(scope.row.settlementStatus) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作时间" prop="createTime" />
+      <el-table-column label="操作人" align="center" prop="userName" fixed="right" />
+    </el-table>
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
+  </el-card>
+</template>
+
+<script>
+import * as API from '@/api/shengde/group/order/orderManagement.js'
+import { mapGetters } from 'vuex'
+import { getList } from '@/api/shengde/group/subcompany/subcompanyManagement/index.js'
+
+export default {
+  name: 'alreadyRemoved',
+  data() {
+    return {
+      loading: false,
+      settlementStatus: [
+        {
+          id: '0',
+          dictValue: '未结算',
+          dictKey: '0',
+        },
+        {
+          id: '2',
+          dictValue: '已对账',
+          dictKey: '2',
+        },
+        {
+          id: '1',
+          dictValue: '已结算',
+          dictKey: '1',
+        },
+      ],
+      orderStatus: [],
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        model: '0',
+      },
+      tableList: [],
+      total: null,
+      companyList: [],
+    }
+  },
+  created() {
+    this.orderStatus = this.dictData.filter((item) => item.code === 'order_status')[0].children
+    getList({ pageNum: 1, pageSize: 9999 }).then((res) => {
+      if (res.data.data.records && res.data.data.records.length > 0) {
+        this.companyList = res.data.data.records.map((item) => {
+          return {
+            dictValue: item.name,
+            dictKey: item.id,
+          }
+        })
+      }
+    })
+  },
+  mounted() {
+    this.getList()
+  },
+  computed: mapGetters(['dictData']),
+  methods: {
+    getList() {
+      this.loading = true
+      API.versionList(this.queryParams).then(
+        (res) => {
+          if (res.data.data.list && res.data.data.list.length > 0) {
+            this.tableList = res.data.data.list.map((item) => {
+              if (item.json) {
+                let json = JSON.parse(item.json)
+                return {
+                  ...item,
+                  ...json,
+                }
+              } else {
+                return {
+                  ...item,
+                }
+              }
+            })
+          } else {
+            this.tableList = []
+          }
+          this.loading = false
+        },
+        (err) => {
+          console.log('versionList:' + err)
+          this.loading = false
+        }
+      )
+      API.versionListCount(this.queryParams).then((res) => {
+        this.total = res.data.data.count
+      })
+    },
+    subsidiaryIdFormat(row) {
+      return this.selectConstantsLabel(this.companyList, row.subsidiaryId)
+    },
+    showStatus(type) {
+      if (type !== '') return this.feedbackLabel(this.orderStatus, type.toString())
+    },
+    showSettleStatus(type) {
+      if (type !== '') return this.feedbackLabel(this.settlementStatus, type.toString())
+    },
+    clickCode(row) {
+      if (row.dataResource === 0) {
+        this.$router.push({
+          path: '/shengde/subsidiary/order/management/OrderDetail',
+          query: {
+            id: row.id,
+          },
+        })
+      } else if (row.dataResource === 1) {
+        this.$router.push({
+          path: '/shengde/subsidiary/order/management/OrderDetail1',
+          query: {
+            id: row.id,
+          },
+        })
+      }
+    },
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.box-card {
+  height: calc(100vh - 110px);
+  overflow-y: auto;
+}
+::v-deep {
+  .el-input__inner {
+    height: 28px;
+    line-height: 28px;
+  }
+  .el-button {
+    border-radius: 0;
+  }
+  .miniBtn .el-button {
+    padding: 0px !important;
+  }
+  .tableHeader th {
+    background-color: #edf0f5;
+    height: 35px;
+    padding: 0;
+  }
+  .head .el-form-item__label {
+    padding: 0;
+    color: #940819;
+  }
+  .head .el-form-item__content {
+    min-width: 0;
+  }
+  .el-input-number {
+    .el-input__inner {
+      text-align: left !important;
+    }
+  }
+}
+.searchBtn {
+  background: #20b2aa;
+  color: #fff;
+  border: 1px solid #20b2aa;
+}
+</style>

src/views/shengde/subsidiary/order/management/index.vue

@@ -490,9 +490,9 @@ export default {
     },
     bulkSubmission() {
       this.submissionData = {
-        amount: 1,
-        failAmount: 2,
-        successAmount: 3,
+        amount: '',
+        failAmount: '',
+        successAmount: '',
         detailsList: [],
       }
       this.loadingSubmission = true