Ver Fonte

处理每页的序号始终从1开始的问题

jiawuxian há 1 ano atrás
pai
commit
5661fa5775

+ 5 - 1
src/views/question/list/index.vue

@@ -120,7 +120,11 @@
               align="center"
               width="60px"
               v-if="columns[0].visible"
-            ></el-table-column>
+            >
+            <template slot-scope="scope">
+              {{(queryParams.pageNum-1)*queryParams.pageSize+scope.$index+1}}
+            </template>
+          </el-table-column>
             <el-table-column
               header-align="center"
               label="机构名称"

+ 5 - 1
src/views/question/reform/index.vue

@@ -104,7 +104,11 @@
               label="序号"
               width="60px"
               v-if="columns[0].visible"
-            ></el-table-column>
+            >
+            <template slot-scope="scope">
+              {{(queryParams.pageNum-1)*queryParams.pageSize+scope.$index+1}}
+            </template>
+          </el-table-column>
             <el-table-column
               header-align="center"
               label="机构名称"

+ 10 - 1
src/views/resumption/protection/index.vue

@@ -142,7 +142,15 @@
               label="序号"
               width="60"
               v-if="columns[0].visible"
-            ></el-table-column>
+            >
+            <template slot-scope="scope">
+              {{
+                (queryParams.pageNum - 1) * queryParams.pageSize +
+                scope.$index +
+                1
+              }}
+            </template>
+          </el-table-column>
             <el-table-column
               header-align="center"
               prop="orgName"
@@ -322,6 +330,7 @@ export default {
     getLabel,
     getList() {
       this.loading = true;
+      this.pageData=[]
       api
         .list(this.queryParams)
         .then((response) => {

+ 6 - 1
src/views/resumption/rule/index.vue

@@ -101,7 +101,11 @@
               width="60"
               align="center"
               v-if="columns[0].visible"
-            ></el-table-column>
+            >
+            <template slot-scope="scope">
+              {{(queryParams.pageNum-1)*queryParams.pageSize+scope.$index+1}}
+            </template>
+          </el-table-column>
             <el-table-column
               header-align="center"
               prop="name"
@@ -275,6 +279,7 @@ export default {
     getList() {
       this.loading = true;
       console.info(this.dict.type);
+      this.pageData=[];
       api
         .list(this.queryParams)
         .then((response) => {

+ 16 - 7
src/views/resumption/ruleManager/index.vue

@@ -18,11 +18,11 @@
         </org-tree>
       </el-col> -->
       <el-col :span="24" :xs="24">
-        <div class="main-right-box">          
+        <div class="main-right-box">
           <!--    搜索条件    -->
           <div class="main-search-box" v-show="showSearch && rule">
-            <div v-if="rule" style="padding-bottom:10px;font-weight: 700;">
-              {{rule.name}}
+            <div v-if="rule" style="padding-bottom: 10px; font-weight: 700">
+              {{ rule.name }}
             </div>
             <el-form
               :model="queryParams"
@@ -174,6 +174,13 @@
               width="80"
               v-if="columns[0].visible"
             >
+              <template slot-scope="scope">
+                {{
+                  (queryParams.pageNum - 1) * queryParams.pageSize +
+                  scope.$index +
+                  1
+                }}
+              </template>
             </el-table-column>
             <el-table-column
               header-align="center"
@@ -360,11 +367,13 @@ export default {
         this.$message.warning("请先选择一个履职内容库定义");
         return;
       }
+      this.tableData = [];
       this.loading = true;
-      const data = await page(this.queryParams);
-      this.tableData = data.rows;
-      this.total = Number.parseInt(data.total);
-      this.loading = false;
+      page(this.queryParams).then((data) => {
+        this.tableData = data.rows;
+        this.total = Number.parseInt(data.total);
+        this.loading = false;
+      });
     },
     clicktreenode(data, node) {
       this.tableData = [];

+ 69 - 62
src/views/resumption/taskManager/index.vue

@@ -24,68 +24,68 @@
             >
               <!-- <el-row>
                 <el-col :span="5"> -->
-                  <el-form-item label="任务名称" prop="planId">
-                    <el-select
-                      v-model="queryParams.planId"
-                      filterable
-                      placeholder="请选择任务名称"
-                      clearable
-                    >
-                      <el-option
-                        v-for="item in planList"
-                        :key="item.id"
-                        :label="item.name"
-                        :value="item.id"
-                      >
-                      </el-option>
-                    </el-select>
-                  </el-form-item>
-                <!-- </el-col>
+              <el-form-item label="任务名称" prop="planId">
+                <el-select
+                  v-model="queryParams.planId"
+                  filterable
+                  placeholder="请选择任务名称"
+                  clearable
+                >
+                  <el-option
+                    v-for="item in planList"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <!-- </el-col>
                 <el-col :span="5"> -->
-                  <el-form-item label="履职人员" prop="executeRole">
-                    <el-select
-                      v-model="queryParams.executeRole"
-                      placeholder="请选择履职人员"
-                      clearable
-                    >
-                      <el-option
-                        v-for="item in roleList"
-                        :key="item.id"
-                        :label="item.name"
-                        :value="item.id"
-                      ></el-option>
-                    </el-select>
-                  </el-form-item>
-                <!-- </el-col>
+              <el-form-item label="履职人员" prop="executeRole">
+                <el-select
+                  v-model="queryParams.executeRole"
+                  placeholder="请选择履职人员"
+                  clearable
+                >
+                  <el-option
+                    v-for="item in roleList"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+              <!-- </el-col>
                 <el-col :span="5"> -->
-                  <el-form-item label="任务进度" prop="status">
-                    <el-select
-                      v-model="queryParams.status"
-                      placeholder="请选择任务进度"
-                      clearable
-                    >
-                      <el-option
-                        v-for="item in dict.type.resumption_status"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value"
-                      ></el-option>
-                    </el-select>
-                  </el-form-item>
-                <!-- </el-col>
+              <el-form-item label="任务进度" prop="status">
+                <el-select
+                  v-model="queryParams.status"
+                  placeholder="请选择任务进度"
+                  clearable
+                >
+                  <el-option
+                    v-for="item in dict.type.resumption_status"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+              <!-- </el-col>
                 <el-col :span="9"> -->
-                  <el-form-item class="searchTitle" label="任务时间">
-                    <DataRangePicker
-                      v-model="queryParams.range"
-                      key="daterange"
-                      type="daterange"
-                      :clearable="timeClearable"
-                      range-separator="至"
-                      start-placeholder="开始日期"
-                      end-placeholder="结束日期"
-                    />
-                  </el-form-item>
-                <!-- </el-col>
+              <el-form-item class="searchTitle" label="任务时间">
+                <DataRangePicker
+                  v-model="queryParams.range"
+                  key="daterange"
+                  type="daterange"
+                  :clearable="timeClearable"
+                  range-separator="至"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                />
+              </el-form-item>
+              <!-- </el-col>
               </el-row> -->
             </el-form>
             <!--    按纽    -->
@@ -138,6 +138,13 @@
               label="序号"
               v-if="columns[0].visible"
             >
+              <template slot-scope="scope">
+                {{
+                  (queryParams.pageNum - 1) * queryParams.pageSize +
+                  scope.$index +
+                  1
+                }}
+              </template>
             </el-table-column>
             <el-table-column
               header-align="center"
@@ -494,7 +501,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-  .el-form--inline .el-form-item{
-    display: inline-flex;
-  }
+.el-form--inline .el-form-item {
+  display: inline-flex;
+}
 </style>

+ 11 - 1
src/views/safetycheck/rule/index.vue

@@ -100,7 +100,15 @@
               label="序号"
               width="60"
               v-if="columns[0].visible"
-            ></el-table-column>
+            >
+            <template slot-scope="scope">
+              {{
+                (queryParams.pageNum - 1) * queryParams.pageSize +
+                scope.$index +
+                1
+              }}
+            </template>
+          </el-table-column>
             <el-table-column
               header-align="center"
               prop="name"
@@ -156,6 +164,7 @@
                   type="text"
                   icon="el-icon-edit-outline"
                   @click="onManageContent(r.row.id)"
+                  v-if="r.row.status==0"
                   v-hasPermi="['safetycheck:rule:contentmanage']"
                   >管理内容库</el-button
                 >
@@ -270,6 +279,7 @@ export default {
     getList() {
       this.loading = true;
       console.info(this.dict.type);
+      this.pageData=[]
       api
         .list(this.queryParams)
         .then((response) => {

+ 16 - 7
src/views/safetycheck/ruleManager/index.vue

@@ -22,8 +22,8 @@
         <div class="main-right-box">
           <!--    搜索条件    -->
           <div class="main-search-box" v-show="showSearch && rule">
-            <div style="padding-bottom:10px;font-weight: 700;">
-              {{rule.name}}
+            <div style="padding-bottom: 10px; font-weight: 700">
+              {{ rule.name }}
             </div>
             <el-form
               :model="queryParams"
@@ -141,6 +141,13 @@
               width="80"
               v-if="columns[0].visible"
             >
+              <template slot-scope="scope">
+                {{
+                  (queryParams.pageNum - 1) * queryParams.pageSize +
+                  scope.$index +
+                  1
+                }}
+              </template>
             </el-table-column>
             <el-table-column
               header-align="center"
@@ -322,11 +329,13 @@ export default {
         return;
       }
       this.loading = true;
-      const data = await page(this.queryParams);
-      this.tableData = data.rows;
-      this.total = Number.parseInt(data.total);
-      this.expandAll = false;
-      this.loading = false;
+      this.tableData = [];
+      const data = await page(this.queryParams).then((data) => {
+        this.tableData = data.rows;
+        this.total = Number.parseInt(data.total);
+        this.expandAll = false;
+        this.loading = false;
+      });
     },
     clicktreenode(data, node) {
       this.tableData = [];