Merge branch 'lihuilin/feature-20250623164044-金币前端' into milestone-20250623-金币前端

src/views/audit/refundAudit.vue

@@ -386,6 +386,7 @@ const handleSearch = function () {
 
 // 重置
 const resetSearch = function () {
+  const auditStatus = searchForm.value.auditStatus;
   searchForm.value = {
     jwcode: '',
     refundType: '',
@@ -394,7 +395,8 @@ const resetSearch = function () {
     startTime: '',
     endTime: '',
   sortField:'',
-  sortOrder:''
+  sortOrder:'',
+  auditStatus:auditStatus
   }
   dateRange.value = []
 }

src/views/permissions/permission.vue

@@ -66,7 +66,7 @@ const get = async function (val) {
     if (typeof val === 'number') {
       getObj.value.pageNum = val
     }
-    console.log('搜索参数', getObj.value,admin.value)
+    console.log('搜索参数', getObj.value, admin.value)
     // 发送POST请求
     const result = await request({
       url: '/permission/getPermission',
@@ -166,10 +166,23 @@ const permissionAdd = async function () {
       try {
         addAdmin.value.adminFlag = 1
         addAdmin.value.status1 = 1
+        if (addAdmin.value.postiton == '管理员') {
+          addAdmin.value.postiton == 1
+        }
+        const params = {
+          "account": addAdmin.value.account,//OA号
+          "adminName": addAdmin.value.name,//姓名
+          "market": addAdmin.value.market,//地区
+          "roleId": addAdmin.value.permission,//权限ID
+          "postiton": addAdmin.value.postiton,//职位
+          "machineId": addAdmin.value.machineId,//机器码
+          "remark": addAdmin.value.remark//备注
+        }
         const result = await request({
           url: '/permission/addPermission',
-          data: addAdmin.value
+          data: params
         })
+        console.log(addAdmin.value)
 
         if (result.code == 200) {
           ElMessage.success('添加成功')
@@ -458,7 +471,7 @@ const handleCurrentChange = function (val) {
           <el-input v-model="addAdmin.name" placeholder="请输入用户名" style="width: 220px" />
         </el-form-item>
 
-        <el-form-item prop="market" label="所属地区:"   required>
+        <el-form-item prop="market" label="所属地区:" required>
           <el-select v-model="addAdmin.market" placeholder="请选择所属地区" style="width: 220px"
             @change="() => Ref.value.validateField('market')">
             <el-option v-for="item in market" :key="item" :label="item" :value="item" />