f发布

src/components/OP/visaform.vue

@@ -45,7 +45,8 @@
         </el-row>
         <div class="form-box">
             <template>
-                <el-table :data="tableData.slice((currentPage - 1) * pageSize, currentPage * pageSize)" border
+                <!-- <el-table :data="tableData.slice((currentPage - 1) * pageSize, currentPage * pageSize)" border -->
+                <el-table :data="tableData" border
                     style="width: 100%">
                     <el-table-column label="序 号" width="55">
                         <template slot-scope="scope">
@@ -73,12 +74,12 @@
                     </el-table-column>
                 </el-table>
             </template>
-            <div class="block">
+            <!-- <div class="block">
                 <el-pagination align='center' @size-change="handleSizeChange" @current-change="handleCurrentChange"
                     :current-page="currentPage" :page-sizes="[5, 10, 15, 20]" :page-size="pageSize"
                     layout="total, sizes, prev, pager, next" :total="tableData.length">
                 </el-pagination>
-            </div>
+            </div> -->
         </div>
     </div>
 </template>
@@ -155,12 +156,11 @@ export default {
                     portType: 1,
                 }
             }).then(function (res) {
-                console.log(res)
                 if (res.data.code == 200) {
                     that.gnameoption = res.data.data.groupNameData;
                     that.gnamevalue = that.gnameoption[0].id;
                     that.optionsgroup = res.data.data.visaNationalityData;
-                    that.groupvalues = that.optionsgroup[0].id;
+                    that.groupvalues = that.optionsgroup[0].key;
                 }
                 that.getCrm()
             })
@@ -180,9 +180,10 @@ export default {
                     groupId: that.gnamevalue
                 }
             }).then(function (res) {
-                console.log(res)
                 if (res.data.code == 200) {
                     that.tableData = res.data.data;
+                }else{
+                    that.tableData = []
                 }
             })
         },
@@ -258,6 +259,7 @@ export default {
     padding: 10px;
     box-shadow: 0 0 5px #0005;
     border-radius: 10px;
+    min-height: 780px;
 }
 
 .search-li:nth-child(1) {

src/components/system/TaskList.vue

@@ -646,10 +646,10 @@ export default {
         },
         //开始
         PostTaskAllocationSetHaveStatus(index,row){
-            if(row.status>=1){
-                this.$message.error('此任务已经开始！');
-                return false
-            }else{
+            // if(row.status>=1){
+            //     this.$message.error('此任务已经开始！');
+            //     return false
+            // }else{
                 var url = "/api/PersonnelModule/PostTaskAllocationSetHaveStatus"
                 var that = this
                 this.$axios({
@@ -676,7 +676,7 @@ export default {
                 }).catch(function (error) {
                     that.$message.error("操作失败（开始步骤）");
                 });
-            }
+            // }
         },
         //处理日期
         datetime(val){