订单页完成

src/utils/request.js

@@ -8,7 +8,7 @@ axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
 // 创建axios实例
 const service = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
-  baseURL: process.env.VUE_APP_BASE_API,
+  // baseURL: process.env.VUE_APP_BASE_API,
   baseURL: 'http://www.huiyj.com:9002/prod-api',
   // 超时
   timeout: 10000

src/views/station/oilgun.vue

@@ -142,9 +142,6 @@ export default {
         pageSize: 10,
         stationId: this.deptId,
       },
-      query: {
-        deptId: null,
-      },
       // 表单参数
       form: {},
       deptInfo: {},

src/views/station/order/notOil.vue

@@ -1,278 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-
-      <el-form-item label="客户姓名" prop="consumer">
-        <el-input
-          v-model="queryParams.likeConsumer"
-          placeholder="请输入客户姓名"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="联系电话" prop="orderNo">
-        <el-input
-          v-model="queryParams.likeCustomerPhone"
-          placeholder="请输入联系电话"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="创建时间" prop="createdDate">
-        <el-date-picker style="width: 350px"
-                        v-model="dateRangeCreatedDate" size="mini" value-format="yyyy-MM-dd HH:mm:ss"
-                        type="datetimerange"
-                        range-separator="至"
-                        start-placeholder="开始日期"
-                        end-placeholder="结束日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button type="info" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-        <!-- <el-button type="warning" icon="el-icon-download" size="mini" @click="handleExport"  v-hasPermi="['station:order:export']">导出</el-button> -->
-      </el-form-item>
-    </el-form>
-    <el-table v-loading="loading" :data="orderList" >
-      <el-table-column v-if="false" label="订单id" align="center" prop="orderId" />
-      <el-table-column label="订单号"  width="200" align="center" prop="orderNo" />
-      <el-table-column label="应付金额" align="center" prop="receivableAmt" />
-      <el-table-column label="实付金额" align="center" prop="amt" />
-      <el-table-column label="客户姓名" width="120" align="center" prop="consumer" />
-      <el-table-column label="加油员" width="120" align="center" prop="oilPersonnel" />
-
-      <el-table-column label="支付类型" align="center" prop="payType" :formatter="payTypeFotmat"/>
-      <el-table-column label="油站名称" width="120" align="center" v-if="false" prop="stationName" />
-      <el-table-column v-if="false" label="用户id(消费者)" align="center" prop="consumerId" />
-      <el-table-column v-if="false" label="油站id" align="center" prop="stationId" />
-      <el-table-column label="状态" align="center" prop="status" :formatter="statusFotmat"/>
-      <el-table-column label="支付方式" align="center" prop="payWay" :formatter="payWayFotmat"/>
-      <el-table-column label="支付时间" align="center" prop="payDate" width="150">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.payDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createdDate" width="150">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createdDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="订单类型" align="center" prop="
-
-" v-if="false" />
-    </el-table>
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-  </div>
-</template>
-<script>
-  import { listOrder, exportOrder } from "@/api/station/noorder";
-  import {stationinfo} from "@/api/station/gun";
-
-  export default {
-    name: "Order",
-    data() {
-      return {
-         //创建订单时间间隔
-        dateRangeCreatedDate:[],
-        // 遮罩层
-        loading: true,
-        // 选中数组
-        ids: [],
-        // 非单个禁用
-        single: true,
-        // 非多个禁用
-        multiple: true,
-        // 显示搜索条件
-        showSearch: true,
-        // 总条数
-        total: 0,
-        // 订单支付表格数据
-        orderList: [],
-        oilNameOptions: [],
-        //字典
-        payTypeOptions:[],
-        payWayOptions:[],
-        //下拉油站
-        stationOptions:[],
-        // 弹出层标题
-        title: "",
-        // 是否显示弹出层
-        open: false,
-        // 查询参数
-        queryParams: {
-          pageNum: 1,
-          pageSize: 10,
-          orderNo: null,
-          oilGun: null,
-          oilName: null,
-          consumerId: null,
-          consumer: null,
-          amt: null,
-          stationId: null,
-          status: null,
-          orderLiters: null,
-          payType: null,
-          payWay: null,
-          stationName: null,
-          payDate: null,
-          payMaxDate: null,
-          payMinDate: null,
-          createdMaxDate: null,
-          createdMinDate: null,
-          oilPersonnel: null,
-          createdDate: null,
-          orderType:2,
-          likeConsumer: null,
-          likeCustomerPhone: null,
-          likeCarNo: null
-        },
-        // 表单参数
-        form: {},
-        // 表单校验
-        rules: {
-        }
-      };
-    },
-    created() {
-      this.getList();
-      //字典
-      this.getDicts("pay_type").then(response => {
-        this.payTypeOptions = response.data;
-      });
-      this.getDicts("pay_way").then(response => {
-        this.payWayOptions = response.data;
-      });
-      stationinfo().then(response => {
-        this.stationOptions = response.rows;
-      });
-      this.getDicts("oil_name").then(response => {
-        this.oilNameOptions = response.data;
-      });
-    },
-    methods: {
-       payTypeFotmat(row, column){
-        if(row.payType === 'wx'){
-          return '微信支付'
-        }else if(row.payType === 'zfb'){
-          return '支付宝支付'
-        }else if(row.payType === 'xj'){
-          return '现金支付'
-        }else if(row.payType === 'dzk'){
-          return '电子卡支付'
-        }
-        else if(row.payType === 'POS'){
-          return 'POS机支付'
-        }
-        else if(row.payType === 'yzf'){
-          return '预支付'
-        }
-        else if(row.payType === 'kbzf'){
-          return '卡包支付'
-        }
-      },
-      payWayFotmat(row, column){
-        if(row.payWay === '02'){
-          return '公众号'
-        }else if(row.payWay === '03'){
-          return '小程序'
-        }
-      },
-      statusFotmat(row, column){
-        if(row.status === '0'){
-          return '未支付'
-        }else if(row.status === '1'){
-          return '已支付'
-        }
-      },
-      //orderTypeFotmat
-      // orderTypeFotmat(row, column){
-      //   if(row.orderType === '1'){
-      //     return '柴油'
-      //   }else if(row.orderType === '2'){
-      //     return '汽油'
-      //   }
-      // },
-
-      /** 查询订单支付列表 */
-      getList() {
-        this.loading = true;
-        this.queryParams.stationId= this.$store.selectDeptId;
-        if(this.queryParams.stationId==null || this.queryParams.stationId==""){
-          this.queryParams.stationId =this.$store.state.user.deptId;
-        }
-        listOrder(this.addDateRange(this.queryParams, this.dateRangeCreatedDate)).then(response => {
-          this.orderList = response.rows;
-          this.total = response.total;
-          this.loading = false;
-        });
-      },
-      onInstitutionChang(e){
-        let obj = {};
-        obj = this.stationOptions.find((item)=>{//这里的userList就是上面遍历的数据源
-          return item.stationId === e;//筛选出匹配数据
-        })
-        this.form.stationName=obj.stationName;
-      },
-      // 取消按钮
-      cancel() {
-        this.open = false;
-        this.reset();
-      },
-      // 表单重置
-      reset() {
-        this.form = {
-          orderId: null,
-          orderNo: null,
-          oilGun: null,
-          oilName: null,
-          consumerId: null,
-          consumer: null,
-          amt: null,
-          stationId: null,
-          status: "0",
-          orderLiters: null,
-          payType: null,
-          payWay: null,
-          payDate: null,
-          oilPersonnel: null,
-          createdDate: null,
-          orderType: null
-        };
-        this.resetForm("form");
-      },
-      /** 搜索按钮操作 */
-      handleQuery() {
-        this.queryParams.pageNum = 1;
-        this.getList();
-      },
-      /** 重置按钮操作 */
-      resetQuery() {
-        this.dateRangeCreatedDate =[];
-        this.resetForm("queryForm");
-        this.handleQuery();
-      },
-
-      /** 导出按钮操作 */
-      handleExport() {
-        const queryParams = this.queryParams;
-        this.$confirm('是否确认导出所有订单支付数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return exportOrder(queryParams);
-        }).then(response => {
-          this.download(response.msg);
-        })
-      }
-    }
-  };
-</script>

src/views/station/order/notOilOrder.vue

@@ -0,0 +1,257 @@
+<template>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      :inline="true"
+      label-width="68px"
+    >
+      <el-form-item label="客户姓名" prop="consumer">
+        <el-input
+          v-model="queryParams.likeConsumer"
+          placeholder="请输入客户姓名"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="联系电话" prop="orderNo">
+        <el-input
+          v-model="queryParams.likeCustomerPhone"
+          placeholder="请输入联系电话"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createdDate">
+        <el-date-picker
+          style="width: 350px"
+          v-model="dateRangeCreatedDate"
+          size="mini"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          type="datetimerange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        >
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button
+          type="cyan"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button
+          type="info"
+          icon="el-icon-refresh"
+          size="mini"
+          @click="resetQuery"
+          >重置</el-button
+        >
+      </el-form-item>
+    </el-form>
+    <el-table :data="orderList">
+      <af-table-column
+        v-if="false"
+        label="订单id"
+        align="center"
+        prop="orderId"
+      />
+      <af-table-column label="订单号" align="center" prop="orderNo" />
+      <af-table-column label="应付金额" align="center" prop="receivableAmt" />
+      <af-table-column label="实付金额" align="center" prop="amt" />
+      <af-table-column label="客户姓名" align="center" prop="consumer" />
+      <af-table-column label="加油员" align="center" prop="oilPersonnel" />
+
+      <af-table-column
+        label="支付类型"
+        align="center"
+        prop="payType"
+        :formatter="payTypeFotmat"
+      />
+      <af-table-column
+        label="油站名称"
+        align="center"
+        v-if="false"
+        prop="stationName"
+      />
+      <af-table-column
+        v-if="false"
+        label="用户id(消费者)"
+        align="center"
+        prop="consumerId"
+      />
+      <af-table-column
+        v-if="false"
+        label="油站id"
+        align="center"
+        prop="stationId"
+      />
+      <af-table-column
+        label="状态"
+        align="center"
+        prop="status"
+        width="120px"
+        :formatter="statusFotmat"
+      />
+      <af-table-column
+        label="支付方式"
+        align="center"
+        prop="payWay"
+        :formatter="payWayFotmat"
+      />
+      <af-table-column label="支付时间" align="center" prop="payDate">
+        <template slot-scope="scope">
+          <span>{{
+            parseTime(scope.row.payDate, "{y}-{m}-{d} {h}:{i}:{s}")
+          }}</span>
+        </template>
+      </af-table-column>
+      <af-table-column label="创建时间" align="center" prop="createdDate">
+        <template slot-scope="scope">
+          <span>{{
+            parseTime(scope.row.createdDate, "{y}-{m}-{d} {h}:{i}:{s}")
+          }}</span>
+        </template>
+      </af-table-column>
+      <af-table-column
+        label="订单类型"
+        align="center"
+        prop="
+
+"
+        v-if="false"
+      />
+    </el-table>
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </div>
+</template>
+<script>
+import { listOrder, exportOrder } from "@/api/station/noorder";
+import { stationinfo } from "@/api/station/gun";
+
+export default {
+  name: "Order",
+  data() {
+    return {
+      //创建订单时间间隔
+      dateRangeCreatedDate: [],
+      // 总条数
+      total: 0,
+      // 订单支付表格数据
+      orderList: [],
+      oilNameOptions: [],
+      //字典
+      payTypeOptions: [],
+      payWayOptions: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        stationId: this.deptId,
+        createdDate: null,
+        orderType: 2,
+        likeConsumer: null,
+        likeCustomerPhone: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {},
+    };
+  },
+  created() {
+    this.getList();
+    //字典
+    this.getDicts("pay_type").then((response) => {
+      this.payTypeOptions = response.data;
+    });
+    this.getDicts("pay_way").then((response) => {
+      this.payWayOptions = response.data;
+    });
+  },
+  methods: {
+    payTypeFotmat(row, column) {
+      if (row.payType === "wx") {
+        return "微信支付";
+      } else if (row.payType === "zfb") {
+        return "支付宝支付";
+      } else if (row.payType === "xj") {
+        return "现金支付";
+      } else if (row.payType === "dzk") {
+        return "电子卡支付";
+      } else if (row.payType === "POS") {
+        return "POS机支付";
+      } else if (row.payType === "yzf") {
+        return "预支付";
+      } else if (row.payType === "kbzf") {
+        return "卡包支付";
+      }
+    },
+    payWayFotmat(row, column) {
+      if (row.payWay === "02") {
+        return "公众号";
+      } else if (row.payWay === "03") {
+        return "小程序";
+      }
+    },
+    statusFotmat(row, column) {
+      if (row.status === "0") {
+        return "未支付";
+      } else if (row.status === "1") {
+        return "已支付";
+      }
+    },
+    /** 查询订单支付列表 */
+    getList() {
+      listOrder(
+        this.addDateRange(this.queryParams, this.dateRangeCreatedDate)
+      ).then((response) => {
+        this.orderList = response.rows;
+        this.total = response.total;
+      });
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRangeCreatedDate = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm("是否确认导出所有订单支付数据项?", "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(function () {
+          return exportOrder(queryParams);
+        })
+        .then((response) => {
+          this.download(response.msg);
+        });
+    },
+  },
+};
+</script>

src/views/station/order/index.vue → src/views/station/order/oilOrder.vue

@@ -4,10 +4,9 @@
       :model="queryParams"
       ref="queryForm"
       :inline="true"
-      v-show="showSearch"
       label-width="68px"
     >
-      <el-form-item label="客户姓名" prop="consumer">
+      <el-form-item label="客户姓名" prop="likeConsumer">
         <el-input
           v-model="queryParams.likeConsumer"
           placeholder="请输入客户姓名"
@@ -16,7 +15,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="联系电话" prop="orderNo">
+      <el-form-item label="联系电话" prop="likeCustomerPhone">
         <el-input
           v-model="queryParams.likeCustomerPhone"
           placeholder="请输入订单号"
@@ -34,9 +33,9 @@
         >
           <el-option
             v-for="dict in oilNameOptions"
-            :key="dict.dictLabel"
-            :label="dict.dictLabel"
-            :value="dict.dictLabel"
+            :key="dict.oilName"
+            :label="dict.oilName"
+            :value="dict.oilName"
           />
         </el-select>
       </el-form-item>
@@ -92,105 +91,80 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['station:order:export']"
           >导出</el-button
         >
       </el-form-item>
     </el-form>
-    <el-table v-loading="loading" :data="orderList">
-      <el-table-column
+    <el-table :data="orderList">
+      <af-table-column
         v-if="false"
         label="订单id"
         align="center"
         prop="orderId"
       />
-      <el-table-column
-        label="订单号"
-        width="200"
-        align="center"
-        prop="orderNo"
-      />
-      <el-table-column label="油品名称" align="center" prop="oilName" />
-      <el-table-column label="油品价格" align="center" prop="oilPirce" />
-      <el-table-column label="加油升数" align="center" prop="orderLiters" />
-      <el-table-column label="应付金额" align="center" prop="receivableAmt" />
-      <el-table-column label="实付金额" align="center" prop="amt" />
-      <el-table-column label="优惠金额" align="center" prop="discountAmt" />
-      <el-table-column
-        label="客户姓名"
-        width="120"
-        align="center"
-        prop="consumer"
-      />
-      <el-table-column
-        label="加油员"
-        width="120"
-        align="center"
-        prop="oilPersonnel"
-      />
-      <el-table-column label="加油枪号" align="center" prop="oilGun" />
-      <el-table-column
+      <af-table-column label="订单号" align="center" prop="orderNo" />
+      <af-table-column label="油品名称" align="center" prop="oilName" />
+      <af-table-column label="油品价格" align="center" prop="oilPirce" />
+      <af-table-column label="加油升数" align="center" prop="orderLiters" />
+      <af-table-column label="应付金额" align="center" prop="receivableAmt" />
+      <af-table-column label="实付金额" align="center" prop="amt" />
+      <af-table-column label="优惠金额" align="center" prop="discountAmt" />
+      <af-table-column label="客户姓名" align="center" prop="consumer" />
+      <af-table-column label="加油员" align="center" prop="oilPersonnel" />
+      <af-table-column label="加油枪号" align="center" prop="oilGun" />
+      <af-table-column
         label="支付类型"
         align="center"
         prop="payType"
+        width="150px"
         :formatter="payTypeFotmat"
       />
-      <el-table-column
+      <af-table-column
         label="油站名称"
-        width="120"
         align="center"
         v-if="false"
         prop="stationName"
       />
-      <el-table-column
+      <af-table-column
         v-if="false"
         label="用户id(消费者)"
         align="center"
         prop="consumerId"
       />
-      <el-table-column
+      <af-table-column
         v-if="false"
         label="油站id"
         align="center"
         prop="stationId"
       />
-      <el-table-column
+      <af-table-column
         label="状态"
+        width="130px"
         align="center"
         prop="status"
         :formatter="statusFotmat"
       />
-      <el-table-column
+      <af-table-column
         label="支付方式"
         align="center"
         prop="payWay"
         :formatter="payWayFotmat"
       />
-      <el-table-column
-        label="支付时间"
-        align="center"
-        prop="payDate"
-        width="150"
-      >
+      <af-table-column label="支付时间" align="center" prop="payDate">
         <template slot-scope="scope">
           <span>{{
             parseTime(scope.row.payDate, "{y}-{m}-{d} {h}:{i}:{s}")
           }}</span>
         </template>
-      </el-table-column>
-      <el-table-column
-        label="创建时间"
-        align="center"
-        prop="createdDate"
-        width="150"
-      >
+      </af-table-column>
+      <af-table-column label="创建时间" align="center" prop="createdDate">
         <template slot-scope="scope">
           <span>{{
             parseTime(scope.row.createdDate, "{y}-{m}-{d} {h}:{i}:{s}")
           }}</span>
         </template>
-      </el-table-column>
-      <el-table-column
+      </af-table-column>
+      <af-table-column
         label="订单类型"
         align="center"
         prop="orderType"
@@ -209,6 +183,7 @@
 <script>
 import { listOrder, exportOrder } from "@/api/station/order";
 import { stationinfo } from "@/api/station/gun";
+import { listPrice, getPrice } from "@/api/station/price";
 
 export default {
   name: "Order",
@@ -216,25 +191,15 @@ export default {
     return {
       //创建订单时间间隔
       dateRangeCreatedDate: [],
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
       // 总条数
       total: 0,
       // 订单支付表格数据
       orderList: [],
       oilNameOptions: [],
-      //字典
+      // 字典
       payTypeOptions: [],
       payWayOptions: [],
-      //下拉油站
+      // 下拉油站
       stationOptions: [],
       // 弹出层标题
       title: "",
@@ -244,32 +209,15 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        orderNo: null,
         oilGun: null,
         oilName: null,
-        consumerId: null,
-        consumer: null,
-        amt: null,
-        stationId: null,
-        status: null,
-        orderLiters: null,
-        payType: null,
-        payWay: null,
-        stationName: null,
-        payDate: null,
-        payMaxDate: null,
-        payMinDate: null,
-        createdMaxDate: null,
-        createdMinDate: null,
+        stationId: this.deptId,
+        orderType: 1,
         oilPersonnel: null,
         createdDate: null,
-        orderType: 1,
         likeConsumer: null,
         likeCustomerPhone: null,
-        likeCarNo: null,
       },
-      // 表单参数
-      form: {},
       // 表单校验
       rules: {},
     };
@@ -289,6 +237,11 @@ export default {
     this.getDicts("oil_name").then((response) => {
       this.oilNameOptions = response.data;
     });
+    listPrice({
+      stationId: this.deptId,
+    }).then((response) => {
+      this.oilNameOptions = response.rows;
+    });
   },
   methods: {
     payTypeFotmat(row, column) {
@@ -322,68 +275,15 @@ export default {
         return "已支付";
       }
     },
-    //orderTypeFotmat
-    // orderTypeFotmat(row, column){
-    //   if(row.orderType === '1'){
-    //     return '柴油'
-    //   }else if(row.orderType === '2'){
-    //     return '汽油'
-    //   }
-    // },
-
     /** 查询订单支付列表 */
     getList() {
-      this.loading = true;
-      this.queryParams.stationId = this.$store.selectDeptId;
-      if (
-        this.queryParams.stationId == null ||
-        this.queryParams.stationId == ""
-      ) {
-        this.queryParams.stationId = this.$store.state.user.deptId;
-      }
       listOrder(
         this.addDateRange(this.queryParams, this.dateRangeCreatedDate)
       ).then((response) => {
         this.orderList = response.rows;
         this.total = response.total;
-        this.loading = false;
       });
     },
-    onInstitutionChang(e) {
-      let obj = {};
-      obj = this.stationOptions.find((item) => {
-        //这里的userList就是上面遍历的数据源
-        return item.stationId === e; //筛选出匹配数据
-      });
-      this.form.stationName = obj.stationName;
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        orderId: null,
-        orderNo: null,
-        oilGun: null,
-        oilName: null,
-        consumerId: null,
-        consumer: null,
-        amt: null,
-        stationId: null,
-        status: "0",
-        orderLiters: null,
-        payType: null,
-        payWay: null,
-        payDate: null,
-        oilPersonnel: null,
-        createdDate: null,
-        orderType: null,
-      };
-      this.resetForm("form");
-    },
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;

vue.config.js

@@ -29,14 +29,14 @@ module.exports = {
   productionSourceMap: false,
   // webpack-dev-server 相关配置
   devServer: {
-    host: '0.0.0.0',
+    // host: '0.0.0.0',
     port: port,
     open: true,
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://localhost:8080`,
-        // target:"http://www.huijy.net:9001/",
+        // target: `http://localhost:8080`,
+        target:"http://www.huiyj.com:9002/prod-api",
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''