雷海东 / factory-web · 提交

转到一个项目

作者 雷海东
提交 5eccef62511ad6fdd8586f27f3c5e639e25363e7 1 个父辈 8bf40ba7

生产计划查看、派工

内嵌 并排对比
正在显示 4 个修改的文件 包含 255 行增加 和 152 行删除
不能预览此文件类型
@@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@
18 <a-form-item label="产品类型"> 18 <a-form-item label="产品类型">
19 <!-- <j-input placeholder="请选择产品类型" v-model="queryParam.productType"></j-input> --> 19 <!-- <j-input placeholder="请选择产品类型" v-model="queryParam.productType"></j-input> -->
20 <a-select size="small" v-model="queryParam.productType" placeholder="请选择产品类型" allowClear> 20 <a-select size="small" v-model="queryParam.productType" placeholder="请选择产品类型" allowClear>
21 - <a-select-option v-for="(item,index) in options" :key="index" :value="item.productTypeName">{{ item.productTypeName }}</a-select-option> 21 + <a-select-option v-for="(item,index) in options" :key="index" :value="item.productTypeId">{{ item.productTypeName }}</a-select-option>
22 </a-select> 22 </a-select>
23 </a-form-item> 23 </a-form-item>
24 </a-col> 24 </a-col>
@@ -49,7 +49,7 @@ @@ -49,7 +49,7 @@
49 <td> 49 <td>
50 <a-form-model-item prop="undertakerjuc" style="margin-bottom: 0px"> 50 <a-form-model-item prop="undertakerjuc" style="margin-bottom: 0px">
51 <a-select size="small" v-model="model.undertakerjuc" placeholder="请选择承接人" allowClear> 51 <a-select size="small" v-model="model.undertakerjuc" placeholder="请选择承接人" allowClear>
52 - <a-select-option v-for="(item, index) in options" :key="index" :value="item. userName">{{ 52 + <a-select-option v-for="(item, index) in options" :key="index" :value="item.userName">{{
53 item.userName 53 item.userName
54 }}</a-select-option> 54 }}</a-select-option>
55 </a-select> 55 </a-select>
@@ -75,7 +75,7 @@ @@ -75,7 +75,7 @@
75 <td> 75 <td>
76 <a-form-model-item prop="undertakerqg" style="margin-bottom: 0px"> 76 <a-form-model-item prop="undertakerqg" style="margin-bottom: 0px">
77 <a-select size="small" v-model="model.undertakerqg" placeholder="请选择承接人" allowClear> 77 <a-select size="small" v-model="model.undertakerqg" placeholder="请选择承接人" allowClear>
78 - <a-select-option v-for="(item, index) in options" :key="index" :value="item. userName">{{ 78 + <a-select-option v-for="(item, index) in options" :key="index" :value="item.userName">{{
79 item.userName 79 item.userName
80 }}</a-select-option> 80 }}</a-select-option>
81 </a-select> 81 </a-select>
@@ -101,7 +101,7 @@ @@ -101,7 +101,7 @@
101 <td> 101 <td>
102 <a-form-model-item prop="undertakerhg" style="margin-bottom: 0px"> 102 <a-form-model-item prop="undertakerhg" style="margin-bottom: 0px">
103 <a-select size="small" v-model="model.undertakerhg" placeholder="请选择承接人" allowClear> 103 <a-select size="small" v-model="model.undertakerhg" placeholder="请选择承接人" allowClear>
104 - <a-select-option v-for="(item, index) in options" :key="index" :value="item. userName">{{ 104 + <a-select-option v-for="(item, index) in options" :key="index" :value="item.userName">{{
105 item.userName 105 item.userName
106 }}</a-select-option> 106 }}</a-select-option>
107 </a-select> 107 </a-select>
@@ -136,7 +136,7 @@ @@ -136,7 +136,7 @@
136 <td> 136 <td>
137 <a-form-model-item prop="undertakerjig" style="margin-bottom: 0px"> 137 <a-form-model-item prop="undertakerjig" style="margin-bottom: 0px">
138 <a-select size="small" v-model="model.undertakerjig" placeholder="请选择承接人" allowClear> 138 <a-select size="small" v-model="model.undertakerjig" placeholder="请选择承接人" allowClear>
139 - <a-select-option v-for="(item, index) in options" :key="index" :value="item. userName">{{ 139 + <a-select-option v-for="(item, index) in options" :key="index" :value="item.userName">{{
140 item.userName 140 item.userName
141 }}</a-select-option> 141 }}</a-select-option>
142 </a-select> 142 </a-select>
@@ -162,7 +162,7 @@ @@ -162,7 +162,7 @@
162 <td> 162 <td>
163 <a-form-model-item prop="undertakerjuc" style="margin-bottom: 0px"> 163 <a-form-model-item prop="undertakerjuc" style="margin-bottom: 0px">
164 <a-select size="small" v-model="model.undertakerjuc" placeholder="请选择承接人" allowClear> 164 <a-select size="small" v-model="model.undertakerjuc" placeholder="请选择承接人" allowClear>
165 - <a-select-option v-for="(item, index) in options" :key="index" :value="item. userName">{{ 165 + <a-select-option v-for="(item, index) in options" :key="index" :value="item.userName">{{
166 item.userName 166 item.userName
167 }}</a-select-option> 167 }}</a-select-option>
168 </a-select> 168 </a-select>
@@ -188,7 +188,7 @@ @@ -188,7 +188,7 @@
188 <td> 188 <td>
189 <a-form-model-item prop="undertakerqg" style="margin-bottom: 0px"> 189 <a-form-model-item prop="undertakerqg" style="margin-bottom: 0px">
190 <a-select size="small" v-model="model.undertakerqg" placeholder="请选择承接人" allowClear> 190 <a-select size="small" v-model="model.undertakerqg" placeholder="请选择承接人" allowClear>
191 - <a-select-option v-for="(item, index) in options" :key="index" :value="item. userName">{{ 191 + <a-select-option v-for="(item, index) in options" :key="index" :value="item.userName">{{
192 item.userName 192 item.userName
193 }}</a-select-option> 193 }}</a-select-option>
194 </a-select> 194 </a-select>
@@ -214,7 +214,7 @@ @@ -214,7 +214,7 @@
214 <td> 214 <td>
215 <a-form-model-item prop="undertakerhg" style="margin-bottom: 0px"> 215 <a-form-model-item prop="undertakerhg" style="margin-bottom: 0px">
216 <a-select size="small" v-model="model.undertakerhg" placeholder="请选择承接人" allowClear> 216 <a-select size="small" v-model="model.undertakerhg" placeholder="请选择承接人" allowClear>
217 - <a-select-option v-for="(item, index) in options" :key="index" :value="item. userName">{{ 217 + <a-select-option v-for="(item, index) in options" :key="index" :value="item.userName">{{
218 item.userName 218 item.userName
219 }}</a-select-option> 219 }}</a-select-option>
220 </a-select> 220 </a-select>
@@ -248,7 +248,7 @@ @@ -248,7 +248,7 @@
248 </td> 248 </td>
249 <a-form-model-item prop="undertakerjig" style="margin-bottom: 0px"> 249 <a-form-model-item prop="undertakerjig" style="margin-bottom: 0px">
250 <a-select size="small" v-model="model.undertakerjig" placeholder="请选择承接人" allowClear> 250 <a-select size="small" v-model="model.undertakerjig" placeholder="请选择承接人" allowClear>
251 - <a-select-option v-for="(item, index) in options" :key="index" :value="item. userName">{{ 251 + <a-select-option v-for="(item, index) in options" :key="index" :value="item.userName">{{
252 item.userName 252 item.userName
253 }}</a-select-option> 253 }}</a-select-option>
254 </a-select> 254 </a-select>
@@ -273,7 +273,7 @@ @@ -273,7 +273,7 @@
273 <td> 273 <td>
274 <a-form-model-item prop="undertakerjuc" style="margin-bottom: 0px"> 274 <a-form-model-item prop="undertakerjuc" style="margin-bottom: 0px">
275 <a-select size="small" v-model="model.undertakerjuc" placeholder="请选择承接人" allowClear> 275 <a-select size="small" v-model="model.undertakerjuc" placeholder="请选择承接人" allowClear>
276 - <a-select-option v-for="(item, index) in options" :key="index" :value="item. userName">{{ 276 + <a-select-option v-for="(item, index) in options" :key="index" :value="item.userName">{{
277 item.userName 277 item.userName
278 }}</a-select-option> 278 }}</a-select-option>
279 </a-select> 279 </a-select>
@@ -299,7 +299,7 @@ @@ -299,7 +299,7 @@
299 <td> 299 <td>
300 <a-form-model-item prop="undertakerqg" style="margin-bottom: 0px"> 300 <a-form-model-item prop="undertakerqg" style="margin-bottom: 0px">
301 <a-select size="small" v-model="model.undertakerqg" placeholder="请选择承接人" allowClear> 301 <a-select size="small" v-model="model.undertakerqg" placeholder="请选择承接人" allowClear>
302 - <a-select-option v-for="(item, index) in options" :key="index" :value="item. userName">{{ 302 + <a-select-option v-for="(item, index) in options" :key="index" :value="item.userName">{{
303 item.userName 303 item.userName
304 }}</a-select-option> 304 }}</a-select-option>
305 </a-select> 305 </a-select>
@@ -324,7 +324,7 @@ @@ -324,7 +324,7 @@
324 </td> 324 </td>
325 <a-form-model-item prop="undertakerhg" style="margin-bottom: 0px"> 325 <a-form-model-item prop="undertakerhg" style="margin-bottom: 0px">
326 <a-select size="small" v-model="model.undertakerhg" placeholder="请选择承接人" allowClear> 326 <a-select size="small" v-model="model.undertakerhg" placeholder="请选择承接人" allowClear>
327 - <a-select-option v-for="(item, index) in options" :key="index" :value="item. userName">{{ 327 + <a-select-option v-for="(item, index) in options" :key="index" :value="item.userName">{{
328 item.userName 328 item.userName
329 }}</a-select-option> 329 }}</a-select-option>
330 </a-select> 330 </a-select>
@@ -358,7 +358,7 @@ @@ -358,7 +358,7 @@
358 <td> 358 <td>
359 <a-form-model-item prop="undertakerjig" style="margin-bottom: 0px"> 359 <a-form-model-item prop="undertakerjig" style="margin-bottom: 0px">
360 <a-select size="small" v-model="model.undertakerjig" placeholder="请选择承接人" allowClear> 360 <a-select size="small" v-model="model.undertakerjig" placeholder="请选择承接人" allowClear>
361 - <a-select-option v-for="(item, index) in options" :key="index" :value="item. userName">{{ 361 + <a-select-option v-for="(item, index) in options" :key="index" :value="item.userName">{{
362 item.userName 362 item.userName
363 }}</a-select-option> 363 }}</a-select-option>
364 </a-select> 364 </a-select>
@@ -384,7 +384,7 @@ @@ -384,7 +384,7 @@
384 <td> 384 <td>
385 <a-form-model-item prop="undertakerjuc" style="margin-bottom: 0px"> 385 <a-form-model-item prop="undertakerjuc" style="margin-bottom: 0px">
386 <a-select size="small" v-model="model.undertakerjuc" placeholder="请选择承接人" allowClear> 386 <a-select size="small" v-model="model.undertakerjuc" placeholder="请选择承接人" allowClear>
387 - <a-select-option v-for="(item, index) in options" :key="index" :value="item. userName">{{ 387 + <a-select-option v-for="(item, index) in options" :key="index" :value="item.userName">{{
388 item.userName 388 item.userName
389 }}</a-select-option> 389 }}</a-select-option>
390 </a-select> 390 </a-select>
@@ -410,7 +410,7 @@ @@ -410,7 +410,7 @@
410 <td> 410 <td>
411 <a-form-model-item prop="undertakerqg" style="margin-bottom: 0px"> 411 <a-form-model-item prop="undertakerqg" style="margin-bottom: 0px">
412 <a-select size="small" v-model="model.undertakerqg" placeholder="请选择承接人" allowClear> 412 <a-select size="small" v-model="model.undertakerqg" placeholder="请选择承接人" allowClear>
413 - <a-select-option v-for="(item, index) in options" :key="index" :value="item. userName">{{ 413 + <a-select-option v-for="(item, index) in options" :key="index" :value="item.userName">{{
414 item.userName 414 item.userName
415 }}</a-select-option> 415 }}</a-select-option>
416 </a-select> 416 </a-select>
@@ -436,7 +436,7 @@ @@ -436,7 +436,7 @@
436 <td> 436 <td>
437 <a-form-model-item prop="undertakermh1" style="margin-bottom: 0px"> 437 <a-form-model-item prop="undertakermh1" style="margin-bottom: 0px">
438 <a-select size="small" v-model="model.undertakermh1" placeholder="请选择承接人" allowClear> 438 <a-select size="small" v-model="model.undertakermh1" placeholder="请选择承接人" allowClear>
439 - <a-select-option v-for="(item, index) in options" :key="index" :value="item. userName">{{ 439 + <a-select-option v-for="(item, index) in options" :key="index" :value="item.userName">{{
440 item.userName 440 item.userName
441 }}</a-select-option> 441 }}</a-select-option>
442 </a-select> 442 </a-select>
@@ -462,7 +462,7 @@ @@ -462,7 +462,7 @@
462 <td> 462 <td>
463 <a-form-model-item prop="undertakermh2" style="margin-bottom: 0px"> 463 <a-form-model-item prop="undertakermh2" style="margin-bottom: 0px">
464 <a-select size="small" v-model="model.undertakermh2" placeholder="请选择承接人" allowClear> 464 <a-select size="small" v-model="model.undertakermh2" placeholder="请选择承接人" allowClear>
465 - <a-select-option v-for="(item, index) in options" :key="index" :value="item. userName">{{ 465 + <a-select-option v-for="(item, index) in options" :key="index" :value="item.userName">{{
466 item.userName 466 item.userName
467 }}</a-select-option> 467 }}</a-select-option>
468 </a-select> 468 </a-select>
@@ -488,7 +488,7 @@ @@ -488,7 +488,7 @@
488 <td> 488 <td>
489 <a-form-model-item prop="undertakerhm" style="margin-bottom: 0px"> 489 <a-form-model-item prop="undertakerhm" style="margin-bottom: 0px">
490 <a-select size="small" v-model="model.undertakerhm" placeholder="请选择承接人" allowClear> 490 <a-select size="small" v-model="model.undertakerhm" placeholder="请选择承接人" allowClear>
491 - <a-select-option v-for="(item, index) in options" :key="index" :value="item. userName">{{ 491 + <a-select-option v-for="(item, index) in options" :key="index" :value="item.userName">{{
492 item.userName 492 item.userName
493 }}</a-select-option> 493 }}</a-select-option>
494 </a-select> 494 </a-select>
@@ -514,7 +514,7 @@ @@ -514,7 +514,7 @@
514 <td> 514 <td>
515 <a-form-model-item prop="undertakerzp" style="margin-bottom: 0px"> 515 <a-form-model-item prop="undertakerzp" style="margin-bottom: 0px">
516 <a-select size="small" v-model="model.undertakerzp" placeholder="请选择承接人" allowClear> 516 <a-select size="small" v-model="model.undertakerzp" placeholder="请选择承接人" allowClear>
517 - <a-select-option v-for="(item, index) in options" :key="index" :value="item. userName">{{ 517 + <a-select-option v-for="(item, index) in options" :key="index" :value="item.userName">{{
518 item.userName 518 item.userName
519 }}</a-select-option> 519 }}</a-select-option>
520 </a-select> 520 </a-select>
@@ -549,7 +549,7 @@ @@ -549,7 +549,7 @@
549 <td> 549 <td>
550 <a-form-model-item prop="undertakerjig" style="margin-bottom: 0px"> 550 <a-form-model-item prop="undertakerjig" style="margin-bottom: 0px">
551 <a-select size="small" v-model="model.undertakerjig" placeholder="请选择承接人" allowClear> 551 <a-select size="small" v-model="model.undertakerjig" placeholder="请选择承接人" allowClear>
552 - <a-select-option v-for="(item, index) in options" :key="index" :value="item. userName">{{ 552 + <a-select-option v-for="(item, index) in options" :key="index" :value="item.userName">{{
553 item.userName 553 item.userName
554 }}</a-select-option> 554 }}</a-select-option>
555 </a-select> 555 </a-select>
@@ -575,7 +575,7 @@ @@ -575,7 +575,7 @@
575 <td> 575 <td>
576 <a-form-model-item prop="undertakerjuc" style="margin-bottom: 0px"> 576 <a-form-model-item prop="undertakerjuc" style="margin-bottom: 0px">
577 <a-select size="small" v-model="model.undertakerjuc" placeholder="请选择承接人" allowClear> 577 <a-select size="small" v-model="model.undertakerjuc" placeholder="请选择承接人" allowClear>
578 - <a-select-option v-for="(item, index) in options" :key="index" :value="item. userName">{{ 578 + <a-select-option v-for="(item, index) in options" :key="index" :value="item.userName">{{
579 item.userName 579 item.userName
580 }}</a-select-option> 580 }}</a-select-option>
581 </a-select> 581 </a-select>
@@ -601,7 +601,7 @@ @@ -601,7 +601,7 @@
601 <td> 601 <td>
602 <a-form-model-item prop="undertakerqg" style="margin-bottom: 0px"> 602 <a-form-model-item prop="undertakerqg" style="margin-bottom: 0px">
603 <a-select size="small" v-model="model.undertakerqg" placeholder="请选择承接人" allowClear> 603 <a-select size="small" v-model="model.undertakerqg" placeholder="请选择承接人" allowClear>
604 - <a-select-option v-for="(item, index) in options" :key="index" :value="item. userName">{{ 604 + <a-select-option v-for="(item, index) in options" :key="index" :value="item.userName">{{
605 item.userName 605 item.userName
606 }}</a-select-option> 606 }}</a-select-option>
607 </a-select> 607 </a-select>
@@ -627,7 +627,7 @@ @@ -627,7 +627,7 @@
627 <td> 627 <td>
628 <a-form-model-item prop="undertakermh1" style="margin-bottom: 0px"> 628 <a-form-model-item prop="undertakermh1" style="margin-bottom: 0px">
629 <a-select size="small" v-model="model.undertakermh1" placeholder="请选择承接人" allowClear> 629 <a-select size="small" v-model="model.undertakermh1" placeholder="请选择承接人" allowClear>
630 - <a-select-option v-for="(item, index) in options" :key="index" :value="item. userName">{{ 630 + <a-select-option v-for="(item, index) in options" :key="index" :value="item.userName">{{
631 item.userName 631 item.userName
632 }}</a-select-option> 632 }}</a-select-option>
633 </a-select> 633 </a-select>
@@ -653,7 +653,7 @@ @@ -653,7 +653,7 @@
653 <td> 653 <td>
654 <a-form-model-item prop="undertakermh2" style="margin-bottom: 0px"> 654 <a-form-model-item prop="undertakermh2" style="margin-bottom: 0px">
655 <a-select size="small" v-model="model.undertakermh2" placeholder="请选择承接人" allowClear> 655 <a-select size="small" v-model="model.undertakermh2" placeholder="请选择承接人" allowClear>
656 - <a-select-option v-for="(item, index) in options" :key="index" :value="item. userName">{{ 656 + <a-select-option v-for="(item, index) in options" :key="index" :value="item.userName">{{
657 item.userName 657 item.userName
658 }}</a-select-option> 658 }}</a-select-option>
659 </a-select> 659 </a-select>
@@ -679,7 +679,7 @@ @@ -679,7 +679,7 @@
679 <td> 679 <td>
680 <a-form-model-item prop="undertakerhm" style="margin-bottom: 0px"> 680 <a-form-model-item prop="undertakerhm" style="margin-bottom: 0px">
681 <a-select size="small" v-model="model.undertakerhm" placeholder="请选择承接人" allowClear> 681 <a-select size="small" v-model="model.undertakerhm" placeholder="请选择承接人" allowClear>
682 - <a-select-option v-for="(item, index) in options" :key="index" :value="item. userName">{{ 682 + <a-select-option v-for="(item, index) in options" :key="index" :value="item.userName">{{
683 item.userName 683 item.userName
684 }}</a-select-option> 684 }}</a-select-option>
685 </a-select> 685 </a-select>
@@ -705,7 +705,7 @@ @@ -705,7 +705,7 @@
705 <td> 705 <td>
706 <a-form-model-item prop="undertakerzp" style="margin-bottom: 0px"> 706 <a-form-model-item prop="undertakerzp" style="margin-bottom: 0px">
707 <a-select size="small" v-model="model.undertakerzp" placeholder="请选择承接人" allowClear> 707 <a-select size="small" v-model="model.undertakerzp" placeholder="请选择承接人" allowClear>
708 - <a-select-option v-for="(item, index) in options" :key="index" :value="item. userName">{{ 708 + <a-select-option v-for="(item, index) in options" :key="index" :value="item.userName">{{
709 item.userName 709 item.userName
710 }}</a-select-option> 710 }}</a-select-option>
711 </a-select> 711 </a-select>
@@ -740,7 +740,7 @@ @@ -740,7 +740,7 @@
740 <td> 740 <td>
741 <a-form-model-item prop="undertakerjig" style="margin-bottom: 0px"> 741 <a-form-model-item prop="undertakerjig" style="margin-bottom: 0px">
742 <a-select size="small" v-model="model.undertakerjig" placeholder="请选择承接人" allowClear> 742 <a-select size="small" v-model="model.undertakerjig" placeholder="请选择承接人" allowClear>
743 - <a-select-option v-for="(item, index) in options" :key="index" :value="item. userName">{{ 743 + <a-select-option v-for="(item, index) in options" :key="index" :value="item.userName">{{
744 item.userName 744 item.userName
745 }}</a-select-option> 745 }}</a-select-option>
746 </a-select> 746 </a-select>
@@ -766,7 +766,7 @@ @@ -766,7 +766,7 @@
766 <td> 766 <td>
767 <a-form-model-item prop="undertakerjuc" style="margin-bottom: 0px"> 767 <a-form-model-item prop="undertakerjuc" style="margin-bottom: 0px">
768 <a-select size="small" v-model="model.undertakerjuc" placeholder="请选择承接人" allowClear> 768 <a-select size="small" v-model="model.undertakerjuc" placeholder="请选择承接人" allowClear>
769 - <a-select-option v-for="(item, index) in options" :key="index" :value="item. userName">{{ 769 + <a-select-option v-for="(item, index) in options" :key="index" :value="item.userName">{{
770 item.userName 770 item.userName
771 }}</a-select-option> 771 }}</a-select-option>
772 </a-select> 772 </a-select>
@@ -793,7 +793,7 @@ @@ -793,7 +793,7 @@
793 <td> 793 <td>
794 <a-form-model-item prop="undertakermh1" style="margin-bottom: 0px"> 794 <a-form-model-item prop="undertakermh1" style="margin-bottom: 0px">
795 <a-select size="small" v-model="model.undertakermh1" placeholder="请选择承接人" allowClear> 795 <a-select size="small" v-model="model.undertakermh1" placeholder="请选择承接人" allowClear>
796 - <a-select-option v-for="(item, index) in options" :key="index" :value="item. userName">{{ 796 + <a-select-option v-for="(item, index) in options" :key="index" :value="item.userName">{{
797 item.userName 797 item.userName
798 }}</a-select-option> 798 }}</a-select-option>
799 </a-select> 799 </a-select>
@@ -819,7 +819,7 @@ @@ -819,7 +819,7 @@
819 <td> 819 <td>
820 <a-form-model-item prop="undertakermh2" style="margin-bottom: 0px"> 820 <a-form-model-item prop="undertakermh2" style="margin-bottom: 0px">
821 <a-select size="small" v-model="model.undertakermh2" placeholder="请选择承接人" allowClear> 821 <a-select size="small" v-model="model.undertakermh2" placeholder="请选择承接人" allowClear>
822 - <a-select-option v-for="(item, index) in options" :key="index" :value="item. userName">{{ 822 + <a-select-option v-for="(item, index) in options" :key="index" :value="item.userName">{{
823 item.userName 823 item.userName
824 }}</a-select-option> 824 }}</a-select-option>
825 </a-select> 825 </a-select>
@@ -845,7 +845,7 @@ @@ -845,7 +845,7 @@
845 <td> 845 <td>
846 <a-form-model-item prop="undertakerhm" style="margin-bottom: 0px"> 846 <a-form-model-item prop="undertakerhm" style="margin-bottom: 0px">
847 <a-select size="small" v-model="model.undertakerhm" placeholder="请选择承接人" allowClear> 847 <a-select size="small" v-model="model.undertakerhm" placeholder="请选择承接人" allowClear>
848 - <a-select-option v-for="(item, index) in options" :key="index" :value="item. userName">{{ 848 + <a-select-option v-for="(item, index) in options" :key="index" :value="item.userName">{{
849 item.userName 849 item.userName
850 }}</a-select-option> 850 }}</a-select-option>
851 </a-select> 851 </a-select>
@@ -887,8 +887,8 @@ export default { @@ -887,8 +887,8 @@ export default {
887 return { 887 return {
888 orderNumber: '', 888 orderNumber: '',
889 productType: '', 889 productType: '',
890 - zong:0,  
891 - yp:0, 890 + zong: 0,
  891 + yp: 0,
892 options: [], 892 options: [],
893 model: { 893 model: {
894 //接地 894 //接地
@@ -1016,11 +1016,13 @@ export default { @@ -1016,11 +1016,13 @@ export default {
1016 add(record) { 1016 add(record) {
1017 this.orderNumber = record.orderNumber 1017 this.orderNumber = record.orderNumber
1018 this.productType = record.productType 1018 this.productType = record.productType
1019 - this.zong=record.totalWork  
1020 - this.yp=record.pai  
1021 - console.log('派工订单号：', this.orderNumber, '产品类型：', this.productType,"总工时：",this.zong,"已派工时：",this.yp) 1019 + this.zong = record.totalWork
  1020 + this.yp = record.pai
  1021 +
1022 console.log('派发人：', this.userInfo().realname) 1022 console.log('派发人：', this.userInfo().realname)
1023 - if (this.productType === 'JD') { 1023 + //如果已派工时为0总工时*工时比例，否则（总工时-已派工时）*工时比例
  1024 + if (record.pai <= 0) {
  1025 + if (this.productType === 'JD') {
1024 this.model.workHoursjig = parseFloat((record.totalWork * 0.5).toFixed(2)).toString().replace(/(\.\d*?[1-9])0+$/, '$1') 1026 this.model.workHoursjig = parseFloat((record.totalWork * 0.5).toFixed(2)).toString().replace(/(\.\d*?[1-9])0+$/, '$1')
1025 this.model.workHoursqg = parseFloat((record.totalWork * 0.5).toFixed(2)).toString().replace(/(\.\d*?[1-9])0+$/, '$1') 1027 this.model.workHoursqg = parseFloat((record.totalWork * 0.5).toFixed(2)).toString().replace(/(\.\d*?[1-9])0+$/, '$1')
1026 this.model.workHoursjuc = record.totalWork * 0 1028 this.model.workHoursjuc = record.totalWork * 0
@@ -1058,19 +1060,59 @@ export default { @@ -1058,19 +1060,59 @@ export default {
1058 this.model.workHoursmh2 = parseFloat((record.totalWork * 0.3).toFixed(2)).toString().replace(/(\.\d*?[1-9])0+$/, '$1') 1060 this.model.workHoursmh2 = parseFloat((record.totalWork * 0.3).toFixed(2)).toString().replace(/(\.\d*?[1-9])0+$/, '$1')
1059 this.model.workHourshm = parseFloat((record.totalWork * 0.21).toFixed(2)).toString().replace(/(\.\d*?[1-9])0+$/, '$1') 1061 this.model.workHourshm = parseFloat((record.totalWork * 0.21).toFixed(2)).toString().replace(/(\.\d*?[1-9])0+$/, '$1')
1060 } 1062 }
  1063 + }else{
  1064 + if (this.productType === 'JD') {
  1065 + this.model.workHoursjig = parseFloat((record.pai * 0.5).toFixed(2)).toString().replace(/(\.\d*?[1-9])0+$/, '$1')
  1066 + this.model.workHoursqg = parseFloat((record.pai * 0.5).toFixed(2)).toString().replace(/(\.\d*?[1-9])0+$/, '$1')
  1067 + this.model.workHoursjuc = record.pai * 0
  1068 + this.model.workHourshg = record.pai * 0
  1069 + } else if (this.productType === 'XC') {
  1070 + this.model.workHoursjig = parseFloat(((record.totalWork-record.pai) * 0.2).toFixed(2)).toString().replace(/(\.\d*?[1-9])0+$/, '$1')
  1071 + this.model.workHoursjuc = parseFloat(((record.totalWork-record.pai) * 0.06).toFixed(2)).toString().replace(/(\.\d*?[1-9])0+$/, '$1')
  1072 + this.model.workHoursqg = parseFloat(((record.totalWork-record.pai) * 0.32).toFixed(2)).toString().replace(/(\.\d*?[1-9])0+$/, '$1')
  1073 + this.model.workHourshg = parseFloat(((record.totalWork-record.pai) * 0.42).toFixed(2)).toString().replace(/(\.\d*?[1-9])0+$/, '$1')
  1074 + } else if (this.productType === 'QZ') {
  1075 + this.model.workHoursjig = (record.totalWork-record.pai) * 0
  1076 + this.model.workHoursjuc = parseFloat(((record.totalWork-record.pai) * 0.5).toFixed(2)).toString().replace(/(\.\d*?[1-9])0+$/, '$1')
  1077 + this.model.workHoursqg = parseFloat(((record.totalWork-record.pai) * 0.5).toFixed(2)).toString().replace(/(\.\d*?[1-9])0+$/, '$1')
  1078 + this.model.workHourshg = (record.totalWork-record.pai) * 0
  1079 + } else if (this.productType === 'GX') {
  1080 + this.model.workHoursjig = parseFloat(((record.totalWork-record.pai) * 0.13).toFixed(2)).toString().replace(/(\.\d*?[1-9])0+$/, '$1')
  1081 + this.model.workHoursjuc = parseFloat(((record.totalWork-record.pai) * 0.05).toFixed(2)).toString().replace(/(\.\d*?[1-9])0+$/, '$1')
  1082 + this.model.workHoursqg = parseFloat(((record.totalWork-record.pai) * 0.17).toFixed(2)).toString().replace(/(\.\d*?[1-9])0+$/, '$1')
  1083 + this.model.workHoursmh1 = parseFloat(((record.totalWork-record.pai) * 0.17).toFixed(2)).toString().replace(/(\.\d*?[1-9])0+$/, '$1')
  1084 + this.model.workHoursmh2 = parseFloat(((record.totalWork-record.pai) * 0.14).toFixed(2)).toString().replace(/(\.\d*?[1-9])0+$/, '$1')
  1085 + this.model.workHourshm = parseFloat(((record.totalWork-record.pai) * 0.15).toFixed(2)).toString().replace(/(\.\d*?[1-9])0+$/, '$1')
  1086 + this.model.workHourszp = parseFloat(((record.totalWork-record.pai) * 0.19).toFixed(2)).toString().replace(/(\.\d*?[1-9])0+$/, '$1')
  1087 + } else if (this.productType === 'SJ') {
  1088 + this.model.workHoursjig = parseFloat(((record.totalWork-record.pai) * 0.13).toFixed(2)).toString().replace(/(\.\d*?[1-9])0+$/, '$1')
  1089 + this.model.workHoursjuc = parseFloat(((record.totalWork-record.pai) * 0.05).toFixed(2)).toString().replace(/(\.\d*?[1-9])0+$/, '$1')
  1090 + this.model.workHoursqg = parseFloat(((record.totalWork-record.pai) * 0.16).toFixed(2)).toString().replace(/(\.\d*?[1-9])0+$/, '$1')
  1091 + this.model.workHoursmh1 = parseFloat(((record.totalWork-record.pai) * 0.22).toFixed(2)).toString().replace(/(\.\d*?[1-9])0+$/, '$1')
  1092 + this.model.workHoursmh2 = parseFloat(((record.totalWork-record.pai) * 0.17).toFixed(2)).toString().replace(/(\.\d*?[1-9])0+$/, '$1')
  1093 + this.model.workHourshm = parseFloat(((record.totalWork-record.pai) * 0.16).toFixed(2)).toString().replace(/(\.\d*?[1-9])0+$/, '$1')
  1094 + this.model.workHourszp = parseFloat(((record.totalWork-record.pai) * 0.11).toFixed(2)).toString().replace(/(\.\d*?[1-9])0+$/, '$1')
  1095 + } else if (this.productType === 'FS') {
  1096 + this.model.workHoursjig = parseFloat(((record.totalWork-record.pai) * 0.1).toFixed(2)).toString().replace(/(\.\d*?[1-9])0+$/, '$1')
  1097 + this.model.workHoursjuc = parseFloat(((record.totalWork-record.pai) * 0.04).toFixed(2)).toString().replace(/(\.\d*?[1-9])0+$/, '$1')
  1098 + this.model.workHoursmh1 = parseFloat(((record.totalWork-record.pai) * 0.35).toFixed(2)).toString().replace(/(\.\d*?[1-9])0+$/, '$1')
  1099 + this.model.workHoursmh2 = parseFloat(((record.totalWork-record.pai) * 0.3).toFixed(2)).toString().replace(/(\.\d*?[1-9])0+$/, '$1')
  1100 + this.model.workHourshm = parseFloat(((record.totalWork-record.pai) * 0.21).toFixed(2)).toString().replace(/(\.\d*?[1-9])0+$/, '$1')
  1101 + }
  1102 + }
1061 }, 1103 },
1062 ...mapGetters(['nickname', 'avatar', 'userInfo']), 1104 ...mapGetters(['nickname', 'avatar', 'userInfo']),
1063 submitForm() { 1105 submitForm() {
1064 - const that = this 1106 + const that = this
1065 // 构造数据对象数组 1107 // 构造数据对象数组
1066 - let data = []; 1108 + let data = []
1067 // 触发表单验证 1109 // 触发表单验证
1068 this.$refs.form.validate((valid) => { 1110 this.$refs.form.validate((valid) => {
1069 if (valid) { 1111 if (valid) {
1070 that.confirmLoading = true 1112 that.confirmLoading = true
1071 if (this.productType === 'JD') { 1113 if (this.productType === 'JD') {
1072 // 构造需要发送的数据数组对象 1114 // 构造需要发送的数据数组对象
1073 - data = [ 1115 + data = [
1074 { 1116 {
1075 dispatchTime: new Date(), 1117 dispatchTime: new Date(),
1076 orderNumber: this.orderNumber, 1118 orderNumber: this.orderNumber,
@@ -1110,7 +1152,7 @@ export default { @@ -1110,7 +1152,7 @@ export default {
1110 ] 1152 ]
1111 } else if (this.productType === 'XC') { 1153 } else if (this.productType === 'XC') {
1112 // 构造需要发送的数据数组对象 1154 // 构造需要发送的数据数组对象
1113 - data = [ 1155 + data = [
1114 { 1156 {
1115 dispatchTime: new Date(), 1157 dispatchTime: new Date(),
1116 orderNumber: this.orderNumber, 1158 orderNumber: this.orderNumber,
@@ -1150,7 +1192,7 @@ export default { @@ -1150,7 +1192,7 @@ export default {
1150 ] 1192 ]
1151 } else if (this.productType === 'QZ') { 1193 } else if (this.productType === 'QZ') {
1152 // 构造需要发送的数据数组对象 1194 // 构造需要发送的数据数组对象
1153 - data = [ 1195 + data = [
1154 { 1196 {
1155 dispatchTime: new Date(), 1197 dispatchTime: new Date(),
1156 orderNumber: this.orderNumber, 1198 orderNumber: this.orderNumber,
@@ -1188,9 +1230,9 @@ export default { @@ -1188,9 +1230,9 @@ export default {
1188 workHours: this.model.workHourshg, 1230 workHours: this.model.workHourshg,
1189 }, 1231 },
1190 ] 1232 ]
1191 - }else if (this.productType === 'GX') { 1233 + } else if (this.productType === 'GX') {
1192 // 构造需要发送的数据数组对象 1234 // 构造需要发送的数据数组对象
1193 - data = [ 1235 + data = [
1194 { 1236 {
1195 dispatchTime: new Date(), 1237 dispatchTime: new Date(),
1196 orderNumber: this.orderNumber, 1238 orderNumber: this.orderNumber,
@@ -1254,12 +1296,10 @@ export default { @@ -1254,12 +1296,10 @@ export default {
1254 undertaker: this.model.undertakerzp, 1296 undertaker: this.model.undertakerzp,
1255 workHours: this.model.workHourszp, 1297 workHours: this.model.workHourszp,
1256 }, 1298 },
1257 -  
1258 -  
1259 ] 1299 ]
1260 - }else if (this.productType === 'SJ') { 1300 + } else if (this.productType === 'SJ') {
1261 // 构造需要发送的数据数组对象 1301 // 构造需要发送的数据数组对象
1262 - data = [ 1302 + data = [
1263 { 1303 {
1264 dispatchTime: new Date(), 1304 dispatchTime: new Date(),
1265 orderNumber: this.orderNumber, 1305 orderNumber: this.orderNumber,
@@ -1324,9 +1364,9 @@ export default { @@ -1324,9 +1364,9 @@ export default {
1324 workHours: this.model.workHourszp, 1364 workHours: this.model.workHourszp,
1325 }, 1365 },
1326 ] 1366 ]
1327 - }else if (this.productType === 'FS') { 1367 + } else if (this.productType === 'FS') {
1328 // 构造需要发送的数据数组对象 1368 // 构造需要发送的数据数组对象
1329 - data = [ 1369 + data = [
1330 { 1370 {
1331 dispatchTime: new Date(), 1371 dispatchTime: new Date(),
1332 orderNumber: this.orderNumber, 1372 orderNumber: this.orderNumber,
@@ -1345,7 +1385,7 @@ export default { @@ -1345,7 +1385,7 @@ export default {
1345 undertaker: this.model.undertakerjuc, 1385 undertaker: this.model.undertakerjuc,
1346 workHours: this.model.workHoursjuc, 1386 workHours: this.model.workHoursjuc,
1347 }, 1387 },
1348 - 1388 +
1349 { 1389 {
1350 dispatchTime: new Date(), 1390 dispatchTime: new Date(),
1351 orderNumber: this.orderNumber, 1391 orderNumber: this.orderNumber,
@@ -1373,106 +1413,145 @@ export default { @@ -1373,106 +1413,145 @@ export default {
1373 undertaker: this.model.undertakerhm, 1413 undertaker: this.model.undertakerhm,
1374 workHours: this.model.workHourshm, 1414 workHours: this.model.workHourshm,
1375 }, 1415 },
1376 -  
1377 ] 1416 ]
1378 } 1417 }
1379 //接地工时和 1418 //接地工时和
1380 - var jiedihe=this.model.workHoursjig+this.model.workHoursjuc+this.model.workHourshg+this.model.workHoursqg+this.yp 1419 + var jiedihe =
  1420 + parseFloat(this.model.workHoursjig) +
  1421 + parseFloat(this.model.workHoursjuc) +
  1422 + parseFloat(this.model.workHourshg) +
  1423 + parseFloat(this.model.workHoursqg) +
  1424 + parseFloat(this.yp)
1381 //线槽 1425 //线槽
1382 - var xche=this.model.workHoursjig+this.model.workHoursjuc+this.model.workHourshg+this.model.workHoursqg 1426 + var xche =
  1427 + parseFloat(this.model.workHoursjig) +
  1428 + parseFloat(this.model.workHoursjuc) +
  1429 + parseFloat(this.model.workHourshg) +
  1430 + parseFloat(this.model.workHoursqg) +
  1431 + parseFloat(this.yp)
1383 console.log(xche) 1432 console.log(xche)
1384 //卡子 1433 //卡子
1385 - var qzhe=this.model.workHoursjig+this.model.workHoursjuc+this.model.workHourshg+this.model.workHoursqg+this.yp 1434 + var qzhe =
  1435 + parseFloat(this.model.workHoursjig) +
  1436 + parseFloat(this.model.workHoursjuc) +
  1437 + parseFloat(this.model.workHourshg) +
  1438 + parseFloat(this.model.workHoursqg) +
  1439 + parseFloat(this.yp)
1386 //柜箱盒 1440 //柜箱盒
1387 - var gxhe=this.model.workHoursjig+this.model.workHoursjuc+this.model.workHoursqg+this.yp+this.model.workHoursmh1+this.model.workHoursmh2+this.model.workHourshm+this.model.workHourszp 1441 + var gxhe =
  1442 + parseFloat(this.model.workHoursjig) +
  1443 + parseFloat(this.model.workHoursjuc) +
  1444 + parseFloat(this.model.workHoursqg) +
  1445 + parseFloat(this.yp) +
  1446 + parseFloat(this.model.workHoursmh1) +
  1447 + parseFloat(this.model.workHoursmh2) +
  1448 + parseFloat(this.model.workHourshm) +
  1449 + parseFloat(this.model.workHourszp)
1388 //司机室 1450 //司机室
1389 - var sjshe=this.model.workHoursjig+this.model.workHoursjuc+this.model.workHoursqg+this.yp+this.model.workHoursmh1+this.model.workHoursmh2+this.model.workHourshm+this.model.workHourszp 1451 + var sjshe =
  1452 + parseFloat(this.model.workHoursjig) +
  1453 + parseFloat(this.model.workHoursjuc) +
  1454 + parseFloat(this.model.workHoursqg) +
  1455 + parseFloat(this.yp) +
  1456 + parseFloat(this.model.workHoursmh1) +
  1457 + parseFloat(this.model.workHoursmh2) +
  1458 + parseFloat(this.model.workHourshm) +
  1459 + parseFloat(this.model.workHourszp)
1390 //附属钢 1460 //附属钢
1391 - var fsghe=this.model.workHoursjig+this.model.workHoursjuc+this.yp+this.model.workHoursmh1+this.model.workHoursmh2+this.model.workHourshm  
1392 -  
1393 - if(this.productType === 'JD' && data.workHours<=this.zong && jiedihe<=this.zong){ 1461 + var fsghe =
  1462 + parseFloat(this.model.workHoursjig) +
  1463 + parseFloat(this.model.workHoursjuc) +
  1464 + parseFloat(this.yp) +
  1465 + parseFloat(this.model.workHoursmh1) +
  1466 + parseFloat(this.model.workHoursmh2) +
  1467 + parseFloat(this.model.workHourshm)
  1468 + console.log(this.productType)
  1469 + console.log(this.zong)
  1470 + if(this.zong-this.yp===0){
  1471 + that.$message.error('工时已派完')
  1472 + that.confirmLoading = false
  1473 + }else if (this.productType === 'JD' && jiedihe <= this.zong) {
1394 addPg(this.url.add, data) 1474 addPg(this.url.add, data)
1395 - .then((res) => {  
1396 - if (res.success) {  
1397 - that.$message.success(res.message)  
1398 - that.$emit('ok')  
1399 - } else {  
1400 - that.$message.warning(res.message)  
1401 - }  
1402 - })  
1403 - .finally(() => {  
1404 - that.confirmLoading = false  
1405 - })  
1406 - }else if(this.productType === 'XC' && data.workHours<=this.zong && xche<=this.zong){ 1475 + .then((res) => {
  1476 + if (res.success) {
  1477 + that.$message.success(res.message)
  1478 + that.$emit('ok')
  1479 + } else {
  1480 + that.$message.warning(res.message)
  1481 + }
  1482 + })
  1483 + .finally(() => {
  1484 + that.confirmLoading = false
  1485 + })
  1486 + } else if (this.productType === 'XC' && xche <= this.zong) {
1407 addPg(this.url.add, data) 1487 addPg(this.url.add, data)
1408 - .then((res) => {  
1409 - if (res.success) {  
1410 - that.$message.success(res.message)  
1411 - that.$emit('ok')  
1412 - } else {  
1413 - that.$message.warning(res.message)  
1414 - }  
1415 - })  
1416 - .finally(() => {  
1417 - that.confirmLoading = false  
1418 - })  
1419 - }else if(this.productType === 'QZ' && data.workHours<=this.zong && qzhe<=this.zong){ 1488 + .then((res) => {
  1489 + if (res.success) {
  1490 + that.$message.success(res.message)
  1491 + that.$emit('ok')
  1492 + } else {
  1493 + that.$message.warning(res.message)
  1494 + }
  1495 + })
  1496 + .finally(() => {
  1497 + that.confirmLoading = false
  1498 + })
  1499 + } else if (this.productType === 'QZ' && qzhe <= this.zong) {
1420 addPg(this.url.add, data) 1500 addPg(this.url.add, data)
1421 - .then((res) => {  
1422 - if (res.success) {  
1423 - that.$message.success(res.message)  
1424 - that.$emit('ok')  
1425 - } else {  
1426 - that.$message.warning(res.message)  
1427 - }  
1428 - })  
1429 - .finally(() => {  
1430 - that.confirmLoading = false  
1431 - })  
1432 - }else if(this.productType === 'GX' && data.workHours<=this.zong && gxhe<=this.zong){ 1501 + .then((res) => {
  1502 + if (res.success) {
  1503 + that.$message.success(res.message)
  1504 + that.$emit('ok')
  1505 + } else {
  1506 + that.$message.warning(res.message)
  1507 + }
  1508 + })
  1509 + .finally(() => {
  1510 + that.confirmLoading = false
  1511 + })
  1512 + } else if (this.productType === 'GX' && gxhe <= this.zong) {
1433 addPg(this.url.add, data) 1513 addPg(this.url.add, data)
1434 - .then((res) => {  
1435 - if (res.success) {  
1436 - that.$message.success(res.message)  
1437 - that.$emit('ok')  
1438 - } else {  
1439 - that.$message.warning(res.message)  
1440 - }  
1441 - })  
1442 - .finally(() => {  
1443 - that.confirmLoading = false  
1444 - })  
1445 - }else if(this.productType === 'SJ' && data.workHours<=this.zong && sjshe<=this.zong){ 1514 + .then((res) => {
  1515 + if (res.success) {
  1516 + that.$message.success(res.message)
  1517 + that.$emit('ok')
  1518 + } else {
  1519 + that.$message.warning(res.message)
  1520 + }
  1521 + })
  1522 + .finally(() => {
  1523 + that.confirmLoading = false
  1524 + })
  1525 + } else if (this.productType === 'SJ' && sjshe <= this.zong) {
1446 addPg(this.url.add, data) 1526 addPg(this.url.add, data)
1447 - .then((res) => {  
1448 - if (res.success) {  
1449 - that.$message.success(res.message)  
1450 - that.$emit('ok')  
1451 - } else {  
1452 - that.$message.warning(res.message)  
1453 - }  
1454 - })  
1455 - .finally(() => {  
1456 - that.confirmLoading = false  
1457 - })  
1458 - }else if(this.productType === 'FS' && data.workHours<=this.zong && fsghe<=this.zong){ 1527 + .then((res) => {
  1528 + if (res.success) {
  1529 + that.$message.success(res.message)
  1530 + that.$emit('ok')
  1531 + } else {
  1532 + that.$message.warning(res.message)
  1533 + }
  1534 + })
  1535 + .finally(() => {
  1536 + that.confirmLoading = false
  1537 + })
  1538 + } else if (this.productType === 'FS' && fsghe <= this.zong) {
1459 addPg(this.url.add, data) 1539 addPg(this.url.add, data)
1460 - .then((res) => {  
1461 - if (res.success) {  
1462 - that.$message.success(res.message)  
1463 - that.$emit('ok')  
1464 - } else {  
1465 - that.$message.warning(res.message)  
1466 - }  
1467 - })  
1468 - .finally(() => {  
1469 - that.confirmLoading = false  
1470 - })  
1471 - }else{  
1472 - that.$message.error("派发工时超过总工时") 1540 + .then((res) => {
  1541 + if (res.success) {
  1542 + that.$message.success(res.message)
  1543 + that.$emit('ok')
  1544 + } else {
  1545 + that.$message.warning(res.message)
  1546 + }
  1547 + })
  1548 + .finally(() => {
  1549 + that.confirmLoading = false
  1550 + })
  1551 + }else {
  1552 + that.$message.error('派发工时超过总工时')
1473 that.confirmLoading = false 1553 that.confirmLoading = false
1474 } 1554 }
1475 -  
1476 } 1555 }
1477 }) 1556 })
1478 }, 1557 },
@@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
21 </p> 21 </p>
22 <p style="margin-bottom: -5px; margin-left: 50px"> 22 <p style="margin-bottom: -5px; margin-left: 50px">
23 <span>产品类型：</span 23 <span>产品类型：</span
24 - ><a-input v-model="model.productType" style="width: 200px; border: 0px; font-weight: bold"></a-input> 24 + ><a-input v-model="this.productType" style="width: 200px; border: 0px; font-weight: bold"></a-input>
25 </p> 25 </p>
26 <p style="margin-bottom: -5px; margin-left: 50px"> 26 <p style="margin-bottom: -5px; margin-left: 50px">
27 <span>任务下达时间：</span 27 <span>任务下达时间：</span
@@ -44,7 +44,7 @@ @@ -44,7 +44,7 @@
44 ><a-input v-model="model.totalWork" style="width: 200px; border: 0px; font-weight: bold"></a-input> 44 ><a-input v-model="model.totalWork" style="width: 200px; border: 0px; font-weight: bold"></a-input>
45 </p> 45 </p>
46 <p style="margin-left: 50px"> 46 <p style="margin-left: 50px">
47 - <span>已派发工时：</span><a-input v-model="model.pai" style="width: 200px; border: 0px"></a-input> 47 + <span>已派发工时：</span><a-input v-model="model.pai" style="width: 200px; border: 0px; font-weight: bold"></a-input>
48 </p> 48 </p>
49 <!-- 图片容器 --> 49 <!-- 图片容器 -->
50 50
@@ -111,6 +111,7 @@ export default { @@ -111,6 +111,7 @@ export default {
111 }, 111 },
112 data() { 112 data() {
113 return { 113 return {
  114 + productType:'',
114 picList: '', 115 picList: '',
115 show: '', 116 show: '',
116 num: 0, 117 num: 0,
@@ -219,6 +220,19 @@ export default { @@ -219,6 +220,19 @@ export default {
219 this.num = e 220 this.num = e
220 }, 221 },
221 querygx(orderNumber, productType) { 222 querygx(orderNumber, productType) {
  223 + if(this.model.productType === '接地'){
  224 + this.model.productType='JD'
  225 + }else if(this.model.productType === '线槽'){
  226 + this.model.productType= 'XC'
  227 + }else if(this.model.productType === '卡子'){
  228 + this.model.productType= 'QZ'
  229 + }else if(this.model.productType === '司机室'){
  230 + this.model.productType= 'SJ'
  231 + }else if(this.model.productType === '柜、箱、盒'){
  232 + this.model.productType= 'GX'
  233 + }else if(this.model.productType === '附属钢'){
  234 + this.model.productType= 'FS'
  235 + }
222 querygx(this.url.querygx, this.model).then((res) => { 236 querygx(this.url.querygx, this.model).then((res) => {
223 console.log('工序订单号：', orderNumber) 237 console.log('工序订单号：', orderNumber)
224 console.log('工序产品类型：', productType) 238 console.log('工序产品类型：', productType)
@@ -229,28 +243,38 @@ export default { @@ -229,28 +243,38 @@ export default {
229 queryBynumber(orderNumber) { 243 queryBynumber(orderNumber) {
230 console.log('1订单号：', orderNumber) 244 console.log('1订单号：', orderNumber)
231 if(this.model.productType === '接地'){ 245 if(this.model.productType === '接地'){
232 - this.model.productType='JD' 246 + this.productType='接地'
233 }else if(this.model.productType === '线槽'){ 247 }else if(this.model.productType === '线槽'){
234 - this.model.productType= 'XC' 248 + this.productType= '线槽'
235 }else if(this.model.productType === '卡子'){ 249 }else if(this.model.productType === '卡子'){
236 - this.model.productType= 'QZ' 250 + this.productType= '卡子'
237 }else if(this.model.productType === '司机室'){ 251 }else if(this.model.productType === '司机室'){
238 - this.model.productType= 'SJ' 252 + this.productType= '司机室'
239 }else if(this.model.productType === '柜、箱、盒'){ 253 }else if(this.model.productType === '柜、箱、盒'){
240 - this.model.productType= 'GX' 254 + this.productType= '柜、箱、盒'
241 }else if(this.model.productType === '附属钢'){ 255 }else if(this.model.productType === '附属钢'){
242 - this.model.productType= 'FS' 256 + this.productType= '附属钢'
243 } 257 }
244 - queryBynumber(this.url.queryBynumber, this.model).then((res) => {  
245 - console.log(res.result)  
246 - this.imageSrc = res.result.pics  
247 - this.files = res.result.files  
248 - var picList = res.result.pics.split(',')  
249 - this.picList = picList  
250 - this.show = this.picList[0]  
251 - console.log('files:', this.files)  
252 - console.log(this.imageSrc)  
253 - }) 258 + queryBynumber(this.url.queryBynumber, { orderNumber: orderNumber }).then((res) => {
  259 +
  260 + if (res.result) {
  261 + const result = res.result;
  262 + if (result.designPic) {
  263 + this.imageSrc = result.designPic;
  264 + this.picList = result.designPic.split(',');
  265 + this.show = this.picList[0];
  266 + }
  267 + if (result.designFile) {
  268 + this.designFile = result.designFile;
  269 + console.log('files:', this.designFile);
  270 + }
  271 + } else {
  272 + console.log('Response result or required properties are missing.');
  273 + }
  274 + })
  275 + .catch((error) => {
  276 + console.error('Error while fetching data:', error);
  277 + });
254 }, 278 },
255 add() { 279 add() {
256 this.edit(this.modelDefault) 280 this.edit(this.modelDefault)