Преглед изворни кода

Merge branch 'master' into bzkf30

bzkf30 пре 1 година
родитељ
комит
109871cb46

+ 35 - 33
src/pages/xdhq/jyly/jylb.vue

@@ -65,7 +65,7 @@ const handleTableRowBtn_import = async ({ file }: { file: File }) => {
   }
 }
 const handleTableRowBtn_export = () => {
-  if(multipleSelection.value.length===0) return ElMessage.info('请先勾选导出文件');exportApi({[TABLE_KEY]:multipleSelection.value.map((item: TYPE_TABLE_FIELD)=>item[TABLE_KEY])?.join()})
+  if (multipleSelection.value.length === 0) return ElMessage.info('请先勾选导出文件'); exportApi({ [TABLE_KEY]: multipleSelection.value.map((item: TYPE_TABLE_FIELD) => item[TABLE_KEY])?.join() })
 }
 const handleTableRowBtn_add = () => {
   whichDialogSubmit = 'add'
@@ -73,7 +73,7 @@ const handleTableRowBtn_add = () => {
   dialogVisible_addOrEdit.value = true
 }
 const handleTableRowBtn_delete = async () => {
-  if(multipleSelection.value.length===0) return ElMessage.info('请先勾选文件');const resp = await deleteApi(multipleSelection.value.map((item: TYPE_TABLE_FIELD) => item[TABLE_KEY]));if(resp.code!=='1')return;ElMessage.success('删除成功');
+  if (multipleSelection.value.length === 0) return ElMessage.info('请先勾选文件'); const resp = await deleteApi(multipleSelection.value.map((item: TYPE_TABLE_FIELD) => item[TABLE_KEY])); if (resp.code !== '1') return; ElMessage.success('删除成功');
   queryApi()
 }
 // #endregion
@@ -98,7 +98,7 @@ const handleTableColBtn_detail = (scope: { row: TYPE_TABLE_FIELD }) => {
   router.push({ name: DetailName, params: { [DetailParam]: scope.row[TABLE_KEY] } })
 }
 const handleTableColBtn_delete = async (scope: { row: TYPE_TABLE_FIELD }) => {
-  const resp = await deleteApi(scope.row[TABLE_KEY]);if(resp.code!=='1')return;ElMessage.success('删除成功');
+  const resp = await deleteApi(scope.row[TABLE_KEY]); if (resp.code !== '1') return; ElMessage.success('删除成功');
   queryApi()
 }
 // #endregion
@@ -120,7 +120,7 @@ const handleDialogFormBtn_submit = async (formRefKey: string, extendData?: Parti
   const isValid = await (instance?.refs[formRefKey] as FormInstance).validate((valid: boolean) => valid)
   if (isValid) {
     const resp = await API_MAP[whichDialogSubmit](<TYPE_TABLE_FIELD>({ ...dialogForm_Data.value, ...extendData }))
-    if(resp.code!=='1')return;ElMessage.success('操作成功');handleDialogFormBtn_cancel()
+    if (resp.code !== '1') return; ElMessage.success('操作成功'); handleDialogFormBtn_cancel()
     queryApi()
   }
 }
@@ -236,7 +236,7 @@ function importApi(data: { file: File }) {
 }
 
 function exportApi(d) {
-  return download(URL_CUT + '/index', {...queryForm_Data.value,...d})
+  return download(URL_CUT + '/index', { ...queryForm_Data.value, ...d })
 }
 
 const API_MAP = {
@@ -271,37 +271,39 @@ const handleTableColBtn_return = async (scope: { row: TYPE_TABLE_FIELD }) => {
 
 <template>
   <div class="card flex-grow flex flex-col">
-    <el-form inline :model="queryForm_Data">
-      <!-- <el-form-item label="关键字"><el-input v-model="queryForm_Data.keyword" ></el-input></el-form-item> -->
-      <el-form-item label="资产名称">
-        <el-input v-model="queryForm_Data.xhj_zcmc" clearable />
-      </el-form-item>
-      <el-form-item label="资产编号">
-        <el-input v-model="queryForm_Data.xhj_zcbh" clearable />
-      </el-form-item>
-      <!-- <el-form-item label="所属部门"><el-input v-model="queryForm_Data.xhj_ssbm" clearable /></el-form-item>
-      <el-form-item label="借领性质"><el-input v-model="queryForm_Data.xhj_jlxz" clearable /></el-form-item> -->
-      <el-form-item label="借领人">
-        <el-input v-model="queryForm_Data.xhj_jlr" clearable />
-      </el-form-item>
-      <!-- <el-form-item label="借领时间"><el-input v-model="queryForm_Data.xhj_jlsj" clearable /></el-form-item> -->
-      <el-form-item label="批准人">
-        <el-input v-model="queryForm_Data.xhj_pzr" clearable />
-      </el-form-item>
-      <el-form-item>
-        <el-button @click="handleQueryFormBtn_search" type="primary">搜索</el-button>
-        <el-button @click="handleQueryFormBtn_clear" type="warning">清空</el-button>
-      </el-form-item>
-    </el-form>
-    <div class="divider"></div>
-    <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">新增</el-button>
+
+    <div class="flex justify-between">
+      <div>
+        <!-- <import-button @success="queryApi" :url="URL_CUT_REF"></import-button> -->
+        <el-button @click="handleTableRowBtn_export" type="primary">导出</el-button>
+        <!-- <el-button @click="handleTableRowBtn_add" type="primary">新增</el-button>
         <el-button @click="handleTableRowBtn_delete" type="danger">删除</el-button> -->
+      </div>
+      <el-form inline :model="queryForm_Data">
+        <!-- <el-form-item label="关键字"><el-input v-model="queryForm_Data.keyword" ></el-input></el-form-item> -->
+        <el-form-item label="">
+          <el-input placeholder="资产名称" v-model="queryForm_Data.xhj_zcmc" clearable />
+        </el-form-item>
+        <el-form-item label="">
+          <el-input placeholder="资产编号" v-model="queryForm_Data.xhj_zcbh" clearable />
+        </el-form-item>
+        <!-- <el-form-item label="所属部门"><el-input v-model="queryForm_Data.xhj_ssbm" clearable /></el-form-item>
+      <el-form-item label="借领性质"><el-input v-model="queryForm_Data.xhj_jlxz" clearable /></el-form-item> -->
+        <el-form-item label="">
+          <el-input placeholder="借领人" v-model="queryForm_Data.xhj_jlr" clearable />
+        </el-form-item>
+        <!-- <el-form-item label="借领时间"><el-input v-model="queryForm_Data.xhj_jlsj" clearable /></el-form-item> -->
+        <el-form-item label="">
+          <el-input placeholder="批准人" v-model="queryForm_Data.xhj_pzr" clearable />
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="handleQueryFormBtn_search" type="primary">搜索</el-button>
+          <!-- <el-button @click="handleQueryFormBtn_clear" type="warning">清空</el-button> -->
+        </el-form-item>
+      </el-form>
     </div>
 
-    <div class="divider"></div>
+
     <div class="flex-auto">
       <el-table :data="tableData" @selection-change="handleSelectionChange" v-loading="loading_table"
         element-loading-background="#ffffff70">

+ 34 - 33
src/pages/xdhq/jyly/lylb.vue

@@ -65,7 +65,7 @@ const handleTableRowBtn_import = async ({ file }: { file: File }) => {
   }
 }
 const handleTableRowBtn_export = () => {
-  if(multipleSelection.value.length===0) return ElMessage.info('请先勾选导出文件');exportApi({[TABLE_KEY]:multipleSelection.value.map((item: TYPE_TABLE_FIELD)=>item[TABLE_KEY])?.join()})
+  if (multipleSelection.value.length === 0) return ElMessage.info('请先勾选导出文件'); exportApi({ [TABLE_KEY]: multipleSelection.value.map((item: TYPE_TABLE_FIELD) => item[TABLE_KEY])?.join() })
 }
 const handleTableRowBtn_add = () => {
   whichDialogSubmit = 'add'
@@ -73,7 +73,7 @@ const handleTableRowBtn_add = () => {
   dialogVisible_addOrEdit.value = true
 }
 const handleTableRowBtn_delete = async () => {
-  if(multipleSelection.value.length===0) return ElMessage.info('请先勾选文件');const resp = await deleteApi(multipleSelection.value.map((item: TYPE_TABLE_FIELD) => item[TABLE_KEY]));if(resp.code!=='1')return;ElMessage.success('删除成功');
+  if (multipleSelection.value.length === 0) return ElMessage.info('请先勾选文件'); const resp = await deleteApi(multipleSelection.value.map((item: TYPE_TABLE_FIELD) => item[TABLE_KEY])); if (resp.code !== '1') return; ElMessage.success('删除成功');
   queryApi()
 }
 // #endregion
@@ -98,7 +98,7 @@ const handleTableColBtn_detail = (scope: { row: TYPE_TABLE_FIELD }) => {
   router.push({ name: DetailName, params: { [DetailParam]: scope.row[TABLE_KEY] } })
 }
 const handleTableColBtn_delete = async (scope: { row: TYPE_TABLE_FIELD }) => {
-  const resp = await deleteApi(scope.row[TABLE_KEY]);if(resp.code!=='1')return;ElMessage.success('删除成功');
+  const resp = await deleteApi(scope.row[TABLE_KEY]); if (resp.code !== '1') return; ElMessage.success('删除成功');
   queryApi()
 }
 // #endregion
@@ -120,7 +120,7 @@ const handleDialogFormBtn_submit = async (formRefKey: string, extendData?: Parti
   const isValid = await (instance?.refs[formRefKey] as FormInstance).validate((valid: boolean) => valid)
   if (isValid) {
     const resp = await API_MAP[whichDialogSubmit](<TYPE_TABLE_FIELD>({ ...dialogForm_Data.value, ...extendData }))
-    if(resp.code!=='1')return;ElMessage.success('操作成功');handleDialogFormBtn_cancel()
+    if (resp.code !== '1') return; ElMessage.success('操作成功'); handleDialogFormBtn_cancel()
     queryApi()
   }
 }
@@ -236,7 +236,7 @@ function importApi(data: { file: File }) {
 }
 
 function exportApi(d) {
-  return download(URL_CUT + '/index', {...queryForm_Data.value,...d})
+  return download(URL_CUT + '/index', { ...queryForm_Data.value, ...d })
 }
 
 const API_MAP = {
@@ -270,37 +270,38 @@ const handleTableColBtn_return = async (scope: { row: TYPE_TABLE_FIELD }) => {
 
 <template>
   <div class="card flex-grow flex flex-col">
-    <el-form inline :model="queryForm_Data">
-      <!-- <el-form-item label="关键字"><el-input v-model="queryForm_Data.keyword" ></el-input></el-form-item> -->
-      <el-form-item label="资产名称">
-        <el-input v-model="queryForm_Data.xhj_zcmc" clearable />
-      </el-form-item>
-      <el-form-item label="资产编号">
-        <el-input v-model="queryForm_Data.xhj_zcbh" clearable />
-      </el-form-item>
-      <!-- <el-form-item label="所属部门"><el-input v-model="queryForm_Data.xhj_ssbm" clearable /></el-form-item>
-      <el-form-item label="借领性质"><el-input v-model="queryForm_Data.xhj_jlxz" clearable /></el-form-item> -->
-      <el-form-item label="借领人">
-        <el-input v-model="queryForm_Data.xhj_jlr" clearable />
-      </el-form-item>
-      <!-- <el-form-item label="借领时间"><el-input v-model="queryForm_Data.xhj_jlsj" clearable /></el-form-item> -->
-      <el-form-item label="批准人">
-        <el-input v-model="queryForm_Data.xhj_pzr" clearable />
-      </el-form-item>
-      <el-form-item>
-        <el-button @click="handleQueryFormBtn_search" type="primary">搜索</el-button>
-        <el-button @click="handleQueryFormBtn_clear" type="warning">清空</el-button>
-      </el-form-item>
-    </el-form>
-    <div class="divider"></div>
-    <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">新增</el-button>
+
+    <div class="flex justify-between">
+      <div>
+        <!-- <import-button @success="queryApi" :url="URL_CUT_REF"></import-button> -->
+        <el-button @click="handleTableRowBtn_export" type="primary">导出</el-button>
+        <!-- <el-button @click="handleTableRowBtn_add" type="primary">新增</el-button>
         <el-button @click="handleTableRowBtn_delete" type="danger">删除</el-button> -->
+      </div>
+      <el-form inline :model="queryForm_Data">
+        <!-- <el-form-item label="关键字"><el-input v-model="queryForm_Data.keyword" ></el-input></el-form-item> -->
+        <el-form-item label="">
+          <el-input placeholder="资产名称" v-model="queryForm_Data.xhj_zcmc" clearable />
+        </el-form-item>
+        <el-form-item label="">
+          <el-input placeholder="资产编号" v-model="queryForm_Data.xhj_zcbh" clearable />
+        </el-form-item>
+        <!-- <el-form-item label="所属部门"><el-input v-model="queryForm_Data.xhj_ssbm" clearable /></el-form-item>
+      <el-form-item label="借领性质"><el-input v-model="queryForm_Data.xhj_jlxz" clearable /></el-form-item> -->
+        <el-form-item label="">
+          <el-input placeholder="借领人" v-model="queryForm_Data.xhj_jlr" clearable />
+        </el-form-item>
+        <!-- <el-form-item label="借领时间"><el-input v-model="queryForm_Data.xhj_jlsj" clearable /></el-form-item> -->
+        <el-form-item label="">
+          <el-input placeholder="批准人" v-model="queryForm_Data.xhj_pzr" clearable />
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="handleQueryFormBtn_search" type="primary">搜索</el-button>
+          <!-- <el-button @click="handleQueryFormBtn_clear" type="warning">清空</el-button> -->
+        </el-form-item>
+      </el-form>
     </div>
 
-    <div class="divider"></div>
     <div class="flex-auto">
       <el-table :data="tableData" @selection-change="handleSelectionChange" v-loading="loading_table"
         element-loading-background="#ffffff70">

+ 35 - 32
src/pages/xdhq/jyly/xclb.vue

@@ -65,7 +65,7 @@ const handleTableRowBtn_import = async ({ file }: { file: File }) => {
   }
 }
 const handleTableRowBtn_export = () => {
-  if(multipleSelection.value.length===0) return ElMessage.info('请先勾选导出文件');exportApi({[TABLE_KEY]:multipleSelection.value.map((item: TYPE_TABLE_FIELD)=>item[TABLE_KEY])?.join()})
+  if (multipleSelection.value.length === 0) return ElMessage.info('请先勾选导出文件'); exportApi({ [TABLE_KEY]: multipleSelection.value.map((item: TYPE_TABLE_FIELD) => item[TABLE_KEY])?.join() })
 }
 const handleTableRowBtn_add = () => {
   whichDialogSubmit = 'add'
@@ -73,7 +73,7 @@ const handleTableRowBtn_add = () => {
   dialogVisible_addOrEdit.value = true
 }
 const handleTableRowBtn_delete = async () => {
-  if(multipleSelection.value.length===0) return ElMessage.info('请先勾选文件');const resp = await deleteApi(multipleSelection.value.map((item: TYPE_TABLE_FIELD) => item[TABLE_KEY]));if(resp.code!=='1')return;ElMessage.success('删除成功');
+  if (multipleSelection.value.length === 0) return ElMessage.info('请先勾选文件'); const resp = await deleteApi(multipleSelection.value.map((item: TYPE_TABLE_FIELD) => item[TABLE_KEY])); if (resp.code !== '1') return; ElMessage.success('删除成功');
   queryApi()
 }
 // #endregion
@@ -98,7 +98,7 @@ const handleTableColBtn_detail = (scope: { row: TYPE_TABLE_FIELD }) => {
   router.push({ name: DetailName, params: { [DetailParam]: scope.row[TABLE_KEY] } })
 }
 const handleTableColBtn_delete = async (scope: { row: TYPE_TABLE_FIELD }) => {
-  const resp = await deleteApi(scope.row[TABLE_KEY]);if(resp.code!=='1')return;ElMessage.success('删除成功');
+  const resp = await deleteApi(scope.row[TABLE_KEY]); if (resp.code !== '1') return; ElMessage.success('删除成功');
   queryApi()
 }
 // #endregion
@@ -120,7 +120,7 @@ const handleDialogFormBtn_submit = async (formRefKey: string, extendData?: Parti
   const isValid = await (instance?.refs[formRefKey] as FormInstance).validate((valid: boolean) => valid)
   if (isValid) {
     const resp = await API_MAP[whichDialogSubmit](<TYPE_TABLE_FIELD>({ ...dialogForm_Data.value, ...extendData }))
-    if(resp.code!=='1')return;ElMessage.success('操作成功');handleDialogFormBtn_cancel()
+    if (resp.code !== '1') return; ElMessage.success('操作成功'); handleDialogFormBtn_cancel()
     queryApi()
   }
 }
@@ -238,7 +238,7 @@ function importApi(data: { file: File }) {
 }
 
 function exportApi(d) {
-  return download(URL_CUT + '/index', {...queryForm_Data.value,...d})
+  return download(URL_CUT + '/index', { ...queryForm_Data.value, ...d })
 }
 
 const API_MAP = {
@@ -314,7 +314,7 @@ const handleDialogFormBtn_submit_borrow = async (formRefKey: string, extendData?
     //   ...dialogForm_Data.value,
     //   xhx_zt: '2'
     // })
-    if(resp.code!=='1')return;ElMessage.success('操作成功');handleDialogFormBtn_cancel()
+    if (resp.code !== '1') return; ElMessage.success('操作成功'); handleDialogFormBtn_cancel()
     queryApi()
   }
 }
@@ -322,7 +322,7 @@ const handleDialogFormBtn_submit_borrow = async (formRefKey: string, extendData?
 const handleTableColBtn_borrow2 = async (row: Partial<TYPE_TABLE_FIELD>) => {
   // 后端处理
   await editApi({
-    [TABLE_KEY]:row[TABLE_KEY],
+    [TABLE_KEY]: row[TABLE_KEY],
     xhx_zt: '1'
   })
   queryApi()
@@ -334,21 +334,23 @@ const handleTableColBtn_borrow2 = async (row: Partial<TYPE_TABLE_FIELD>) => {
 
 <template>
   <div class="card flex-grow flex flex-col">
-    <el-form inline :model="queryForm_Data">
-      <!-- <el-form-item label="关键字"><el-input v-model="queryForm_Data.keyword" ></el-input></el-form-item> -->
-      <el-form-item label="资产名称">
-        <el-input v-model="queryForm_Data.xhx_zcmc" clearable />
-      </el-form-item>
-      <!-- <el-form-item label="资产编号">
+    <div class="flex justify-between">
+      <div></div>
+      <el-form inline :model="queryForm_Data">
+        <!-- <el-form-item label="关键字"><el-input v-model="queryForm_Data.keyword" ></el-input></el-form-item> -->
+        <el-form-item label="">
+          <el-input placeholder="资产名称" v-model="queryForm_Data.xhx_zcmc" clearable />
+        </el-form-item>
+        <!-- <el-form-item label="资产编号">
         <el-input v-model="queryForm_Data.xhx_zcbh" clearable />
       </el-form-item> -->
-      <el-form-item label="状态">
-        <el-select v-model="queryForm_Data.xhx_zt" clearable filterable>
-          <el-option label="可借" value="1" />
-          <el-option label="不可借" value="2" />
-        </el-select>
-      </el-form-item>
-      <!-- <el-form-item label="单价">
+        <el-form-item label="">
+          <el-select placeholder="状态" v-model="queryForm_Data.xhx_zt" clearable filterable>
+            <el-option label="可借" value="1" />
+            <el-option label="不可借" value="2" />
+          </el-select>
+        </el-form-item>
+        <!-- <el-form-item label="单价">
         <el-input v-model="queryForm_Data.xhx_dj" clearable />
       </el-form-item>
       <el-form-item label="被借领">
@@ -357,17 +359,19 @@ const handleTableColBtn_borrow2 = async (row: Partial<TYPE_TABLE_FIELD>) => {
       <el-form-item label="被维修">
         <el-input v-model="queryForm_Data.xhx_bwx" clearable />
       </el-form-item> -->
-      <el-form-item label="资产分类">
-        <el-input v-model="queryForm_Data.xhx_zcfl" clearable />
-      </el-form-item>
-      <el-form-item label="审批人">
-        <el-input v-model="queryForm_Data.xhx_spr" clearable />
-      </el-form-item>
-      <el-form-item>
-        <el-button @click="handleQueryFormBtn_search" type="primary">搜索</el-button>
-        <el-button @click="handleQueryFormBtn_clear" type="warning">清空</el-button>
-      </el-form-item>
-    </el-form>
+        <el-form-item label="">
+          <el-input placeholder="资产分类" v-model="queryForm_Data.xhx_zcfl" clearable />
+        </el-form-item>
+        <el-form-item label="">
+          <el-input placeholder="审批人" v-model="queryForm_Data.xhx_spr" clearable />
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="handleQueryFormBtn_search" type="primary">搜索</el-button>
+          <!-- <el-button @click="handleQueryFormBtn_clear" type="warning">清空</el-button> -->
+        </el-form-item>
+      </el-form>
+    </div>
+
     <!-- <div class="divider"></div>
     <div>
       <import-button @success="queryApi" :url="URL_CUT_REF"></import-button>
@@ -376,7 +380,6 @@ const handleTableColBtn_borrow2 = async (row: Partial<TYPE_TABLE_FIELD>) => {
       <el-button @click="handleTableRowBtn_delete" type="danger">删除</el-button>
     </div> -->
 
-    <div class="divider"></div>
     <div class="flex-auto">
       <el-table :data="tableData" @selection-change="handleSelectionChange" v-loading="loading_table"
         element-loading-background="#ffffff70">

+ 27 - 27
src/pages/xdhq/sbbx/bxlb.vue

@@ -69,7 +69,7 @@ const handleTableRowBtn_import = async ({ file }: { file: File }) => {
   }
 }
 const handleTableRowBtn_export = () => {
-  if(multipleSelection.value.length===0) return ElMessage.info('请先勾选导出文件');exportApi({[TABLE_KEY]:multipleSelection.value.map((item: TYPE_TABLE_FIELD)=>item[TABLE_KEY])?.join()})
+  if (multipleSelection.value.length === 0) return ElMessage.info('请先勾选导出文件'); exportApi({ [TABLE_KEY]: multipleSelection.value.map((item: TYPE_TABLE_FIELD) => item[TABLE_KEY])?.join() })
 }
 const handleTableRowBtn_add = () => {
   whichDialogSubmit = 'add'
@@ -78,7 +78,7 @@ const handleTableRowBtn_add = () => {
   dialogVisible_addOrEdit.value = true
 }
 const handleTableRowBtn_delete = async () => {
-  if(multipleSelection.value.length===0) return ElMessage.info('请先勾选文件');const resp = await deleteApi(multipleSelection.value.map((item: TYPE_TABLE_FIELD) => item[TABLE_KEY]));if(resp.code!=='1')return;ElMessage.success('删除成功');
+  if (multipleSelection.value.length === 0) return ElMessage.info('请先勾选文件'); const resp = await deleteApi(multipleSelection.value.map((item: TYPE_TABLE_FIELD) => item[TABLE_KEY])); if (resp.code !== '1') return; ElMessage.success('删除成功');
   queryApi()
 }
 // #endregion
@@ -93,7 +93,7 @@ const handleTableColBtn_edit = async (scope: { row: TYPE_TABLE_FIELD }) => {
   dialogVisible_addOrEdit.value = true
 }
 const handleTableColBtn_delete = async (scope: { row: TYPE_TABLE_FIELD }) => {
-  const resp = await deleteApi(scope.row[TABLE_KEY]);if(resp.code!=='1')return;ElMessage.success('删除成功');
+  const resp = await deleteApi(scope.row[TABLE_KEY]); if (resp.code !== '1') return; ElMessage.success('删除成功');
   queryApi()
 }
 // #endregion
@@ -115,7 +115,7 @@ const handleDialogFormBtn_submit = async (formRefKey: string, extendData?: Parti
   const isValid = await (instance?.refs[formRefKey] as FormInstance).validate((valid: boolean) => valid)
   if (isValid) {
     const resp = await API_MAP[whichDialogSubmit](<TYPE_TABLE_FIELD>({ ...dialogForm_Data.value, ...extendData, cs_pid: '837' }))
-    if(resp.code!=='1')return;ElMessage.success('操作成功');handleDialogFormBtn_cancel()
+    if (resp.code !== '1') return; ElMessage.success('操作成功'); handleDialogFormBtn_cancel()
     queryApi()
   }
 }
@@ -154,8 +154,8 @@ function queryApi() {
       limit: limit.value,
       page: currentPage.value,
       cs_pid: 837,
-      sort_field:'cs_id',
-      sort_type:'DESC',
+      sort_field: 'cs_id',
+      sort_type: 'DESC',
     }
   }).then((response: { data: { total_rows: string, page_data: TYPE_TABLE_FIELD[] } }) => {
     const { data } = response
@@ -213,7 +213,7 @@ function importApi(data: { file: File }) {
 }
 
 function exportApi(d) {
-  return download(URL_CUT + '/index', {...queryForm_Data.value,...d,excel_file_name:'报修类别'})
+  return download(URL_CUT + '/index', { ...queryForm_Data.value, ...d, excel_file_name: '报修类别' })
 }
 
 const API_MAP = {
@@ -238,15 +238,23 @@ init()
 
 <template>
   <div class="card flex-grow flex flex-col">
-    <el-form inline :model="queryForm_Data">
-      <!-- <el-form-item label="关键字"><el-input v-model="queryForm_Data.keyword" ></el-input></el-form-item> -->
-      <!-- <el-form-item label="上级编号">
+    <div class="flex justify-between">
+      <div>
+        <import-button @success="queryApi" :importKey="('cs_pid=837')" :url="URL_CUT_REF"
+          :exportKey="('cs_pid=837')"></import-button>
+        <el-button @click="handleTableRowBtn_export" type="primary">导出</el-button>
+        <el-button @click="handleTableRowBtn_add" type="primary">新增</el-button>
+        <el-button @click="handleTableRowBtn_delete" type="danger">删除</el-button>
+      </div>
+      <el-form inline :model="queryForm_Data">
+        <!-- <el-form-item label="关键字"><el-input v-model="queryForm_Data.keyword" ></el-input></el-form-item> -->
+        <!-- <el-form-item label="上级编号">
         <el-input v-model="queryForm_Data.cs_pid" clearable />
       </el-form-item> -->
-      <el-form-item label="类别名称">
-        <el-input v-model="queryForm_Data.cs_name" clearable />
-      </el-form-item>
-      <!-- <el-form-item label="字典编号">
+        <el-form-item label="">
+          <el-input placeholder="类别名称" v-model="queryForm_Data.cs_name" clearable />
+        </el-form-item>
+        <!-- <el-form-item label="字典编号">
         <el-input v-model="queryForm_Data.cs_code" clearable />
       </el-form-item>
       <el-form-item label="排序编号">
@@ -283,20 +291,12 @@ init()
       <el-form-item label="父级code">
         <el-input v-model="queryForm_Data.cs_pcode" clearable />
       </el-form-item> -->
-      <el-form-item>
-        <el-button @click="handleQueryFormBtn_search" type="primary">搜索</el-button>
-        <el-button @click="handleQueryFormBtn_clear" type="warning">清空</el-button>
-      </el-form-item>
-    </el-form>
-    <div class="divider"></div>
-    <div>
-      <import-button @success="queryApi" :importKey="('cs_pid=837')" :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>
+        <el-form-item>
+          <el-button @click="handleQueryFormBtn_search" type="primary">搜索</el-button>
+          <!-- <el-button @click="handleQueryFormBtn_clear" type="warning">清空</el-button> -->
+        </el-form-item>
+      </el-form>
     </div>
-
-    <div class="divider"></div>
     <div class="flex-auto">
       <el-table :data="tableData" @selection-change="handleSelectionChange" v-loading="loading_table"
         element-loading-background="#ffffff70">

+ 33 - 32
src/pages/xdhq/sbbx/index.vue

@@ -74,7 +74,7 @@ const handleTableRowBtn_import = async ({ file }: { file: File }) => {
   }
 }
 const handleTableRowBtn_export = () => {
-  if(multipleSelection.value.length===0) return ElMessage.info('请先勾选导出文件');exportApi({[TABLE_KEY]:multipleSelection.value.map((item: TYPE_TABLE_FIELD)=>item[TABLE_KEY])?.join()})
+  if (multipleSelection.value.length === 0) return ElMessage.info('请先勾选导出文件'); exportApi({ [TABLE_KEY]: multipleSelection.value.map((item: TYPE_TABLE_FIELD) => item[TABLE_KEY])?.join() })
 }
 const handleTableRowBtn_add = () => {
   whichDialogSubmit = 'add'
@@ -82,7 +82,7 @@ const handleTableRowBtn_add = () => {
   dialogVisible_addOrEdit.value = true
 }
 const handleTableRowBtn_delete = async () => {
-  if(multipleSelection.value.length===0) return ElMessage.info('请先勾选文件');const resp = await deleteApi(multipleSelection.value.map((item: TYPE_TABLE_FIELD) => item[TABLE_KEY]));if(resp.code!=='1')return;ElMessage.success('删除成功');
+  if (multipleSelection.value.length === 0) return ElMessage.info('请先勾选文件'); const resp = await deleteApi(multipleSelection.value.map((item: TYPE_TABLE_FIELD) => item[TABLE_KEY])); if (resp.code !== '1') return; ElMessage.success('删除成功');
   queryApi()
 }
 // #endregion
@@ -112,7 +112,7 @@ const handleTableColBtn_detail = (scope: { row: TYPE_TABLE_FIELD }) => {
   router.push({ name: DetailName, params: { [DetailParam]: scope.row[TABLE_KEY] } })
 }
 const handleTableColBtn_delete = async (scope: { row: TYPE_TABLE_FIELD }) => {
-  const resp = await deleteApi(scope.row[TABLE_KEY]);if(resp.code!=='1')return;ElMessage.success('删除成功');
+  const resp = await deleteApi(scope.row[TABLE_KEY]); if (resp.code !== '1') return; ElMessage.success('删除成功');
   queryApi()
 }
 const handleTableColBtn_drop = async (scope: { row: TYPE_TABLE_FIELD }) => {
@@ -139,7 +139,7 @@ const handleDialogFormBtn_submit = async (formRefKey: string, extendData?: Parti
   const isValid = await (instance?.refs[formRefKey] as FormInstance).validate((valid: boolean) => valid)
   if (isValid) {
     const resp = await API_MAP[whichDialogSubmit](<TYPE_TABLE_FIELD>({ ...dialogForm_Data.value, ...extendData }))
-    if(resp.code!=='1')return;ElMessage.success('操作成功');handleDialogFormBtn_cancel()
+    if (resp.code !== '1') return; ElMessage.success('操作成功'); handleDialogFormBtn_cancel()
     queryApi()
   }
 }
@@ -267,7 +267,7 @@ function importApi(data: { file: File }) {
 }
 
 function exportApi(d) {
-  return download(URL_CUT + '/index', {...queryForm_Data.value,...d})
+  return download(URL_CUT + '/index', { ...queryForm_Data.value, ...d })
 }
 
 const API_MAP = {
@@ -305,18 +305,25 @@ init()
     </template>
   </div>
   <div class="card flex-grow flex flex-col">
-    <el-form inline :model="queryForm_Data">
-      <!-- <el-form-item label="关键字"><el-input v-model="queryForm_Data.keyword" ></el-input></el-form-item> -->
-      <!-- <el-form-item label="资产编号">
+    <div class="flex justify-between">
+      <div class="flex">
+        <!-- <import-button @success="queryApi" :url="URL_CUT_REF"></import-button> -->
+        <el-button @click="handleTableRowBtn_export" type="primary">导出</el-button>
+        <el-button @click="handleTableRowBtn_add" type="primary">设备报修</el-button>
+        <el-button @click="handleTableRowBtn_delete" type="danger">删除</el-button>
+      </div>
+      <el-form inline :model="queryForm_Data">
+        <!-- <el-form-item label="关键字"><el-input v-model="queryForm_Data.keyword" ></el-input></el-form-item> -->
+        <!-- <el-form-item label="资产编号">
         <el-input v-model="queryForm_Data.xhs_zcbh" clearable />
       </el-form-item> -->
-      <el-form-item label="资产名称">
-        <el-input v-model="queryForm_Data.xhs_zcmc" clearable />
-      </el-form-item>
-      <el-form-item label="维修地点">
-        <el-input v-model="queryForm_Data.xhs_wxdd" clearable />
-      </el-form-item>
-      <!-- <el-form-item label="维修方式">
+        <el-form-item>
+          <el-input placeholder="资产名称" v-model="queryForm_Data.xhs_zcmc" clearable />
+        </el-form-item>
+        <el-form-item>
+          <el-input placeholder="维修地点" v-model="queryForm_Data.xhs_wxdd" clearable />
+        </el-form-item>
+        <!-- <el-form-item label="维修方式">
         <el-input v-model="queryForm_Data.xhs_wxfs" clearable />
       </el-form-item>
       <el-form-item label="维修结果">
@@ -326,10 +333,10 @@ init()
           <el-option label="已报废" value="3" />
         </el-select>
       </el-form-item> -->
-      <el-form-item label="申请人">
-        <el-input v-model="queryForm_Data.xhs_sqr" clearable />
-      </el-form-item>
-      <!-- <el-form-item label="经手人">
+        <el-form-item>
+          <el-input placeholder="申请人" v-model="queryForm_Data.xhs_sqr" clearable />
+        </el-form-item>
+        <!-- <el-form-item label="经手人">
         <el-input v-model="queryForm_Data.xhs_jsr" clearable />
       </el-form-item>
       <el-form-item label="批准人">
@@ -354,20 +361,14 @@ init()
           <el-option label="其他" value="6" />
         </el-select>
       </el-form-item> -->
-      <el-form-item>
-        <el-button @click="handleQueryFormBtn_search" type="primary">搜索</el-button>
-        <el-button @click="handleQueryFormBtn_clear" type="warning">清空</el-button>
-      </el-form-item>
-    </el-form>
-    <div class="divider"></div>
-    <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">设备报修</el-button>
-      <el-button @click="handleTableRowBtn_delete" type="danger">删除</el-button>
+        <el-form-item>
+          <el-button @click="handleQueryFormBtn_search" type="primary">搜索</el-button>
+          <!-- <el-button @click="handleQueryFormBtn_clear" type="warning">清空</el-button> -->
+        </el-form-item>
+      </el-form>
     </div>
 
-    <div class="divider"></div>
+
     <div class="flex-auto">
       <el-table :data="tableData" @selection-change="handleSelectionChange" v-loading="loading_table"
         element-loading-background="#ffffff70">
@@ -393,7 +394,7 @@ init()
                 scope.row.xhs_wxcs
             }}次</el-link> -->
             <span> {{
-                scope.row.xhs_wxcs
+              scope.row.xhs_wxcs
             }}次</span>
           </template>
         </el-table-column>

+ 55 - 52
src/pages/xdhq/sbsg/index.vue

@@ -6,6 +6,7 @@ import { pick } from 'lodash-es';
 import { ElMessage } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import type { AxiosRequestConfig } from 'axios'
+import { user } from "~/store/user";
 
 // #region (constant)
 const TABLE_KEY = 'xhs_id'
@@ -73,7 +74,7 @@ const handleTableRowBtn_import = async ({ file }: { file: File }) => {
   }
 }
 const handleTableRowBtn_export = () => {
-  if(multipleSelection.value.length===0) return ElMessage.info('请先勾选导出文件');exportApi({[TABLE_KEY]:multipleSelection.value.map((item: TYPE_TABLE_FIELD)=>item[TABLE_KEY])?.join()})
+  if (multipleSelection.value.length === 0) return ElMessage.info('请先勾选导出文件'); exportApi({ [TABLE_KEY]: multipleSelection.value.map((item: TYPE_TABLE_FIELD) => item[TABLE_KEY])?.join() })
 }
 const handleTableRowBtn_add = () => {
   whichDialogSubmit = 'add'
@@ -87,7 +88,7 @@ const handleTableRowBtn_add_new = () => {
   dialogVisible_add.value = true
 }
 const handleTableRowBtn_delete = async () => {
-  if(multipleSelection.value.length===0) return ElMessage.info('请先勾选文件');const resp = await deleteApi(multipleSelection.value.map((item: TYPE_TABLE_FIELD) => item[TABLE_KEY]));if(resp.code!=='1')return;ElMessage.success('删除成功');
+  if (multipleSelection.value.length === 0) return ElMessage.info('请先勾选文件'); const resp = await deleteApi(multipleSelection.value.map((item: TYPE_TABLE_FIELD) => item[TABLE_KEY])); if (resp.code !== '1') return; ElMessage.success('删除成功');
   queryApi()
 }
 // #endregion
@@ -112,7 +113,7 @@ const handleTableColBtn_detail = (scope: { row: TYPE_TABLE_FIELD }) => {
   router.push({ name: DetailName, params: { [DetailParam]: scope.row[TABLE_KEY] } })
 }
 const handleTableColBtn_delete = async (scope: { row: TYPE_TABLE_FIELD }) => {
-  const resp = await deleteApi(scope.row[TABLE_KEY]);if(resp.code!=='1')return;ElMessage.success('删除成功');
+  const resp = await deleteApi(scope.row[TABLE_KEY]); if (resp.code !== '1') return; ElMessage.success('删除成功');
   queryApi()
 }
 // #endregion
@@ -134,7 +135,7 @@ const handleDialogFormBtn_submit = async (formRefKey: string, extendData?: Parti
   const isValid = await (instance?.refs[formRefKey] as FormInstance).validate((valid: boolean) => valid)
   if (isValid) {
     const resp = await API_MAP[whichDialogSubmit](<TYPE_TABLE_FIELD>({ ...dialogForm_Data.value, ...extendData }))
-    if(resp.code!=='1')return;ElMessage.success('操作成功');handleDialogFormBtn_cancel()
+    if (resp.code !== '1') return; ElMessage.success('操作成功'); handleDialogFormBtn_cancel()
     queryApi()
   }
 }
@@ -222,7 +223,7 @@ const handleDialogFormBtn_submit_new = async (formRefKey: string, extendData?: P
         ...extendData
       }))
     ))
-    if(resp.code!=='1')return;ElMessage.success('操作成功');handleDialogFormBtn_cancel()
+    if (resp.code !== '1') return; ElMessage.success('操作成功'); handleDialogFormBtn_cancel()
     queryApi()
   }
 }
@@ -351,7 +352,7 @@ function importApi(data: { file: File }) {
 }
 
 function exportApi(d) {
-  return download(URL_CUT + '/index', {...queryForm_Data.value,...d})
+  return download(URL_CUT + '/index', { ...queryForm_Data.value, ...d })
 }
 
 const API_MAP = {
@@ -405,22 +406,30 @@ request({
 
 <template>
   <div class="card flex-grow flex flex-col">
-    <el-form inline :model="queryForm_Data">
-      <!-- <el-form-item label="关键字"><el-input v-model="queryForm_Data.keyword" ></el-input></el-form-item> -->
-      <el-form-item label="资产名称">
-        <el-input v-model="queryForm_Data.xhs_zcmc" clearable />
-      </el-form-item>
-      <!-- <el-form-item label="规格型号">
+    <div class="flex justify-between">
+      <div class="flex">
+        <import-button @success="queryApi" :url="URL_CUT_REF"></import-button>
+        <el-button @click="handleTableRowBtn_export" type="primary">导出</el-button>
+        <!-- <el-button @click="handleTableRowBtn_add" type="primary">新增</el-button> -->
+        <el-button @click="handleTableRowBtn_add_new" type="primary">设备申购</el-button>
+        <el-button @click="handleTableRowBtn_delete" type="danger">删除</el-button>
+      </div>
+      <el-form inline :model="queryForm_Data">
+        <!-- <el-form-item label="关键字"><el-input v-model="queryForm_Data.keyword" ></el-input></el-form-item> -->
+        <el-form-item>
+          <el-input class="search_input" placeholder="资产名称" v-model="queryForm_Data.xhs_zcmc" clearable />
+        </el-form-item>
+        <!-- <el-form-item label="规格型号">
         <el-input v-model="queryForm_Data.xhs_ggxh" clearable />
       </el-form-item> -->
-      <el-form-item label="资产分类">
-        <el-input v-model="queryForm_Data.xhs_zcfl" clearable />
-        <!-- <remote-cascader url="/xdhq/hqgl_xcgllb/tree" v-model="queryForm_Data.xhs_zcfl_bh"></remote-cascader> -->
-      </el-form-item>
-      <!-- <el-form-item label="资产分类编号">
+        <el-form-item>
+          <el-input class="search_input" placeholder="资产分类" v-model="queryForm_Data.xhs_zcfl" clearable />
+          <!-- <remote-cascader url="/xdhq/hqgl_xcgllb/tree" v-model="queryForm_Data.xhs_zcfl_bh"></remote-cascader> -->
+        </el-form-item>
+        <!-- <el-form-item label="资产分类编号">
         <el-input v-model="queryForm_Data.xhs_zcfl_bh" clearable />
       </el-form-item> -->
-      <!-- <el-form-item label="资产批次">
+        <!-- <el-form-item label="资产批次">
         <el-input v-model="queryForm_Data.xhs_zcpc" clearable />
       </el-form-item>
       <el-form-item label="单价">
@@ -433,13 +442,13 @@ request({
       <el-form-item label="数量单位">
         <el-input v-model="queryForm_Data.xhs_dw" clearable />
       </el-form-item> -->
-      <!-- <el-form-item label="所属部门">
+        <!-- <el-form-item label="所属部门">
         <el-input v-model="queryForm_Data.xhs_ssbm" clearable />
       </el-form-item>
       <el-form-item label="所属部门路径">
         <el-input v-model="queryForm_Data.xhs_ssbm_lj" clearable />
       </el-form-item> -->
-      <!-- <el-form-item label="总价">
+        <!-- <el-form-item label="总价">
         <el-input v-model="queryForm_Data.xhs_zj" clearable />
       </el-form-item>
       <el-form-item label="购买时间">
@@ -451,36 +460,25 @@ request({
       <el-form-item label="审批人ID">
         <el-input v-model="queryForm_Data.xhs_spr_uid" clearable />
       </el-form-item> -->
-      <el-form-item label="状态">
-        <el-select v-model="queryForm_Data.xhs_spzt" clearable filterable>
-          <el-option label="待审批" value="1" />
-          <el-option label="通过" value="2" />
-          <el-option label="不通过" value="3" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="校务会讨论">
-        <el-select v-model="queryForm_Data.xhs_xwhtl" clearable filterable>
-          <el-option label="是" value="1" />
-          <el-option label="否" value="2" />
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button @click="handleQueryFormBtn_search" type="primary">搜索</el-button>
-        <el-button @click="handleQueryFormBtn_clear" type="warning">清空</el-button>
-      </el-form-item>
-    </el-form>
-    <div class="divider"></div>
-    <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">新增</el-button> -->
-      <el-button @click="handleTableRowBtn_add_new" type="primary">设备申购</el-button>
-      <el-button @click="handleTableRowBtn_delete" type="danger">删除</el-button>
-
-
+        <el-form-item>
+          <el-select class="search_input" placeholder="状态" v-model="queryForm_Data.xhs_spzt" clearable filterable>
+            <el-option label="待审批" value="1" />
+            <el-option label="通过" value="2" />
+            <el-option label="不通过" value="3" />
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-select class="search_input" placeholder="校务会讨论" v-model="queryForm_Data.xhs_xwhtl" clearable filterable>
+            <el-option label="是" value="1" />
+            <el-option label="否" value="2" />
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="handleQueryFormBtn_search" type="primary">搜索</el-button>
+          <!-- <el-button @click="handleQueryFormBtn_clear" type="warning">清空</el-button> -->
+        </el-form-item>
+      </el-form>
     </div>
-
-    <div class="divider"></div>
     <div class="flex-auto">
       <el-table :data="tableData" @selection-change="handleSelectionChange" v-loading="loading_table"
         element-loading-background="#ffffff70">
@@ -506,7 +504,7 @@ request({
             <!-- <el-button link :auto-insert-space="false" @click="handleTableColBtn_edit(scope)" type="primary">编辑
             </el-button> -->
             <el-button link :auto-insert-space="false" @click="handleTableColBtn_audit(scope)" type="primary"
-              :disabled="scope.row.xhs_spzt_option_k !== '1'">审核
+              :disabled="scope.row.xhs_spzt_option_k !== '1' || scope.row.xhs_spr !== user.user_realname">审核
             </el-button>
             <!-- <el-button link :auto-insert-space="false" @click="handleTableColBtn_detail(scope)" type="primary">详情
             </el-button>
@@ -701,6 +699,11 @@ request({
       </div>
     </el-form>
   </el-dialog>
-
-
 </template>
+<style lang="scss" scoped>
+::v-deep {
+  .search_input {
+    width: 150px;
+  }
+}
+</style>

+ 26 - 4
src/pages/xdhq/splcsz/index.vue

@@ -6,6 +6,7 @@ import { pick } from 'lodash-es';
 import { ElMessage } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import type { AxiosRequestConfig } from 'axios'
+import { user } from "~/store/user";
 
 // #region (constant)
 const TABLE_KEY = 'xhsl_id'
@@ -16,6 +17,23 @@ const instance = getCurrentInstance()
 const router = useRouter()
 // #endregion
 
+//#region 审核人
+let userList = ref([]);
+request({
+  url: '/user/main/index',
+  data: {
+    limit: 999,
+    page: 1,
+    admin: 1,
+    dept_id: user.uo_id
+  }
+}).then(res => {
+  if (res.code == '1') {
+    userList.value = res.data.page_data;
+  }
+})
+//#endregion
+
 // #region (variable)
 const loading_table = ref(true)
 let whichDialogSubmit: 'add' | 'edit'
@@ -109,6 +127,7 @@ function handleCurrentChange() {
 const dialogForm_Data = ref<Partial<TYPE_TABLE_FIELD> & { keyword?: string }>({})
 
 const handleDialogFormBtn_submit = async (formRefKey: string, extendData?: Partial<TYPE_TABLE_FIELD>) => {
+  
   const isValid = await (instance?.refs[formRefKey] as FormInstance).validate((valid: boolean) => valid)
   if (isValid) {
     const resp = await API_MAP[whichDialogSubmit](<TYPE_TABLE_FIELD>({ ...dialogForm_Data.value, ...extendData }))
@@ -329,8 +348,8 @@ init()
           <div v-for="(item, idx) in value" class="w-full flex flex-wrap py-1 items-center">
             <div class="min-w-470px">
               <span class="mr-4">申购金额</span>
-              <span>
-                <el-select v-model="item.sign" size="default" class="w-90px">
+              <div class="flex">
+                <el-select v-model="item.sign" size="default" class="w-90px mr-5px">
                   <el-option value="1" label="小于"></el-option>
                   <el-option value="2" label="介于"></el-option>
                   <el-option value="3" label="大于"></el-option>
@@ -341,12 +360,15 @@ init()
                 <el-input-number v-show="item.sign !== '1'" v-model="item.val_2" size="default"
                   controls-position="right">
                 </el-input-number>
-              </span>
+              </div>
             </div>
             <div class="ml-2 flex items-center">
               <span class="mr-4">审批人</span>
               <span class="flex">
-                <el-input v-model="item.spr" size="default" class="mr-2"></el-input>
+                <el-select v-model="item.spr">
+                  <el-option v-for="(user,index) in userList" :key="index" :label="user.user_realname" :value="user.user_realname"></el-option>
+                </el-select>
+                <!-- <el-input v-model="item.spr" size="default" class="mr-2"></el-input> -->
                 <el-checkbox v-model="item.jwhtl" label="校务会讨论" size="default" true-label="1" false-label="2" />
               </span>
             </div>

+ 50 - 39
src/pages/xdhq/xcgl/xcgl/index.vue

@@ -6,6 +6,7 @@ import { pick } from 'lodash-es';
 import { ElMessage } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import type { AxiosRequestConfig } from 'axios'
+import { user } from "~/store/user";
 
 // #region (constant)
 const TABLE_KEY = 'xhx_id'
@@ -65,15 +66,16 @@ const handleTableRowBtn_import = async ({ file }: { file: File }) => {
   }
 }
 const handleTableRowBtn_export = () => {
-  if(multipleSelection.value.length===0) return ElMessage.info('请先勾选导出文件');exportApi({[TABLE_KEY]:multipleSelection.value.map((item: TYPE_TABLE_FIELD)=>item[TABLE_KEY])?.join()})
+  if (multipleSelection.value.length === 0) return ElMessage.info('请先勾选导出文件'); exportApi({ [TABLE_KEY]: multipleSelection.value.map((item: TYPE_TABLE_FIELD) => item[TABLE_KEY])?.join() })
 }
 const handleTableRowBtn_add = () => {
   whichDialogSubmit = 'add'
   dialogForm_Data.value = {}
+  dialogForm_Data.value.xhx_spr = user.user_realname
   dialogVisible_addOrEdit.value = true
 }
 const handleTableRowBtn_delete = async () => {
-  if(multipleSelection.value.length===0) return ElMessage.info('请先勾选文件');const resp = await deleteApi(multipleSelection.value.map((item: TYPE_TABLE_FIELD) => item[TABLE_KEY]));if(resp.code!=='1')return;ElMessage.success('删除成功');
+  if (multipleSelection.value.length === 0) return ElMessage.info('请先勾选文件'); const resp = await deleteApi(multipleSelection.value.map((item: TYPE_TABLE_FIELD) => item[TABLE_KEY])); if (resp.code !== '1') return; ElMessage.success('删除成功');
   queryApi()
 }
 // #endregion
@@ -98,7 +100,7 @@ const handleTableColBtn_detail = (scope: { row: TYPE_TABLE_FIELD }) => {
   router.push({ name: DetailName, params: { [DetailParam]: scope.row[TABLE_KEY] } })
 }
 const handleTableColBtn_delete = async (scope: { row: TYPE_TABLE_FIELD }) => {
-  const resp = await deleteApi(scope.row[TABLE_KEY]);if(resp.code!=='1')return;ElMessage.success('删除成功');
+  const resp = await deleteApi(scope.row[TABLE_KEY]); if (resp.code !== '1') return; ElMessage.success('删除成功');
   queryApi()
 }
 // #endregion
@@ -120,7 +122,7 @@ const handleDialogFormBtn_submit = async (formRefKey: string, extendData?: Parti
   const isValid = await (instance?.refs[formRefKey] as FormInstance).validate((valid: boolean) => valid)
   if (isValid) {
     const resp = await API_MAP[whichDialogSubmit](<TYPE_TABLE_FIELD>({ ...dialogForm_Data.value, ...extendData }))
-    if(resp.code!=='1')return;ElMessage.success('操作成功');handleDialogFormBtn_cancel()
+    if (resp.code !== '1') return; ElMessage.success('操作成功'); handleDialogFormBtn_cancel()
     queryApi()
   }
 }
@@ -237,7 +239,7 @@ function importApi(data: { file: File }) {
 }
 
 function exportApi(d) {
-  return download(URL_CUT + '/index', {...queryForm_Data.value,...d})
+  return download(URL_CUT + '/index', { ...queryForm_Data.value, ...d })
 }
 
 const API_MAP = {
@@ -262,21 +264,29 @@ init()
 
 <template>
   <div class="card flex-grow flex flex-col">
-    <el-form inline :model="queryForm_Data">
-      <!-- <el-form-item label="关键字"><el-input v-model="queryForm_Data.keyword" ></el-input></el-form-item> -->
-      <el-form-item label="资产名称">
-        <el-input v-model="queryForm_Data.xhx_zcmc" clearable />
-      </el-form-item>
-      <!-- <el-form-item label="资产编号">
+
+    <div class="flex justify-between">
+      <div class="flex">
+        <import-button @success="queryApi" :url="URL_CUT_REF"></import-button>
+        <el-button @click="handleTableRowBtn_export" type="primary">导出</el-button>
+        <el-button @click="handleTableRowBtn_add" type="primary">新增</el-button>
+        <el-button @click="handleTableRowBtn_delete" type="danger">删除</el-button>
+      </div>
+      <el-form inline :model="queryForm_Data">
+        <!-- <el-form-item label="关键字"><el-input v-model="queryForm_Data.keyword" ></el-input></el-form-item> -->
+        <el-form-item label="">
+          <el-input class="search_input" placeholder="资产名称" v-model="queryForm_Data.xhx_zcmc" clearable />
+        </el-form-item>
+        <!-- <el-form-item label="资产编号">
         <el-input v-model="queryForm_Data.xhx_zcbh" clearable />
       </el-form-item> -->
-      <el-form-item label="状态">
-        <el-select v-model="queryForm_Data.xhx_zt" clearable filterable>
-          <el-option label="可借" value="1" />
-          <el-option label="不可借" value="2" />
-        </el-select>
-      </el-form-item>
-      <!-- <el-form-item label="单价">
+        <el-form-item label="">
+          <el-select class="search_input" placeholder="状态" v-model="queryForm_Data.xhx_zt" clearable filterable>
+            <el-option label="可借" value="1" />
+            <el-option label="不可借" value="2" />
+          </el-select>
+        </el-form-item>
+        <!-- <el-form-item label="单价">
         <el-input v-model="queryForm_Data.xhx_dj" clearable />
       </el-form-item>
       <el-form-item label="被借领">
@@ -285,26 +295,20 @@ init()
       <el-form-item label="被维修">
         <el-input v-model="queryForm_Data.xhx_bwx" clearable />
       </el-form-item> -->
-      <el-form-item label="资产分类">
-        <el-input v-model="queryForm_Data.xhx_zcfl" clearable />
-      </el-form-item>
-      <el-form-item label="审批人">
-        <el-input v-model="queryForm_Data.xhx_spr" clearable />
-      </el-form-item>
-      <el-form-item>
-        <el-button @click="handleQueryFormBtn_search" type="primary">搜索</el-button>
-        <el-button @click="handleQueryFormBtn_clear" type="warning">清空</el-button>
-      </el-form-item>
-    </el-form>
-    <div class="divider"></div>
-    <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">新增</el-button>
-      <el-button @click="handleTableRowBtn_delete" type="danger">删除</el-button>
+        <el-form-item label="">
+          <el-input class="search_input" placeholder="资产分类" v-model="queryForm_Data.xhx_zcfl" clearable />
+        </el-form-item>
+        <el-form-item label="">
+          <el-input class="search_input" placeholder="审批人" v-model="queryForm_Data.xhx_spr" clearable />
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="handleQueryFormBtn_search" type="primary">搜索</el-button>
+          <!-- <el-button @click="handleQueryFormBtn_clear" type="primary">清空</el-button> -->
+        </el-form-item>
+      </el-form>
     </div>
 
-    <div class="divider"></div>
+
     <div class="flex-auto">
       <el-table :data="tableData" @selection-change="handleSelectionChange" v-loading="loading_table"
         element-loading-background="#ffffff70">
@@ -320,7 +324,7 @@ init()
                   scope.row.xhx_bjl
               }}次</el-link> -->
             <span>{{
-                scope.row.xhx_bjl
+              scope.row.xhx_bjl
             }}次</span>
           </template></el-table-column>
         <el-table-column prop="xhx_bwx" label="被维修" width="auto" show-overflow-tooltip> <template #default="scope">
@@ -329,7 +333,7 @@ init()
                   scope.row.xhx_bwx
               }}次</el-link> -->
             <span>{{
-                scope.row.xhx_bwx
+              scope.row.xhx_bwx
             }}次</span>
           </template></el-table-column>
         <el-table-column prop="xhx_spr" label="审批人" width="auto" show-overflow-tooltip></el-table-column>
@@ -377,7 +381,7 @@ init()
       </el-form-item> -->
 
       <el-form-item label="审批人" prop="xhx_spr">
-        <el-input v-model="dialogForm_Data.xhx_spr" clearable />
+        <el-input disabled v-model="dialogForm_Data.xhx_spr" clearable />
       </el-form-item>
       <div class="flex justify-center">
         <el-button
@@ -406,3 +410,10 @@ init()
     </el-form>
   </el-dialog>
 </template>
+<style lang="scss" scoped>
+::v-deep {
+  .search_input {
+    width: 150px;
+  }
+}
+</style>

+ 28 - 26
src/pages/xdhq/xcgl/xcgllb.vue

@@ -62,7 +62,7 @@ const handleTableRowBtn_import = async ({ file }: { file: File }) => {
   }
 }
 const handleTableRowBtn_export = () => {
-  if(multipleSelection.value.length===0) return ElMessage.info('请先勾选导出文件');exportApi({[TABLE_KEY]:multipleSelection.value.map((item: TYPE_TABLE_FIELD)=>item[TABLE_KEY])?.join()})
+  if (multipleSelection.value.length === 0) return ElMessage.info('请先勾选导出文件'); exportApi({ [TABLE_KEY]: multipleSelection.value.map((item: TYPE_TABLE_FIELD) => item[TABLE_KEY])?.join() })
 }
 const handleTableRowBtn_add = (d?: Partial<TYPE_TABLE_FIELD>) => {
   whichDialogSubmit = 'add'
@@ -70,7 +70,7 @@ const handleTableRowBtn_add = (d?: Partial<TYPE_TABLE_FIELD>) => {
   dialogVisible_addOrEdit.value = true
 }
 const handleTableRowBtn_delete = async () => {
-  if(multipleSelection.value.length===0) return ElMessage.info('请先勾选文件');const resp = await deleteApi(multipleSelection.value.map((item: TYPE_TABLE_FIELD) => item[TABLE_KEY]));if(resp.code!=='1')return;ElMessage.success('删除成功');
+  if (multipleSelection.value.length === 0) return ElMessage.info('请先勾选文件'); const resp = await deleteApi(multipleSelection.value.map((item: TYPE_TABLE_FIELD) => item[TABLE_KEY])); if (resp.code !== '1') return; ElMessage.success('删除成功');
   queryApi()
 }
 // #endregion
@@ -95,7 +95,7 @@ const handleTableColBtn_detail = (scope: { row: TYPE_TABLE_FIELD }) => {
   router.push({ name: DetailName, params: { [DetailParam]: scope.row[TABLE_KEY] } })
 }
 const handleTableColBtn_delete = async (scope: { row: TYPE_TABLE_FIELD }) => {
-  const resp = await deleteApi(scope.row[TABLE_KEY]);if(resp.code!=='1')return;ElMessage.success('删除成功');
+  const resp = await deleteApi(scope.row[TABLE_KEY]); if (resp.code !== '1') return; ElMessage.success('删除成功');
   queryApi()
 }
 // #endregion
@@ -117,7 +117,7 @@ const handleDialogFormBtn_submit = async (formRefKey: string, extendData?: Parti
   const isValid = await (instance?.refs[formRefKey] as FormInstance).validate((valid: boolean) => valid)
   if (isValid) {
     const resp = await API_MAP[whichDialogSubmit](<TYPE_TABLE_FIELD>({ ...dialogForm_Data.value, ...extendData }))
-    if(resp.code!=='1')return;ElMessage.success('操作成功');handleDialogFormBtn_cancel()
+    if (resp.code !== '1') return; ElMessage.success('操作成功'); handleDialogFormBtn_cancel()
     await queryApi()
     timestamp.value = Date.now()
   }
@@ -230,7 +230,7 @@ function importApi(data: { file: File }) {
 }
 
 function exportApi(d) {
-  return download(URL_CUT + '/index', {...queryForm_Data.value,...d})
+  return download(URL_CUT + '/index', { ...queryForm_Data.value, ...d })
 }
 
 const API_MAP = {
@@ -274,15 +274,23 @@ const load = (
 
 <template>
   <div class="card flex-grow flex flex-col">
-    <el-form inline :model="queryForm_Data">
-      <!-- <el-form-item label="关键字"><el-input v-model="queryForm_Data.keyword" ></el-input></el-form-item> -->
-      <el-form-item label="分类名称">
-        <el-input v-model="queryForm_Data.xhxl_mc" clearable />
-      </el-form-item>
-      <el-form-item label="分类编码">
-        <el-input v-model="queryForm_Data.xhxl_bm" clearable />
-      </el-form-item>
-      <!-- <el-form-item label="创建时间">
+
+    <div class="flex justify-between">
+      <div>
+        <!-- <import-button @success="queryApi" :url="URL_CUT_REF"></import-button> -->
+        <el-button @click="handleTableRowBtn_export" type="primary">导出</el-button>
+        <el-button @click="handleTableRowBtn_add({ xhxl_pid: '0' })" type="primary">新增</el-button>
+        <el-button @click="handleTableRowBtn_delete" type="danger">删除</el-button>
+      </div>
+      <el-form inline :model="queryForm_Data">
+        <!-- <el-form-item label="关键字"><el-input v-model="queryForm_Data.keyword" ></el-input></el-form-item> -->
+        <el-form-item label="">
+          <el-input placeholder="分类名称" v-model="queryForm_Data.xhxl_mc" clearable />
+        </el-form-item>
+        <el-form-item label="">
+          <el-input placeholder="分类编码" v-model="queryForm_Data.xhxl_bm" clearable />
+        </el-form-item>
+        <!-- <el-form-item label="创建时间">
         <el-input v-model="queryForm_Data.xhxl_cjsj" clearable />
       </el-form-item>
       <el-form-item label="是否启用">
@@ -294,20 +302,14 @@ const load = (
       <el-form-item label="上级编号">
         <el-input v-model="queryForm_Data.xhxl_pid" clearable />
       </el-form-item> -->
-      <el-form-item>
-        <el-button @click="handleQueryFormBtn_search" type="primary">搜索</el-button>
-        <el-button @click="handleQueryFormBtn_clear" type="warning">清空</el-button>
-      </el-form-item>
-    </el-form>
-    <div class="divider"></div>
-    <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({ xhxl_pid: '0' })" type="primary">新增</el-button>
-      <el-button @click="handleTableRowBtn_delete" type="danger">删除</el-button>
+        <el-form-item>
+          <el-button @click="handleQueryFormBtn_search" type="primary">搜索</el-button>
+          <!-- <el-button @click="handleQueryFormBtn_clear" type="warning">清空</el-button> -->
+        </el-form-item>
+      </el-form>
     </div>
 
-    <div class="divider"></div>
+
     <div class="flex-auto">
       <el-table :data="tableData" @selection-change="handleSelectionChange" v-loading="loading_table"
         element-loading-background="#ffffff70" row-key="xhxl_id" lazy :load="load" :key="timestamp">

+ 46 - 38
src/pages/xdhq/zyyy/cdgl.vue

@@ -69,7 +69,7 @@ const handleTableRowBtn_import = async ({ file }: { file: File }) => {
   }
 }
 const handleTableRowBtn_export = () => {
-  if(multipleSelection.value.length===0) return ElMessage.info('请先勾选导出文件');exportApi({[TABLE_KEY]:multipleSelection.value.map((item: TYPE_TABLE_FIELD)=>item[TABLE_KEY])?.join()})
+  if (multipleSelection.value.length === 0) return ElMessage.info('请先勾选导出文件'); exportApi({ [TABLE_KEY]: multipleSelection.value.map((item: TYPE_TABLE_FIELD) => item[TABLE_KEY])?.join() })
 }
 const handleTableRowBtn_add = () => {
   whichDialogSubmit = 'add'
@@ -77,7 +77,7 @@ const handleTableRowBtn_add = () => {
   dialogVisible_addOrEdit.value = true
 }
 const handleTableRowBtn_delete = async () => {
-  if(multipleSelection.value.length===0) return ElMessage.info('请先勾选文件');const resp = await deleteApi(multipleSelection.value.map((item: TYPE_TABLE_FIELD) => item[TABLE_KEY]));if(resp.code!=='1')return;ElMessage.success('删除成功');
+  if (multipleSelection.value.length === 0) return ElMessage.info('请先勾选文件'); const resp = await deleteApi(multipleSelection.value.map((item: TYPE_TABLE_FIELD) => item[TABLE_KEY])); if (resp.code !== '1') return; ElMessage.success('删除成功');
   queryApi()
 }
 // #endregion
@@ -102,7 +102,7 @@ const handleTableColBtn_detail = (scope: { row: TYPE_TABLE_FIELD }) => {
   router.push({ name: DetailName, params: { [DetailParam]: scope.row[TABLE_KEY] } })
 }
 const handleTableColBtn_delete = async (scope: { row: TYPE_TABLE_FIELD }) => {
-  const resp = await deleteApi(scope.row[TABLE_KEY]);if(resp.code!=='1')return;ElMessage.success('删除成功');
+  const resp = await deleteApi(scope.row[TABLE_KEY]); if (resp.code !== '1') return; ElMessage.success('删除成功');
   queryApi()
 }
 // #endregion
@@ -124,7 +124,7 @@ const handleDialogFormBtn_submit = async (formRefKey: string, extendData?: Parti
   const isValid = await (instance?.refs[formRefKey] as FormInstance).validate((valid: boolean) => valid)
   if (isValid) {
     const resp = await API_MAP[whichDialogSubmit](<TYPE_TABLE_FIELD>({ ...dialogForm_Data.value, ...extendData }))
-    if(resp.code!=='1')return;ElMessage.success('操作成功');handleDialogFormBtn_cancel()
+    if (resp.code !== '1') return; ElMessage.success('操作成功'); handleDialogFormBtn_cancel()
     queryApi()
   }
 }
@@ -217,7 +217,7 @@ function editApi(data: Partial<TYPE_TABLE_FIELD>) {
     url: URL_CUT + '/edit',
     data: {
       [TABLE_KEY]: data[TABLE_KEY],
-      [URL_SUBMIT_KEY]: pick(data, ['xhzz_cdbh', 'xhzz_cdmc', 'xhzl_flbm','xhzl_flmc', 'xhzz_ssxq', 'xhzz_zdmj', 'xhzz_dz', 'xhzz_tp', 'xhzz_sfkjy', 'xhzz_fzr', 'xhzz_fzr_uid', 'xhzz_bz',]),
+      [URL_SUBMIT_KEY]: pick(data, ['xhzz_cdbh', 'xhzz_cdmc', 'xhzl_flbm', 'xhzl_flmc', 'xhzz_ssxq', 'xhzz_zdmj', 'xhzz_dz', 'xhzz_tp', 'xhzz_sfkjy', 'xhzz_fzr', 'xhzz_fzr_uid', 'xhzz_bz',]),
     }
   })
 }
@@ -249,7 +249,7 @@ function importApi(data: { file: File }) {
 }
 
 function exportApi(d) {
-  return download(URL_CUT + '/index', {...queryForm_Data.value,...d})
+  return download(URL_CUT + '/index', { ...queryForm_Data.value, ...d })
 }
 
 const API_MAP = {
@@ -274,19 +274,27 @@ init()
 
 <template>
   <div class="card flex-grow flex flex-col">
-    <el-form inline :model="queryForm_Data">
-      <!-- <el-form-item label="关键字"><el-input v-model="queryForm_Data.keyword" ></el-input></el-form-item> -->
-      <el-form-item label="场地编号">
-        <el-input v-model="queryForm_Data.xhzz_cdbh" clearable />
-      </el-form-item>
-      <el-form-item label="场地名称">
-        <el-input v-model="queryForm_Data.xhzz_cdmc" clearable />
-      </el-form-item>
-      <el-form-item label="场地类别">
-        <!-- <el-input v-model="queryForm_Data.xhzl_flbm" clearable /> -->
-        <remote-select url="/xdhq/hqgl_zyyylb/index" :fields="['xhzl_flbm','xhzl_flmc']" v-model="queryForm_Data.xhzl_flbm" v-model:modelName="queryForm_Data.xhzl_flmc"></remote-select>
-      </el-form-item>
-      <!-- <el-form-item label="所属校区">
+    <div class="flex justify-between">
+      <div class="flex">
+        <import-button @success="queryApi" :url="URL_CUT_REF"></import-button>
+        <el-button @click="handleTableRowBtn_export" type="primary">导出</el-button>
+        <el-button @click="handleTableRowBtn_add" type="primary">新增</el-button>
+        <el-button @click="handleTableRowBtn_delete" type="danger">删除</el-button>
+      </div>
+      <el-form inline :model="queryForm_Data">
+        <!-- <el-form-item label="关键字"><el-input v-model="queryForm_Data.keyword" ></el-input></el-form-item> -->
+        <el-form-item>
+          <el-input placeholder="场地编号" class="search_input" v-model="queryForm_Data.xhzz_cdbh" clearable />
+        </el-form-item>
+        <el-form-item>
+          <el-input placeholder="场地名称" class="search_input" v-model="queryForm_Data.xhzz_cdmc" clearable />
+        </el-form-item>
+        <el-form-item>
+          <!-- <el-input v-model="queryForm_Data.xhzl_flbm" clearable /> -->
+          <remote-select placeholder="场地类别" class="search_input" url="/xdhq/hqgl_zyyylb/index" :fields="['xhzl_flbm', 'xhzl_flmc']"
+            v-model="queryForm_Data.xhzl_flbm" v-model:modelName="queryForm_Data.xhzl_flmc"></remote-select>
+        </el-form-item>
+        <!-- <el-form-item label="所属校区">
         <el-input v-model="queryForm_Data.xhzz_ssxq" clearable />
       </el-form-item>
       <el-form-item label="占地面积">
@@ -304,29 +312,21 @@ init()
           <el-option label="否" value="2" />
         </el-select>
       </el-form-item> -->
-      <el-form-item label="负责人">
-        <el-input v-model="queryForm_Data.xhzz_fzr" clearable />
-      </el-form-item>
-      <!-- <el-form-item label="负责人ID">
+        <el-form-item>
+          <el-input placeholder="负责人" class="search_input" v-model="queryForm_Data.xhzz_fzr" clearable />
+        </el-form-item>
+        <!-- <el-form-item label="负责人ID">
         <el-input v-model="queryForm_Data.xhzz_fzr_uid" clearable />
       </el-form-item>
       <el-form-item label="备注">
         <el-input v-model="queryForm_Data.xhzz_bz" clearable />
       </el-form-item> -->
-      <el-form-item>
-        <el-button @click="handleQueryFormBtn_search" type="primary">搜索</el-button>
-        <el-button @click="handleQueryFormBtn_clear" type="warning">清空</el-button>
-      </el-form-item>
-    </el-form>
-    <div class="divider"></div>
-    <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">新增</el-button>
-      <el-button @click="handleTableRowBtn_delete" type="danger">删除</el-button>
+        <el-form-item>
+          <el-button @click="handleQueryFormBtn_search" type="primary">搜索</el-button>
+          <!-- <el-button @click="handleQueryFormBtn_clear" type="warning">清空</el-button> -->
+        </el-form-item>
+      </el-form>
     </div>
-
-    <div class="divider"></div>
     <div class="flex-auto">
       <el-table :data="tableData" @selection-change="handleSelectionChange" v-loading="loading_table"
         element-loading-background="#ffffff70">
@@ -379,13 +379,14 @@ init()
       </el-form-item>
       <el-form-item label="场地类别" prop="xhzl_flbm">
         <!-- <el-input v-model="dialogForm_Data.xhzl_flbm" clearable /> -->
-        <remote-select url="/xdhq/hqgl_zyyylb/index" :fields="['xhzl_flbm','xhzl_flmc']" v-model="dialogForm_Data.xhzl_flbm" v-model:modelName="dialogForm_Data.xhzl_flmc"></remote-select>
+        <remote-select url="/xdhq/hqgl_zyyylb/index" :fields="['xhzl_flbm', 'xhzl_flmc']"
+          v-model="dialogForm_Data.xhzl_flbm" v-model:modelName="dialogForm_Data.xhzl_flmc"></remote-select>
       </el-form-item>
       <el-form-item label="所属校区" prop="xhzz_ssxq">
         <el-input v-model="dialogForm_Data.xhzz_ssxq" clearable />
       </el-form-item>
       <el-form-item label="占地面积" prop="xhzz_zdmj">
-        <el-input v-model="dialogForm_Data.xhzz_zdmj" clearable ><template #append>平方米</template></el-input>
+        <el-input v-model="dialogForm_Data.xhzz_zdmj" clearable><template #append>平方米</template></el-input>
       </el-form-item>
       <el-form-item label="地址" prop="xhzz_dz">
         <el-input v-model="dialogForm_Data.xhzz_dz" clearable />
@@ -434,3 +435,10 @@ init()
     </el-form>
   </el-dialog>
 </template>
+<style lang="scss" scoped>
+::v-deep {
+  .search_input {
+    width: 150px;
+  }
+}
+</style>

+ 39 - 32
src/pages/xdhq/zyyy/cdlbgl.vue

@@ -62,7 +62,7 @@ const handleTableRowBtn_import = async ({ file }: { file: File }) => {
   }
 }
 const handleTableRowBtn_export = () => {
-  if(multipleSelection.value.length===0) return ElMessage.info('请先勾选导出文件');exportApi({[TABLE_KEY]:multipleSelection.value.map((item: TYPE_TABLE_FIELD)=>item[TABLE_KEY])?.join()})
+  if (multipleSelection.value.length === 0) return ElMessage.info('请先勾选导出文件'); exportApi({ [TABLE_KEY]: multipleSelection.value.map((item: TYPE_TABLE_FIELD) => item[TABLE_KEY])?.join() })
 }
 const handleTableRowBtn_add = () => {
   whichDialogSubmit = 'add'
@@ -70,7 +70,7 @@ const handleTableRowBtn_add = () => {
   dialogVisible_addOrEdit.value = true
 }
 const handleTableRowBtn_delete = async () => {
-  if(multipleSelection.value.length===0) return ElMessage.info('请先勾选文件');const resp = await deleteApi(multipleSelection.value.map((item: TYPE_TABLE_FIELD) => item[TABLE_KEY]));if(resp.code!=='1')return;ElMessage.success('删除成功');
+  if (multipleSelection.value.length === 0) return ElMessage.info('请先勾选文件'); const resp = await deleteApi(multipleSelection.value.map((item: TYPE_TABLE_FIELD) => item[TABLE_KEY])); if (resp.code !== '1') return; ElMessage.success('删除成功');
   queryApi()
 }
 // #endregion
@@ -95,7 +95,7 @@ const handleTableColBtn_detail = (scope: { row: TYPE_TABLE_FIELD }) => {
   router.push({ name: DetailName, params: { [DetailParam]: scope.row[TABLE_KEY] } })
 }
 const handleTableColBtn_delete = async (scope: { row: TYPE_TABLE_FIELD }) => {
-  const resp = await deleteApi(scope.row[TABLE_KEY]);if(resp.code!=='1')return;ElMessage.success('删除成功');
+  const resp = await deleteApi(scope.row[TABLE_KEY]); if (resp.code !== '1') return; ElMessage.success('删除成功');
   queryApi()
 }
 // #endregion
@@ -117,7 +117,7 @@ const handleDialogFormBtn_submit = async (formRefKey: string, extendData?: Parti
   const isValid = await (instance?.refs[formRefKey] as FormInstance).validate((valid: boolean) => valid)
   if (isValid) {
     const resp = await API_MAP[whichDialogSubmit](<TYPE_TABLE_FIELD>({ ...dialogForm_Data.value, ...extendData }))
-    if(resp.code!=='1')return;ElMessage.success('操作成功');handleDialogFormBtn_cancel()
+    if (resp.code !== '1') return; ElMessage.success('操作成功'); handleDialogFormBtn_cancel()
     queryApi()
   }
 }
@@ -228,7 +228,7 @@ function importApi(data: { file: File }) {
 }
 
 function exportApi(d) {
-  return download(URL_CUT + '/index', {...queryForm_Data.value,...d})
+  return download(URL_CUT + '/index', { ...queryForm_Data.value, ...d })
 }
 
 const API_MAP = {
@@ -253,36 +253,36 @@ init()
 
 <template>
   <div class="card flex-grow flex flex-col">
-    <el-form inline :model="queryForm_Data">
-      <!-- <el-form-item label="关键字"><el-input v-model="queryForm_Data.keyword" ></el-input></el-form-item> -->
-      <el-form-item label="分类编码">
-        <el-input v-model="queryForm_Data.xhzl_flbm" clearable />
-      </el-form-item>
-      <el-form-item label="分类名称">
-        <el-input v-model="queryForm_Data.xhzl_flmc" clearable />
-      </el-form-item>
-      <!-- <el-form-item label="排序"><el-input v-model="queryForm_Data.xhzl_px" clearable /></el-form-item>
+    <div class="flex justify-between">
+      <div class="flex">
+        <import-button @success="queryApi" :url="URL_CUT_REF"></import-button>
+        <el-button @click="handleTableRowBtn_export" type="primary">导出</el-button>
+        <el-button @click="handleTableRowBtn_add" type="primary">新增</el-button>
+        <el-button @click="handleTableRowBtn_delete" type="danger">删除</el-button>
+      </div>
+      <el-form inline :model="queryForm_Data">
+        <!-- <el-form-item label="关键字"><el-input v-model="queryForm_Data.keyword" ></el-input></el-form-item> -->
+        <el-form-item>
+          <el-input class="search_input" placeholder="分类编码" v-model="queryForm_Data.xhzl_flbm" clearable />
+        </el-form-item>
+        <el-form-item>
+          <el-input class="search_input" placeholder="分类名称" v-model="queryForm_Data.xhzl_flmc" clearable />
+        </el-form-item>
+        <!-- <el-form-item label="排序"><el-input v-model="queryForm_Data.xhzl_px" clearable /></el-form-item>
       <el-form-item label="图片"><el-input v-model="queryForm_Data.xhzl_tp" clearable /></el-form-item> -->
-      <el-form-item label="是否启用">
-        <el-select v-model="queryForm_Data.xhzl_sfqy" clearable filterable>
-          <el-option label="是" value="1" />
-          <el-option label="否" value="2" />
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button @click="handleQueryFormBtn_search" type="primary">搜索</el-button>
-        <el-button @click="handleQueryFormBtn_clear" type="warning">清空</el-button>
-      </el-form-item>
-    </el-form>
-    <div class="divider"></div>
-    <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">新增</el-button>
-      <el-button @click="handleTableRowBtn_delete" type="danger">删除</el-button>
+        <el-form-item>
+          <el-select class="search_input" placeholder="是否启用" v-model="queryForm_Data.xhzl_sfqy" clearable filterable>
+            <el-option label="是" value="1" />
+            <el-option label="否" value="2" />
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="handleQueryFormBtn_search" type="primary">搜索</el-button>
+          <!-- <el-button @click="handleQueryFormBtn_clear" type="warning">清空</el-button> -->
+        </el-form-item>
+      </el-form>
     </div>
 
-    <div class="divider"></div>
     <div class="flex-auto">
       <el-table :data="tableData" @selection-change="handleSelectionChange" v-loading="loading_table"
         element-loading-background="#ffffff70">
@@ -364,3 +364,10 @@ init()
     </el-form>
   </el-dialog>
 </template>
+<style lang="scss" scoped>
+::v-deep {
+  .search_input {
+    width: 150px;
+  }
+}
+</style>

+ 48 - 38
src/pages/xdhq/zyyy/shgl.vue

@@ -67,7 +67,7 @@ const handleTableRowBtn_import = async ({ file }: { file: File }) => {
   }
 }
 const handleTableRowBtn_export = () => {
-  if(multipleSelection.value.length===0) return ElMessage.info('请先勾选导出文件');exportApi({[TABLE_KEY]:multipleSelection.value.map((item: TYPE_TABLE_FIELD)=>item[TABLE_KEY])?.join()})
+  if (multipleSelection.value.length === 0) return ElMessage.info('请先勾选导出文件'); exportApi({ [TABLE_KEY]: multipleSelection.value.map((item: TYPE_TABLE_FIELD) => item[TABLE_KEY])?.join() })
 }
 const handleTableRowBtn_add = () => {
   whichDialogSubmit = 'add'
@@ -75,7 +75,7 @@ const handleTableRowBtn_add = () => {
   dialogVisible_addOrEdit.value = true
 }
 const handleTableRowBtn_delete = async () => {
-  if(multipleSelection.value.length===0) return ElMessage.info('请先勾选文件');const resp = await deleteApi(multipleSelection.value.map((item: TYPE_TABLE_FIELD) => item[TABLE_KEY]));if(resp.code!=='1')return;ElMessage.success('删除成功');
+  if (multipleSelection.value.length === 0) return ElMessage.info('请先勾选文件'); const resp = await deleteApi(multipleSelection.value.map((item: TYPE_TABLE_FIELD) => item[TABLE_KEY])); if (resp.code !== '1') return; ElMessage.success('删除成功');
   queryApi()
 }
 // #endregion
@@ -100,7 +100,7 @@ const handleTableColBtn_detail = (scope: { row: TYPE_TABLE_FIELD }) => {
   router.push({ name: DetailName, params: { [DetailParam]: scope.row[TABLE_KEY] } })
 }
 const handleTableColBtn_delete = async (scope: { row: TYPE_TABLE_FIELD }) => {
-  const resp = await deleteApi(scope.row[TABLE_KEY]);if(resp.code!=='1')return;ElMessage.success('删除成功');
+  const resp = await deleteApi(scope.row[TABLE_KEY]); if (resp.code !== '1') return; ElMessage.success('删除成功');
   queryApi()
 }
 // #endregion
@@ -122,7 +122,7 @@ const handleDialogFormBtn_submit = async (formRefKey: string, extendData?: Parti
   const isValid = await (instance?.refs[formRefKey] as FormInstance).validate((valid: boolean) => valid)
   if (isValid) {
     const resp = await API_MAP[whichDialogSubmit](<TYPE_TABLE_FIELD>({ ...dialogForm_Data.value, ...extendData }))
-    if(resp.code!=='1')return;ElMessage.success('操作成功');handleDialogFormBtn_cancel()
+    if (resp.code !== '1') return; ElMessage.success('操作成功'); handleDialogFormBtn_cancel()
     queryApi()
   }
 }
@@ -157,7 +157,7 @@ const dialogForm_Field_audit = reactive<{
   REASON: keyof TYPE_TABLE_FIELD
 }>({
   FLAG: 'xhz_zt',
-  REASON:'xhz_yy'
+  REASON: 'xhz_yy'
 })
 
 const dialogForm_Ref_audit = ref<FormInstance>()
@@ -241,7 +241,7 @@ function importApi(data: { file: File }) {
 }
 
 function exportApi(d) {
-  return download(URL_CUT + '/index', {...queryForm_Data.value,...d})
+  return download(URL_CUT + '/index', { ...queryForm_Data.value, ...d })
 }
 
 const API_MAP = {
@@ -266,44 +266,48 @@ init()
 
 <template>
   <div class="card flex-grow flex flex-col">
-    <el-form inline :model="queryForm_Data">
-      <!-- <el-form-item label="关键字"><el-input v-model="queryForm_Data.keyword" ></el-input></el-form-item> -->
-      <el-form-item label="场地名称">
-        <el-input v-model="queryForm_Data.xhz_cdmc" clearable />
-      </el-form-item>
-      <el-form-item label="所属部门">
-        <el-input v-model="queryForm_Data.xhz_ssbm" clearable />
-      </el-form-item>
-      <el-form-item label="借用人">
-        <el-input v-model="queryForm_Data.xhz_jyr" clearable />
-      </el-form-item>
-      <!-- <el-form-item label="用途">
+    <div class="flex justify-between">
+      <div></div>
+      <el-form inline :model="queryForm_Data">
+        <!-- <el-form-item label="关键字"><el-input v-model="queryForm_Data.keyword" ></el-input></el-form-item> -->
+        <el-form-item label="">
+          <el-input class="search_input" placeholder="场地名称" v-model="queryForm_Data.xhz_cdmc" clearable />
+        </el-form-item>
+        <el-form-item label="">
+          <el-input class="search_input" placeholder="所属部门" v-model="queryForm_Data.xhz_ssbm" clearable />
+        </el-form-item>
+        <el-form-item label="">
+          <el-input class="search_input" placeholder="借用人" v-model="queryForm_Data.xhz_jyr" clearable />
+        </el-form-item>
+        <!-- <el-form-item label="用途">
         <el-input v-model="queryForm_Data.xhz_yt" clearable />
       </el-form-item> -->
-      <el-form-item label="批准人">
-        <el-input v-model="queryForm_Data.xhz_pzr" clearable />
-      </el-form-item>
-      <!-- <el-form-item label="借用时间_开始">
+        <el-form-item label="">
+          <el-input class="search_input" placeholder="批准人" v-model="queryForm_Data.xhz_pzr" clearable />
+        </el-form-item>
+        <!-- <el-form-item label="借用时间_开始">
         <el-input v-model="queryForm_Data.xhz_jysj_ks" clearable />
       </el-form-item>
       <el-form-item label="借用时间_结束">
         <el-input v-model="queryForm_Data.xhz_jysj_js" clearable />
       </el-form-item> -->
-      <el-form-item label="状态">
-        <el-select v-model="queryForm_Data.xhz_zt" clearable filterable>
-          <el-option label="通过" value="1" />
-          <el-option label="未通过" value="2" />
-          <el-option label="待审核" value="3" />
-        </el-select>
-      </el-form-item>
-      <!-- <el-form-item label="原因">
+        <el-form-item label="">
+          <el-select class="search_input" placeholder="状态" v-model="queryForm_Data.xhz_zt" clearable filterable>
+            <el-option label="通过" value="1" />
+            <el-option label="未通过" value="2" />
+            <el-option label="待审核" value="3" />
+          </el-select>
+        </el-form-item>
+        <!-- <el-form-item label="原因">
         <el-input v-model="queryForm_Data.xhz_yy" clearable />
       </el-form-item> -->
-      <el-form-item>
-        <el-button @click="handleQueryFormBtn_search" type="primary">搜索</el-button>
-        <el-button @click="handleQueryFormBtn_clear" type="warning">清空</el-button>
-      </el-form-item>
-    </el-form>
+        <el-form-item>
+          <el-button @click="handleQueryFormBtn_search" type="primary">搜索</el-button>
+          <!-- <el-button @click="handleQueryFormBtn_clear" type="warning">清空</el-button> -->
+        </el-form-item>
+      </el-form>
+    </div>
+
     <!-- <div class="divider"></div>
     <div>
       <import-button @success="queryApi" :url="URL_CUT_REF"></import-button>
@@ -311,8 +315,6 @@ init()
       <el-button @click="handleTableRowBtn_add" type="primary">新增</el-button>
       <el-button @click="handleTableRowBtn_delete" type="danger">删除</el-button>
     </div> -->
-
-    <div class="divider"></div>
     <div class="flex-auto">
       <el-table :data="tableData" @selection-change="handleSelectionChange" v-loading="loading_table"
         element-loading-background="#ffffff70">
@@ -333,7 +335,8 @@ init()
           <template #default="scope">
             <!-- <el-button link :auto-insert-space="false" @click="handleTableColBtn_edit(scope)" type="primary">编辑
             </el-button> -->
-            <el-button link :auto-insert-space="false" @click="handleTableColBtn_audit(scope)" type="primary" :disabled="scope.row.xhz_zt_option_k!=='3'">审核
+            <el-button link :auto-insert-space="false" @click="handleTableColBtn_audit(scope)" type="primary"
+              :disabled="scope.row.xhz_zt_option_k !== '3'">审核
             </el-button>
             <!-- <el-button link :auto-insert-space="false" @click="handleTableColBtn_detail(scope)" type="primary">详情
             </el-button>
@@ -408,3 +411,10 @@ init()
     </el-form>
   </el-dialog>
 </template>
+<style lang="scss" scoped>
+::v-deep {
+  .search_input {
+    width: 150px;
+  }
+}
+</style>

+ 40 - 35
src/pages/xdhq/zyyy/yygl.vue

@@ -69,7 +69,7 @@ const handleTableRowBtn_import = async ({ file }: { file: File }) => {
   }
 }
 const handleTableRowBtn_export = () => {
-  if(multipleSelection.value.length===0) return ElMessage.info('请先勾选导出文件');exportApi({[TABLE_KEY]:multipleSelection.value.map((item: TYPE_TABLE_FIELD)=>item[TABLE_KEY])?.join()})
+  if (multipleSelection.value.length === 0) return ElMessage.info('请先勾选导出文件'); exportApi({ [TABLE_KEY]: multipleSelection.value.map((item: TYPE_TABLE_FIELD) => item[TABLE_KEY])?.join() })
 }
 const handleTableRowBtn_add = () => {
   whichDialogSubmit = 'add'
@@ -77,7 +77,7 @@ const handleTableRowBtn_add = () => {
   dialogVisible_addOrEdit.value = true
 }
 const handleTableRowBtn_delete = async () => {
-  if(multipleSelection.value.length===0) return ElMessage.info('请先勾选文件');const resp = await deleteApi(multipleSelection.value.map((item: TYPE_TABLE_FIELD) => item[TABLE_KEY]));if(resp.code!=='1')return;ElMessage.success('删除成功');
+  if (multipleSelection.value.length === 0) return ElMessage.info('请先勾选文件'); const resp = await deleteApi(multipleSelection.value.map((item: TYPE_TABLE_FIELD) => item[TABLE_KEY])); if (resp.code !== '1') return; ElMessage.success('删除成功');
   queryApi()
 }
 // #endregion
@@ -102,7 +102,7 @@ const handleTableColBtn_detail = (scope: { row: TYPE_TABLE_FIELD }) => {
   router.push({ name: DetailName, params: { [DetailParam]: scope.row[TABLE_KEY] } })
 }
 const handleTableColBtn_delete = async (scope: { row: TYPE_TABLE_FIELD }) => {
-  const resp = await deleteApi(scope.row[TABLE_KEY]);if(resp.code!=='1')return;ElMessage.success('删除成功');
+  const resp = await deleteApi(scope.row[TABLE_KEY]); if (resp.code !== '1') return; ElMessage.success('删除成功');
   queryApi()
 }
 
@@ -125,7 +125,7 @@ const handleDialogFormBtn_submit = async (formRefKey: string, extendData?: Parti
   const isValid = await (instance?.refs[formRefKey] as FormInstance).validate((valid: boolean) => valid)
   if (isValid) {
     const resp = await API_MAP[whichDialogSubmit](<TYPE_TABLE_FIELD>({ ...dialogForm_Data.value, ...extendData }))
-    if(resp.code!=='1')return;ElMessage.success('操作成功');handleDialogFormBtn_cancel()
+    if (resp.code !== '1') return; ElMessage.success('操作成功'); handleDialogFormBtn_cancel()
     queryApi()
   }
 }
@@ -153,8 +153,8 @@ type TYPE_TABLE_FIELD_BOOKING = {
 
 const handleTableColBtn_booking = async (scope: { row: TYPE_TABLE_FIELD }) => {
   dialogForm_Data_booking.value = {
-    xhzz_cdbh:scope.row.xhzz_cdbh,
-    xhz_cdmc:scope.row.xhzz_cdmc,
+    xhzz_cdbh: scope.row.xhzz_cdbh,
+    xhz_cdmc: scope.row.xhzz_cdmc,
   }
   dialogVisible_booking.value = true
 }
@@ -189,7 +189,7 @@ const handleDialogFormBtn_submit_booking = async (formRefKey: string, extendData
         }
       }
     })
-    if(resp.code!=='1')return;ElMessage.success('预约成功等待审核');handleDialogFormBtn_cancel();init();
+    if (resp.code !== '1') return; ElMessage.success('预约成功等待审核'); handleDialogFormBtn_cancel(); init();
   }
 }
 // #endregion
@@ -310,7 +310,7 @@ function importApi(data: { file: File }) {
 }
 
 function exportApi(d) {
-  return download(URL_CUT + '/index', {...queryForm_Data.value,...d})
+  return download(URL_CUT + '/index', { ...queryForm_Data.value, ...d })
 }
 
 const API_MAP = {
@@ -335,20 +335,22 @@ init()
 
 <template>
   <div class="card flex-grow flex flex-col">
-    <el-form inline :model="queryForm_Data">
-      <!-- <el-form-item label="关键字"><el-input v-model="queryForm_Data.keyword" ></el-input></el-form-item> -->
-      <el-form-item label="场地编号">
-        <el-input v-model="queryForm_Data.xhzz_cdbh" clearable />
-      </el-form-item>
-      <el-form-item label="场地名称">
-        <el-input v-model="queryForm_Data.xhzz_cdmc" clearable />
-      </el-form-item>
-      <el-form-item label="场地类别">
-        <!-- <el-input v-model="queryForm_Data.xhzl_flbm" clearable /> -->
-        <remote-select url="/xdhq/hqgl_zyyylb/index" :fields="['xhzl_flbm', 'xhzl_flmc']"
-          v-model="queryForm_Data.xhzl_flbm" v-model:modelName="queryForm_Data.xhzl_flmc"></remote-select>
-      </el-form-item>
-      <!-- <el-form-item label="所属校区">
+    <div class="flex justify-between">
+      <div></div>
+      <el-form inline :model="queryForm_Data">
+        <!-- <el-form-item label="关键字"><el-input v-model="queryForm_Data.keyword" ></el-input></el-form-item> -->
+        <el-form-item>
+          <el-input placeholder="场地编号" v-model="queryForm_Data.xhzz_cdbh" clearable />
+        </el-form-item>
+        <el-form-item>
+          <el-input placeholder="场地名称" v-model="queryForm_Data.xhzz_cdmc" clearable />
+        </el-form-item>
+        <el-form-item>
+          <!-- <el-input v-model="queryForm_Data.xhzl_flbm" clearable /> -->
+          <remote-select placeholder="场地类别" url="/xdhq/hqgl_zyyylb/index" :fields="['xhzl_flbm', 'xhzl_flmc']"
+            v-model="queryForm_Data.xhzl_flbm" v-model:modelName="queryForm_Data.xhzl_flmc"></remote-select>
+        </el-form-item>
+        <!-- <el-form-item label="所属校区">
         <el-input v-model="queryForm_Data.xhzz_ssxq" clearable />
       </el-form-item>
       <el-form-item label="占地面积">
@@ -366,20 +368,22 @@ init()
           <el-option label="否" value="2" />
         </el-select>
       </el-form-item> -->
-      <el-form-item label="负责人">
-        <el-input v-model="queryForm_Data.xhzz_fzr" clearable />
-      </el-form-item>
-      <!-- <el-form-item label="负责人ID">
+        <el-form-item>
+          <el-input placeholder="负责人" v-model="queryForm_Data.xhzz_fzr" clearable />
+        </el-form-item>
+        <!-- <el-form-item label="负责人ID">
         <el-input v-model="queryForm_Data.xhzz_fzr_uid" clearable />
       </el-form-item>
       <el-form-item label="备注">
         <el-input v-model="queryForm_Data.xhzz_bz" clearable />
       </el-form-item> -->
-      <el-form-item>
-        <el-button @click="handleQueryFormBtn_search" type="primary">搜索</el-button>
-        <el-button @click="handleQueryFormBtn_clear" type="warning">清空</el-button>
-      </el-form-item>
-    </el-form>
+        <el-form-item>
+          <el-button @click="handleQueryFormBtn_search" type="primary">搜索</el-button>
+          <!-- <el-button @click="handleQueryFormBtn_clear" type="warning">清空</el-button> -->
+        </el-form-item>
+      </el-form>
+    </div>
+
     <!-- <div class="divider"></div>
     <div>
       <import-button @success="queryApi" :url="URL_CUT_REF"></import-button>
@@ -388,7 +392,6 @@ init()
       <el-button @click="handleTableRowBtn_delete" type="danger">删除</el-button>
     </div> -->
 
-    <div class="divider"></div>
     <div class="flex-auto">
       <el-table :data="tableData" @selection-change="handleSelectionChange" v-loading="loading_table"
         element-loading-background="#ffffff70">
@@ -451,14 +454,16 @@ init()
         <el-input v-model="dialogForm_Data_booking.xhz_pzr" clearable />
       </el-form-item>
       <el-form-item label="借用时间_开始" prop="xhz_jysj_ks">
-        <el-date-picker type="datetime" v-model="dialogForm_Data_booking.xhz_jysj_ks" value-format="YYYY-MM-DD HH:mm:ss" clearable />
+        <el-date-picker type="datetime" v-model="dialogForm_Data_booking.xhz_jysj_ks" value-format="YYYY-MM-DD HH:mm:ss"
+          clearable />
       </el-form-item>
       <el-form-item label="借用时间_结束" prop="xhz_jysj_js">
-        <el-date-picker type="datetime" v-model="dialogForm_Data_booking.xhz_jysj_js" value-format="YYYY-MM-DD HH:mm:ss" clearable />
+        <el-date-picker type="datetime" v-model="dialogForm_Data_booking.xhz_jysj_js" value-format="YYYY-MM-DD HH:mm:ss"
+          clearable />
       </el-form-item>
 
       <el-form-item label="用途" prop="xhz_yt">
-        <el-input v-model="dialogForm_Data_booking.xhz_yt" type="textarea" :row="5"  clearable />
+        <el-input v-model="dialogForm_Data_booking.xhz_yt" type="textarea" :row="5" clearable />
       </el-form-item>
       <!-- <el-form-item label="状态" prop="xhz_zt">
         <el-radio-group v-model="dialogForm_Data_booking.xhz_zt">

+ 5 - 0
src/styles/element/index.scss

@@ -8,3 +8,8 @@
 :root{
   --el-color-primary: #4351ff;
 }
+.el-table__header{
+  .cell{
+    font-weight: normal;
+  }
+}