chris 3 éve
szülő
commit
620e32dead
1 módosított fájl, 24 hozzáadás és 21 törlés
  1. 24 21
      src/views/modules/works/work.vue

+ 24 - 21
src/views/modules/works/work.vue

@@ -35,16 +35,17 @@
         header-align="center"
         align="center"
         min-width="140"
+        :show-tooltip-when-overflow="true"
         label="任务名称">
       </el-table-column>
       <el-table-column
-        prop="-"
+        prop="completeNum"
         header-align="center"
         align="center"
-        min-width="200"
+        min-width="160"
         label="任务进度">
         <template slot-scope="scope">
-          <el-progress :percentage="50"></el-progress>
+          <el-progress :percentage="scope.row.completeNum?Number(scope.row.completeNum):0"></el-progress>
         </template>
       </el-table-column>
       <el-table-column
@@ -58,6 +59,8 @@
         prop="stepName"
         header-align="center"
         align="center"
+        min-width="160"
+        :show-tooltip-when-overflow="true"
         label="工序内容">
       </el-table-column>
       <el-table-column
@@ -167,7 +170,7 @@
         checkDialogFormVisible: false,
         checkDialogForm: {},
         checkDialogFormRules: {
-          checkType: [{required: true, message: '请选择检验类型', trigger: 'blur'}],
+          checkType: [{required: true, message: '请选择检验类型', trigger: 'blur'}]
         }
       }
     },
@@ -222,7 +225,7 @@
           type: 'warning'
         }).then(() => {
           startTask({taskId}).then(({data}) => {
-            if(data && data.code === '200'){
+            if (data && data.code === '200') {
               this.$message({
                 type: 'success',
                 message: '操作成功!'
@@ -239,7 +242,7 @@
           this.$message({
             type: 'info',
             message: '已取消'
-          });         
+          })
         })
       },
       // 移交
@@ -248,17 +251,17 @@
         this.transferDialogForm.taskId = taskId
 
         workTypeMasterList(workTypeId).then(({data}) => {
-          if(data && data.code === '200') {
+          if (data && data.code === '200') {
             this.transferUserList = data.data
           }
         })
       },
       // 确认移交
-      transferSubmit() {
+      transferSubmit () {
         this.$refs['transferDialogForm'].validate((valid) => {
-          if(valid){
+          if (valid) {
             transferTask(this.transferDialogForm).then(({data}) => {
-              if(data && data.code === '200'){
+              if (data && data.code === '200') {
                 this.$message({
                   type: 'success',
                   message: '移交成功!'
@@ -266,7 +269,7 @@
                 this.transferDialogFormVisible = false
                 this.getDataList()
               } else {
-                  this.$message({
+                this.$message({
                   type: 'error',
                   message: data.msg
                 })
@@ -276,21 +279,21 @@
         })
       },
       // 完成
-      completeTask(taskId){
+      completeTask (taskId) {
         this.$confirm('是否完成任务?', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
           completeTask({taskId}).then(({data}) => {
-            if(data && data.code === '200'){
+            if (data && data.code === '200') {
               this.$message({
                 type: 'success',
                 message: '操作成功!'
               })
               this.getDataList()
             } else {
-               this.$message({
+              this.$message({
                 type: 'error',
                 message: data.msg
               })
@@ -300,21 +303,21 @@
           this.$message({
             type: 'info',
             message: '已取消'
-          })         
+          })
         })
       },
       // 检验
-      checkTask(taskId){
+      checkTask (taskId) {
         this.checkDialogFormVisible = true
         this.checkDialogForm.taskId = taskId
       },
       // 确认检验
-      checkSubmit(){
+      checkSubmit () {
         this.$refs['checkDialogForm'].validate((valid) => {
-          if(valid) {
-            let submitData = this.checkDialogForm;
+          if (valid) {
+            let submitData = this.checkDialogForm
             checkTask(submitData).then(({data}) => {
-              if(data && data.code === '200') {
+              if (data && data.code === '200') {
                 this.$message({
                   type: 'success',
                   message: '移交成功!'
@@ -322,7 +325,7 @@
                 this.checkDialogFormVisible = false
                 this.getDataList()
               } else {
-                  this.$message({
+                this.$message({
                   type: 'error',
                   message: data.msg
                 })