aXin-0810 vor 9 Monaten
Ursprung
Commit
be92156757
2 geänderte Dateien mit 374 neuen und 120 gelöschten Zeilen
  1. 17 5
      src/api/setting.js
  2. 357 115
      src/views/setting/departmentManage/index.vue

+ 17 - 5
src/api/setting.js

@@ -1,6 +1,5 @@
 import request, { postBlob, getBlob, handleImport } from '@/utils/request'
 
-
 export function carouselMapListPageV2(data) {
   return request({
     url: `/carouselMap/list/pageV2?moduleId=${data.moduleId}`,
@@ -17,7 +16,6 @@ export function carouselMapPageExport(data, name) {
   })
 }
 
-
 // 获取部门列表
 export function getDepartmentList(params) {
   return request({
@@ -36,6 +34,22 @@ export function addDepartment(params) {
   })
 }
 
+export function adminWebsitSavePayConfig(data) {
+  return request({
+    url: '/admin/websit/save/pay/config',
+    method: 'post',
+    data
+  })
+}
+
+export function adminWebsitDeletePayConfig(params) {
+  return request({
+    url: '/admin/websit/delete/pay/config',
+    method: 'post',
+    params
+  })
+}
+
 // 修改部门
 export function editDepartment(params) {
   return request({
@@ -63,7 +77,6 @@ export function getDepartmentDetail(params) {
   })
 }
 
-
 // 获取个人信息
 export function getUserInfo(params) {
   return request({
@@ -289,7 +302,6 @@ export function deleteRole(params) {
   })
 }
 
-
 // 获取角色详情
 export function getRoleDetail(params) {
   return request({
@@ -450,4 +462,4 @@ export function editAgreement(params) {
     method: 'post',
     data: params
   })
-}
+}

+ 357 - 115
src/views/setting/departmentManage/index.vue

@@ -1,15 +1,15 @@
 <template>
   <zj-tab-page ref="tabPage" :defaultActives="[{ key: 'list', label: $route.meta.title + '-列表', essential: true }]">
-    <template slot-scope="{activeKey, data}">
+    <template slot-scope="{ activeKey, data }">
       <div class="app-container">
         <div v-if="activeKey == 'list'" class="mymain-container">
           <div>
             <el-select v-model="value1" multiple placeholder="显示层级">
-              <el-option v-for="item in types" :key="item.value" :label="item.label" :value="item.value">
-              </el-option>
+              <el-option v-for="item in types" :key="item.value" :label="item.label" :value="item.value"> </el-option>
             </el-select>
-            <span style="display: inline-block; width: 220px; margin-left: 10px"><el-input v-model="input"
-                placeholder="模糊搜索"></el-input></span>
+            <span style="display: inline-block; width: 220px; margin-left: 10px"
+              ><el-input v-model="input" placeholder="模糊搜索"></el-input
+            ></span>
           </div>
 
           <div class="table">
@@ -36,16 +36,25 @@
               </el-table-column>
               <el-table-column label="操作" width="268" fixed="right">
                 <template slot-scope="scope">
-                  <el-button type="primary" size="mini" icon="el-icon-edit"
-                    @click="openMainForm('edit', scope.row.websitId)">编辑</el-button>
-                  <el-button type="primary" size="mini" icon="el-icon-edit"
-                    @click="handleDelete(scope.row.websitId)">删除</el-button>
-                  <el-button v-if="!!~['A', 'B'].indexOf(scope.row.type)"
-                    :type="({ A: 'primary', B: 'warning' })[scope.row.type]" plain size="mini" icon="el-icon-plus"
-                    @click="openMainForm('add', scope.row.websitId)">
-                    添加{{ scope.row.type
-                      == 'A' ? '商户' :
-                      scope.row.type == 'B' ? '网点' : '网点' }}
+                  <el-button
+                    type="primary"
+                    size="mini"
+                    icon="el-icon-edit"
+                    @click="openMainForm('edit', scope.row.websitId)"
+                    >编辑</el-button
+                  >
+                  <el-button type="primary" size="mini" icon="el-icon-edit" @click="handleDelete(scope.row.websitId)"
+                    >删除</el-button
+                  >
+                  <el-button
+                    v-if="!!~['A', 'B'].indexOf(scope.row.type)"
+                    :type="{ A: 'primary', B: 'warning' }[scope.row.type]"
+                    plain
+                    size="mini"
+                    icon="el-icon-plus"
+                    @click="openMainForm('add', scope.row.websitId)"
+                  >
+                    添加{{ scope.row.type == 'A' ? '商户' : scope.row.type == 'B' ? '网点' : '网点' }}
                   </el-button>
                 </template>
               </el-table-column>
@@ -53,64 +62,199 @@
           </div>
           <div class="pagination clearfix">
             <div class="fr">
-              <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
-                :current-page="currentPage" :page-sizes="[15, 20, 30, 50]" :page-size="pageSize"
-                layout="total, sizes, prev, pager, next, jumper" :total="listTotal">
+              <el-pagination
+                @size-change="handleSizeChange"
+                @current-change="handleCurrentChange"
+                :current-page="currentPage"
+                :page-sizes="[15, 20, 30, 50]"
+                :page-size="pageSize"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="listTotal"
+              >
               </el-pagination>
             </div>
           </div>
         </div>
         <div v-if="~['add', 'edit'].indexOf(activeKey)">
           <el-form ref="mainForm" :model="mainForm" :rules="mainFormRules" label-width="100px">
-			<el-row :gutter="20" justify="start">
-				<el-col :span="6">
-					<el-form-item label="上级" prop="parentId">
-					  <el-cascader style="width: 100%" :options="dataList2"
-					    :props="{ checkStrictly: true, value: 'websitId', label: 'name' }" v-model="mainForm.parentId" filterable
-					    clearable>
-					  </el-cascader>
-					</el-form-item>
-				</el-col>
-				<el-col :span="6">
-					<el-form-item label="名称" prop="name">
-					  <el-input placeholder="请输入网点名称" v-model="mainForm.name"></el-input>
-					</el-form-item>
-				</el-col>
-				<el-col :span="6">
-					<el-form-item label="联系人" prop="linkName">
-					  <el-input placeholder="请输入联系人名称" v-model="mainForm.linkName"></el-input>
-					</el-form-item>
-				</el-col>
-				<el-col :span="6">
-					<el-form-item label="联系人电话" prop="websitPhone">
-					  <el-input placeholder="请输入联系人电话" maxlength="11" type="number" v-model="mainForm.websitPhone"></el-input>
-					</el-form-item>
-				</el-col>
-				<el-col :span="12">
-					<el-form-item label="地址" prop="address">
-					  <div style="display:flex;">
-					    <el-input placeholder="请选择地址" style="margin-right: 20px;" v-model="mainForm.address"></el-input>
-					    <geographicalPosi :formData="mainForm" @selectPosi="selectAddress"></geographicalPosi>
-					  </div>
-					</el-form-item>
-				</el-col>
-				<el-col :span="6">
-					<el-form-item label="状态" prop="status">
-					  <el-radio-group v-model="mainForm.status">
-					    <el-radio :label="true">启用</el-radio>
-					    <el-radio :label="false">禁用</el-radio>
-					  </el-radio-group>
-					</el-form-item>
-				</el-col>
-				<el-col :span="6">
-					<el-form-item label="增值服务" prop="isIncre">
-					  <el-radio-group v-model="mainForm.isIncre">
-					    <el-radio :label="true">启用</el-radio>
-					    <el-radio :label="false">禁用</el-radio>
-					  </el-radio-group>
-					</el-form-item>
-				</el-col>
-			</el-row>
+            <el-row :gutter="20" justify="start">
+              <el-col :span="6">
+                <el-form-item label="上级" prop="parentId">
+                  <el-cascader
+                    style="width: 100%"
+                    :options="dataList2"
+                    :props="{ checkStrictly: true, value: 'websitId', label: 'name' }"
+                    v-model="mainForm.parentId"
+                    filterable
+                    clearable
+                  >
+                  </el-cascader>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="名称" prop="name">
+                  <el-input placeholder="请输入网点名称" v-model="mainForm.name"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="联系人" prop="linkName">
+                  <el-input placeholder="请输入联系人名称" v-model="mainForm.linkName"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="联系人电话" prop="websitPhone">
+                  <el-input
+                    placeholder="请输入联系人电话"
+                    maxlength="11"
+                    type="number"
+                    v-model="mainForm.websitPhone"
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="地址" prop="address">
+                  <div style="display: flex">
+                    <el-input placeholder="请选择地址" style="margin-right: 20px" v-model="mainForm.address"></el-input>
+                    <geographicalPosi :formData="mainForm" @selectPosi="selectAddress"></geographicalPosi>
+                  </div>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="电子支付商户" prop="payWorkerCodeId">
+                  <el-select v-model="mainForm.payWorkerCodeId" placeholder="请选择">
+                    <el-option v-for="item in PayConfigList" :key="item.value" :label="item.label" :value="item.value">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="状态" prop="status">
+                  <el-radio-group v-model="mainForm.status">
+                    <el-radio :label="true">启用</el-radio>
+                    <el-radio :label="false">禁用</el-radio>
+                  </el-radio-group>
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="通联支付" prop="isUseAllinpay">
+                  <el-switch v-model="mainForm.isUseAllinpay" active-color="#13ce66" inactive-color="#ff4949">
+                  </el-switch>
+                </el-form-item>
+              </el-col>
+              <el-col :span="24" v-if="mainForm.isUseAllinpay">
+                <el-button
+                  v-if="!editId"
+                  type="text"
+                  @click="
+                    () => {
+                      mainForm.payConfigList.push({})
+                    }
+                  "
+                  >添加</el-button
+                >
+                <el-table
+                  :data="editId ? [{}, ...(mainForm.payConfigList || [])] : mainForm.payConfigList || []"
+                  style="width: 100%"
+                >
+                  <el-table-column prop="name" label="商户名称">
+                    <template slot-scope="scope">
+                      <el-input
+                        v-if="!!~indexs.indexOf(scope.$index) || !editId"
+                        v-model="scope.row.name"
+                        placeholder="请输入内容"
+                      ></el-input>
+                      <span v-else>{{ scope.row.type }}</span>
+                    </template>
+                  </el-table-column>
+                  <el-table-column prop="orgId" label="通联集团号">
+                    <template slot-scope="scope">
+                      <el-input
+                        v-if="!!~indexs.indexOf(scope.$index) || !editId"
+                        v-model="scope.row.orgId"
+                        placeholder="请输入内容"
+                      ></el-input>
+                      <span v-else>{{ scope.row.type }}</span>
+                    </template>
+                  </el-table-column>
+                  <el-table-column prop="type" label="类别">
+                    <template slot-scope="scope">
+                      <el-select
+                        v-if="!!~indexs.indexOf(scope.$index) || !editId"
+                        v-model="scope.row.type"
+                        placeholder="请选择"
+                      >
+                        <el-option label="辅材" value="M" />
+                        <el-option label="配件" value="P" />
+                      </el-select>
+                      <span v-else>{{ { M: '辅材', P: '配件' }[scope.row.type] }}</span>
+                    </template>
+                  </el-table-column>
+                  <el-table-column prop="mchNo" label="通联商户号">
+                    <template slot-scope="scope">
+                      <el-input
+                        v-if="!!~indexs.indexOf(scope.$index) || !editId"
+                        v-model="scope.row.mchNo"
+                        placeholder="请输入内容"
+                      ></el-input>
+                      <span v-else>{{ scope.row.type }}</span>
+                    </template>
+                  </el-table-column>
+                  <el-table-column prop="appid" label="通联商户appid">
+                    <template slot-scope="scope">
+                      <el-input
+                        v-if="!!~indexs.indexOf(scope.$index) || !editId"
+                        v-model="scope.row.appid"
+                        placeholder="请输入内容"
+                      ></el-input>
+                      <span v-else>{{ scope.row.type }}</span>
+                    </template>
+                  </el-table-column>
+                  <el-table-column prop="status" label="状态">
+                    <template slot-scope="scope">
+                      <el-select
+                        v-if="!!~indexs.indexOf(scope.$index) || !editId"
+                        v-model="scope.row.status"
+                        placeholder="请选择"
+                      >
+                        <el-option label="开启" :value="true" />
+                        <el-option label="关闭" :value="false" />
+                      </el-select>
+                      <span v-else>{{ scope.row.type ? '开启' : '关闭' }}</span>
+                    </template>
+                  </el-table-column>
+                  <el-table-column v-if="editId" prop="createBy" label="创建人"> </el-table-column>
+                  <el-table-column v-if="editId" prop="createTime" label="创建时间"> </el-table-column>
+                  <el-table-column v-if="editId" prop="updateBy" label="修改人"> </el-table-column>
+                  <el-table-column v-if="editId" prop="" label="操作">
+                    <template slot-scope="scope">
+                      <el-button v-if="!!~indexs.indexOf(scope.$index)" type="text" @click="caozuoanniuSave(scope)"
+                        >保存</el-button
+                      >
+                      <el-button
+                        v-if="!~indexs.indexOf(scope.$index) && scope.$index > 0"
+                        type="text"
+                        @click="caozuoanniuEid(scope)"
+                        >编辑</el-button
+                      >
+                      <el-button
+                        v-if="!~indexs.indexOf(scope.$index) && scope.$index > 0"
+                        type="text"
+                        @click="caozuoanniuDel(scope)"
+                        >删除</el-button
+                      >
+                    </template>
+                  </el-table-column>
+                </el-table>
+              </el-col>
+              <!-- <el-col :span="6">
+                <el-form-item label="增值服务" prop="isIncre">
+                  <el-radio-group v-model="mainForm.isIncre">
+                    <el-radio :label="true">启用</el-radio>
+                    <el-radio :label="false">禁用</el-radio>
+                  </el-radio-group>
+                </el-form-item>
+              </el-col> -->
+            </el-row>
             <!-- <el-form-item v-if="mainForm.type == 'B'" label="商品出入库" prop="joinCode">
               <el-radio-group v-model="mainForm.joinCode">
                 <el-radio :label="true">关联条码</el-radio>
@@ -129,12 +273,22 @@
 </template>
 
 <script>
-import { getDepartmentList, addDepartment, editDepartment, getDepartmentDetail, deleteDepartment } from '@/api/setting'
+import {
+  getDepartmentList,
+  addDepartment,
+  editDepartment,
+  getDepartmentDetail,
+  deleteDepartment,
+  adminWebsitSavePayConfig,
+  adminWebsitDeletePayConfig
+} from '@/api/setting'
 import geographicalPosi from '@/components/geographicalPosi/index.vue'
+import { adminCompanyPayConfigList } from '@/api/paymentMerchantManagement'
 export default {
   components: { geographicalPosi },
   data() {
     return {
+      PayConfigList: [],
       dataList: [], // 列表数据
       dataList2: [], // 列表数据
       listLoading: true, // 列表加载loading
@@ -147,7 +301,11 @@ export default {
       input: '',
       value1: [],
       levels: [],
-      types: [{ label: '平台', value: 'A' }, { label: '商户', value: 'B' }, { label: '网点', value: 'C' }],
+      types: [
+        { label: '平台', value: 'A' },
+        { label: '商户', value: 'B' },
+        { label: '网点', value: 'C' }
+      ],
       mainForm: {
         parentId: '',
         name: '',
@@ -157,16 +315,20 @@ export default {
         lng: '',
         address: '',
         status: true,
+        isUseAllinpay: true,
+        payWorkerCodeId: '',
+        payConfigList: [],
         isIncre: true,
-        joinCode: "",
-        type: ""
+        joinCode: '',
+        type: ''
       },
       mainFormRules: {
         name: [{ required: true, message: '请填写网点名称', trigger: 'blur' }],
         linkName: [{ required: true, message: '请填写联系人名称', trigger: 'blur' }],
         websitPhone: [{ required: true, message: '请填写联系人电话', trigger: 'blur' }],
-        address: [{ required: true, message: '请选择GPS地址', trigger: 'blur' }],
-      }
+        address: [{ required: true, message: '请选择GPS地址', trigger: 'blur' }]
+      },
+      indexs: [0]
     }
   },
 
@@ -255,15 +417,14 @@ export default {
         cancelButtonText: '取消',
         showClose: false,
         type: 'warning'
-      }).then(() => {
-        deleteDepartment({ id: id }).then(res => {
-          this.getList()
-          this.$successMsg()
+      })
+        .then(() => {
+          deleteDepartment({ id: id }).then(res => {
+            this.getList()
+            this.$successMsg()
+          })
         })
-      }).catch(() => {
-
-      });
-
+        .catch(() => {})
     },
 
     // 打开 新增编辑 网点表单
@@ -274,14 +435,22 @@ export default {
         // 唯一标识
         key: type,
         // 页签名称
-        label: ({ edit: "编辑", add: "新增" })[type],
+        label: { edit: '编辑', add: '新增' }[type],
         // 打开时事件
         triggerEvent: () => {
+          adminCompanyPayConfigList({ pageNum: 1, pageSize: -1, params: [] }).then(res => {
+            this.PayConfigList = res.data.records.map(item => ({
+              label: item.payMerchantName,
+              value: item.id
+            }))
+          })
+
           this.cancelMainForm()
           this.$nextTick(() => {
             this.mainFormType = type
             this.mainFormVisible = true
             if (type == 'add') {
+              this.editId = null
               this.mainForm.parentId = id
             } else {
               this.editId = id
@@ -295,18 +464,19 @@ export default {
                   lng: res.data.lng,
                   address: res.data.address,
                   status: res.data.status,
+                  isUseAllinpay: res.data.isUseAllinpay,
+                  payWorkerCodeId: res.data.payWorkerCodeId,
+                  payConfigList: res.data.payConfigList || [],
                   isIncre: res.data.isIncre,
                   joinCode: res.data.joinCode,
-                  type: res.data.type,
+                  type: res.data.type
                 }
               })
             }
           })
         },
         // 关闭时事件
-        closeEvent: () => {
-
-        }
+        closeEvent: () => {}
       })
     },
 
@@ -337,6 +507,9 @@ export default {
             address: this.mainForm.address,
             status: this.mainForm.status,
             isIncre: this.mainForm.isIncre,
+            isUseAllinpay: this.mainForm.isUseAllinpay,
+            payWorkerCodeId: this.mainForm.payWorkerCodeId,
+            payConfigList: this.mainForm.payConfigList.filter(item => item.websitId),
             joinCode: this.mainForm.joinCode
           }
           if (this.mainFormType == 'edit') {
@@ -355,39 +528,108 @@ export default {
           }
         }
       })
+    },
+    caozuoanniuSave(data) {
+      adminWebsitSavePayConfig({
+        ...{
+          companyWechatName: JSON.parse(localStorage.getItem('greemall_user'))?.companyName || '',
+          companyWechatId: JSON.parse(localStorage.getItem('greemall_user'))?.companyWechatId || ''
+        },
+        ...data.row
+      }).then(res => {
+        getDepartmentDetail({ id: data.row.websitId }).then(res => {
+          this.mainForm = {
+            parentId: res.data.parentId,
+            name: res.data.name,
+            linkName: res.data.linkName,
+            websitPhone: res.data.websitPhone,
+            lat: res.data.lat,
+            lng: res.data.lng,
+            address: res.data.address,
+            status: res.data.status,
+            isUseAllinpay: res.data.isUseAllinpay,
+            payWorkerCodeId: res.data.payWorkerCodeId,
+            payConfigList: res.data.payConfigList || [],
+            isIncre: res.data.isIncre,
+            joinCode: res.data.joinCode,
+            type: res.data.type
+          }
+          this.$successMsg('保存成功')
+          if (data.$index > 0) {
+            if (~indexs.indexOf(data.$index)) {
+              this.indexs.splice(indexs.indexOf(data.$index), 1)
+            }
+          }
+        })
+      })
+    },
+    caozuoanniuDel(data) {
+      adminWebsitDeletePayConfig({
+        id: data.row.id
+      }).then(res => {
+        getDepartmentDetail({ id: data.row.websitId }).then(res => {
+          this.mainForm = {
+            parentId: res.data.parentId,
+            name: res.data.name,
+            linkName: res.data.linkName,
+            websitPhone: res.data.websitPhone,
+            lat: res.data.lat,
+            lng: res.data.lng,
+            address: res.data.address,
+            status: res.data.status,
+            isUseAllinpay: res.data.isUseAllinpay,
+            payWorkerCodeId: res.data.payWorkerCodeId,
+            payConfigList: res.data.payConfigList || [],
+            isIncre: res.data.isIncre,
+            joinCode: res.data.joinCode,
+            type: res.data.type
+          }
+          this.$successMsg('删除成功')
+          if (data.$index > 0) {
+            if (~indexs.indexOf(data.$index)) {
+              this.indexs.splice(indexs.indexOf(data.$index), 1)
+            }
+          }
+        })
+      })
+    },
+    caozuoanniuEid(data) {
+      if (!~this.indexs.indexOf(data.$index)) {
+        this.indexs.push(data.$index)
+      }
     }
   }
 }
 </script>
 
 <style scoped lang="scss">
-	.footer {
-		position: fixed;
-		bottom: 0;
-		left: 0;
-		z-index: 1;
-		width: 100%;
-		background: #fff;
-		padding: 15px 40px;
-		box-sizing: border-box;
-		transition: all 0.28s;
-		text-align: right;
-		box-shadow: 0 2px 5px 0 rgb(0 0 0 / 50%), 0 2px 5px 0 rgb(0 0 0 / 10%);
-	
-		&.hideSidebar {
-			margin-left: 54px;
-			width: calc(100vw - 54px);
-		}
-	
-		&.openSidebar {
-			margin-left: 210px;
-			width: calc(100vw - 210px);
-		}
-	
-		.tips {
-			font-size: 12px;
-			color: red;
-			margin-top: 10px;
-		}
-	}
+.footer {
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  z-index: 1;
+  width: 100%;
+  background: #fff;
+  padding: 15px 40px;
+  box-sizing: border-box;
+  transition: all 0.28s;
+  text-align: right;
+  box-shadow: 0 2px 5px 0 rgb(0 0 0 / 50%), 0 2px 5px 0 rgb(0 0 0 / 10%);
+
+  &.hideSidebar {
+    margin-left: 54px;
+    width: calc(100vw - 54px);
+  }
+
+  &.openSidebar {
+    margin-left: 210px;
+    width: calc(100vw - 210px);
+  }
+
+  .tips {
+    font-size: 12px;
+    color: red;
+    margin-top: 10px;
+  }
+}
 </style>