Merge branch 'iteration-oss-up' into jenkins

src/views/process/list/all.vue

@@ -251,6 +251,7 @@ export default {
       for (var k in val) {
         this.listQuery[k] = val[k];
       }
+      this.queryParams.pageIndex = this.listQuery.page;
       this.$refs.listQuery.save(this.listQuery);
       this.$refs.listQuery.save(this.queryParams, "page");
       this.getList();

src/views/process/list/components/search/index.vue

@@ -56,6 +56,17 @@
         </div>
       </div>
     </el-form-item> -->
+    <el-form-item v-if="['all', 'related', 'upcoming'].includes(genre)">
+      <el-input
+        v-model="listQuery.createName"
+        placeholder="请输入申请人"
+        clearable
+        size="small"
+        style="width: 180px"
+        @keyup.enter.native="getList"
+      />
+    </el-form-item>
+
     <el-form-item v-if="genre !== 'upcoming'">
       <el-select
         v-model="listQuery.processor"
@@ -255,6 +266,7 @@ export default {
         this.listQuery.processorName = "";
       }
       console.log(this.listQuery, "listQuery showInfo");
+      this.listQuery.page = 1;
 
       this.$emit("handleSearch", {
         ...this.listQuery,

src/views/process/list/my-create.vue

@@ -237,6 +237,7 @@ export default {
       for (var k in val) {
         this.listQuery[k] = val[k];
       }
+      this.queryParams.pageIndex = this.listQuery.page;
       this.$refs.listQuery.save(this.listQuery);
       this.$refs.listQuery.save(this.queryParams, "page");
       this.getList();

src/views/process/list/related.vue

@@ -3,7 +3,7 @@
     <el-card class="box-card">
       <save-form ref="listQuery" :model="listQuery" :inline="true">
         <WorkOrderSearch
-          :genre="'my-create'"
+          :genre="'related'"
           :list="listQuery"
           @handleSearch="handleSearch"
         />
@@ -35,6 +35,12 @@
             </span>
           </template>
         </el-table-column>
+        <el-table-column
+          label="申请人"
+          :show-overflow-tooltip="true"
+          prop="creator_name"
+        >
+        </el-table-column>
         <el-table-column label="当前处理人" :show-overflow-tooltip="true">
           <template slot-scope="scope">
             <span v-if="scope.row.is_end === 0">{{
@@ -218,6 +224,7 @@ export default {
       for (var k in val) {
         this.listQuery[k] = val[k];
       }
+      this.queryParams.pageIndex = this.listQuery.page;
       this.$refs.listQuery.save(this.listQuery);
       this.$refs.listQuery.save(this.queryParams, "page");
       this.getList();

src/views/process/list/upcoming.vue

@@ -35,6 +35,12 @@
             </span>
           </template>
         </el-table-column>
+        <el-table-column
+          label="申请人"
+          :show-overflow-tooltip="true"
+          prop="creator_name"
+        >
+        </el-table-column>
         <el-table-column label="当前处理人" :show-overflow-tooltip="true">
           <template slot-scope="scope">
             <span v-if="scope.row.is_end === 0">{{
@@ -224,7 +230,7 @@ export default {
       for (var k in val) {
         this.listQuery[k] = val[k];
       }
-
+      this.queryParams.pageIndex = this.listQuery.page;
       this.$refs.listQuery.save(this.listQuery);
       this.$refs.listQuery.save(this.queryParams, "page");
       this.getList();