From 97a84b500fb1d5418d8a72a7fc8af2829c83ece5 Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: 星期五, 28 十一月 2025 15:16:19 +0800
Subject: [PATCH] 修改

---
 src/views/build/conpanyFunctionConsult/standardSysTemp/programStanderdModule/index.vue                 |   48 ++++++-
 src/views/build/conpanyFunctionConsult/standardSysTemp/techStandardModule/components/editDialog.vue    |   28 ++--
 src/views/build/conpanyFunctionConsult/standardSysTemp/appStandardModule/index.vue                     |   48 ++++++-
 src/views/build/conpanyFunctionConsult/standardSysTemp/programStanderdModule/components/editDialog.vue |   42 +++---
 src/views/build/conpanyFunctionConsult/standardSysTemp/techStandardModule/index.vue                    |   48 ++++++-
 src/views/build/conpanyFunctionConsult/standardSysTemp/sysStandardModule/index.vue                     |   49 ++++++-
 src/views/build/conpanyFunctionConsult/standardSysTemp/recordStandardModule/index.vue                  |   48 ++++++-
 src/views/build/conpanyFunctionConsult/standardSysTemp/recordStandardModule/components/editDialog.vue  |    2 
 8 files changed, 226 insertions(+), 87 deletions(-)

diff --git a/src/views/build/conpanyFunctionConsult/standardSysTemp/appStandardModule/index.vue b/src/views/build/conpanyFunctionConsult/standardSysTemp/appStandardModule/index.vue
index 313a1dc..6745ab9 100644
--- a/src/views/build/conpanyFunctionConsult/standardSysTemp/appStandardModule/index.vue
+++ b/src/views/build/conpanyFunctionConsult/standardSysTemp/appStandardModule/index.vue
@@ -20,17 +20,20 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="文件名称:" >
+          <el-input v-model.trim="data.queryParams.templateName"  placeholder="文件名称"></el-input>
+        </el-form-item>
         <el-form-item >
-          <el-button v-if="isAdmin" type="primary" @click="getList">查询</el-button>
-          <el-button v-if="isAdmin" type="primary" plain @click="reset">重置</el-button>
+          <el-button  type="primary" @click="getList">查询</el-button>
+          <el-button  type="primary" plain @click="reset">重置</el-button>
         </el-form-item>
       </el-form>
     </div>
     <!-- 表格数据 -->
-    <el-table v-loading="loading" :data="dataList" :border="true">
+    <el-table v-loading="loading" :data="dataList" :border="true" @sort-change="handleSortChange">
       <el-table-column label="序号" type="index" align="center" width="80"/>
       <el-table-column label="阶段" prop="stage" header-align="center" align="left"/>
-      <el-table-column label="模板名称" prop="templateName" header-align="center" align="left"/>
+      <el-table-column label="模板名称" prop="templateName" header-align="center" align="left" sortable="custom"/>
       <el-table-column label="模板文件" header-align="center" align="left">
         <template #default="scope">
           <el-link type="primary" @click="openFile(scope.row.filePath)">{{scope.row.templateName + '模板' + scope.row.format}}</el-link>
@@ -78,6 +81,8 @@
     pageNum: 1,
     pageSize: 10,
     companyId: null,
+    templateName:'',
+    sort:null,
     templateType: 3
   },
   total: 0,
@@ -182,13 +187,27 @@
 
 /** 重置新增的表单以及其他数据  */
 const reset= async()=> {
-  data.queryParams = {
-    pageNum: 1,
-    pageSize: 10,
-    companyId: null,
-    templateType: 3
+  if(data.isAdmin){
+    data.queryParams = {
+      pageNum: 1,
+      pageSize: 10,
+      companyId: null,
+      templateName:'',
+      sort:data.queryParams.sort,
+      templateType: 3
+    }
+    await getCompanyList()
+  }else {
+    data.queryParams = {
+      pageNum: 1,
+      pageSize: 10,
+      companyId: data.queryParams.companyId,
+      templateName:'',
+      sort:data.queryParams.sort,
+      templateType: 3
+    }
   }
-  await getCompanyList()
+
   await getList()
 }
 const handleDelete = (val) => {
@@ -210,5 +229,14 @@
         }
       })
 }
+const handleSortChange = (val) => {
+  console.log('bal',val)
+  if(val.order === 'ascending' ){
+    data.queryParams.sort = 1
+  }else if(val.order === "descending" ){
+    data.queryParams.sort = 2
+  }
+  getList()
+}
 
 </script>
diff --git a/src/views/build/conpanyFunctionConsult/standardSysTemp/programStanderdModule/components/editDialog.vue b/src/views/build/conpanyFunctionConsult/standardSysTemp/programStanderdModule/components/editDialog.vue
index 885bbd4..7217c12 100644
--- a/src/views/build/conpanyFunctionConsult/standardSysTemp/programStanderdModule/components/editDialog.vue
+++ b/src/views/build/conpanyFunctionConsult/standardSysTemp/programStanderdModule/components/editDialog.vue
@@ -19,30 +19,30 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="所属部门:" prop="deptId">
-          <el-select v-model="state.form.deptId" placeholder="请选择" style="width: 100%" clearable>
-            <el-option
-                v-for="item in state.deptList"
-                :key="item.deptId"
-                :label="item.deptName"
-                :value="item.deptId">
-            </el-option>
-          </el-select>
-        </el-form-item>
+<!--        <el-form-item label="所属部门:" prop="deptId">-->
+<!--          <el-select v-model="state.form.deptId" placeholder="请选择" style="width: 100%" clearable>-->
+<!--            <el-option-->
+<!--                v-for="item in state.deptList"-->
+<!--                :key="item.deptId"-->
+<!--                :label="item.deptName"-->
+<!--                :value="item.deptId">-->
+<!--            </el-option>-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
         <el-form-item label="模板名称:" prop="templateName">
           <el-input v-model.trim="state.form.templateName" :disabled="state.title =='查看'" placeholder="模板名称"></el-input>
         </el-form-item>
-        <el-form-item label="行业类别:" prop="industryTypeId">
-          <el-select v-model="state.form.industryTypeId" filterable placeholder="请选择" clearable>
-            <el-option
-                v-for="item in state.typeList"
-                :key="item.id"
-                style="width: 100%"
-                :label="item.name"
-                :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
+<!--        <el-form-item label="行业类别:" prop="industryTypeId">-->
+<!--          <el-select v-model="state.form.industryTypeId" filterable placeholder="请选择" clearable>-->
+<!--            <el-option-->
+<!--                v-for="item in state.typeList"-->
+<!--                :key="item.id"-->
+<!--                style="width: 100%"-->
+<!--                :label="item.name"-->
+<!--                :value="item.id">-->
+<!--            </el-option>-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
         <el-form-item label="模板文件:" prop="filePath">
           <el-upload accept=".doc,.docx,.pdf,.xlsx,.xls" :action="state.uploadUrl" :headers="state.header" method="post" :on-success="(res, uploadFile)=>handleAvatarSuccess(res, uploadFile)" :on-exceed="showTip" :limit='state.fileLimit' v-model:file-list="state.fileList" :before-upload="picSize" :on-remove="(file, uploadFiles)=>handleRemove(file, uploadFiles)" >
             <el-button type="primary">点击上传</el-button>
diff --git a/src/views/build/conpanyFunctionConsult/standardSysTemp/programStanderdModule/index.vue b/src/views/build/conpanyFunctionConsult/standardSysTemp/programStanderdModule/index.vue
index 74dd4db..e219b53 100644
--- a/src/views/build/conpanyFunctionConsult/standardSysTemp/programStanderdModule/index.vue
+++ b/src/views/build/conpanyFunctionConsult/standardSysTemp/programStanderdModule/index.vue
@@ -20,16 +20,19 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="文件名称:" >
+          <el-input v-model.trim="data.queryParams.templateName"  placeholder="文件名称"></el-input>
+        </el-form-item>
         <el-form-item >
-          <el-button v-if="isAdmin" type="primary" @click="getList">查询</el-button>
-          <el-button v-if="isAdmin" type="primary" plain @click="reset">重置</el-button>
+          <el-button  type="primary" @click="getList">查询</el-button>
+          <el-button  type="primary" plain @click="reset">重置</el-button>
         </el-form-item>
       </el-form>
     </div>
     <!-- 表格数据 -->
-    <el-table v-loading="loading" :data="dataList" :border="true">
+    <el-table v-loading="loading" :data="dataList" :border="true" @sort-change="handleSortChange">
       <el-table-column label="序号" type="index" align="center" width="80"/>
-      <el-table-column label="模板名称" prop="templateName" header-align="center" align="left"/>
+      <el-table-column label="模板名称" prop="templateName" header-align="center" align="left" sortable="custom"/>
 <!--      <el-table-column label="所属部门" prop="deptName" header-align="center" align="left"/>-->
 <!--      <el-table-column label="行业类别" prop="industryTypeName" header-align="center" align="left"/>-->
       <el-table-column label="模板文件" header-align="center" align="left">
@@ -77,6 +80,8 @@
     pageNum: 1,
     pageSize: 10,
     companyId: null,
+    templateName:'',
+    sort:null,
     templateType: 10
   },
   total: 0,
@@ -193,13 +198,27 @@
 
 /** 重置新增的表单以及其他数据  */
 const reset= async()=> {
-  data.queryParams = {
-    pageNum: 1,
-    pageSize: 10,
-    companyId: null,
-    templateType: 10
+  if(data.isAdmin){
+    data.queryParams = {
+      pageNum: 1,
+      pageSize: 10,
+      companyId: null,
+      templateName:'',
+      sort:data.queryParams.sort,
+      templateType: 10
+    }
+    await getCompanyList()
+  }else {
+    data.queryParams = {
+      pageNum: 1,
+      pageSize: 10,
+      companyId: data.queryParams.companyId,
+      templateName:'',
+      sort:data.queryParams.sort,
+      templateType: 10
+    }
   }
-  await getCompanyList()
+
   await getList()
 }
 const handleDelete = (val) => {
@@ -221,5 +240,14 @@
         }
       })
 }
+const handleSortChange = (val) => {
+  console.log('bal',val)
+  if(val.order === 'ascending' ){
+    data.queryParams.sort = 1
+  }else if(val.order === "descending" ){
+    data.queryParams.sort = 2
+  }
+  getList()
+}
 
 </script>
diff --git a/src/views/build/conpanyFunctionConsult/standardSysTemp/recordStandardModule/components/editDialog.vue b/src/views/build/conpanyFunctionConsult/standardSysTemp/recordStandardModule/components/editDialog.vue
index da53004..b9c99f0 100644
--- a/src/views/build/conpanyFunctionConsult/standardSysTemp/recordStandardModule/components/editDialog.vue
+++ b/src/views/build/conpanyFunctionConsult/standardSysTemp/recordStandardModule/components/editDialog.vue
@@ -20,7 +20,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="文件名称:" prop="templateName">
-          <el-input v-model.trim="state.form.templateName" :disabled="state.title =='查看'" placeholder="模板名称"></el-input>
+          <el-input v-model.trim="state.form.templateName" :disabled="state.title =='查看'" placeholder="文件名称"></el-input>
         </el-form-item>
 <!--        <el-form-item label="分类:" prop="classify">-->
 <!--          <el-select v-model="state.form.classify" placeholder="请选择" style="width: 100%">-->
diff --git a/src/views/build/conpanyFunctionConsult/standardSysTemp/recordStandardModule/index.vue b/src/views/build/conpanyFunctionConsult/standardSysTemp/recordStandardModule/index.vue
index c002f1b..636adec 100644
--- a/src/views/build/conpanyFunctionConsult/standardSysTemp/recordStandardModule/index.vue
+++ b/src/views/build/conpanyFunctionConsult/standardSysTemp/recordStandardModule/index.vue
@@ -20,16 +20,19 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="文件名称:" >
+          <el-input v-model.trim="data.queryParams.templateName"  placeholder="文件名称"></el-input>
+        </el-form-item>
         <el-form-item >
-          <el-button v-if="isAdmin" type="primary" @click="getList">查询</el-button>
-          <el-button v-if="isAdmin" type="primary" plain @click="reset">重置</el-button>
+          <el-button type="primary" @click="getList">查询</el-button>
+          <el-button type="primary" plain @click="reset">重置</el-button>
         </el-form-item>
       </el-form>
     </div>
     <!-- 表格数据 -->
-    <el-table v-loading="loading" :data="dataList" :border="true">
+    <el-table v-loading="loading" :data="dataList" :border="true"  @sort-change="handleSortChange">
       <el-table-column label="序号" type="index" align="center" width="80"/>
-      <el-table-column label="文件名称" prop="templateName" header-align="center" align="left"/>
+      <el-table-column label="文件名称" prop="templateName" header-align="center" align="left" sortable="custom"/>
 <!--      <el-table-column label="分类" prop="classify" align="center">-->
 <!--        <template #default="scope">-->
 <!--          <span>{{scope.row.classify == 1 ? '体系标准' :scope.row.classify == 2 ?'安全标准': scope.row.classify == 3 ? '其他' : ''}}</span>-->
@@ -80,6 +83,8 @@
     pageNum: 1,
     pageSize: 10,
     companyId: null,
+    templateName:'',
+    sort:null,
     templateType: 11
   },
   total: 0,
@@ -185,13 +190,27 @@
 
 /** 重置新增的表单以及其他数据  */
 const reset= async()=> {
-  data.queryParams = {
-    pageNum: 1,
-    pageSize: 10,
-    companyId: null,
-    templateType: 11
+  if(data.isAdmin){
+    data.queryParams = {
+      pageNum: 1,
+      pageSize: 10,
+      companyId: null,
+      templateName:'',
+      sort:data.queryParams.sort,
+      templateType: 11
+    }
+    await getCompanyList()
+  }else {
+    data.queryParams = {
+      pageNum: 1,
+      pageSize: 10,
+      companyId: data.queryParams.companyId,
+      templateName:'',
+      sort:data.queryParams.sort,
+      templateType: 11
+    }
   }
-  await getCompanyList()
+
   await getList()
 }
 const handleDelete = (val) => {
@@ -213,5 +232,14 @@
         }
       })
 }
+const handleSortChange = (val) => {
+  console.log('bal',val)
+  if(val.order === 'ascending' ){
+    data.queryParams.sort = 1
+  }else if(val.order === "descending" ){
+    data.queryParams.sort = 2
+  }
+  getList()
+}
 
 </script>
diff --git a/src/views/build/conpanyFunctionConsult/standardSysTemp/sysStandardModule/index.vue b/src/views/build/conpanyFunctionConsult/standardSysTemp/sysStandardModule/index.vue
index 2c5aed9..58e3498 100644
--- a/src/views/build/conpanyFunctionConsult/standardSysTemp/sysStandardModule/index.vue
+++ b/src/views/build/conpanyFunctionConsult/standardSysTemp/sysStandardModule/index.vue
@@ -20,16 +20,19 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="文件名称:" >
+          <el-input v-model.trim="data.queryParams.templateName"  placeholder="文件名称"></el-input>
+        </el-form-item>
         <el-form-item >
-          <el-button v-if="isAdmin" type="primary" @click="getList">查询</el-button>
-          <el-button v-if="isAdmin" type="primary" plain @click="reset">重置</el-button>
+          <el-button  type="primary" @click="getList">查询</el-button>
+          <el-button  type="primary" plain @click="reset">重置</el-button>
         </el-form-item>
       </el-form>
     </div>
     <!-- 表格数据 -->
-    <el-table v-loading="loading" :data="dataList" :border="true">
+    <el-table v-loading="loading" :data="dataList" :border="true" @sort-change="handleSortChange">
       <el-table-column label="序号" type="index" align="center" width="80"/>
-      <el-table-column label="文件名称" prop="templateName" header-align="center" align="left"/>
+      <el-table-column label="文件名称" prop="templateName" header-align="center" align="left" sortable="custom"/>
 <!--      <el-table-column label="分类" prop="classify" align="center">-->
 <!--        <template #default="scope">-->
 <!--          <span>{{scope.row.classify == 1 ? '体系标准' :scope.row.classify == 2 ?'安全标准': scope.row.classify == 3 ? '其他' : ''}}</span>-->
@@ -80,6 +83,8 @@
     pageNum: 1,
     pageSize: 10,
     companyId: null,
+    sort:null,
+    templateName:'',
     templateType: 1
   },
   total: 0,
@@ -185,13 +190,27 @@
 
 /** 重置新增的表单以及其他数据  */
 const reset= async()=> {
-  data.queryParams = {
-    pageNum: 1,
-    pageSize: 10,
-    companyId: null,
-    templateType: 1
+  if(data.isAdmin){
+    data.queryParams = {
+      pageNum: 1,
+      pageSize: 10,
+      companyId: null,
+      templateName:'',
+      sort:data.queryParams.sort,
+      templateType: 1
+    }
+    await getCompanyList()
+  }else {
+    data.queryParams = {
+      pageNum: 1,
+      pageSize: 10,
+      companyId: data.queryParams.companyId,
+      templateName:'',
+      sort:data.queryParams.sort,
+      templateType: 1
+    }
   }
-  await getCompanyList()
+
   await getList()
 }
 const handleDelete = (val) => {
@@ -213,5 +232,13 @@
         }
       })
 }
-
+const handleSortChange = (val) => {
+  console.log('bal',val)
+  if(val.order === 'ascending' ){
+    data.queryParams.sort = 1
+  }else if(val.order === "descending" ){
+    data.queryParams.sort = 2
+  }
+  getList()
+}
 </script>
diff --git a/src/views/build/conpanyFunctionConsult/standardSysTemp/techStandardModule/components/editDialog.vue b/src/views/build/conpanyFunctionConsult/standardSysTemp/techStandardModule/components/editDialog.vue
index 3451bdd..4204865 100644
--- a/src/views/build/conpanyFunctionConsult/standardSysTemp/techStandardModule/components/editDialog.vue
+++ b/src/views/build/conpanyFunctionConsult/standardSysTemp/techStandardModule/components/editDialog.vue
@@ -19,8 +19,8 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="所属部门:" prop="department">
-          <el-input v-model.trim="state.form.department" :disabled="state.title =='查看'" placeholder="部门名称"></el-input>
+<!--        <el-form-item label="所属部门:" prop="department">-->
+<!--          <el-input v-model.trim="state.form.department" :disabled="state.title =='查看'" placeholder="部门名称"></el-input>-->
 <!--          <el-select v-model="state.form.deptId" placeholder="请选择" style="width: 100%" clearable>-->
 <!--            <el-option-->
 <!--                v-for="item in state.deptList"-->
@@ -29,22 +29,22 @@
 <!--                :value="item.deptId">-->
 <!--            </el-option>-->
 <!--          </el-select>-->
-        </el-form-item>
+<!--        </el-form-item>-->
 
         <el-form-item label="模板名称:" prop="templateName">
           <el-input v-model.trim="state.form.templateName" :disabled="state.title =='查看'" placeholder="模板名称"></el-input>
         </el-form-item>
-        <el-form-item label="行业类别:" prop="industryTypeId">
-          <el-select v-model="state.form.industryTypeId" filterable placeholder="请选择" clearable>
-            <el-option
-                v-for="item in state.typeList"
-                :key="item.id"
-                style="width: 100%"
-                :label="item.name"
-                :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
+<!--        <el-form-item label="行业类别:" prop="industryTypeId">-->
+<!--          <el-select v-model="state.form.industryTypeId" filterable placeholder="请选择" clearable>-->
+<!--            <el-option-->
+<!--                v-for="item in state.typeList"-->
+<!--                :key="item.id"-->
+<!--                style="width: 100%"-->
+<!--                :label="item.name"-->
+<!--                :value="item.id">-->
+<!--            </el-option>-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
         <el-form-item label="模板文件:" prop="filePath">
           <el-upload accept=".doc,.docx,.pdf,.xlsx,.xls" :action="state.uploadUrl" :headers="state.header" method="post" :on-success="(res, uploadFile)=>handleAvatarSuccess(res, uploadFile)" :on-exceed="showTip" :limit='state.fileLimit' v-model:file-list="state.fileList" :before-upload="picSize" :on-remove="(file, uploadFiles)=>handleRemove(file, uploadFiles)" >
             <el-button type="primary">点击上传</el-button>
diff --git a/src/views/build/conpanyFunctionConsult/standardSysTemp/techStandardModule/index.vue b/src/views/build/conpanyFunctionConsult/standardSysTemp/techStandardModule/index.vue
index 5abc8a9..51767f4 100644
--- a/src/views/build/conpanyFunctionConsult/standardSysTemp/techStandardModule/index.vue
+++ b/src/views/build/conpanyFunctionConsult/standardSysTemp/techStandardModule/index.vue
@@ -20,16 +20,19 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="文件名称:" >
+          <el-input v-model.trim="data.queryParams.templateName"  placeholder="文件名称"></el-input>
+        </el-form-item>
         <el-form-item >
-          <el-button v-if="isAdmin" type="primary" @click="getList">查询</el-button>
-          <el-button v-if="isAdmin" type="primary" plain @click="reset">重置</el-button>
+          <el-button type="primary" @click="getList">查询</el-button>
+          <el-button  type="primary" plain @click="reset">重置</el-button>
         </el-form-item>
       </el-form>
     </div>
     <!-- 表格数据 -->
-    <el-table v-loading="loading" :data="dataList" :border="true">
+    <el-table v-loading="loading" :data="dataList" :border="true" @sort-change="handleSortChange">
       <el-table-column label="序号" type="index" align="center" width="80"/>
-      <el-table-column label="模板名称" prop="templateName" header-align="center" align="left"/>
+      <el-table-column label="模板名称" prop="templateName" header-align="center" align="left" sortable="custom"/>
 <!--      <el-table-column label="所属部门" prop="department" header-align="center" align="left"/>-->
 <!--      <el-table-column label="行业类别" prop="industryTypeName" header-align="center" align="left"/>-->
       <el-table-column label="模板文件" header-align="center" align="left">
@@ -77,6 +80,8 @@
     pageNum: 1,
     pageSize: 10,
     companyId: null,
+    templateName:'',
+    sort:null,
     templateType: 2
   },
   total: 0,
@@ -193,13 +198,27 @@
 
 /** 重置新增的表单以及其他数据  */
 const reset= async()=> {
-  data.queryParams = {
-    pageNum: 1,
-    pageSize: 10,
-    companyId: null,
-    templateType: 2
+  if(data.isAdmin){
+    data.queryParams = {
+      pageNum: 1,
+      pageSize: 10,
+      companyId: null,
+      templateName:'',
+      sort:data.queryParams.sort,
+      templateType: 2
+    }
+    await getCompanyList()
+  }else {
+    data.queryParams = {
+      pageNum: 1,
+      pageSize: 10,
+      companyId: data.queryParams.companyId,
+      templateName:'',
+      sort:data.queryParams.sort,
+      templateType: 2
+    }
   }
-  await getCompanyList()
+
   await getList()
 }
 const handleDelete = (val) => {
@@ -221,5 +240,14 @@
         }
       })
 }
+const handleSortChange = (val) => {
+  console.log('bal',val)
+  if(val.order === 'ascending' ){
+    data.queryParams.sort = 1
+  }else if(val.order === "descending" ){
+    data.queryParams.sort = 2
+  }
+  getList()
+}
 
 </script>

--
Gitblit v1.9.2