Ver Fonte

云闪付签约

2297027248@qq.com há 3 anos atrás
pai
commit
bdc66ab255
4 ficheiros alterados com 76 adições e 5 exclusões
  1. 2 2
      .env.development
  2. 8 0
      src/api/system/dept.js
  3. 64 1
      src/views/system/dept/index.vue
  4. 2 2
      vue.config.js

+ 2 - 2
.env.development

@@ -2,7 +2,7 @@
 ENV = 'development'
 
 # 智慧易加管理系统/开发环境
- VUE_APP_BASE_API = 'http://test.huijy.net/prod-api'
-# VUE_APP_BASE_API = '/dev-api'
+#VUE_APP_BASE_API = 'http://test.huijy.net/prod-api'
+ VUE_APP_BASE_API = '/dev-api'
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

+ 8 - 0
src/api/system/dept.js

@@ -89,6 +89,14 @@ export function delDept(deptId) {
   })
 }
 
+// 获取部门分账管理
+export function setMnoSplit(deptId) {
+  return request({
+    url: '/system/dept/mnoSplit/'+deptId,
+    method: 'get'
+  })
+}
+
 // 查询部门列表
 export function getGroups() {
   return request({

+ 64 - 1
src/views/system/dept/index.vue

@@ -80,6 +80,14 @@
             @click="handleDelete(scope.row)"
             v-hasPermi="['system:dept:remove']"
           >删除</el-button>
+            <el-button
+            v-if="scope.row.parentId != 0"
+            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>
@@ -176,6 +184,42 @@
             </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="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="isShow">
+            <el-form-item label="是否分账" >
+              <el-radio-group v-model="form.mnoStatus">
+                <el-radio label="0"> 是 </el-radio>
+                <el-radio label="1"> 否 </el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+
           <el-col :span="12">
             <el-form-item label="部门状态">
               <el-radio-group v-model="form.status">
@@ -198,7 +242,7 @@
 </template>
 
 <script>
-import { listDept, getDept, delDept, addDept, updateDept, listDeptExcludeChild,listTree } from "@/api/system/dept";
+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";
 
@@ -221,6 +265,7 @@ export default {
       open: false,
       isShow: false,
       showIsLngFlag:false,
+      splitShow: false,
       // 状态数据字典
       statusOptions: [],
       // 查询参数
@@ -377,12 +422,30 @@ export default {
         this.showIsLngFlag = true;
       }
     },
+    //设置分账的参数
+    handleMnoSplit(row) {
+      this.$confirm('是否进行分账设置,点击确定跳转确认页面"', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+           return setMnoSplit(row.deptId)
+        }).then((res) => {
+         // this.getList();
+         console.log(res)
+         console.log('22',res.msg)
+         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;

+ 2 - 2
vue.config.js

@@ -35,8 +35,8 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        // target: `http://localhost:8080`,
-        target: `http://localhost:8081`,
+        target: `http://localhost:8080`,
+       // target: `http://localhost:8081`,
         // target:"http://www.huiyj.com:9002/prod-api",
         //target:"http://demo.huijy.net/prod-api",
         changeOrigin: true,