Bladeren bron

任务管理

ZaiZai 1 jaar geleden
bovenliggende
commit
e6676cb955
3 gewijzigde bestanden met toevoegingen van 12 en 11 verwijderingen
  1. 1 1
      src/config/index.json
  2. 9 8
      src/views/tasks/components/hc-data/task-review.vue
  3. 2 2
      src/views/tasks/hc-data.vue

+ 1 - 1
src/config/index.json

@@ -1,6 +1,6 @@
 {
     "version": "20230607160059",
-    "target": "http://192.168.0.109:8090",
+    "target": "http://192.168.0.196:8090",
     "smsPhone": "",
     "vite": {
         "port": 5180,

+ 9 - 8
src/views/tasks/components/hc-data/task-review.vue

@@ -67,7 +67,7 @@
 
 <script setup>
 import { nextTick, ref, watch } from 'vue'
-import { getArrValue, getRandom } from 'js-fast-way'
+import { getRandom } from 'js-fast-way'
 import HcTaskForm from './task-form.vue'
 import HcTaskNotes from './task-notes.vue'
 
@@ -131,17 +131,18 @@ const setSplitRef = () => {
 
 //设置任务信息
 const setTaskInfo = async () => {
-    const { taskName, type } = rowInfo.value
+    //meterType:1中间,2材料,3开工,4变更令
+    const { taskName, meterType } = rowInfo.value
     taskInfo.value.taskName = taskName
-    taskInfo.value.type = type
-    if (type === 1) {
+    taskInfo.value.type = meterType
+    if (meterType === 1) {
         tableColumn.value = middlepayTableColumn.value
-    } else if (type === 2) {
+    } else if (meterType === 2) {
+        tableColumn.value = materialTableColumn.value
+    } else if (meterType === 3) {
         tableColumn.value = startWorkTableColumn.value
-    } else if (type === 3) {
+    } else if (meterType === 4) {
         tableColumn.value = alterTableColumn.value
-    } else if (type === 4) {
-        tableColumn.value = materialTableColumn.value
     } else {
         tableColumn.value = []
     }

+ 2 - 2
src/views/tasks/hc-data.vue

@@ -63,7 +63,7 @@
                     <el-tag class="mx-1" effect="dark" type="danger">签字异常</el-tag>
                 </div>
                 <div class="right">
-                    <hc-pages :pages="searchForm" :sizes="[30, 40, 50, 200]" @change="pageChange" />
+                    <hc-pages :pages="searchForm" :sizes="[50, 100, 150, 200, 300]" @change="pageChange" />
                 </div>
             </div>
         </template>
@@ -107,7 +107,7 @@ const tabsClick = ({ key }) => {
 //搜索条件
 const searchForm = ref({
     selectedType: 1, typeValue: '', statusValue: '', batchValue: '', queryValue: '', startTimeValue: '', endTimeValue: '',
-    current: 1, size: 200, total: 0,
+    current: 1, size: 100, total: 0,
 })
 
 //获取任务类型