xiugai

2023-02-22 10:14:10 +08:00
parent 1ccc6803e7
commit b3502c348d
6 changed files with 653 additions and 74 deletions
--- a/src/views/order/index.vue
+++ b/src/views/order/index.vue
@@ -46,70 +46,80 @@
        :data="tableData"
        style="width: 100%"
      >
-        <el-table-column
-          prop="refineryName"
-          label="用户名称"
+      <el-table-column
+          prop="id"
+          label="订单ID"
          show-overflow-tooltip
+          minWidth="250"
        >
-        </el-table-column>
-        <el-table-column
-          prop="refineryName"
-          label="炼厂名称"
-          show-overflow-tooltip
-        >
-        </el-table-column>
-        <el-table-column prop="orderSerialNumber" label="产品名称" width="90">
+      </el-table-column>
+        <el-table-column label="购方客户信息" minWidth="250">
          <template slot-scope="{ row }">
-            {{
-              refineryTypeEnum.find((item) => item.value === row.refineryType)
-                .label
-            }}
+            <p class="gray">
+              <span>{{ row.customerName }}</span>
+            </p>
+            <p class="gray">
+              <span>{{ row.customerId || "暂无" }}</span>
+            </p>
          </template>
        </el-table-column>
-        <el-table-column prop="refineryLevel" label="价格" width="90">
-        </el-table-column>
-        <el-table-column prop="address" label="支付状态" show-overflow-tooltip>
-        </el-table-column>
-        <el-table-column prop="orderSerialNumber" label="订单状态" width="80">
+        <el-table-column label="炼厂&产品" minWidth="250">
          <template slot-scope="{ row }">
-            <el-switch
-              v-model="row.enableMark"
-              active-value="ENABLE"
-              inactive-value="DISABLE"
-              active-color="#13ce66"
-              inactive-color="#ff4949"
-              @change="
-                (val) => {
-                  switchTrigger(val, row);
-                }
-              "
-            >
-            </el-switch>
+            <p class="gray">
+              炼厂名称 <span>{{ row.refineryName }}</span>
+            </p>
+            <p class="gray">
+              产品名称 <span>{{ row.productName }}</span>
+            </p>
          </template>
        </el-table-column>
+
+        <el-table-column 
+        prop="salePrice" label="价格" minWidth="90">
+        </el-table-column>
+
+    
+        <el-table-column prop="payStatus" label="支付状态" minWidth="120" show-overflow-tooltip>
+          <template slot-scope="{ row }">
+            <el-tag :effect="payTagType(row.payStatus).effect" :type="payTagType(row.payStatus).type">{{ payTagType(row.payStatus).label }}</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column prop="orderStatus" label="订单状态" minWidth="120">
+          <template slot-scope="{ row }">
+            <el-tag :effect="orderTagType(row.orderStatus).effect" :type="orderTagType(row.orderStatus).type">{{ orderTagType(row.orderStatus).label }}</el-tag>
+          </template>
+        </el-table-column>
+        
        <el-table-column
          prop="orderSerialNumber"
-          label="价格"
-          width="120"
+          label="订单提货量(实际/预约)"
+          minWidth="180"
        >
+          <template slot-scope="{ row }">
+            <span>{{ row.actQuantity?row.actQuantity:'--' }} / {{ row.preQuantity?row.preQuantity:'--' }} 吨</span>
+          </template>
        </el-table-column>
+
        <el-table-column
          prop="orderSerialNumber"
-          label="价格"
-          width="120"
+          label="订单金额(实际/预约)"
+          minWidth="180"
        >
+          <template slot-scope="{ row }">
+            <span>{{ row.actAmount }} / {{ row.preAmount }} 元</span>
+          </template>
        </el-table-column>
-        <el-table-column label="时间" width="235">
+        <el-table-column label="时间" minWidth="235">
          <template slot-scope="{ row }">
            <p class="gray">
              创建时间 <span>{{ row.createTime }}</span>
            </p>
            <p class="gray">
-              更新时间 <span>{{ row.updateTime || " - -" }}</span>
+              更新时间 <span>{{ row.updateTime || "暂无" }}</span>
            </p>
          </template>
        </el-table-column>
-        <el-table-column prop="orderSerialNumber" label="操作" width="250">
+        <el-table-column prop="orderSerialNumber" fixed="right" label="操作" width="250">
          <template slot-scope="{ row }">
            <el-link type="primary" :underline="false" @click="detail(row)"
              >详情</el-link
@@ -160,12 +170,16 @@
      >
      </general-details>
    </el-drawer>
+    <!-- 提货单 -->
+    <billOfLading :billData="billData" :controlWindows="controlWindows" @closeWindow="handleCurrentChange" />
  </div>
 </template>

 <script>
 import serve from "api/refineryInfo.js";
+import order from "api/order.js";
 import generalDetails from "components/generalDetails/index.vue";
+import billOfLading from "./components/billOfLading.vue";

 export default {
  data() {
@@ -173,9 +187,10 @@ export default {
      controlWindows: {
        add: false,
        addInfo: {
-          title: "炼厂入驻",
+
        },
        detail: false,
+        bill: false,
      },
      refineryTypeEnum: [
        {
@@ -190,9 +205,11 @@ export default {
      parameter: {
        currentPage: 1,
        pageSize: 10,
+        total: 0,
        params: {},
      },
      oilCompanyMatch: {},
+      billData:[],
      mappingData: [
        {
          carTitle: "",
@@ -213,6 +230,7 @@ export default {
  },
  components: {
    generalDetails,
+    billOfLading
  },
  mounted() {
    this.$nextTick(() => {
@@ -228,6 +246,30 @@ export default {
    this.getByPage();
  },
  methods: {
+    payTagType(val){
+      switch(val){
+        case 'PREPAID': return {label:'预支付',type:'info'}
+        case 'PAYING': return {label:'支付中',type:'warning'}
+        case 'SUCCESS': return {label:'支付成功',type:'success',effect:'dark'}
+        case 'FAILURE': return {label:'支付失败',type:'danger',effect:'dark'}
+        case 'CANCELED': return {label:'支付取消',type:'info'}
+        case 'REFUNDED': return {label:'退款成功',type:'danger',effect:'dark'}
+        case 'REFUNDING': return{label:'退款中',type:'warning'}
+        case 'REFUNDFAIL': return{label:'退款失败',type:'info',effect:'dark'}
+      }
+      return {label:val?val:'暂无数据',type:'info',effect:'plain'}
+    },
+    orderTagType(val){
+      switch(val){
+        case 'SUBMITED': return {label:'订单提交 ',type:'info'}
+        case 'ORDER_LOCKED': return {label:'下单中',type:'warning'}
+        case 'ORDER_SUCCESS': return {label:'下单成功',type:'success',effect:'dark'}
+        case 'DELIVERING': return {label:'提货中', type: ''}
+        case 'COMPLETE': return {label:'订单完成',type:'success',effect:'dark'}
+        case 'CANCELED': return {label:'订单取消',type:'info'}
+      }
+      return {label:val?val:'暂无数据',type:'info'}
+    },
    // currentPage change
    handleCurrentChange(page) {
      this.parameter.currentPage = page;
@@ -241,9 +283,9 @@ export default {
    },
    //table list
    getByPage() {
-      serve.getByPage(this.parameter).then((res) => {
+      order.getByPage(this.parameter).then((res) => {
        this.tableData = res.data.list;
-        this.total = res.data.totalPage;
+        this.total = res.data.totalCount;
      });
    },
    //炼厂list
@@ -257,15 +299,17 @@ export default {
      this.controlWindows.addInfo.title = "炼厂入驻";
      this.controlWindows.add = true;
    },
-    //修改
-    update(row) {
-      this.controlWindows.addInfo.title = "炼厂修改";
-      Object.assign(this.controlWindows.addInfo, row);
-      this.controlWindows.add = true;
-    },
    //提货单
-    billOfLading(){
-
+    async billOfLading(row){
+      this.controlWindows.addInfo.title = "";
+      await order.findDeliveryByOrderId(row.id).then((res) => {
+        this.billData.list = res.data
+      });
+      await order.findByOrderId(row.id).then((res) => {
+        this.billData.orderInfo = res.data
+      });
+      this.controlWindows.addInfo = row
+      this.controlWindows.bill = true
    },
    //详情
    detail(row) {
@@ -274,14 +318,14 @@ export default {
    },
    //删除
    deleteRow(row) {
-      serve
-        .deleteRow({
-          id: row.id,
-        })
-        .then((res) => {
-          this.$message.success(res.msg);
-          this.getByPage();
-        });
+      // serve
+      //   .deleteRow({
+      //     id: row.id,
+      //   })
+      //   .then((res) => {
+      //     this.$message.success(res.msg);
+      //     this.getByPage();
+      //   });
    },
    //启用禁用
    switchTrigger(val, row) {
@@ -302,6 +346,7 @@ export default {
      this.parameter = {
        currentPage: 1,
        pageSize: 10,
+        total: 0,
        params: {},
      };
    },