wsx 11 ماه پیش
والد
کامیت
20945fee88

+ 1 - 1
src/views/bpm/tickets/index.vue

@@ -96,7 +96,7 @@
 <style lang="scss" scoped>
   .tickets_index {
     width: 100%;
-    height: calc(100vh - 96px);
+    // height: calc(100vh - 96px);
     ::v-deep .el-card {
       height: 100%;
       width: 100%;

+ 1 - 0
src/views/bpm/tickets/maintenance/index.vue

@@ -105,6 +105,7 @@
           :columns="columns"
           :datasource="datasource"
           maxHeight="580"
+          :pageSize="20"
         >
           <!-- 操作列 -->
           <template v-slot:action="{ row }">

+ 1 - 0
src/views/bpm/tickets/patrolInspection/index.vue

@@ -105,6 +105,7 @@
           :columns="columns"
           :datasource="datasource"
           maxHeight="580"
+          :pageSize="20"
         >
           <!-- 操作列 -->
           <template v-slot:action="{ row }">

+ 171 - 177
src/views/bpm/tickets/repair/index.vue

@@ -1,161 +1,155 @@
 <!-- 维修工单 -->
-
 <template>
-  <div>
-    <div class="ele-body">
-      <el-card shadow="never">
-        <div class="filter-container">
-          <el-form
-            label-width="100px"
-            class="ele-form-search"
-            @keyup.enter.native="reload"
-            @submit.native.prevent
-          >
-            <el-row :gutter="15">
-              <el-col
-                v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }"
-              >
-                <el-form-item label="工单编号">
-                  <el-input
-                    v-model="searchForm.code"
-                    placeholder="请输入"
-                    size="small"
-                  ></el-input>
-                </el-form-item>
-              </el-col>
-
-              <el-col
-                v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }"
-              >
-                <el-form-item label="规则名称">
-                  <el-select
-                    v-model="searchForm.ruleId"
-                    size="small"
-                    clearable
-                    style="width: 100%"
-                    filterable
-                  >
-                    <el-option
-                      v-for="item in ruleNameList"
-                      :key="item.id"
-                      :value="item.id"
-                      :label="item.name"
-                    ></el-option> </el-select
-                ></el-form-item>
-              </el-col>
+  <div class="ele-body">
+    <el-card shadow="never">
+      <div class="filter-container">
+        <el-form
+          label-width="100px"
+          class="ele-form-search"
+          @keyup.enter.native="reload"
+          @submit.native.prevent
+        >
+          <el-row :gutter="15">
+            <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+              <el-form-item label="工单编号">
+                <el-input
+                  v-model="searchForm.code"
+                  placeholder="请输入"
+                  size="small"
+                ></el-input>
+              </el-form-item>
+            </el-col>
 
-              <el-col
-                v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }"
-              >
-                <el-form-item label="状态">
-                  <el-select
-                    filterable
-                    clearable
-                    v-model="searchForm.status"
-                    size="small"
-                  >
-                    <el-option
-                      v-for="item in ticketStatus"
-                      :key="item.id"
-                      :value="item.id"
-                      :label="item.label"
-                    ></el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
+            <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+              <el-form-item label="规则名称">
+                <el-select
+                  v-model="searchForm.ruleId"
+                  size="small"
+                  clearable
+                  style="width: 100%"
+                  filterable
+                >
+                  <el-option
+                    v-for="item in ruleNameList"
+                    :key="item.id"
+                    :value="item.id"
+                    :label="item.name"
+                  ></el-option> </el-select
+              ></el-form-item>
+            </el-col>
 
-              <el-col
-                v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }"
-              >
-                <el-form-item label="开始结束时间">
-                  <el-date-picker
-                    class="form-input"
-                    size="small"
-                    v-model="searchForm.date"
-                    type="daterange"
-                    range-separator="至"
-                    start-placeholder="开始日期"
-                    end-placeholder="结束日期"
-                    value-format="yyyy-MM-dd HH:mm:ss"
-                    :default-time="['00:00:00', '23:59:59']"
-                  >
-                  </el-date-picker>
-                </el-form-item>
-              </el-col>
-              <el-col :md="4" :sm="16" :xs="16" style="text-align: right">
-                <el-button
-                  icon="el-icon-refresh-left"
+            <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+              <el-form-item label="状态">
+                <el-select
+                  filterable
+                  clearable
+                  v-model="searchForm.status"
                   size="small"
-                  @click="reload('reset')"
-                  >重置</el-button
                 >
-                <el-button
-                  type="primary"
-                  icon="el-icon-search"
+                  <el-option
+                    v-for="item in ticketStatus"
+                    :key="item.id"
+                    :value="item.id"
+                    :label="item.label"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+
+            <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+              <el-form-item label="开始结束时间">
+                <el-date-picker
+                  class="form-input"
                   size="small"
-                  @click="reload('search')"
-                  >搜索</el-button
-                ></el-col
-              >
-            </el-row>
-          </el-form>
-        </div>
-        <ele-pro-table
-          ref="table"
-          :columns="columns"
-          :datasource="datasource"
-          maxHeight="580"
-        >
-          <!-- 操作列 -->
-          <template v-slot:action="{ row }">
-            <el-link
-              v-if="row.orderStatus == 3 && row.createUserId == userId"
-              type="primary"
-              :underline="false"
-              icon="el-icon-edit"
-              @click="goDetail(row)"
-            >
-              验收
-            </el-link>
-            <el-link
-              v-if="
-                row.orderStatus !== 3 &&
-                row.orderStatus !== 4 &&
-                userId === row.executeUserId
-              "
-              type="primary"
-              :underline="false"
-              icon="el-icon-edit"
-              @click="toSigningUpWork(row)"
-            >
-              报工
-            </el-link>
-            <el-link
-              v-if="
-                row.orderStatus !== 3 &&
-                row.orderStatus !== 4 &&
-                userId === row.executeUserId
-              "
-              type="primary"
-              :underline="false"
-              icon="el-icon-edit"
-              @click="toRedeploy(row)"
+                  v-model="searchForm.date"
+                  type="daterange"
+                  range-separator="至"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                  :default-time="['00:00:00', '23:59:59']"
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col
+              :md="4"
+              :sm="16"
+              :xs="16"
+              style="display: flex; justify-content: flex-end"
+              v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }"
             >
-              转派
-            </el-link>
-            <el-link
-              type="primary"
-              :underline="false"
-              icon="el-icon-edit"
-              @click="openDetail(row)"
+              <el-button
+                icon="el-icon-refresh-left"
+                size="small"
+                @click="reload('reset')"
+                >重置</el-button
+              >
+              <el-button
+                type="primary"
+                icon="el-icon-search"
+                size="small"
+                @click="reload('search')"
+                >搜索</el-button
+              ></el-col
             >
-              详情
-            </el-link>
-          </template>
-        </ele-pro-table>
-      </el-card>
-    </div>
-
+          </el-row>
+        </el-form>
+      </div>
+      <ele-pro-table
+        ref="table"
+        :columns="columns"
+        :datasource="datasource"
+        :pageSize="20"
+      >
+        <!-- 操作列 -->
+        <template v-slot:action="{ row }">
+          <el-link
+            v-if="row.orderStatus == 3 && row.createUserId == userId"
+            type="primary"
+            :underline="false"
+            icon="el-icon-edit"
+            @click="goDetail(row)"
+          >
+            验收
+          </el-link>
+          <el-link
+            v-if="
+              row.orderStatus !== 3 &&
+              row.orderStatus !== 4 &&
+              userId === row.executeUserId
+            "
+            type="primary"
+            :underline="false"
+            icon="el-icon-edit"
+            @click="toSigningUpWork(row)"
+          >
+            报工
+          </el-link>
+          <el-link
+            v-if="
+              row.orderStatus !== 3 &&
+              row.orderStatus !== 4 &&
+              userId === row.executeUserId
+            "
+            type="primary"
+            :underline="false"
+            icon="el-icon-edit"
+            @click="toRedeploy(row)"
+          >
+            转派
+          </el-link>
+          <el-link
+            type="primary"
+            :underline="false"
+            icon="el-icon-edit"
+            @click="openDetail(row)"
+          >
+            详情
+          </el-link>
+        </template>
+      </ele-pro-table>
+    </el-card>
     <!-- 验收 -->
     <RepairDetailsDialog ref="detailsDialogRef" @refesh="getData" />
     <!-- 转派弹窗 -->
@@ -198,7 +192,7 @@
             columnKey: 'index',
             label: '序号',
             type: 'index',
-            minWidth: '150',
+            Width: '55',
             align: 'center',
             showOverflowTooltip: true,
             fixed: 'left'
@@ -221,21 +215,21 @@
             prop: 'planName',
             label: '维修名称',
             align: 'center',
-             minWidth: '180',
+            minWidth: '180',
             showOverflowTooltip: true
           },
           {
             prop: 'ruleName',
             label: '规则名称',
             align: 'center',
-             minWidth: '180',
+            minWidth: '180',
             showOverflowTooltip: true
           },
           {
             prop: 'equiCode',
             label: '设备编号',
             align: 'center',
-             minWidth: '180',
+            minWidth: '180',
             showOverflowTooltip: true
           },
 
@@ -257,21 +251,21 @@
             prop: 'executeUserName',
             label: '执行人',
             align: 'center',
-             minWidth: '180',
+            minWidth: '180',
             showOverflowTooltip: true
           },
           {
             prop: 'acceptTime',
             label: '开始时间',
             align: 'center',
-             minWidth: '180',
+            minWidth: '180',
             showOverflowTooltip: true
           },
           {
             prop: 'finishTime',
             label: '结束时间',
             align: 'center',
-             minWidth: '180',
+            minWidth: '180',
             showOverflowTooltip: true
           },
           {
@@ -340,7 +334,7 @@
           executeUserId: ''
         },
         tableData: [],
-        size: 10,
+        size: 20,
         page: 1,
         total: 0
       };
@@ -510,28 +504,28 @@
   // }
 
   // 修改
-  ::v-deep .el-card__body {
-    padding: 0;
-  }
+  // ::v-deep .el-card__body {
+  //   padding: 0;
+  // }
 
-  .app-container {
-    background: #f0f3f3;
-    min-height: calc(100vh - 84px);
-  }
+  // .app-container {
+  //   background: #f0f3f3;
+  //   min-height: calc(100vh - 84px);
+  // }
 
-  .zw-page-table {
-    background: #ffffff;
-    padding-top: 20px;
-  }
+  // .zw-page-table {
+  //   background: #ffffff;
+  //   padding-top: 20px;
+  // }
 
-  .pagination-wrap {
-    display: flex;
-    justify-content: flex-end;
-    padding: 10px 0;
-  }
+  // .pagination-wrap {
+  //   display: flex;
+  //   justify-content: flex-end;
+  //   padding: 10px 0;
+  // }
 
-  .table {
-    width: 100%;
-    margin-top: 10px;
-  }
+  // .table {
+  //   width: 100%;
+  //   margin-top: 10px;
+  // }
 </style>