Merge branch 'dev' of http://60.209.125.238:20010/lijingjia/ds-wms-client-web into dev

src/views/taskmanage/index.vue

@@ -1593,7 +1593,7 @@ function laraRecordFun() {
 function expandIcon(props) {
   if (props.record.childTaskCount > 0) {
     return h('div', { class: 'expDiv', onClick: (e) => props.onExpand(props.record, e) },
-      [h('i', { class: 'iconfont icon-icon_tianjia iconExp' }),
+      [h('i', { class: 'iconfont icon-piliangxiaxian iconExp' }),
       h('div', { class: 'expNum' }, props.record.childTaskCount)])
   }
 }
@@ -1959,6 +1959,7 @@ function handleClickTree(row, index) {
 
 :deep(.iconExp) {
   cursor: pointer;
+  color: #257afa;
   font-size: 17px;
 }
 

src/views/taskmanage/taskList/BLConfirmation/index.vue

@@ -150,11 +150,11 @@
     // 是否自动同步更新主任务状态   (嵇工 说 最好是手动设置一下确保万无一失)
     ApiData.autoSync = true
     let res: any = null
-    if (isMainBL.value) {
+    // if (isMainBL.value) {
-      res = await SetTaskStatus(ApiData)
+    // res = await SetTaskStatus(ApiData)
-    } else {
+    // } else {
     res = await SetSteps(ApiData)
-    }
+    // }
     if (res.succeeded) {
       createMessage.success(res.message)
       init(true)