Commit f9e8e943a871706ab88818f9175d53b0d3e69268
1 parent
91c6c7bb
生产和项目看板修改
Showing
2 changed files
with
29 additions
and
10 deletions
src/views/scheduler/progressRate.vue
| 1 | <template> | 1 | <template> |
| 2 | <div> | 2 | <div> |
| 3 | <div class="table-page-search-wrapper"> | 3 | <div class="table-page-search-wrapper"> |
| 4 | - <a-form layout="inline"> | 4 | + <!-- <a-form layout="inline"> |
| 5 | <a-row :gutter="10"> | 5 | <a-row :gutter="10"> |
| 6 | <a-col :md="6" :sm="24"> | 6 | <a-col :md="6" :sm="24"> |
| 7 | <a-form-item label="项目名称"> | 7 | <a-form-item label="项目名称"> |
| @@ -16,9 +16,25 @@ | @@ -16,9 +16,25 @@ | ||
| 16 | </a-form-item> | 16 | </a-form-item> |
| 17 | </a-col> | 17 | </a-col> |
| 18 | </a-row> | 18 | </a-row> |
| 19 | - </a-form> | 19 | + </a-form> --> |
| 20 | </div> | 20 | </div> |
| 21 | 21 | ||
| 22 | + <div class="table-page-search-wrapper"> | ||
| 23 | + <a-form layout="inline"> | ||
| 24 | + <a-row :gutter="10"> | ||
| 25 | + <a-col :md="6" :sm="8"> | ||
| 26 | + <a-form-item label="工作令号"> | ||
| 27 | + <!-- <a-input placeholder="请输入工作令号" v-model="queryParam.workNo"></a-input>--> | ||
| 28 | + <j-popup v-model="queryParam" code="find_projectc" field="field0056" orgFields="field0056" destFields="field0056" :multi="false"/> | ||
| 29 | + </a-form-item> | ||
| 30 | + </a-col> | ||
| 31 | + <a-col :md="6" :sm="24"> | ||
| 32 | + <a-button type="primary" @click="handleChange(queryParam)">查询</a-button> | ||
| 33 | + <a-button style="margin-left: 8px" @click="() => (queryParam = {})">重置</a-button> | ||
| 34 | + </a-col> | ||
| 35 | + </a-row> | ||
| 36 | + </a-form> | ||
| 37 | + </div> | ||
| 22 | <gantt-elastic | 38 | <gantt-elastic |
| 23 | :options="options" | 39 | :options="options" |
| 24 | :tasks="tasks" | 40 | :tasks="tasks" |
| @@ -65,7 +81,7 @@ let options = { | @@ -65,7 +81,7 @@ let options = { | ||
| 65 | maxRows: 100, | 81 | maxRows: 100, |
| 66 | maxHeight: 500, | 82 | maxHeight: 500, |
| 67 | title: { | 83 | title: { |
| 68 | - label: "", | 84 | + label: "生产进度看板", |
| 69 | html: false | 85 | html: false |
| 70 | }, | 86 | }, |
| 71 | row: { | 87 | row: { |
| @@ -200,6 +216,7 @@ export default { | @@ -200,6 +216,7 @@ export default { | ||
| 200 | data() { | 216 | data() { |
| 201 | return { | 217 | return { |
| 202 | tasks: [], | 218 | tasks: [], |
| 219 | + projectName:'', | ||
| 203 | options, | 220 | options, |
| 204 | dynamicStyle: { | 221 | dynamicStyle: { |
| 205 | 'task-list-header-label': { | 222 | 'task-list-header-label': { |
| @@ -264,6 +281,7 @@ export default { | @@ -264,6 +281,7 @@ export default { | ||
| 264 | if (projectName == null || projectName === "") { | 281 | if (projectName == null || projectName === "") { |
| 265 | return; | 282 | return; |
| 266 | } | 283 | } |
| 284 | + this.tasks = [] | ||
| 267 | let params = { | 285 | let params = { |
| 268 | "projectName": projectName | 286 | "projectName": projectName |
| 269 | }; | 287 | }; |
| @@ -273,7 +291,7 @@ export default { | @@ -273,7 +291,7 @@ export default { | ||
| 273 | this.tasks = res.result | 291 | this.tasks = res.result |
| 274 | } | 292 | } |
| 275 | }) | 293 | }) |
| 276 | - } | 294 | + }, |
| 277 | } | 295 | } |
| 278 | } | 296 | } |
| 279 | </script> | 297 | </script> |
src/views/scheduler/progressRateCopy.vue
| @@ -12,9 +12,9 @@ | @@ -12,9 +12,9 @@ | ||
| 12 | <a-col :md="6" :sm="8"> | 12 | <a-col :md="6" :sm="8"> |
| 13 | <a-form-item label="工作令号"> | 13 | <a-form-item label="工作令号"> |
| 14 | <!-- <a-input placeholder="请输入工作令号" v-model="queryParam.workNo"></a-input>--> | 14 | <!-- <a-input placeholder="请输入工作令号" v-model="queryParam.workNo"></a-input>--> |
| 15 | - <j-popup v-model="queryParam.workNo" code="find_projectc" field="field0056" orgFields="field0056" destFields="field0056" :multi="true"/> | 15 | + <j-popup v-model="queryParam.workNo" code="find_projectc" field="field0056" orgFields="field0056" destFields="field0056" :multi="false"/> |
| 16 | </a-form-item> | 16 | </a-form-item> |
| 17 | - </a-col> | 17 | + </a-col> |
| 18 | <a-col :md="6" :sm="24"> | 18 | <a-col :md="6" :sm="24"> |
| 19 | <a-button type="primary" @click="getTask(queryParam.workNo)">查询</a-button> | 19 | <a-button type="primary" @click="getTask(queryParam.workNo)">查询</a-button> |
| 20 | <a-button style="margin-left: 8px" @click="() => (queryParam = {})">重置</a-button> | 20 | <a-button style="margin-left: 8px" @click="() => (queryParam = {})">重置</a-button> |
| @@ -69,7 +69,7 @@ let tasks = [ | @@ -69,7 +69,7 @@ let tasks = [ | ||
| 69 | "id": "1", | 69 | "id": "1", |
| 70 | "isOnTime": "否", | 70 | "isOnTime": "否", |
| 71 | "start": 1616575959000, | 71 | "start": 1616575959000, |
| 72 | - "taskPoint": "测试项目1", | 72 | + "taskPoint": "展示", |
| 73 | "type": "task", | 73 | "type": "task", |
| 74 | "style": { | 74 | "style": { |
| 75 | "base": { | 75 | "base": { |
| @@ -168,16 +168,17 @@ let options = { | @@ -168,16 +168,17 @@ let options = { | ||
| 168 | width: 100, | 168 | width: 100, |
| 169 | }, | 169 | }, |
| 170 | { | 170 | { |
| 171 | - id: 9, | 171 | + id: 5, |
| 172 | label: "意见", | 172 | label: "意见", |
| 173 | value: "opinion", | 173 | value: "opinion", |
| 174 | width: 60 | 174 | width: 60 |
| 175 | }, | 175 | }, |
| 176 | { | 176 | { |
| 177 | - id: 9, | 177 | + id: 6, |
| 178 | label: "按时完成", | 178 | label: "按时完成", |
| 179 | value: "isOnTime", | 179 | value: "isOnTime", |
| 180 | - width: 60 | 180 | + width: 60, |
| 181 | + expander: true | ||
| 181 | } | 182 | } |
| 182 | ] | 183 | ] |
| 183 | }, | 184 | }, |