Ver código fonte

退款收尾

Joe 3 anos atrás
pai
commit
1d6ebb4882

+ 6 - 3
src/App.vue

@@ -5,7 +5,10 @@
 </template>
 
 <script>
-export default  {
-  name:  'App',
-}
+export default {
+  name: "App",
+};
 </script>
+
+<style lang="scss">
+</style>

+ 574 - 0
src/views/dept/index.vue

@@ -0,0 +1,574 @@
+<template>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      :inline="true"
+      v-show="showSearch"
+    >
+      <el-form-item label="部门名称" prop="deptName">
+        <el-input
+          v-model="queryParams.deptName"
+          placeholder="请输入部门名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select
+          v-model="queryParams.status"
+          placeholder="部门状态"
+          clearable
+          size="small"
+        >
+          <el-option
+            v-for="dict in statusOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button
+          type="cyan"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['system:dept:add']"
+          >新增</el-button
+        >
+      </el-col>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
+    </el-row>
+
+    <el-table
+      v-loading="loading"
+      :data="deptList"
+      row-key="deptId"
+      default-expand-all
+      :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
+    >
+      <el-table-column
+        prop="deptName"
+        label="部门名称"
+        width="260"
+      ></el-table-column>
+      <el-table-column prop="deptId" label="ID" width="110"></el-table-column>
+      <el-table-column
+        prop="orderNum"
+        label="排序"
+        width="200"
+      ></el-table-column>
+      <el-table-column
+        prop="status"
+        label="状态"
+        :formatter="statusFormat"
+        width="100"
+      ></el-table-column>
+      <el-table-column
+        prop="jiBie"
+        label="级别"
+        v-if="false"
+        width="100"
+      ></el-table-column>
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        width="200"
+      >
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:dept:edit']"
+            >修改</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-plus"
+            @click="handleAdd(scope.row)"
+            v-hasPermi="['system:dept:add']"
+            >新增</el-button
+          >
+          <el-button
+            v-if="scope.row.parentId != 0"
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:dept:remove']"
+            >删除</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-paperclip"
+            @click="handleMnoSplit(scope.row)"
+            v-hasPermi="['system:dept:sign']"
+            >分账确认</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 添加或修改部门对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-row>
+          <el-col :span="24" v-if="form.parentId !== 0">
+            <el-form-item label="上级部门" prop="parentId">
+              <treeselect
+                v-model="form.parentId"
+                :options="deptOptions"
+                :normalizer="normalizer"
+                @select="selectDepart"
+                placeholder="选择上级部门"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="部门名称" prop="deptName">
+              <el-input v-model="form.deptName" placeholder="请输入部门名称" />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="显示排序" prop="orderNum">
+              <el-input-number
+                v-model="form.orderNum"
+                controls-position="right"
+                :min="0"
+              />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="负责人" prop="leader">
+              <el-input
+                v-model="form.leader"
+                placeholder="请输入负责人"
+                maxlength="20"
+              />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="联系电话" prop="phone">
+              <el-input
+                v-model="form.phone"
+                placeholder="请输入联系电话"
+                maxlength="11"
+              />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12" v-show="false">
+            <el-form-item label="jiBie " prop="jiBie">
+              <el-input v-model="form.jiBie" maxlength="50" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" v-show="isShow">
+            <el-form-item label="所属城市" prop="city">
+              <el-input
+                v-model="form.city"
+                placeholder="所属城市"
+                maxlength="50"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" v-show="isShow">
+            <el-form-item label="油站地址" prop="deptAddress">
+              <el-input v-model="form.deptAddress" maxlength="50" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" v-show="isShow">
+            <el-form-item label="油站经度" prop="stationLatitude">
+              <el-input v-model="form.stationLatitude" maxlength="50" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" v-show="isShow">
+            <el-form-item label="油站纬度" prop="stationLongitude">
+              <el-input v-model="form.stationLongitude" maxlength="50" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="部门状态">
+              <el-radio-group v-model="form.status">
+                <el-radio
+                  v-for="dict in statusOptions"
+                  :key="dict.dictValue"
+                  :label="dict.dictValue"
+                  >{{ dict.dictLabel }}</el-radio
+                >
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" v-show="isShow">
+            <el-form-item label="小程序appID" prop="appId">
+              <el-input v-model="form.appId" maxlength="50" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" v-show="isShow">
+            <el-form-item label="小程序appSecret" prop="appSecret">
+              <el-input v-model="form.appSecret" maxlength="50" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" v-show="isShow">
+            <el-form-item label="公众号appID" prop="gzhAppId">
+              <el-input v-model="form.gzhAppId" maxlength="50" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" v-show="isShow">
+            <el-form-item label="公众号appSecret" prop="gzhAppSecret">
+              <el-input v-model="form.gzhAppSecret" maxlength="50" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" v-show="isShow">
+            <el-form-item label="商户号" prop="mno">
+              <el-input v-model="form.mno" maxlength="50" />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12" v-show="isShow">
+            <el-form-item label="云闪付商户号码" prop="merchantNo">
+              <el-input v-model="form.merchantNo" maxlength="50" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" v-show="isShow">
+            <el-form-item label="云闪付终端号" prop="terminalId">
+              <el-input v-model="form.terminalId" maxlength="50" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" v-show="isShow">
+            <el-form-item label="云闪付密钥" prop="yunKey">
+              <el-input v-model="form.yunKey" maxlength="50" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" v-show="isShow">
+            <el-form-item label="是否启用支付宝">
+              <el-radio-group v-model="form.isAlipayFlag">
+                <el-radio label="1"> 是 </el-radio>
+                <el-radio label="0"> 否 </el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" v-show="isShow">
+            <el-form-item label="是否分账">
+              <el-radio-group v-model="form.mnoStatus">
+                <el-radio label="1"> 是 </el-radio>
+                <el-radio label="0"> 否 </el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" v-show="isShow">
+            <el-form-item label="分账收款商户编号" prop="mnoArray">
+              <el-input v-model="form.mnoArray" maxlength="50" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" v-show="isShow">
+            <el-form-item label="分账账号比例" prop="mnoProportion" >
+              <el-input v-model="form.mnoProportion" maxlength="50" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" v-show="showIsLngFlag">
+            <el-form-item label="LNG平台">
+              <el-radio-group v-model="form.isLngFlag">
+                <el-radio label="1"> 是 </el-radio>
+                <el-radio label="0"> 否 </el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  listDept,
+  getDept,
+  delDept,
+  addDept,
+  updateDept,
+  listDeptExcludeChild,
+  listTree,
+  setMnoSplit,
+} from "@/api/system/dept";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+
+export default {
+  name: "Dept",
+  components: { Treeselect },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 表格树数据
+      deptList: [],
+      // 部门树选项
+      deptOptions: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      isShow: false,
+      showIsLngFlag: false,
+      splitShow: false,
+      // 状态数据字典
+      statusOptions: [],
+      // 查询参数
+      queryParams: {
+        deptName: undefined,
+        status: undefined,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        parentId: [
+          { required: true, message: "上级部门不能为空", trigger: "blur" },
+        ],
+        deptName: [
+          { required: true, message: "部门名称不能为空", trigger: "blur" },
+        ],
+        orderNum: [
+          { required: true, message: "显示排序不能为空", trigger: "blur" },
+        ],
+        // singleStationFlag: [
+        //   { required: true, message: "站点类型不能为空", trigger: "change" }
+        // ],
+        email: [
+          {
+            type: "email",
+            message: "'请输入正确的邮箱地址",
+            trigger: ["blur", "change"],
+          },
+        ],
+        phone: [
+          {
+            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+            message: "请输入正确的手机号码",
+            trigger: "blur",
+          },
+        ],
+      },
+    };
+  },
+  created() {
+    this.getList();
+    this.getDicts("sys_normal_disable").then((response) => {
+      this.statusOptions = response.data;
+    });
+  },
+  methods: {
+    /** 查询部门列表 */
+    getList() {
+      this.loading = true;
+      // listTree(this.queryParams).then(response => {
+      //   this.deptList = this.handleTree(response.data, "deptId");
+      //   this.loading = false;
+      // });
+      listDept(this.queryParams).then((response) => {
+        this.deptList = this.handleTree(response.data, "deptId");
+        this.loading = false;
+      });
+    },
+    selectDepart(val) {
+      this.form.jiBie = parseInt(val.jiBie) + 1;
+      if (val.jiBie == 1) {
+        this.isShow = true;
+        this.showIsLngFlag = false;
+      } else {
+        this.isShow = false;
+        this.showIsLngFlag = true;
+      }
+    },
+    /** 转换部门数据结构 */
+    normalizer(node) {
+      if (node.children && !node.children.length) {
+        delete node.children;
+      }
+      return {
+        id: node.deptId,
+        label: node.deptName,
+        children: node.children,
+      };
+    },
+    // 字典状态字典翻译
+    statusFormat(row, column) {
+      return this.selectDictLabel(this.statusOptions, row.status);
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.isShow = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        deptId: undefined,
+        parentId: undefined,
+        deptName: undefined,
+        orderNum: undefined,
+        leader: undefined,
+        phone: undefined,
+        email: undefined,
+        status: "0",
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 新增按钮操作 */
+    handleAdd(row) {
+      this.reset();
+      if (row != undefined) {
+        this.form.parentId = row.deptId;
+        //判断级别 1是集团,如果是集团展示的是油站的所有数据
+        if (row.jiBie == 1) {
+          this.form.jiBie = parseInt(row.jiBie) + 1;
+          this.isShow = true;
+          this.isLngFlag = false;
+        } else {
+          this.isLngFlag = true;
+          this.isShow = false;
+        }
+      }
+      this.open = true;
+      this.title = "添加部门";
+      listDept().then((response) => {
+        this.deptOptions = this.handleTree(response.data, "deptId");
+      });
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      getDept(row.deptId).then((response) => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改部门";
+      });
+      listDeptExcludeChild(row.deptId).then((response) => {
+        this.deptOptions = this.handleTree(response.data, "deptId");
+      });
+      //判断级别 1是集团,如果是集团展示的是油站的所有数据
+      if (row.jiBie == 2) {
+        this.isShow = true;
+        this.showIsLngFlag = false;
+      } else {
+        this.isShow = false;
+        this.showIsLngFlag = true;
+      }
+    },
+    //设置分账的参数
+    handleMnoSplit(row) {
+      this.$confirm('是否进行分账设置,点击确定跳转确认页面"', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          return setMnoSplit(row.deptId);
+        })
+        .then((res) => {
+          // this.getList();
+          window.open(res.msg, "_blank");
+          //this.msgSuccess("分账设置成功");
+        });
+    },
+
+    /** 提交按钮 */
+    submitForm: function () {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.form.deptId != undefined) {
+            updateDept(this.form).then((response) => {
+              //window.location=response.message;
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.isShow = false;
+              this.getList();
+            });
+          } else {
+            addDept(this.form).then((response) => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.isShow = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      this.$confirm(
+        '是否确认删除名称为"' + row.deptName + '"的数据项?',
+        "警告",
+        {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        }
+      )
+        .then(function () {
+          return delDept(row.deptId);
+        })
+        .then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        });
+    },
+  },
+};
+</script>

+ 189 - 210
src/views/order/Order_Approval.vue

@@ -10,216 +10,190 @@
       '您暂未启动退款功能',
     ]"
   >
-  <div class="app-container">
-    <el-form
-      :model="queryParams"
-      ref="queryForm"
-      :inline="true"
-      label-width="68px"
-    >
-      <el-form-item label="订单号" prop="orderNo">
-        <el-input
-          v-model="queryParams.orderNo"
-          placeholder="请输入订单号"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
+    <div class="app-container">
+      <el-form
+        :model="queryParams"
+        ref="queryForm"
+        :inline="true"
+        label-width="68px"
+      >
+        <el-form-item label="订单号" prop="orderNo">
+          <el-input
+            v-model="queryParams.orderNo"
+            placeholder="请输入订单号"
+            clearable
+            size="small"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="客户姓名" prop="likeConsumer">
+          <el-input
+            v-model="queryParams.likeConsumer"
+            placeholder="请输入客户姓名"
+            clearable
+            size="small"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="油品名称" prop="oilName">
+          <el-select
+            v-model="queryParams.oilName"
+            placeholder="油品名称"
+            clearable
+            size="small"
+          >
+            <el-option
+              v-for="dict in oilNameOptions"
+              :key="dict.dictLabel"
+              :label="dict.dictLabel"
+              :value="dict.dictLabel"
+            />
+          </el-select>
+        </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"
+            >导出</el-button
+          >
+        </el-form-item>
+      </el-form>
+      <el-table :data="orderList">
+        <af-table-column
+          label="油站名"
+          align="center"
+          prop="stationName"
+          v-if="jiBie == 0 || jiBie == 1"
         />
-      </el-form-item>
-      <el-form-item label="客户姓名" prop="likeConsumer">
-        <el-input
-          v-model="queryParams.likeConsumer"
-          placeholder="请输入客户姓名"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
+        <af-table-column
+          v-if="false"
+          label="订单id"
+          align="center"
+          prop="orderId"
         />
-      </el-form-item>
-      <el-form-item label="油品名称" prop="oilName">
-        <el-select
-          v-model="queryParams.oilName"
-          placeholder="油品名称"
-          clearable
-          size="small"
-        >
-          <el-option
-            v-for="dict in oilNameOptions"
-            :key="dict.dictLabel"
-            :label="dict.dictLabel"
-            :value="dict.dictLabel"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="加油员" prop="oilPersonnel">
-        <el-input
-          v-model="queryParams.oilPersonnel"
-          placeholder="请输入加油员"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
+        <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-form-item>
-      <el-form-item label="油枪" prop="oilGun">
-        <el-input
-          v-model="queryParams.oilGun"
-          placeholder="请输入油枪"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
+        <af-table-column
+          label="油站名称"
+          align="center"
+          v-if="false"
+          prop="stationName"
         />
-      </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"
-          >导出</el-button
+        <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="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"
+          class-name="small-padding fixed-width"
+          width="240px"
         >
-      </el-form-item>
-    </el-form>
-    <el-table :data="orderList">
-      <af-table-column
-        label="油站名"
-        align="center"
-        prop="stationName"
-        v-if="jiBie == 0 || jiBie == 1"
-      />
-      <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="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"
-      />
-      <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="状态"
-        width="130px"
-        align="center"
-        prop="status"
-        :formatter="statusFotmat"
-      />
-      <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"
-        class-name="small-padding fixed-width"
-        width="240px"
-        
-      >
-        <template slot-scope="scope">
-          <el-popconfirm
-            title="审核通过后立刻走退款流程,且不可撤销,是否继续"
-            confirm-button-text="审核通过"
-            @onConfirm="examinRefundSuccess(scope.row)"
-          >
-            <el-button
-              slot="reference"
-              size="mini"
-              type="text"
-              icon="el-icon-plus"
-              >审核通过</el-button
+          <template slot-scope="scope">
+            <el-popconfirm
+              title="审核通过后立刻走退款流程,且不可撤销,是否继续"
+              confirm-button-text="审核通过"
+              @onConfirm="examinRefundSuccess(scope.row)"
             >
-          </el-popconfirm>
-          <el-popconfirm
-            title="确认驳回此退款申请,是否继续"
-            confirm-button-text="确定"
-            @onConfirm="examinRefundBack(scope.row)"
-          >
-            <el-button
-              slot="reference"
-              size="mini"
-              type="text"
-              icon="el-icon-plus"
-              >驳回申请</el-button
+              <el-button
+                slot="reference"
+                size="mini"
+                type="text"
+                icon="el-icon-plus"
+                >审核通过</el-button
+              >
+            </el-popconfirm>
+            <el-popconfirm
+              title="确认驳回此退款申请,是否继续"
+              confirm-button-text="确定"
+              @onConfirm="examinRefundBack(scope.row)"
             >
-          </el-popconfirm>
-        </template>
-      </af-table-column>
-    </el-table>
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-  </div>
+              <el-button
+                slot="reference"
+                size="mini"
+                type="text"
+                icon="el-icon-plus"
+                >驳回申请</el-button
+              >
+            </el-popconfirm>
+          </template>
+        </af-table-column>
+      </el-table>
+      <pagination
+        v-show="total > 0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+      />
+    </div>
   </PermissionContainer>
 </template>
 <script>
@@ -261,7 +235,7 @@ export default {
         createdDate: null,
         likeConsumer: null,
         orderNo: null,
-        examinStatus: "-1", // -1 查询下面的列表: 1申请  2成功 3驳回 4 失败 
+        examinStatus: "1", // -1 查询下面的列表: 1申请  2成功 3驳回 4 失败
       },
       // 表单校验
       rules: {},
@@ -294,17 +268,18 @@ export default {
   },
   methods: {
     // 审批通过
-    examinRefundSuccess(row){
+    examinRefundSuccess(row) {
       examinRefundSuccess(row).then((res) => {
-        console.log(row);
-      })
+        this.msgSuccess("退款成功");
+        this.getList();
+      });
     },
     // 驳回申请
-    examinRefundBack(row){
+    examinRefundBack(row) {
       examinRefundBack(row).then((res) => {
-        this.msgSuccess('已经驳回该退款申请')
+        this.msgSuccess("已经驳回该退款申请");
         this.getList();
-      })
+      });
     },
     payTypeFotmat(row, column) {
       if (row.payType === "wx") {
@@ -328,6 +303,10 @@ export default {
         return "未支付";
       } else if (row.status === "1") {
         return "已支付";
+      } else if (row.status === "2") {
+        return "线下退款";
+      } else if (row.status === "3") {
+        return "线上退款";
       }
     },
     /** 查询订单支付列表 */

+ 4 - 2
src/views/order/Order_Lng.vue

@@ -212,12 +212,14 @@ export default {
       }
     },
     statusFotmat(row, column) {
-      if (row.status === "0") {
+    if (row.status === "0") {
         return "未支付";
       } else if (row.status === "1") {
         return "已支付";
       }else if (row.status === "2") {
-        return "已退款";
+        return "线下退款";
+      }else if (row.status === "3") {
+        return "线上退款";
       }
     },
     /** 查询订单支付列表 */

+ 13 - 4
src/views/order/Order_NotOil.vue

@@ -46,7 +46,12 @@
       </el-form-item>
     </el-form>
     <el-table :data="orderList">
-      <af-table-column label="油站名" align="center" prop="stationName" v-if="jiBie==0||jiBie==1"/>
+      <af-table-column
+        label="油站名"
+        align="center"
+        prop="stationName"
+        v-if="jiBie == 0 || jiBie == 1"
+      />
       <af-table-column label="应付金额" align="center" prop="receivableAmt" />
       <af-table-column label="实付金额" align="center" prop="amt" />
       <af-table-column label="客户姓名" align="center" prop="consumer" />
@@ -118,7 +123,7 @@ export default {
         createdDate: null,
         orderType: 2,
         likeConsumer: null,
-        levelId: this.levelId
+        levelId: this.levelId,
       },
       // 表单参数
       form: {},
@@ -129,7 +134,7 @@ export default {
     //字典
     this.getDicts("pay_type").then((response) => {
       this.payTypeOptions = response.data;
-    })
+    });
   },
   methods: {
     payTypeFotmat(row, column) {
@@ -154,11 +159,15 @@ export default {
         return "未支付";
       } else if (row.status === "1") {
         return "已支付";
+      } else if (row.status === "2") {
+        return "线下退款";
+      } else if (row.status === "3") {
+        return "线上退款";
       }
     },
     /** 查询订单支付列表 */
     getList() {
-      this.queryParams.levelId = this.levelId
+      this.queryParams.levelId = this.levelId;
       listOrder(
         this.addDateRange(this.queryParams, this.dateRangeCreatedDate)
       ).then((response) => {

+ 5 - 1
src/views/order/Order_Oil.vue

@@ -274,10 +274,14 @@ export default {
       }
     },
     statusFotmat(row, column) {
-      if (row.status === "0") {
+    if (row.status === "0") {
         return "未支付";
       } else if (row.status === "1") {
         return "已支付";
+      }else if (row.status === "2") {
+        return "线下退款";
+      }else if (row.status === "3") {
+        return "线上退款";
       }
     },
     /** 查询订单支付列表 */

+ 6 - 19
src/views/order/Order_Refund.vue

@@ -49,26 +49,8 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="加油员" prop="oilPersonnel">
-        <el-input
-          v-model="queryParams.oilPersonnel"
-          placeholder="请输入加油员"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="油枪" prop="oilGun">
-        <el-input
-          v-model="queryParams.oilGun"
-          placeholder="请输入油枪"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
 
-      <el-form-item label="创建时间" prop="createdDate">
+      <el-form-item label="下单时间" prop="createdDate">
         <el-date-picker
           style="width: 350px"
           v-model="dateRangeCreatedDate"
@@ -192,6 +174,7 @@
             type="text"
             icon="el-icon-plus"
             :disable="scope.row.examinStatus=='2'"
+            v-if="scope.row.status==1"
             @click="startRefund(scope.row)"
             >{{
               scope.row.examinStatus == null ? '申请退款' : '' + 
@@ -345,6 +328,10 @@ export default {
         return "未支付";
       } else if (row.status === "1") {
         return "已支付";
+      }else if (row.status === "2") {
+        return "线下退款";
+      }else if (row.status === "3") {
+        return "线上退款";
       }
     },
     /** 查询订单支付列表 */