opt:优化点位及任务相关查询，操作

wms_pro/qd/src/views/wms/dispatch_manage/point/index.vue

@@ -39,17 +39,16 @@
           <el-form-item label="区域类型">
             <el-select
               v-model="query.region_code"
-              clearable
-              filterable
-              size="mini"
               placeholder="区域类型"
               class="filter-item"
-              @change="getPointStatusAndTypeList(query.region_code, 1)"
+              clearable
+              @change="hand"
             >
               <el-option
-                v-for="item in regionList"
-                :label="item.region_name"
-                :value="item.region_code"
+                v-for="item in statusEnum.REGION_INFO"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
               />
             </el-select>
           </el-form-item>
@@ -63,21 +62,29 @@
               @change="hand"
             >
               <el-option
-                v-for="item in pointTypesList"
+                v-for="item in statusEnum.POINT_TYPE"
+                :key="item.value"
                 :label="item.label"
                 :value="item.value"
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="是否锁定">
-            <el-switch
+          <el-form-item label="锁定类型">
+            <el-select
               v-model="query.lock_type"
-              active-value="1"
-              inactive-value="0"
-              active-color="#409EFF"
-              inactive-color="#C0CCDA"
+              clearable
+              size="mini"
+              placeholder="锁定类型"
+              class="filter-item"
               @change="hand"
-            />
+            >
+              <el-option
+                v-for="item in statusEnum.LOCK"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
           </el-form-item>
           <rrOperation/>
         </el-form>
@@ -97,6 +104,7 @@
           <el-form-item label="生产车间" prop="product_area">
             <el-select
               v-model="form.product_area"
+              disabled
               placeholder=""
               style="width: 370px"
             >
@@ -110,6 +118,7 @@
           </el-form-item>
           <el-form-item label="所属区域" prop="region_code">
             <el-select
+              disabled
               v-model="form.region_code"
               placeholder="请选择"
               style="width: 370px;"
@@ -122,10 +131,28 @@
             </el-select>
           </el-form-item>
           <el-form-item label="点位编码" prop="code">
-            <el-input v-model="form.code" style="width: 370px;"/>
+            <el-input v-model="form.code" disabled style="width: 370px;"/>
           </el-form-item>
           <el-form-item label="点位名称" prop="name">
-            <el-input v-model="form.name" style="width: 370px;"/>
+            <el-input v-model="form.name" disabled style="width: 370px;"/>
+          </el-form-item>
+          <el-form-item label="载具编码" prop="vehicle_code">
+            <el-input v-model="form.vehicle_code" clearable style="width: 370px;"/>
+          </el-form-item>
+          <el-form-item label="绑定/解绑" prop="priority">
+            <el-select
+              v-model="form.priority"
+              size="mini"
+              placeholder="绑定/解绑"
+              class="filter-item"
+              style="width: 370px;"
+            >
+              <el-option
+                v-for="item in statusEnum.BIND_TYPE"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
           </el-form-item>
           <el-form-item label="锁定类型" prop="lock_type">
             <el-select
@@ -160,15 +187,13 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="载具编码" prop="vehicle_code">
-            <el-input v-model="form.vehicle_code" clearable style="width: 370px;"/>
-          </el-form-item>
+
           <el-form-item label="位置" prop="point_location">
             <el-input v-model="form.point_location" clearable style="width: 370px;"/>
           </el-form-item>
-          <el-form-item label="优先级" prop="priority">
-            <el-input v-model="form.priority" clearable style="width: 370px;"/>
-          </el-form-item>
+<!--          <el-form-item label="优先级" prop="priority">-->
+<!--            <el-input v-model="form.priority" clearable style="width: 370px;"/>-->
+<!--          </el-form-item>-->
           <el-form-item label="表单数据" prop="form_data">
             <el-input type="textarea" v-model="form.form_data" clearable style="width: 370px;"/>
           </el-form-item>
@@ -194,26 +219,30 @@
         <el-table-column prop="code" label="点位编码" sortable width="120" show-overflow-tooltip />
         <el-table-column prop="name" label="点位名称" width="150" sortable show-overflow-tooltip/>
         <el-table-column prop="region_code" label="区域编码" min-width="120" show-overflow-tooltip/>
-        <el-table-column prop="group_code" label="点位组编码" min-width="120" show-overflow-tooltip/>
-        <el-table-column prop="point_location" label="位置" min-width="120" show-overflow-tooltip/>
-        <el-table-column prop="point_type_name" label="点位类型"/>
+        <el-table-column prop="point_type" label="点位类型">
+          <template slot-scope="scope">
+            {{ scope.row.point_type == '1' ? '满货架' : '空货架' }}
+          </template>
+        </el-table-column>
         <el-table-column prop="lock_type" label="锁定类型" min-width="120" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ statusEnum.label.LOCK[scope.row.lock_type] }}
           </template>
         </el-table-column>
-        <el-table-column prop="priority" label="优先级"/>
-        <el-table-column prop="vehicle_code" label="载具编码" min-width="120" show-overflow-tooltip/>
-        <el-table-column prop="form_data" label="表单数据" min-width="120" show-overflow-tooltip/>
-        <el-table-column prop="remark" label="备注" min-width="100" show-overflow-tooltip/>
         <el-table-column prop="is_used" label="是否启用">
           <template slot-scope="scope">
             {{ scope.row.is_used == '1' ? '是' : '否' }}
           </template>
         </el-table-column>
+        <el-table-column prop="vehicle_code" label="载具编码" min-width="120" show-overflow-tooltip/>
+        <el-table-column prop="priority" label="优先级"/>
+        <el-table-column prop="point_location" label="位置" min-width="120" show-overflow-tooltip/>
+        <el-table-column prop="group_code" label="点位组编码" min-width="120" show-overflow-tooltip/>
+        <el-table-column prop="form_data" label="表单数据" min-width="120" show-overflow-tooltip/>
+        <el-table-column prop="remark" label="备注" min-width="100" show-overflow-tooltip/>
         <el-table-column prop="create_name" label="创建人"/>
         <el-table-column prop="create_time" label="创建时间" width="150"/>
-        <el-table-column prop="update_name" label="修改人"/>
+        <el-table-column prop="update_name" label="修改人"  width="100"/>
         <el-table-column prop="update_time" label="修改时间" width="150"/>
         <el-table-column
           v-permission="[]"
@@ -267,7 +296,7 @@ const defaultForm = {
 export default {
   name: 'Point',
   dicts: ['storagevehicle_type', 'd_lock_type', 'SCH_TASK_TYPE_DTL', 'point_location', 'product_area'],
-  statusEnums: ['LOCK'],
+  statusEnums: ['LOCK','REGION_INFO','POINT_TYPE','BIND_TYPE'],
   components: {pagination, crudOperation, rrOperation, udOperation},
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {
@@ -284,7 +313,7 @@ export default {
       },
       crudMethod: {...crudPoint},
       query: {
-        product_area: 'A1'
+        product_area: 'A2'
       }
     })
   },
@@ -307,6 +336,9 @@ export default {
         point_type: [
           {required: true, message: '点位类型不能为空', trigger: 'blur'}
         ],
+        priority: [
+          {required: true, message: '绑定或解绑操作不能为空', trigger: 'blur'}
+        ],
         lock_type: [
           {required: true, message: '锁定类型不能为空', trigger: 'blur'}
         ]

wms_pro/qd/src/views/wms/dispatch_manage/task/index.vue

@@ -78,6 +78,24 @@
               />
             </el-select>
           </el-form-item>
+          <el-form-item label="任务类型">
+            <el-select
+              v-model="query.task_type"
+              multiple
+              style="width: 360px"
+              placeholder="任务类型"
+              class="filter-item"
+              clearable
+              @change="handTaskStatus"
+            >
+              <el-option
+                v-for="item in statusEnum.TASK_TYPE"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
           <rrOperation />
         </el-form>
       </div>
@@ -162,37 +180,39 @@
         <el-table-column prop="product_area" show-overflow-tooltip show-tooltip-when-overflow label="生产区域" />
         <el-table-column prop="id" show-overflow-tooltip show-tooltip-when-overflow label="任务ID" />
         <el-table-column prop="task_code" show-overflow-tooltip show-tooltip-when-overflow label="任务编码" />
-        <el-table-column prop="task_type" show-overflow-tooltip show-tooltip-when-overflow label="任务类型">
+        <el-table-column prop="task_type" show-overflow-tooltip show-tooltip-when-overflow width="140"  label="任务类型">
           <template slot-scope="scope">
             {{ statusEnum.label.TASK_TYPE[scope.row.task_type] }}
           </template>
         </el-table-column>
-        <el-table-column prop="vehicle_code" show-overflow-tooltip show-tooltip-when-overflow label="载具编码">
+        <el-table-column prop="vehicle_code" show-overflow-tooltip show-tooltip-when-overflow :min-width="flexWidth('vehicle_code',crud.data,'载具编码')"  label="载具编码">
           <template slot-scope="scope">
             {{ scope.row.vehicle_code ? scope.row.vehicle_code : '-' }}
           </template>
         </el-table-column>
-        <el-table-column prop="acs_type" show-overflow-tooltip show-tooltip-when-overflow width="130" label="ACS任务类型" />
+
         <el-table-column prop="status" show-overflow-tooltip show-tooltip-when-overflow label="任务状态">
           <template slot-scope="scope">
             {{ statusEnum.label.FORM_STATUS[scope.row.status] }}
           </template>
         </el-table-column>
-        <el-table-column prop="task_step" show-overflow-tooltip show-tooltip-when-overflow width="130" label="任务执行步骤" />
-        <el-table-column prop="group_code" show-overflow-tooltip show-tooltip-when-overflow label="任务组" />
+
         <el-table-column prop="point_code1" show-overflow-tooltip show-tooltip-when-overflow width="130" label="起点1" />
         <el-table-column prop="point_code2" show-overflow-tooltip show-tooltip-when-overflow width="130" label="终点1" />
         <el-table-column prop="point_code3" show-overflow-tooltip show-tooltip-when-overflow width="130" label="起点2" />
         <el-table-column prop="point_code4" show-overflow-tooltip show-tooltip-when-overflow width="130" label="终点2" />
-
+        <el-table-column prop="create_time" show-overflow-tooltip show-tooltip-when-overflow :min-width="flexWidth('create_time',crud.data,'创建时间')"  label="创建时间" />
+        <el-table-column prop="update_time" show-overflow-tooltip show-tooltip-when-overflow :min-width="flexWidth('update_time',crud.data,'修改时间')"  label="修改时间" />
+        <el-table-column prop="task_step" show-overflow-tooltip show-tooltip-when-overflow width="130" label="任务执行步骤" />
+        <el-table-column prop="update_name" show-overflow-tooltip show-tooltip-when-overflow label="修改人" />
+        <el-table-column prop="remark" show-overflow-tooltip show-tooltip-when-overflow :min-width="flexWidth('remark',crud.data,'备注')" label="备注" />
+        <el-table-column prop="acs_type" show-overflow-tooltip show-tooltip-when-overflow width="130" label="ACS任务类型" />
         <el-table-column prop="priority" show-overflow-tooltip show-tooltip-when-overflow label="优先级" />
         <el-table-column prop="handle_class" show-overflow-tooltip show-tooltip-when-overflow width="150" label="处理类" />
         <el-table-column prop="is_send" show-overflow-tooltip show-tooltip-when-overflow label="立即下发" />
-        <el-table-column prop="remark" show-overflow-tooltip show-tooltip-when-overflow label="备注" />
+        <el-table-column prop="group_code" show-overflow-tooltip show-tooltip-when-overflow label="任务组" />
         <el-table-column prop="form_data" show-overflow-tooltip show-tooltip-when-overflow width="130" label="自定义参数" />
-        <el-table-column prop="create_time" show-overflow-tooltip show-tooltip-when-overflow label="创建时间" />
-        <el-table-column prop="update_name" show-overflow-tooltip show-tooltip-when-overflow label="修改人" />
-        <el-table-column prop="update_time" show-overflow-tooltip show-tooltip-when-overflow label="修改时间" />
+
         <el-table-column v-permission="[]" label="操作" width="250px" align="center" fixed="right">
           <template slot-scope="scope">
             <el-button