商城商品新增ERP类型

src/api/his/detail.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询分账明细列表
+export function listDetail(query) {
+  return request({
+    url: '/his/detail/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询分账明细详细
+export function getDetail(id) {
+  return request({
+    url: '/his/detail/' + id,
+    method: 'get'
+  })
+}
+
+// 新增分账明细
+export function addDetail(data) {
+  return request({
+    url: '/his/detail',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改分账明细
+export function updateDetail(data) {
+  return request({
+    url: '/his/detail',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除分账明细
+export function delDetail(id) {
+  return request({
+    url: '/his/detail/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出分账明细
+export function exportDetail(query) {
+  return request({
+    url: '/his/detail/export',
+    method: 'get',
+    params: query
+  })
+}

src/api/his/merchant.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询分账商户列表
+export function listMerchant(query) {
+  return request({
+    url: '/his/merchant/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询分账商户详细
+export function getMerchant(id) {
+  return request({
+    url: '/his/merchant/' + id,
+    method: 'get'
+  })
+}
+
+// 新增分账商户
+export function addMerchant(data) {
+  return request({
+    url: '/his/merchant',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改分账商户
+export function updateMerchant(data) {
+  return request({
+    url: '/his/merchant',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除分账商户
+export function delMerchant(id) {
+  return request({
+    url: '/his/merchant/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出分账商户
+export function exportMerchant(query) {
+  return request({
+    url: '/his/merchant/export',
+    method: 'get',
+    params: query
+  })
+}

src/views/his/detail/index.vue

@@ -0,0 +1,310 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="订单号" prop="orderCode">
+        <el-input v-model="queryParams.orderCode" placeholder="请输入订单号" clearable size="small"
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="商户号" prop="merchantAccount">
+        <el-input v-model="queryParams.merchantAccount" placeholder="请输入订单号" clearable size="small"
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="分账商户" prop="merchantName">
+        <el-input v-model="queryParams.merchantName" placeholder="请输入订单号" clearable size="small"
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="分账类型" prop="type">
+        <el-select v-model="queryParams.type" placeholder="请选择分账类型" clearable size="small">
+          <el-option label="聚水潭" value="1" />
+          <el-option label="兔灵" value="2" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="分账时间" prop="createTime">
+        <el-date-picker v-model="createTime" size="small" style="width: 220px" value-format="yyyy-MM-dd"
+          type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
+          @change="changeTime"></el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" 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"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['his:detail:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['his:detail:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['his:detail:remove']"
+        >删除</el-button>
+      </el-col> -->
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['his:detail:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table border v-loading="loading" :data="detailList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="订单号" align="center" prop="orderCode" />
+      <el-table-column label="分账商户" align="center" prop="merchantName" />
+      <el-table-column label="分账商户号" align="center" prop="merchantAccount" />
+      <el-table-column label="分账类型" align="center" prop="type">
+        <template slot-scope="scope">
+          <dict-tag :options="erpTypeOptions" :value="scope.row.type" />
+        </template>
+      </el-table-column>
+      <el-table-column label="分账金额" align="center" prop="shareAmount" />
+      <el-table-column label="分账时间" align="center" prop="createTime" />
+      <!-- <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="['his:detail:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['his:detail:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column> -->
+    </el-table>
+
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
+
+    <!-- 添加或修改分账明细对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="订单号" prop="orderCode">
+          <el-input v-model="form.orderCode" placeholder="请输入订单号" />
+        </el-form-item>
+        <el-form-item label="商户id" prop="merchantId">
+          <el-input v-model="form.merchantId" placeholder="请输入商户id" />
+        </el-form-item>
+        <el-form-item label="分账金额" prop="shareAmount">
+          <el-input v-model="form.shareAmount" placeholder="请输入分账金额" />
+        </el-form-item>
+      </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 { listDetail, getDetail, delDetail, addDetail, updateDetail, exportDetail } from "@/api/his/detail";
+
+export default {
+  name: "Detail",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 分账明细表格数据
+      detailList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        orderId: null,
+        orderCode: null,
+        merchantId: null,
+        shareAmount: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      },
+      createTime: null,
+      erpTypeOptions: [],
+    };
+  },
+  created() {
+    this.getDicts("sys_erp_type").then(response => {
+      this.erpTypeOptions = response.data;
+    });
+    this.getList();
+  },
+  methods: {
+    changeTime() {
+      if (this.createTime != null) {
+        this.queryParams.startTime = this.createTime[0];
+        this.queryParams.endTime = this.createTime[1];
+      } else {
+        this.queryParams.startTime = null;
+        this.queryParams.endTime = null;
+      }
+    },
+    /** 查询分账明细列表 */
+    getList() {
+      this.loading = true;
+      listDetail(this.queryParams).then(response => {
+        this.detailList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        orderId: null,
+        orderCode: null,
+        merchantId: null,
+        shareAmount: null,
+        createTime: null,
+        updateTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.createTime = null;
+      this.queryParams.startTime = null;
+      this.queryParams.endTime = null;
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加分账明细";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getDetail(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改分账明细";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateDetail(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addDetail(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$confirm('是否确认删除分账明细编号为"' + ids + '"的数据项?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        return delDetail(ids);
+      }).then(() => {
+        this.getList();
+        this.msgSuccess("删除成功");
+      }).catch(() => { });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有分账明细数据项?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        this.exportLoading = true;
+        return exportDetail(queryParams);
+      }).then(response => {
+        this.download(response.msg);
+        this.exportLoading = false;
+      }).catch(() => { });
+    }
+  }
+};
+</script>

src/views/his/merchant/index.vue

@@ -0,0 +1,258 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="商户号" prop="merchantAccount">
+        <el-input v-model="queryParams.merchantAccount" placeholder="请输入商户号" clearable size="small"
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="商户名称" prop="merchantName">
+        <el-input v-model="queryParams.merchantName" placeholder="请输入商户名称" clearable size="small"
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="分账类型" prop="type">
+        <el-select v-model="queryParams.type" placeholder="请选择分账类型" clearable size="small">
+          <el-option label="聚水潭" value="1" />
+          <el-option label="兔灵" value="2" />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" 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" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+          v-hasPermi="['his:merchant:add']">新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['his:merchant:edit']">修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['his:merchant:remove']">删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="el-icon-download" size="mini" :loading="exportLoading"
+          @click="handleExport" v-hasPermi="['his:merchant:export']">导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table border v-loading="loading" :data="merchantList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="id" align="center" prop="id" />
+      <el-table-column label="商户号" align="center" prop="merchantAccount" />
+      <el-table-column label="商户名称" align="center" prop="merchantName" />
+      <el-table-column label="分账类型" align="center" prop="type" >
+        <template slot-scope="scope">
+              <dict-tag :options="erpTypeOptions" :value="scope.row.type"/>
+         </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="['his:merchant:edit']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['his:merchant:remove']">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
+
+    <!-- 添加或修改分账商户对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="商户号" prop="merchantAccount">
+          <el-input v-model="form.merchantAccount" placeholder="请输入商户号" />
+        </el-form-item>
+        <el-form-item label="商户名称" prop="merchantName">
+          <el-input v-model="form.merchantName" placeholder="请输入商户名称" />
+        </el-form-item>
+        <el-form-item label="分账类型" prop="type">
+          <el-radio-group v-model="form.type">
+            <el-radio :label="parseInt(item.dictValue)" v-for="item in erpTypeOptions">{{ item.dictLabel }}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+      </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 { listMerchant, getMerchant, delMerchant, addMerchant, updateMerchant, exportMerchant } from "@/api/his/merchant";
+
+export default {
+  name: "Merchant",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 分账商户表格数据
+      merchantList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        merchantAccount: null,
+        merchantName: null,
+        type: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        merchantAccount: [
+          { required: true, message: '套餐包名称不能为空', trigger: 'blur' }
+        ],
+        merchantName: [
+          { required: true, message: '套餐包名称不能为空', trigger: 'blur' }
+        ],
+        type: [
+          { required: true, message: '请选择分账类型', trigger: 'change' }
+        ],
+      },
+      erpTypeOptions: []
+    };
+  },
+  created() {
+    this.getDicts("sys_erp_type").then(response => {
+      this.erpTypeOptions = response.data;
+    });
+    this.getList();
+  },
+  methods: {
+    /** 查询分账商户列表 */
+    getList() {
+      this.loading = true;
+      listMerchant(this.queryParams).then(response => {
+        this.merchantList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        merchantAccount: null,
+        merchantName: null,
+        type: null,
+        createTime: null,
+        updateTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加分账商户";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getMerchant(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改分账商户";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateMerchant(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addMerchant(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$confirm('是否确认删除分账商户编号为"' + ids + '"的数据项?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        return delMerchant(ids);
+      }).then(() => {
+        this.getList();
+        this.msgSuccess("删除成功");
+      }).catch(() => { });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有分账商户数据项?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        this.exportLoading = true;
+        return exportMerchant(queryParams);
+      }).then(response => {
+        this.download(response.msg);
+        this.exportLoading = false;
+      }).catch(() => { });
+    }
+  }
+};
+</script>

src/views/hisStore/storeProduct/index.vue

@@ -437,6 +437,11 @@
           </el-col>
 
         </el-row>
+        <el-form-item label="ERP类型" prop="erpType">
+              <el-radio-group v-model="form.erpType">
+                 <el-radio :label="parseInt(item.dictValue)" v-for="item in erpTypeOptions" >{{item.dictLabel}}</el-radio>
+              </el-radio-group>
+         </el-form-item>
         <el-row :gutter="10">
           <el-col :span="12">
             <el-form-item label="是否药品" prop="isDrug">
@@ -1152,6 +1157,9 @@ export default {
         dosage: [
           { required: true, message: "用法用量不能为空", trigger: "blur" }
         ],
+        erpType: [
+                { required: true, message: '请选择erp类型', trigger: 'change' }
+              ],
         adverseReactions: [
           { required: true, message: "不良反应不能为空", trigger: "blur" }
         ],
@@ -1164,10 +1172,14 @@ export default {
         // storeId :[
         //   { required: true, message: "所属店铺不能为空", trigger: "blur"}
         // ],
-      }
+      },
+      erpTypeOptions:[],
     };
   },
   created() {
+    this.getDicts("sys_erp_type").then(response => {
+      this.erpTypeOptions = response.data;
+    });
     this.getDicts("store_product_tui_cate").then((response) => {
       this.productTuiCateOptions = response.data;
     });