Merge branch 'dev' of http://60.209.125.238:20010/lijingjia/ds-wms-client-web into szh-new

src/views/baseinfo/infoclient/FeeCustTemplate/api.ts

@@ -6,8 +6,8 @@ enum Api {
   edit = '/feeApi/FeeCustTemplate/Edit',
   info = '/feeApi/FeeCustTemplate/Edit',
   delete = '/feeApi/FeeCustTemplate/Delete',
-  GenerateFees = '/feeApi/FeeCustTemplate/GenerateFees',
   GetColumns = '/mainApi/Common/GetColumnsByClient',
+  DeleteDetails = '/feeApi/FeeCustTemplate/DeleteDetails',
 }
 // 根据表明 查询数据
 export function getColumns(query: { id: string }) {
@@ -50,10 +50,10 @@ export function ApiDel(data: PageRequest) {
   })
 }
 
-// 生成订单费用 (Auth)
+// 根据ID删除明细 (Auth)
-export function ApiGenerateFees(data: PageRequest) {
+export function DeleteDetails(data: PageRequest) {
   return request<DataResult>({
-    url: Api.GenerateFees,
+    url: Api.DeleteDetails,
     method: 'post',
     data
   })

src/views/baseinfo/infoclient/FeeCustTemplate/feeField.vue

@@ -11,7 +11,7 @@
           <span class="iconfont icon-new_document"></span>
           添加
         </a-button>
-        <!-- <a-popconfirm
+        <a-popconfirm
           title="确定删除当前选中数据？"
           ok-text="是"
           cancel-text="否"
@@ -21,7 +21,7 @@
             <span class="iconfont icon-shanchu21"></span>
             删除
           </a-button>
-        </a-popconfirm> -->
+        </a-popconfirm>
       </div>
     </div>
     <a-spin :spinning="loading">
@@ -56,7 +56,7 @@
   } from 'vue'
   // 下拉框数据接口
   import { GetFeeCodeSelectList, GetFeeCurrencySelectList } from '/@/api/common'
-  import { getColumns } from './api'
+  import { getColumns, DeleteDetails } from './api'
   // import { GetFeeTemplateDetailList, BatchDelFeeTemplateDetail } from '../api'
   // 引入计费标准字典
   import { feeUnitDict } from '/@/hooks/dict/index'
@@ -796,23 +796,28 @@
   )
   // 删除行
   const deleteRow = async () => {
-    // const ids = []
+    // list.value.forEach((item: any, index) => {
+    //   if (item.selected) {
+    //     list.value.splice(index, 1)
+    //   }
+    // })
+    const ids = []
     list.value.forEach((item: any, index) => {
       if (item.selected) {
-        list.value.splice(index, 1)
+        ids.push(item.id)
       }
     })
-    // if (ids.length) {
+    if (ids.length) {
-    //   loading.value = true
+      loading.value = true
-    //   const data = await BatchDelFeeTemplateDetail({ ids })
+      const data = await DeleteDetails({ ids })
-    //   loading.value = false
+      loading.value = false
-    //   createMessage.success(data.message)
+      createMessage.success(data.message)
-    // }
+    }
-    // const res = list.value.filter((item) => {
+    const res = list.value.filter((item) => {
-    //   return !item.selected
+      return !item.selected
-    // })
+    })
-    // list.value = res
+    list.value = res
-    // hotTb.value.hotInstance.loadData(res)
+    hotTb.value.hotInstance.loadData(res)
   }
   // 如果有id通过id查询表格
   // watch(

src/views/system/user/UserPermissionModal.vue

@@ -96,12 +96,17 @@
     })
     if (type) {
       permissionId.value = checkedKeys[0]
+      InfoId.value = ''
+      RefdataruleInfo.value.resetFields()
+      RefdataruleInfo.value.setFieldsValue({ permissionId: permissionId.value })
     }
   }
   const RefdataruleIndex = ref()
   const RefdataruleInfo = ref()
   // 新增
   function Create() {
+    console.log(permissionId.value)
+
     RefdataruleIndex.value.clearSelectedRowKeys()
     RefdataruleInfo.value.resetFields()
     RefdataruleInfo.value.setFieldsValue({ permissionId: permissionId.value })
@@ -113,7 +118,6 @@
   const InfoId = ref('')
   // 改变选中
   function ChangeSelect(data) {
-    console.log(data[0])
     InfoId.value = data[0]
   }
   /**
@@ -121,12 +125,18 @@
    */
   function reset() {
     treeData.value = []
+    permissionId.value = ''
+    selectedKeys.value = []
+    expandedKeys.value = []
   }
   /**
    * 提交
    */
   async function handleSubmit(exit) {
     RefdataruleInfo.value.handleSave()
+    if (exit) {
+      closeModal()
+    }
   }
 </script>
 

src/views/system/user/columns.tsx

@@ -9,7 +9,7 @@ import {
   getCountryList,
 } from '/@/api/common'
 import { GetTablesByClient } from '/@/views/baseinfo/clientflowtemplate/api'
-import { getTables, getColumns, getClientPermissionList } from '/@/api/system/role'
+import { getColumns, getClientPermissionList } from '/@/api/system/role'
 import { Tag } from 'ant-design-vue'
 import { useOptionsStore } from '/@/store/modules/options'
 import { checkPermissions } from '/@/hooks/Permissions/index'
@@ -35,7 +35,6 @@ const ClientPermissionData = []
 let ClientPermissionList = []
 const res2: API.DataResult = await getClientPermissionList()
 if (res2.succeeded) {
-  console.log(res2)
   ClientPermissionList = res2.data
   res2.data.forEach((item) => {
     ClientPermissionData.push({
@@ -164,9 +163,9 @@ export const searchFormSchema: FormSchema[] = [
         showSearch: true,
         filterOption: (input: string, option: any) => {
           return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
-        }
+        },
       }
-    }
+    },
   },
   {
     field: 'deptId',
@@ -180,7 +179,7 @@ export const searchFormSchema: FormSchema[] = [
         labelField: 'orgName',
         valueField: 'id',
         resultField: 'data',
-        immediate: false
+        immediate: false,
       }
     },
   },
@@ -720,12 +719,9 @@ export const infoformSchema: FormSchema[] = [
           return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
         },
         onChange: async (e: ChangeEvent, a) => {
-          console.log(e, a)
-
           const res: API.DataResult = await getColumns({ tableViewName: e })
           fields.value = []
           if (res.succeeded) {
-            console.log(res)
             const Arr = [
               {
                 dbColumnName: '{loginRole}',
@@ -766,8 +762,6 @@ export const infoformSchema: FormSchema[] = [
                 conditions: [],
               }
             }
-
-            console.log(fields.value, 'fields.value')
           }
         },
       }
@@ -805,10 +799,8 @@ export const infoformSchema: FormSchema[] = [
         },
         // xxxx props
         onChange: (e) => {
-          console.log(e)
           ClientPermissionList.forEach((item) => {
             if (item.id == e) {
-              console.log(item)
               formModel.permissionEntity = item.permissionEntity
             }
           })
@@ -882,16 +874,38 @@ export const infoformSchema: FormSchema[] = [
       return h(ConditionFilter, {
         modelValue: model[field],
         filterFields: fields.value,
-        // onChange: (e: ChangeEvent) => {
-        //   console.log(e);
-        //   model[field] = e.target.value;
-        // },
       })
     },
-    // componentProps: {
+  },
-    //   onChange: (e: ChangeEvent) => {
+]
-    //     console.log('change', e);
+
-    //   },
+export const indexcolumns: BasicColumn[] = [
-    // },
+  {
+    title: '权限描述',
+    dataIndex: 'description',
+    width: 200,
+  },
+  {
+    title: '排序号',
+    dataIndex: 'orderNo',
+    width: 150,
+  },
+  {
+    title: '状态',
+    dataIndex: 'status',
+    width: 100,
+    customRender: ({ text }) => {
+      if (text === 0) {
+        return <Tag color="success">启用</Tag>
+      } else if (text === 1) {
+        return <Tag color="red">禁用</Tag>
+      }
+      return text
+    },
+  },
+  {
+    title: '备注',
+    dataIndex: 'note',
+    width: 150,
   },
 ]

src/views/system/user/dataruleIndex.vue

@@ -18,7 +18,7 @@
 </template>
 <script lang="ts" setup>
   import { BasicTable, useTable, TableAction } from '/@/components/Table'
-  import { columns } from '/@/views/system/datarule/columns.tsx'
+  import { indexcolumns } from './columns.tsx'
   import { watch } from 'vue'
   import { GetDataRuleListByPermission } from './api'
   const props = defineProps({
@@ -43,7 +43,7 @@
         resolve({ data: [...res.data] })
       })
     },
-    columns,
+    columns: indexcolumns,
     isTreeTable: false,
     pagination: false,
     striped: true,
@@ -62,7 +62,6 @@
     },
   })
   function handleCreate() {
-    console.log('新增')
     emit('Create')
   }
   defineExpose({

src/views/system/user/dataruleInfo.vue

@@ -22,8 +22,15 @@
   watch(
     () => props.InfoId,
     (Nval) => {
-      rowId.value = Nval
+      if (Nval) {
-      GetData()
+        rowId.value = Nval
+        GetData()
+      } else {
+        resetFields()
+        setFieldsValue({
+          permissionId: props.permissionId,
+        })
+      }
     },
   )
   // 声明Emits

src/views/system/user/index.vue

@@ -65,7 +65,6 @@
   const [registerTable, { reload, getForm, getPaginationRef }] = useTable({
     api: async (p) => {
       const res: API.DataResult = await getUserList(p)
-      // console.log(items);
       return new Promise((resolve) => {
         resolve({ data: [...res.data], total: res.count })
       })