seimin 4 months ago
parent
commit
879255d0ee

+ 1 - 1
proxy.conf.json

@@ -1,6 +1,6 @@
1 1
 {
2 2
   "/service": {
3
-		"target": "http://192.168.4.105",
3
+		"target": "http://192.168.3.108",
4 4
     "logLevel": "debug",
5 5
     "changeOrigin": true,
6 6
     "pathRewrite": {

+ 1 - 0
src/app/components/build-quick-confirm/build-quick-confirm.component.less

@@ -82,6 +82,7 @@
82 82
   }
83 83
   .modalBody_box {
84 84
     width: 100%;
85
+    min-width: 0;
85 86
     height: 100%;
86 87
     display: flex;
87 88
     flex-direction: column;

+ 6 - 2
src/app/views/hushijiandan/hushijiandan.component.ts

@@ -3356,9 +3356,9 @@ export class HushijiandanComponent implements OnInit {
3356 3356
       return;
3357 3357
     }
3358 3358
     shortcutForm && (this.isShowBuildQuickConfirm = false);
3359
-    this.otherBuildOrder();
3359
+    this.otherBuildOrder(undefined, buildType);
3360 3360
   }
3361
-  otherBuildOrder(otherList?){
3361
+  otherBuildOrder(otherList?,buildType?){
3362 3362
     var that = this;
3363 3363
     // 其他
3364 3364
     let workOrderRemark = '';
@@ -3402,6 +3402,7 @@ export class HushijiandanComponent implements OnInit {
3402 3402
       .subscribe((data) => {
3403 3403
         this.message.remove(this.jdFlagId);
3404 3404
         that.loading5 = false;
3405
+
3405 3406
         if (data.status == 200 && (that.buildType == "other" || that.buildType == "ordinary")) {
3406 3407
           that.showPromptModal("创建", true, "", that.buildType);
3407 3408
           this.getTodayNum();
@@ -3418,6 +3419,9 @@ export class HushijiandanComponent implements OnInit {
3418 3419
         } else {
3419 3420
           that.showPromptModal("创建", false, data.msg);
3420 3421
         }
3422
+
3423
+        // 重置
3424
+        this.getDeptTaskType();
3421 3425
       });
3422 3426
     })
3423 3427
   }

+ 1 - 1
src/app/views/keep-order-config/keep-order-config.component.html

@@ -30,7 +30,7 @@
30 30
             <td>{{ data.endDept?.name }}</td>
31 31
             <td>{{ data.copyRemark === 1 ? '是' : '否' }}</td>
32 32
             <td>{{ data.getOrderType?.name }}</td>
33
-            <td>{{ data.getOrderRange === 4 ? '待到达' : '待送达' }}</td>
33
+            <td>{{ data.getOrderRange === 4 ? '待到达' : (data.getOrderRange === 5 ? '待送达' : '') }}</td>
34 34
             <td>{{ data.active === 1 ? '是' : '否' }}</td>
35 35
             <td>
36 36
               <div class="coop">