新增设备选择的设备编码，新增已办任务搜索标题

oa-ui/src/views/flowable/form/settleForm.vue

@@ -677,7 +677,6 @@ export default {
     async initForm() {
       this.loading = true
       const res = await listSettle({ settleId: this.taskForm.formId });
-      debugger
       if (res.total === 1) {
         this.form = res.rows[0];
         this.isAppend = await this.getIsAppend(this.taskForm.formId, res.rows[0].projectId) //判断是否为追加结算

oa-ui/src/views/flowable/task/finished/index.vue

@@ -10,6 +10,9 @@
           placeholder="选择时间">
         </el-date-picker>
       </el-form-item>
+      <el-form-item label="标题">
+        <el-input v-model="searchText" size="small" @input="filterTitle()" clearable placeholder="仅搜索当前页面标题"></el-input>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -75,7 +78,8 @@
         </template>
       </el-table-column>
     </el-table>
-
+    <div class="mt20" style="font-size:12px;color:#e45656;text-align:right;">
+      tips:标题搜索只搜索当前页码列表，可在右下角调整每页条数，若当前页面未查询到，可点击下一页;</div>
     <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
       @pagination="getList" />
     <el-dialog title="表单信息" :visible.sync="formOpen" append-to-body width="80%">
@@ -116,6 +120,7 @@ export default {
       total: 0,
       // 已办任务列表数据
       finishedList: [],
+      filterList: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -145,6 +150,7 @@ export default {
       // 当前点击的行数据
       clickRow: {},
       detailsOpen: false,
+      searchText: '',
     };
   },
   created() {
@@ -154,7 +160,7 @@ export default {
     tableData() {
       const processed = [];
       const map = {};
-      this.finishedList.forEach(item => {
+      this.filterList.forEach(item => {
         if (!map[item.procInsId]) {
           map[item.procInsId] = { ...item, children: [] };
           processed.push(map[item.procInsId]);
@@ -171,10 +177,21 @@ export default {
       this.loading = true;
       finishedList(this.queryParams).then(response => {
         this.finishedList = response.data.records;
+        this.filterList = response.data.records;
         this.total = response.data.total;
+        this.filterTitle();
         this.loading = false;
       });
     },
+    filterTitle() {
+      this.filterList = this.finishedList.filter(data => {
+        if (data.title) {
+          return !this.searchText || data.title.toLowerCase().includes(this.searchText.toLowerCase())
+        } else {
+          return data
+        }
+      })
+    },
     // 取消按钮
     cancel() {
       this.open = false;

oa-ui/src/views/flowable/task/myProcess/index.vue

@@ -342,7 +342,6 @@ export default {
       let formId = new Snowflake(1n, 1n, 0n).nextId().toString();
       getNextFlowNodeByStart({ deploymentId: row.deploymentId, variables: { formId: formId } }).then(res => {
         let data = res.data;
-        debugger
         if (data.dataType === 'dynamic' && row.name != '项目预算') {
           if (data.type === 'assignee') { // 指定人员
             this.checkSendUser = true;

oa-ui/src/views/oa/device/index.vue

@@ -255,6 +255,9 @@ export default {
       form: {},
       // 表单校验
       rules: {
+        name: [
+          { required: true, message: '请输入设备名称', trigger: 'blur' }
+        ],
       }
     };
   },

oa-ui/src/views/oa/supply/deviceList.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-06-21 18:51:51
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-07-30 15:36:16
+ * @LastEditTime: 2025-03-06 17:03:13
 -->
 <template>
   <div>
@@ -27,7 +27,7 @@
       </el-form-item>
       <el-form-item label="设备名称：">
         <el-select v-model="queryParams.name" filterable @change="getList" clearable>
-          <el-option v-for="item in nameList" :key="item.name" :label="item.name" :value="item.name">
+          <el-option v-for="(item, index) in nameList" :key="'d' + index" :label="item.name" :value="item.name">
           </el-option>
         </el-select>
         <!-- <el-input v-model="queryParams.name" clearable></el-input> -->
@@ -42,6 +42,7 @@
     <el-table ref="chooseDevice" :data="list" @selection-change="handleSelectionChange" :row-key="getRowKeys"
       @current-change="handleCurrentChange" @row-dblclick="confirmChooseBySingle" :highlight-current-row="!multiple">
       <el-table-column type="selection" width="50" align="center" :reserve-selection="true" v-if="multiple" />
+      <el-table-column label="设备编码" align="center" prop="deviceNumber" />
       <el-table-column label="设备状态" align="center" prop="status" v-if="queryParams.type == '仪器设备'">
         <template slot-scope="scope">
           <el-tag :type="statusType(scope.row.status)">
@@ -57,9 +58,12 @@
       <el-table-column label="单日成本" align="center" prop="dayCost" />
     </el-table>
     <div style="text-align: right;">
-      <el-pagination @current-change="getList" :current-page.sync="queryParams.pageNum"
+      <!-- <el-pagination @current-change="getList()" :current-page.sync="queryParams.pageNum"
         :page-size="queryParams.pageSize" layout="total, prev, pager, next" :total="total">
-      </el-pagination>
+      </el-pagination> -->
+      <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+        :layout="'total, prev, pager, next,jumper'" :limit.sync="queryParams.pageSize" :autoScroll="false"
+        @pagination="getList" />
     </div>
     <div>
       已选设备：
@@ -77,7 +81,6 @@
 
 <script>
 import { listDevice, listDeviceName } from "@/api/oa/device/device";
-import { multiply } from 'ol/transform';
 export default {
   props: {
     multiple: {
@@ -199,7 +202,7 @@ export default {
     formatChooseList() {
       if (this.chooseList.name) {
         return this.chooseList.name + '-' + this.chooseList.series + '-' + this.chooseList.brand
-      }else{
+      } else {
         return null
       }
     }

oa-ui/src/views/oa/supply/index.vue

@@ -256,6 +256,9 @@ export default {
       form: {},
       // 表单校验
       rules: {
+        name: [
+          { required: true, message: '请输入设备名称', trigger: 'blur' }
+        ],
       }
     };
   },