Merge branch 'master' of http://121.40.234.130:8899/wangs/niuDiXiYa3

lms/nladmin-ui/src/settings.js

@@ -40,7 +40,7 @@ module.exports = {
   /**
    * @description token key
    */
-  TokenKey: 'EL-ADMIN-TOEKN',
+  TokenKey: 'NL-LMS-TOEKN',
   /**
    * @description 请求超时时间，毫秒（默认2分钟）
    */

lms/nladmin-ui/src/views/wms/sch/point/index.vue

@@ -195,7 +195,7 @@
             <el-input v-model="form.point_id" style="width: 370px;"/>
           </el-form-item>
           <el-form-item label="点位编码" prop="point_code">
-            <el-input v-model="form.point_code" style="width: 370px;" :disabled="this.form.point_type==='01'"/>
+            <el-input v-model="form.point_code" style="width: 370px;" :disabled="crud.status.edit > 0"/>
           </el-form-item>
           <el-form-item label="点位名称" prop="point_name">
             <el-input v-model="form.point_name" style="width: 370px;" :disabled="this.form.point_type==='01'"/>

lms/nladmin-ui/src/views/wms/sch/task/index.vue

@@ -79,7 +79,7 @@
             />
           </el-form-item>
 
-          <el-form-item label="任务状态">
+          <!-- <el-form-item label="任务状态">
             <el-select
               v-model="query.task_status"
               multiple
@@ -96,8 +96,28 @@
                 :value="item.code"
               />
             </el-select>
+          </el-form-item> -->
+          <el-form-item label="任务状态">
+            <el-select
+              v-model="query.task_status"
+              style="width: 400px"
+              placeholder="任务状态"
+              class="filter-item"
+              clearable
+            >
+              <el-option
+                label="未完成"
+                value="-1"
+              />
+              <el-option
+                v-for="item in dict.task_status"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
           </el-form-item>
-          <rrOperation />
+          <rrOperation :crud="crud" />
         </el-form>
 
       </div>
@@ -116,14 +136,14 @@
         <el-table-column v-if="false" prop="task_id" label="任务标识" min-width="150" show-overflow-tooltip />
         <el-table-column v-if="false" prop="material_id" label="物料标识" min-width="150" show-overflow-tooltip />
         <el-table-column prop="task_code" label="任务编码" min-width="100" show-overflow-tooltip />
-        <el-table-column prop="task_type" label="任务类型" />
+        <el-table-column v-if="false" prop="task_type" label="任务类型" />
         <el-table-column v-if="false" prop="acs_task_type" label="acs任务类型" min-width="120" show-overflow-tooltip >
           <template slot-scope="scope">
             {{ dict.label.acs_task_type[scope.row.acs_task_type] }}
           </template>
         </el-table-column>
         <el-table-column v-if="false" prop="task_name" label="任务描述" min-width="120" show-overflow-tooltip />
-        <el-table-column v-if="false" prop="task_type_name" label="任务类型" min-width="120" show-overflow-tooltip />
+        <el-table-column prop="task_type_name" label="任务类型" min-width="120" show-overflow-tooltip />
         <el-table-column v-if="false" prop="task_status" label="任务状态" />
         <el-table-column prop="task_status_name" label="任务状态" width="95px" :formatter="formatTaskStatusName" />
         <el-table-column v-if="false" prop="vehicle_type" label="载具类型" min-width="100" show-overflow-tooltip >
@@ -205,7 +225,7 @@ import crudClassstandard from '@/api/wms/basedata/classstandard'
 
 export default {
   name: 'Task',
-  dicts: ['acs_task_type', 'vehicle_type'],
+  dicts: ['acs_task_type', 'vehicle_type', 'task_status'],
   components: {
     pagination, crudOperation, rrOperation, Treeselect, udOperation
   },
@@ -218,7 +238,7 @@ export default {
       sort: 'task_id,desc',
       crudMethod: { ...crudTask },
       query: {
-        task_code: '', vehicle_code: '', start_point_code: '', next_point_code: '', task_type: '', finished_type: '', task_status: ''
+        task_code: '', vehicle_code: '', start_point_code: '', next_point_code: '', task_type: '', finished_type: '', task_status: '-1'
       },
       optShow: {
         add: false,
@@ -254,7 +274,7 @@ export default {
     crudTask.getFinishType().then(data => {
       this.finishTypeList = data
     })
-    this.crud.query.task_status = ['-1']
+    // this.crud.query.task_status = ['-1']
     this.crud.toQuery()
   },
   methods: {

lms/nladmin-ui/src/views/wms/st/vm/index.vue

@@ -129,7 +129,7 @@ export default {
       title: '组盘',
       optShow: { reset: true, del: true },
       url: 'api/vm',
-      idField: 'vm_id',
+      idField: 'vehicle_id',
       sort: 'vm_id,desc',
       crudMethod: { ...crudVM }
     })

lms/nladmin-ui/src/views/wms/st/ysa/index.vue

@@ -7,10 +7,10 @@
       </el-tab-pane>
       <el-tab-pane v-if="false" label="修改记录">
       </el-tab-pane>
-      <el-tab-pane label="入库管理">
+      <el-tab-pane v-if="false" label="入库管理">
         <ysq-in-region/>
       </el-tab-pane>
-      <el-tab-pane label="出库管理">
+      <el-tab-pane v-if="false" label="出库管理">
         <ysq-out-region/>
       </el-tab-pane>
     </el-tabs>

lms/nladmin-ui/src/views/wms/st/ysa/inventory.vue

@@ -391,7 +391,7 @@ export default {
     }
   },
   created() {
-    this.getPointStatusList('1557539288307077120')
+    // this.getPointStatusList('1557539288307077120')
   },
   methods: {
     // 钩子：在获取表格数据之前执行，false 则代表不获取数据