rev:海柔业务

wcs/nladmin-ui/src/views/acs/device/driver/hailiang_hr_ssx_station.vue

@@ -85,13 +85,13 @@
 
         <el-row>
           <el-col :span="8">
-            <el-form-item label="申请空框" >
+            <el-form-item label="申请空框">
               <el-switch v-model="form.apply_task" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="申请空框数量" label-width="150px">
-              <el-input v-model="form.apply_num" />
+            <el-form-item label="容器到达通知" label-width="150px">
+              <el-switch v-model="form.containerArrived" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -118,6 +118,16 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="申请空框数量" label-width="150px">
+              <el-input v-model="form.apply_num" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="输送线编码" label-width="150px">
+              <el-input v-model="form.aa" />
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
     </el-card>
@@ -277,7 +287,8 @@ export default {
         apply_empty: [],
         manual_create_task: true,
         is_pickup: true,
-        is_release: true
+        is_release: true,
+        containerArrived: false
       },
       rules: {}
     }

wcs/nladmin-ui/src/views/acs/task/index.vue

@@ -102,7 +102,7 @@
               />
             </el-select>
           </el-form-item>
-           <el-form-item v-if="form.task_type == '10'" label="立库任务类型">
+          <el-form-item v-if="form.task_type == '18'" label="立库任务类型">
             <el-select
               v-model="form.storage_task_type"
               style="width: 370px;"