Browse Source

更新1025-1

epans 1 year ago
parent
commit
ea7748d7c5
2 changed files with 14 additions and 12 deletions
  1. 1 1
      .env.development
  2. 13 11
      src/views/workManagement/WorkTaskAssign3.vue

+ 1 - 1
.env.development

@@ -5,6 +5,6 @@ NODE_ENV = 'development'
 # VUE_APP_BASE_API = 'http://192.168.1.70:8087'
 
 
-VUE_APP_BASE_API = 'http://jsxzsl8087.kptyun.com'
+ VUE_APP_BASE_API = 'http://jsxzsl8087.kptyun.com'
 
  

+ 13 - 11
src/views/workManagement/WorkTaskAssign3.vue

@@ -51,9 +51,10 @@
         <el-table-column label="状态" min-width="150px" align="center">
           <template slot-scope="scope">
             <!-- <span v-if = "scope.row.status == 0">未知</span> -->
-            <span v-if = "scope.row.status == 1">未完成</span>
-            <span v-if = "scope.row.status == 2">已关闭</span>
+            <span v-if = "scope.row.status == 1">已创建未执行</span>
+            <span v-if = "scope.row.status == 2">执行中</span>
             <span v-if = "scope.row.status == 3">已完成</span>
+            <span v-if = "scope.row.status == 4">已关闭</span>
           </template>
         </el-table-column>
         <el-table-column label="对象" min-width="150px" align="center">
@@ -206,7 +207,7 @@ export default {
         operation_user: "",
         operation_phone: "",
         work_order_category_id: undefined,
-        status: 0,
+        status: undefined,
         start_finished_time: "",
         end_finished_time: "",
         start_created_time: "",
@@ -247,12 +248,13 @@ export default {
 
       statusList:[
         // {id: 0, name: '未知'},
-        {id: 1, name: '未完成'},
-        {id: 2, name: '已关闭'},
+        {id: 1, name: '已创建未执行'},
+        {id: 2, name: '执行中'},
         {id: 3, name: '已完成'},
+        {id: 4, name: '已关闭'},
       ],
     
-
+   
  
 
 
@@ -311,7 +313,7 @@ export default {
      this.get_select_list1()
 
       //表格 - 初始化 
-     // this.get_table_data()
+      this.get_table_data()
 
      
 
@@ -463,7 +465,7 @@ export default {
       me.searchData.operation_user = ""
       me.searchData.operation_phone = ""
       me.searchData.work_order_category_id = undefined
-      me.searchData.status = 0
+      me.searchData.status = undefined
       me.searchData.start_finished_time = ""
       me.searchData.end_finished_time = ""
       me.searchData.start_created_time = ""
@@ -616,7 +618,7 @@ export default {
     form_delete(row) {
       var me = this
 
-       me.$confirm('是否删除此条内容?', '提示', {
+       me.$confirm('是否关闭此条内容?', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'
@@ -627,10 +629,10 @@ export default {
                 console.log("编辑结果:",e)
                 //打印请求成功结果
                 if(e.code == 200  ){
-                  me.$message({ type: 'success',  message: '删除成功!'  });
+                  me.$message({ type: 'success',  message: '关闭成功!'  });
                   me.get_table_data()
                 } else {
-                  me.$message({ type: 'error', message: '删除失败!' + e.msg, duration: 2000 })
+                  me.$message({ type: 'error', message: '关闭失败!' + e.msg, duration: 2000 })
                 }
             })