Merge pull request #28 from lanyulei/dev

调整催办的位置。

src/views/process/list/apply-process-list.vue

@@ -122,13 +122,14 @@ export default {
 
 
   .process-div-title {
   .process-div-title {
     font-size: 15px;
     font-size: 15px;
-    margin-top: 8px;
+    margin-top: 10px;
     color: #606266;
     color: #606266;
   }
   }
 
 
   .process-div-remarks {
   .process-div-remarks {
     color: #999999;
     color: #999999;
-    margin-top: 3px;
+    margin-top: 6px;
+    font-size: 12px;
   }
   }
 
 
   .ellipsis {
   .ellipsis {

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

@@ -64,36 +64,18 @@
               icon="el-icon-edit"
               icon="el-icon-edit"
               @click="handleView(scope.row)"
               @click="handleView(scope.row)"
             >查看</el-button>
             >查看</el-button>
+            <el-button
+              v-if="scope.row.is_end===0"
+              v-permisaction="['process:list:upcoming:urge']"
+              size="mini"
+              type="text"
+              icon="el-icon-alarm-clock"
+              @click="handleUrge(scope.row)"
+            >催办</el-button>
           </template>
           </template>
         </el-table-column>
         </el-table-column>
       </el-table>
       </el-table>
 
 
-      <el-dialog
-        title="转交工单"
-        :visible.sync="dialogVisible"
-        width="30%"
-      >
-        <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="60px" class="demo-ruleForm">
-          <el-form-item label="节点" prop="node_id">
-            <el-select v-model="ruleForm.node_id" placeholder="选择节点" size="small" style="width: 100%">
-              <el-option v-for="(item, index) in nodeList" :key="index" :label="item.label" :value="item.id" />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="用户" prop="user_id">
-            <el-select v-model="ruleForm.user_id" placeholder="选择用户" size="small" style="width: 100%">
-              <el-option v-for="(item, index) in users" :key="index" :label="item.nickName" :value="item.userId" />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="备注">
-            <el-input v-model="ruleForm.remarks" type="textarea" size="small" />
-          </el-form-item>
-          <el-form-item style="text-align: right">
-            <el-button type="primary" @click="submitForm('ruleForm')">提交</el-button>
-            <el-button @click="dialogVisible = false">关闭</el-button>
-          </el-form-item>
-        </el-form>
-      </el-dialog>
-
       <pagination
       <pagination
         v-show="total>0"
         v-show="total>0"
         :total="total"
         :total="total"
@@ -106,13 +88,12 @@
 </template>
 </template>
 
 
 <script>
 <script>
-import { workOrderList } from '@/api/process/work-order'
+import { workOrderList, urgeWorkOrder } from '@/api/process/work-order'
 export default {
 export default {
   data() {
   data() {
     return {
     return {
       users: [],
       users: [],
       nodeList: [],
       nodeList: [],
-      dialogVisible: false,
       queryParams: {},
       queryParams: {},
       total: 0,
       total: 0,
       loading: false,
       loading: false,
@@ -157,7 +138,29 @@ export default {
     handleView(row) {
     handleView(row) {
       this.$router.push({ name: 'ProcessListHandle', query: { workOrderId: row.id, processId: row.process }})
       this.$router.push({ name: 'ProcessListHandle', query: { workOrderId: row.id, processId: row.process }})
     },
     },
-    handleSelectionChange() {}
+    handleSelectionChange() {},
+    handleUrge(row) {
+      this.$confirm('<span style="font-size:15px ">对此工单处理人进行催办通知提醒, 是否继续?</span><br><span style="color: #c33; font-size: 10px">注意：十分钟内只能催办一次。</span>', '催办', {
+        dangerouslyUseHTMLString: true,
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        urgeWorkOrder({
+          workOrderId: row.id
+        }).then(response => {
+          this.$message({
+            type: 'success',
+            message: '已进行催办通知!'
+          })
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消'
+        })
+      })
+    }
   }
   }
 }
 }
 </script>
 </script>

src/views/process/list/upcoming.vue

@@ -65,13 +65,6 @@
               @click="handleView(scope.row)"
               @click="handleView(scope.row)"
             >查看</el-button>
             >查看</el-button>
             <el-button
             <el-button
-              v-permisaction="['process:list:upcoming:urge']"
-              size="mini"
-              type="text"
-              icon="el-icon-alarm-clock"
-              @click="handleUrge(scope.row)"
-            >催办</el-button>
-            <el-button
               v-if="scope.row.is_end===0"
               v-if="scope.row.is_end===0"
               v-permisaction="['process:list:upcoming:inversion']"
               v-permisaction="['process:list:upcoming:inversion']"
               size="mini"
               size="mini"
@@ -121,7 +114,7 @@
 </template>
 </template>
 
 
 <script>
 <script>
-import { workOrderList, inversionWorkOrder, urgeWorkOrder } from '@/api/process/work-order'
+import { workOrderList, inversionWorkOrder } from '@/api/process/work-order'
 import { listUser } from '@/api/system/sysuser'
 import { listUser } from '@/api/system/sysuser'
 export default {
 export default {
   data() {
   data() {
@@ -198,28 +191,6 @@ export default {
           })
           })
         }
         }
       })
       })
-    },
-    handleUrge(row) {
-      this.$confirm('<span style="font-size:15px ">对此工单处理人进行催办通知提醒, 是否继续?</span><br><span style="color: #c33; font-size: 10px">注意：十分钟内只能催办一次。</span>', '催办', {
-        dangerouslyUseHTMLString: true,
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        urgeWorkOrder({
-          workOrderId: row.id
-        }).then(response => {
-          this.$message({
-            type: 'success',
-            message: '已进行催办通知!'
-          })
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消'
-        })
-      })
     }
     }
   }
   }
 }
 }