opt:界面优化，手持出入库优化；

nladmin-ui/.env.development

@@ -2,7 +2,7 @@ ENV = 'development'
 
 # 接口地址
 VUE_APP_BASE_API  = 'http://localhost:8011'
-VUE_APP_WS_API = 'ws://localhost:801'
+VUE_APP_WS_API = 'ws://localhost:8011'
 
 # 是否启用 babel-plugin-dynamic-import-node插件
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

nladmin-ui/.env.production

@@ -2,6 +2,6 @@ ENV = 'production'
 
 # 如果使用 Nginx 代理后端接口，那么此处需要改为 '/'，文件查看 Docker 部署篇，Nginx 配置
 # 接口地址，注意协议，如果你没有配置 ssl，需要将 https 改为 http
-VUE_APP_BASE_API  = 'http://10.93.41.201:8011'
+VUE_APP_BASE_API  = 'http://localhost:8011'
 # 如果接口是 http 形式， wss 需要改为 ws
-VUE_APP_WS_API = 'ws://10.93.41.201:8010'
+VUE_APP_WS_API = 'ws://localhost:8011'

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

@@ -37,12 +37,12 @@
           <el-form-item label="区域类型">
             <el-select
               v-model="query.region_code"
-              @clear="handleClear"
               clearable
               filterable
               size="mini"
               placeholder="区域类型"
               class="filter-item"
+              @clear="handleClear"
               @change="getPointStatusAndTypeList(query.region_code, 1)"
             >
               <el-option
@@ -52,22 +52,22 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="点位类型">
-            <el-select
-              v-model="query.point_type"
-              clearable
-              size="mini"
-              placeholder="点位类型"
-              class="filter-item"
-              @change="hand"
-            >
-              <el-option
-                v-for="item in pointTypesList"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
+          <!--          <el-form-item label="点位类型">-->
+          <!--            <el-select-->
+          <!--              v-model="query.point_type"-->
+          <!--              clearable-->
+          <!--              size="mini"-->
+          <!--              placeholder="点位类型"-->
+          <!--              class="filter-item"-->
+          <!--              @change="hand"-->
+          <!--            >-->
+          <!--              <el-option-->
+          <!--                v-for="item in pointTypesList"-->
+          <!--                :label="item.label"-->
+          <!--                :value="item.value"-->
+          <!--              />-->
+          <!--            </el-select>-->
+          <!--          </el-form-item>-->
           <el-form-item label="点位状态">
             <el-select
               v-model="query.point_status"
@@ -77,12 +77,11 @@
               placeholder="点位状态"
               class="filter-item"
               @change="hand"
-            >
-              <el-option
-                v-for="item in pointStatusList"
-                :label="item.label"
-                :value="item.value"
-              />
+            ><el-option
+              v-for="item in dict.point_status"
+              :label="item.label"
+              :value="item.value"
+            />
             </el-select>
           </el-form-item>
           <el-form-item label="锁定类型">
@@ -109,7 +108,7 @@
         </el-form>
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-      <crudOperation :permission="permission" >
+      <crudOperation :permission="permission">
         <el-button
           v-if="crud.query.is_used == 'false'"
           slot="right"
@@ -160,8 +159,21 @@
         </el-button>
       </crudOperation>
       <!--表单组件-->
-      <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="540px">
-        <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="110px" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;">
+      <el-dialog
+        :close-on-click-modal="false"
+        :before-close="crud.cancelCU"
+        :visible.sync="crud.status.cu > 0"
+        :title="crud.status.title"
+        width="540px"
+      >
+        <el-form
+          ref="form"
+          :model="form"
+          :rules="rules"
+          size="mini"
+          label-width="110px"
+          style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;"
+        >
           <el-form-item v-if="false" label="点位标识" prop="point_id">
             <el-input v-model="form.point_id" style="width: 370px;" />
           </el-form-item>
@@ -198,7 +210,7 @@
           <el-form-item label="点位名称" prop="point_name">
             <el-input v-model="form.point_name" style="width: 370px;" />
           </el-form-item>
-          <el-form-item v-if="pointStatusDialogList.length > 0" label="点位状态" prop="point_status">
+          <el-form-item label="点位状态" prop="point_status">
             <el-select
               v-model="form.point_status"
               size="mini"
@@ -206,31 +218,30 @@
               class="filter-item"
               style="width: 370px;"
               clearable
-            >
-              <el-option
-                v-for="item in pointStatusDialogList"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item v-show="pointTypesDialogList.length > 0" label="点位类型" prop="device_point_type">
-            <el-select
-              v-model="form.point_type"
-              size="mini"
-              placeholder="设备点位类型"
-              class="filter-item"
-              style="width: 370px;"
-            >
-              <el-option
-                v-for="item in pointTypesDialogList"
-                :label="item.label"
-                :value="item.value"
-              />
+            ><el-option
+              v-for="item in dict.point_status"
+              :label="item.label"
+              :value="item.value"
+            />
             </el-select>
           </el-form-item>
+          <!--          <el-form-item v-show="pointTypesDialogList.length > 0" label="点位类型" prop="device_point_type">-->
+          <!--            <el-select-->
+          <!--              v-model="form.point_type"-->
+          <!--              size="mini"-->
+          <!--              placeholder="设备点位类型"-->
+          <!--              class="filter-item"-->
+          <!--              style="width: 370px;"-->
+          <!--            >-->
+          <!--              <el-option-->
+          <!--                v-for="item in pointTypesDialogList"-->
+          <!--                :label="item.label"-->
+          <!--                :value="item.value"-->
+          <!--              />-->
+          <!--            </el-select>-->
+          <!--          </el-form-item>-->
           <el-form-item label="父类编码" prop="vehicle_code">
-            <el-input v-model="form.parent_point_code" clearable style="width: 370px;" @focus="getParentPoint"/>
+            <el-input v-model="form.parent_point_code" clearable style="width: 370px;" @focus="getParentPoint" />
           </el-form-item>
           <el-form-item v-if="form.point_status !== '1'" label="载具编码" prop="vehicle_code">
             <el-input v-model="form.vehicle_code" clearable style="width: 370px;" />
@@ -241,8 +252,8 @@
                 v-for="item in dict.vehicle_type"
                 :key="item.value"
                 :label="item.label"
-                :value="item.value">
-              </el-option>
+                :value="item.value"
+              />
             </el-select>
           </el-form-item>
           <el-form-item label="可放载具类型" prop="can_vehicle_types">
@@ -251,18 +262,32 @@
                 v-for="item in dict.vehicle_type"
                 :key="item.value"
                 :label="item.label"
-                :value="item.value">
-              </el-option>
+                :value="item.value"
+              />
             </el-select>
           </el-form-item>
           <el-form-item label="载具数量" prop="vehicle_qty">
-            <el-input-number style="width: 370px;" :controls="false" class="clear-number-input" v-model="form.vehicle_qty" :min="0" :precision="0" :max="99999" label="载具数量" size="mini" />
+            <el-input-number
+              v-model="form.vehicle_qty"
+              style="width: 370px;"
+              :controls="false"
+              class="clear-number-input"
+              :min="0"
+              :precision="0"
+              :max="99999"
+              label="载具数量"
+              size="mini"
+            />
           </el-form-item>
           <el-form-item label="是否有工单">
-            <el-radio v-for="item in dict.TrueOrFalse" :key="item.id" v-model="form.is_has_workder" :label="item.value">{{ item.label }}</el-radio>
+            <el-radio v-for="item in dict.TrueOrFalse" :key="item.id" v-model="form.is_has_workder" :label="item.value">
+              {{ item.label }}
+            </el-radio>
           </el-form-item>
           <el-form-item label="是否自动">
-            <el-radio v-for="item in dict.TrueOrFalse" :key="item.id" v-model="form.is_auto" :label="item.value">{{ item.label }}</el-radio>
+            <el-radio v-for="item in dict.TrueOrFalse" :key="item.id" v-model="form.is_auto" :label="item.value">
+              {{ item.label }}
+            </el-radio>
           </el-form-item>
           <el-form-item label="备注">
             <el-input v-model="form.remark" style="width: 370px;" rows="2" type="textarea" />
@@ -274,56 +299,133 @@
         </div>
       </el-dialog>
       <!--表格渲染-->
-      <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
+      <el-table
+        ref="table"
+        v-loading="crud.loading"
+        :data="crud.data"
+        size="mini"
+        style="width: 100%;"
+        @selection-change="crud.selectionChangeHandler"
+      >
         <el-table-column type="selection" width="55" />
-        <el-table-column prop="workshop_code" label="车间编码" :min-width="flexWidth('workshop_code',crud.data,'车间编码')" />
+        <el-table-column
+          prop="workshop_code"
+          label="车间编码"
+          :min-width="flexWidth('workshop_code',crud.data,'车间编码')"
+        />
         <el-table-column prop="point_code" label="点位编码" :min-width="flexWidth('point_code',crud.data,'点位编码')" />
         <el-table-column prop="point_name" label="点位名称" :min-width="flexWidth('point_name',crud.data,'点位名称')" />
-        <el-table-column prop="region_code" label="区域编码" :min-width="flexWidth('region_code',crud.data,'区域编码')" />
-        <el-table-column prop="region_name" label="区域名称" :min-width="flexWidth('region_name',crud.data,'区域名称')" />
-        <el-table-column prop="point_type_name" label="点位类型" :min-width="flexWidth('point_type_name',crud.data,'点位类型')"/>
-        <el-table-column prop="point_status_name" label="点位状态" :min-width="flexWidth('point_status_name',crud.data,'点位类型')"/>
-<!--        <el-table-column prop="point_type" label="点位类型" :min-width="flexWidth('point_type',crud.data,'点位类型')" />-->
-<!--        <el-table-column prop="point_status" label="点位状态" :min-width="flexWidth('point_status',crud.data,'点位状态')" />-->
-        <el-table-column prop="vehicle_type" label="载具类型" :min-width="flexWidth('vehicle_type',crud.data,'载具类型', 30)">
+        <el-table-column
+          prop="region_code"
+          label="区域编码"
+          :min-width="flexWidth('region_code',crud.data,'区域编码')"
+        />
+        <el-table-column
+          prop="region_name"
+          label="区域名称"
+          :min-width="flexWidth('region_name',crud.data,'区域名称')"
+        />
+        <el-table-column
+          prop="point_type_name"
+          label="点位类型"
+          :min-width="flexWidth('point_type_name',crud.data,'点位类型')"
+        />
+        <el-table-column
+          prop="point_status_name"
+          label="点位状态"
+          :min-width="flexWidth('point_status_name',crud.data,'点位类型')"
+        />
+        <el-table-column
+          prop="vehicle_type"
+          label="载具类型"
+          :min-width="flexWidth('vehicle_type',crud.data,'载具类型', 30)"
+        >
           <template slot-scope="scope">
             {{ dict.label.vehicle_type[scope.row.vehicle_type] }}
           </template>
         </el-table-column>
-        <el-table-column prop="vehicle_code" label="载具编码" :min-width="flexWidth('vehicle_code',crud.data,'载具编码')" />
-        <el-table-column prop="vehicle_qty" label="载具数量" :min-width="flexWidth('vehicle_qty',crud.data,'载具数量')" />
+        <el-table-column
+          prop="vehicle_code"
+          label="载具编码"
+          :min-width="flexWidth('vehicle_code',crud.data,'载具编码')"
+        />
+        <el-table-column
+          prop="vehicle_qty"
+          label="载具数量"
+          :min-width="flexWidth('vehicle_qty',crud.data,'载具数量')"
+        />
         <el-table-column label="是否锁定" :min-width="flexWidth('vehicle_qty',crud.data,'是否锁定')">
           <template slot-scope="scope">
-            {{scope.row.ing_task_code?'是':'否'}}
+            {{ scope.row.ing_task_code ? '是' : '否' }}
           </template>
         </el-table-column>
-        <el-table-column prop="material_code" label="物料编码" :min-width="flexWidth('material_code',crud.data,'载具数量')" />
-        <el-table-column prop="material_name" label="物料名称" :min-width="flexWidth('material_name',crud.data,'载具数量')" />
-        <el-table-column prop="material_spec" label="物料规格" :min-width="flexWidth('material_spec',crud.data,'载具数量')" />
-        <el-table-column prop="material_model" label="物料型号" :min-width="flexWidth('material_model',crud.data,'载具数量')" />
-        <el-table-column prop="material_qty" label="物料数量" :min-width="flexWidth('material_qty',crud.data,'载具数量')" />
-        <el-table-column prop="parent_point_code" label="父点位编码" :min-width="flexWidth('parent_point_code',crud.data,'父点位编码')"/>
-        <el-table-column prop="ing_task_code" label="在执行的任务标识" :min-width="flexWidth('ing_task_code',crud.data,'在执行的任务标识')" />
-        <el-table-column prop="is_has_workder" label="是否有工单" :min-width="flexWidth('is_has_workder',crud.data,'是否有工单')">
+        <el-table-column
+          prop="material_code"
+          label="物料编码"
+          :min-width="flexWidth('material_code',crud.data,'载具数量')"
+        />
+        <el-table-column
+          prop="material_name"
+          label="物料名称"
+          :min-width="flexWidth('material_name',crud.data,'载具数量')"
+        />
+        <el-table-column
+          prop="material_spec"
+          label="物料规格"
+          :min-width="flexWidth('material_spec',crud.data,'载具数量')"
+        />
+        <el-table-column
+          prop="material_model"
+          label="物料型号"
+          :min-width="flexWidth('material_model',crud.data,'载具数量')"
+        />
+        <el-table-column
+          prop="material_qty"
+          label="物料数量"
+          :min-width="flexWidth('material_qty',crud.data,'载具数量')"
+        />
+        <el-table-column
+          prop="parent_point_code"
+          label="父点位编码"
+          :min-width="flexWidth('parent_point_code',crud.data,'父点位编码')"
+        />
+        <el-table-column
+          prop="ing_task_code"
+          label="在执行的任务标识"
+          :min-width="flexWidth('ing_task_code',crud.data,'在执行的任务标识')"
+        />
+        <el-table-column
+          prop="is_has_workder"
+          label="是否有工单"
+          :min-width="flexWidth('is_has_workder',crud.data,'是否有工单')"
+        >
           <template slot-scope="scope">
-            {{scope.row.is_has_workder?'是':'否'}}
+            {{ scope.row.is_has_workder ? '是' : '否' }}
           </template>
         </el-table-column>
         <el-table-column prop="is_auto" label="是否自动" :min-width="flexWidth('is_auto',crud.data,'是否自动')">
           <template slot-scope="scope">
-            {{scope.row.is_auto?'是':'否'}}
+            {{ scope.row.is_auto ? '是' : '否' }}
           </template>
         </el-table-column>
         <el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" />
         <el-table-column prop="is_used" label="是否启用" :min-width="flexWidth('is_used',crud.data,'是否启用')">
           <template slot-scope="scope">
-            {{scope.row.is_used?'是':'否'}}
+            {{ scope.row.is_used ? '是' : '否' }}
           </template>
         </el-table-column>
         <el-table-column prop="create_name" label="创建人" :min-width="flexWidth('create_name',crud.data,'创建人')" />
-        <el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')" />
+        <el-table-column
+          prop="create_time"
+          label="创建时间"
+          :min-width="flexWidth('create_time',crud.data,'创建时间')"
+        />
         <el-table-column prop="update_name" label="修改人" :min-width="flexWidth('update_name',crud.data,'修改人')" />
-        <el-table-column prop="update_time" label="修改时间" :min-width="flexWidth('update_time',crud.data,'修改时间')" />
+        <el-table-column
+          prop="update_time"
+          label="修改时间"
+          :min-width="flexWidth('update_time',crud.data,'修改时间')"
+        />
         <el-table-column v-permission="[]" label="操作" width="200px" align="center" fixed="right">
           <template slot-scope="scope">
             <udOperation
@@ -346,8 +448,8 @@
       <!--分页组件-->
       <pagination />
     </div>
-    <ViewDialog ref="viewDialog"/>
-    <PointDialog :dialog-show.sync="pointDialog" :is-single="false" @tableChanged="tableChanged"/>
+    <ViewDialog ref="viewDialog" />
+    <PointDialog :dialog-show.sync="pointDialog" :is-single="false" @tableChanged="tableChanged" />
   </div>
 </template>
 
@@ -395,7 +497,7 @@ const defaultForm = {
 }
 export default {
   name: 'Point',
-  dicts: ['vehicle_type', 'TrueOrFalse'],
+  dicts: ['vehicle_type', 'point_status', 'TrueOrFalse'],
   components: { PointDialog, ViewDialog, pagination, crudOperation, rrOperation, udOperation },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {

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

@@ -200,7 +200,7 @@
         <el-table-column prop="point_code4" label="终点2" :min-width="flexWidth('point_code4',crud.data,'点位4')" />-->
         <el-table-column prop="vehicle_type" label="载具类型" :min-width="flexWidth('vehicle_type',crud.data,'载具类型', 20)">
           <template slot-scope="scope">
-            {{ dict.label.vehicle_type[scope.row.vehicle_type] }}
+            {{ dict.label.storagevehicle_type[scope.row.vehicle_type] }}
           </template>
         </el-table-column>
         <el-table-column prop="vehicle_qty" label="载具数量" :min-width="flexWidth('vehicle_qty',crud.data,'载具数量')" />
@@ -299,7 +299,7 @@ const defaultForm = {
 }
 export default {
   name: 'Task',
-  dicts: ['vehicle_type', 'create_mode', 'finished_type'],
+  dicts: ['storagevehicle_type', 'create_mode', 'finished_type'],
   components: { pagination, crudOperation, rrOperation, udOperation },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {