Merge branch 'zhaoj'

src/components/ImportButton/index.vue

@@ -4,7 +4,7 @@ import { ref } from 'vue';
 import request, { download } from '~/utils/request';
 
 
-const props = defineProps<{ url: string, importKey?: string }>()
+const props = defineProps<{ url: string, importKey: string, exportKey: string }>()
 console.log(props)
 const emits = defineEmits(["success"])
 const loading = ref(false)
@@ -26,7 +26,16 @@ const handleTableRowBtns_import = ({ file }: { file: File }) => {
   })
 }
 const handleTableRowBtns_export = () => {
-  download(`${props.url}/index`, { limit: 1 })
+  if(props.exportKey){
+    let name = props.exportKey.split('=')[0];
+    let id = props.exportKey.split('=')[1];
+    let data:any = {};
+    data[name]=id;
+    data.limit = 1;
+    download(`${props.url}/index`, data);
+  }else{
+    download(`${props.url}/index`, { limit: 1});
+  }
 }
 </script>
 

src/pages/xdhq/sbbx/bxlb.vue

@@ -50,6 +50,7 @@ const handleQueryFormBtn_search = () => {
 }
 const handleQueryFormBtn_clear = () => {
   queryForm_Data.value = {}
+  queryApi()
 }
 // #endregion
 
@@ -77,7 +78,12 @@ const handleTableRowBtn_add = () => {
   dialogVisible_addOrEdit.value = true
 }
 const handleTableRowBtn_delete = async () => {
-  await deleteApi(multipleSelection.value.map((item: TYPE_TABLE_FIELD) => item[TABLE_KEY]))
+  const res = await deleteApi(multipleSelection.value.map((item: TYPE_TABLE_FIELD) => item[TABLE_KEY]))
+  console.log(res);
+  
+//  if(res.code==1){
+
+//  }
   queryApi()
 }
 // #endregion
@@ -153,11 +159,13 @@ function queryApi() {
       limit: limit.value,
       page: currentPage.value,
       cs_pid: 837,
+      sort_field: 'cs_id',
+      sort_type:'DESC'
     }
   }).then((response: { data: { total_rows: string, page_data: TYPE_TABLE_FIELD[] } }) => {
     const { data } = response
     total.value = parseInt(data.total_rows)
-    tableData.value = data.page_data
+    tableData.value = data.page_data;
     return response
   }).then(() => {
     loading_table.value = false
@@ -287,7 +295,7 @@ init()
     </el-form>
     <div class="divider"></div>
     <div>
-      <import-button @success="queryApi" :url="URL_CUT_REF"></import-button>
+      <import-button @success="queryApi" :url="URL_CUT_REF" exportKey="cs_pid=837"></import-button>
       <el-button @click="handleTableRowBtn_export" type="success">导出</el-button>
       <el-button @click="handleTableRowBtn_add" type="primary">新增</el-button>
       <el-button @click="handleTableRowBtn_delete" type="danger">删除</el-button>

src/pages/xdhq/xcgl/xcgl/index.vue

@@ -300,7 +300,7 @@ init()
     <div>
       <import-button @success="queryApi" :url="URL_CUT_REF"></import-button>
       <el-button @click="handleTableRowBtn_export" type="success">导出</el-button>
-      <!-- <el-button @click="handleTableRowBtn_add" type="primary">dev:新增</el-button> -->
+      <el-button @click="handleTableRowBtn_add" type="primary">新增</el-button>
       <el-button @click="handleTableRowBtn_delete" type="danger">删除</el-button>
     </div>
 

src/store/user.ts

@@ -1,4 +1,4 @@
 import local from './local/zjx'
 
 export const user = local
-// export const user = JSON.parse(localStorage.getItem('userInfo') as string)
+// export const user = JSON.parse(localStorage.getItem('userInfo') as string)

vite.config.ts

@@ -10,9 +10,9 @@ import { ElementPlusResolver } from 'unplugin-vue-components/resolvers'
 export default defineConfig(({ command }) => {
 
   const config: UserConfigExport = {
-    base:'/app/xdjx/',
+    // base:'/app/xdjx/',
     // base: '/app/xdjy/',
-    // base: '/app/xdhq/',
+    base: '/app/xdhq/',
     resolve: {
       alias: {
         '~': `${path.resolve(__dirname, 'src')}`,