Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system-vue

src/api/repair/supplier/index.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 创建供应商
+export function createBaseSupplier(data) {
+  return request({
+    url: '/supplier/baseSupplier/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新供应商
+export function updateBaseSupplier(data) {
+  return request({
+    url: '/supplier/baseSupplier/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除供应商
+export function deleteBaseSupplier(id) {
+  return request({
+    url: '/supplier/baseSupplier/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得供应商
+export function getBaseSupplier(id) {
+  return request({
+    url: '/supplier/baseSupplier/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得供应商分页
+export function getBaseSupplierPage(params) {
+  return request({
+    url: '/supplier/baseSupplier/page',
+    method: 'get',
+    params
+  })
+}
+// 导出供应商 Excel
+export function exportBaseSupplierExcel(params) {
+  return request({
+    url: '/supplier/baseSupplier/export-excel',
+    method: 'get',
+    params,
+    responseType: 'blob'
+  })
+}

src/utils/dict.js

@@ -59,6 +59,7 @@ export const DICT_TYPE = {
   PAY_REFUND_STATUS: 'pay_refund_status', // 退款订单状态
   PAY_NOTIFY_STATUS: 'pay_notify_status', // 商户支付回调状态
   PAY_NOTIFY_TYPE: 'pay_notify_type', // 商户支付回调状态
+  PAY_TYPE: 'pay_type', // 商户支付回调状态
 
   // ========== MP 模块 ==========
   MP_AUTO_REPLY_REQUEST_MATCH: 'mp_auto_reply_request_match', // 自动回复请求匹配类型

src/views/conf/warehouse/index.vue

@@ -40,7 +40,7 @@
       <el-table-column label="状态" align="center" prop="status">
         <template v-slot="scope">
           <el-tag v-if="scope.row.status == '01'" type="success">启用</el-tag>
-          <el-tag v-if="scope.row.status == '02'" type="success">禁用</el-tag>
+          <el-tag v-if="scope.row.status == '02'" type="danger">禁用</el-tag>
         </template>
       </el-table-column>
       <el-table-column label="所属子公司" align="left" prop="corpNames"/>

src/views/repair/supplier/BaseSupplierForm.vue

@@ -0,0 +1,266 @@
+<template>
+  <div class="app-container">
+    <!-- 对话框(添加 / 修改) -->
+    <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="45%" v-dialogDrag append-to-body>
+      <el-form ref="formRef" :model="formData" :rules="formRules" v-loading="formLoading" label-width="100px">
+
+        <el-collapse v-model="activeNames">
+          <!--   供应商基本信息     -->
+          <el-collapse-item title="供应商基本信息" name="1">
+            <el-row :gutter="20">
+              <el-col :span="12">
+                <el-form-item label="供应商名称" prop="name">
+                  <el-input v-model="formData.name" placeholder="请输入供应商名称"/>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="联系人" prop="linkName">
+                  <el-input v-model="formData.linkName" placeholder="请输入联系人"/>
+                </el-form-item>
+              </el-col>
+            </el-row>
+
+            <el-row :gutter="20">
+              <el-col :span="12">
+                <el-form-item label="联系电话" prop="linkPhone">
+                  <el-input v-model="formData.linkPhone" placeholder="请输入联系电话"/>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="联系方式" prop="phone">
+                  <el-input v-model="formData.phone" placeholder="请输入联系方式"/>
+                </el-form-item>
+              </el-col>
+            </el-row>
+
+            <el-row :gutter="20">
+              <el-col :span="12">
+                <el-form-item label="传真" prop="fax">
+                  <el-input v-model="formData.fax" placeholder="请输入传真"/>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="结算方式" prop="billing">
+                  <el-select v-model="formData.billing" placeholder="请选择结算方式">
+                    <el-option v-for="dict in this.getDictDatas(DICT_TYPE.PAY_TYPE)" :key="dict.value"
+                               :label="dict.label" :value="dict.value" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+
+            <el-row :gutter="20">
+              <el-col :span="12">
+                <el-form-item label="状态" prop="status">
+                  <el-switch
+                    v-model="formData.status"
+                    active-color="#13ce66"
+                    inactive-color="#ff4949"
+                    active-value="01"
+                    inactive-value="02">
+                  </el-switch>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="关联子公司" prop="corpId">
+                  <el-select v-model="formData.corpIds" multiple placeholder="请选择">
+                    <el-option
+                      v-for="item in companyList"
+                      :key="item.id"
+                      :label="item.corpName"
+                      :value="item.id">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="24">
+                <el-form-item label="地址" prop="address">
+                  <el-input type="textarea" v-model="formData.address" placeholder="请输入地址"/>
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="备注" prop="remark">
+                  <el-input type="textarea" v-model="formData.remark" placeholder="请输入备注"/>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-collapse-item>
+
+          <el-collapse-item title="银行账户" name="2">
+            <el-table :data="formData.accountList" border size="small" style="width: 100%">
+              <el-table-column prop="countName" align="left" width="180">
+                <template slot="header">
+                  <i style="color: #409EFF;cursor:pointer" class="el-icon-circle-plus-outline" @click="addItem"/>
+                  开户名
+                </template>
+                <template v-slot="scope">
+                  <el-input v-model="scope.row.countName" placeholder="请输入银行卡号"/>
+                </template>
+              </el-table-column>
+
+              <el-table-column prop="countNo" align="center" label="银行卡号">
+                <template v-slot="scope">
+                  <el-input v-model="scope.row.countNo" placeholder="请输入银行卡号"/>
+                </template>
+              </el-table-column>
+
+              <el-table-column prop="bankName" align="center" label="开户行">
+                <template v-slot="scope">
+                  <el-input v-model="scope.row.bankName" placeholder="请输入开户行"/>
+                </template>
+              </el-table-column>
+
+              <el-table-column align="center" width="100" label="操作">
+                <template v-slot="scope">
+                  <el-button v-if="formData.accountList.length > 1" size="mini" type="text" icon="el-icon-delete"
+                             @click="deleteItem(scope.$index, formData.accountList)">删除
+                  </el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+          </el-collapse-item>
+        </el-collapse>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm" :disabled="formLoading">确 定</el-button>
+        <el-button @click="dialogVisible = false">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import * as BaseSupplierApi from '@/api/repair/supplier';
+import { getDictDatas, DICT_TYPE } from '@/utils/dict';
+import {getCompanyList} from '@/api/base/company'
+
+export default {
+  name: "BaseSupplierForm",
+  components: {},
+  data() {
+    return {
+      // 弹出层标题
+      dialogTitle: "",
+      //折叠面板默认展开
+      activeNames: ['1', '2'],
+      // 是否显示弹出层
+      dialogVisible: false,
+      // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+      formLoading: false,
+      // 表单参数
+      formData: {
+        name: undefined,
+        linkName: undefined,
+        linkPhone: undefined,
+        phone: undefined,
+        fax: undefined,
+        billing: undefined,
+        sort: undefined,
+        address: undefined,
+        status: '01',
+        remark: undefined,
+        corpId: undefined,
+        corpIds: [],
+        accountList: [],
+      },
+      // 表单校验
+      formRules: {
+        name: [{required: true, message: '供应商名称不能为空', trigger: 'blur'}],
+        linkName: [{required: true, message: '联系人不能为空', trigger: 'blur'}],
+        linkPhone: [{required: true, message: '联系电话不能为空', trigger: 'blur'}],
+      },
+      companyList: []
+    };
+  },
+  methods: {
+    /** 打开弹窗 */
+    async open(id) {
+      this.dialogVisible = true;
+      this.reset();
+      // 修改时，设置数据
+      if (id) {
+        this.formLoading = true;
+        try {
+          const res = await BaseSupplierApi.getBaseSupplier(id);
+          this.formData = res.data;
+          this.title = "修改供应商";
+        } finally {
+          this.formLoading = false;
+        }
+      }
+      //获取子公司
+      await this.listCompany();
+      this.title = "新增供应商";
+    },
+    /**查询子公司*/
+    async listCompany() {
+      const res = await getCompanyList()
+      this.companyList = res.data
+    },
+    /**
+     * 新增银行账户
+     */
+    addItem() {
+      const item = {
+        bankName: '',
+        countName: '',
+        countNo: ''
+      }
+      this.formData.accountList.push(item)
+    },
+
+    /**
+     * 移除账户内容
+     */
+    deleteItem(index, rows) {
+      rows.splice(index, 1);
+    },
+    /** 提交按钮 */
+    async submitForm() {
+      // 校验主表
+      await this.$refs["formRef"].validate();
+      this.formLoading = true;
+      try {
+        this.formData.corpId = this.formData.corpIds + ''
+        const data = this.formData;
+        // 修改的提交
+        if (data.id) {
+          await BaseSupplierApi.updateBaseSupplier(data);
+          this.$modal.msgSuccess("修改成功");
+          this.dialogVisible = false;
+          this.$emit('success');
+          return;
+        }
+        // 添加的提交
+        await BaseSupplierApi.createBaseSupplier(data);
+        this.$modal.msgSuccess("新增成功");
+        this.dialogVisible = false;
+        this.$emit('success');
+      } finally {
+        this.formLoading = false;
+      }
+    },
+    /** 表单重置 */
+    reset() {
+      this.formData = {
+        name: undefined,
+        linkName: undefined,
+        linkPhone: undefined,
+        phone: undefined,
+        fax: undefined,
+        billing: undefined,
+        sort: undefined,
+        address: undefined,
+        status: '01',
+        remark: undefined,
+        corpId: undefined,
+        corpIds: [],
+        accountList: [],
+      };
+      this.resetForm("formRef");
+    }
+  }
+};
+</script>

src/views/repair/supplier/index.vue

@@ -0,0 +1,150 @@
+<template>
+  <div class="app-container">
+    <!-- 搜索工作栏 -->
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="名称" prop="name">
+        <el-input v-model="queryParams.name" placeholder="请输入供应商名称" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <!-- 操作工具栏 -->
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="openForm(undefined)"
+                   v-hasPermi="['supplier:base-supplier:create']">新增
+        </el-button>
+      </el-col>
+    </el-row>
+
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+      <el-table-column label="供应商名称" align="center" prop="name"/>
+      <el-table-column label="联系人" align="center" prop="linkName"/>
+      <el-table-column label="联系电话" align="center" prop="linkPhone"/>
+      <el-table-column label="手机号码" align="center" prop="phone"/>
+      <el-table-column label="传真" align="center" prop="fax"/>
+      <el-table-column label="地址" align="center" prop="address"/>
+      <el-table-column label="状态" align="center" prop="status">
+        <template v-slot="scope">
+          <el-tag v-if="scope.row.status == '01'" type="success">启用</el-tag>
+          <el-tag v-if="scope.row.status == '02'" type="danger">禁用</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="remark"/>
+      <el-table-column label="绑定状态" align="center" prop="corpId">
+        <template v-slot="scope">
+          <el-tag v-if="scope.row.corpId == null || scope.row.corpId == ''" type="danger">未绑定</el-tag>
+          <el-tag v-else type="success">已绑定</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template v-slot="scope">
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="openForm(scope.row.id)"
+                     v-hasPermi="['supplier:base-supplier:update']">修改
+          </el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+                     v-hasPermi="['supplier:base-supplier:delete']">删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页组件 -->
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
+                @pagination="getList"/>
+    <!-- 对话框(添加 / 修改) -->
+    <BaseSupplierForm ref="formRef" @success="getList"/>
+  </div>
+</template>
+
+<script>
+import * as BaseSupplierApi from '@/api/repair/supplier';
+import BaseSupplierForm from './BaseSupplierForm.vue';
+
+export default {
+  name: "BaseSupplier",
+  components: {
+    BaseSupplierForm,
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 供应商列表
+      list: [],
+      // 是否展开，默认全部展开
+      isExpandAll: true,
+      // 重新渲染表格状态
+      refreshTable: true,
+      // 选中行
+      currentRow: {},
+      // 查询参数
+      queryParams: {
+        pageNo: 1,
+        pageSize: 10,
+        name: null,
+        linkName: null,
+        linkPhone: null,
+        phone: null,
+        fax: null,
+        billing: null,
+        sort: null,
+        address: null,
+        status: null,
+        remark: null,
+        corpId: null,
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询列表 */
+    async getList() {
+      try {
+        this.loading = true;
+        const res = await BaseSupplierApi.getBaseSupplierPage(this.queryParams);
+        this.list = res.data.records;
+        this.total = res.data.total;
+      } finally {
+        this.loading = false;
+      }
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNo = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 添加/修改操作 */
+    openForm(id) {
+      this.$refs["formRef"].open(id);
+    },
+    /** 删除按钮操作 */
+    async handleDelete(row) {
+      const id = row.id;
+      await this.$modal.confirm('是否确认删除供应商名称为"' + row.name + '"的数据项?')
+      try {
+        await BaseSupplierApi.deleteBaseSupplier(id);
+        await this.getList();
+        this.$modal.msgSuccess("删除成功");
+      } catch {
+      }
+    },
+
+  }
+};
+</script>