refactor(入库计划): 工具

This reverts commit ae1358bc71.

.env.development

@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 工刀具库WMS(内部)
+VUE_APP_TITLE = 工具库WMS(内部)
 
 # 开发环境配置
 ENV = 'development'

.env.production

@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 工刀具库WMS(内部)
+VUE_APP_TITLE = 工具库WMS(内部)
 
 # 生产环境配置
 ENV = 'production'

.env.staging

@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 工刀具库WMS(内部)
+VUE_APP_TITLE = 工具库WMS(内部)
 
 NODE_ENV = production
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "ktg-mes-ui",
   "version": "3.8.2",
-  "description": "工刀具库WMS(内部)",
+  "description": "工具库WMS(内部)",
   "author": "YinJinLu",
   "license": "MIT",
   "scripts": {

src/api/mes/md/baseKnife.js

@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 
-// 查询刀具台账列表
+// 查询工具台账列表
 export function listBaseKnife(query) {
   return request({
     url: '/mes/md/baseKnife/list',
@@ -9,7 +9,7 @@ export function listBaseKnife(query) {
   })
 }
 
-// 查询刀具台账详细
+// 查询工具台账详细
 export function getBaseKnife(baseKnifeId) {
   return request({
     url: '/mes/md/baseKnife/' + baseKnifeId,
@@ -17,7 +17,15 @@ export function getBaseKnife(baseKnifeId) {
   })
 }
 
-// 新增刀具台账
+// 查询台账RFID是否重复
+export function isDuplicateRfid(rfid) {
+  return request({
+    url: '/mes/md/baseKnife/isDuplicateRfid/' + rfid,
+    method: 'get'
+  })
+}
+
+// 新增工具台账
 export function addBaseKnife(data) {
   return request({
     url: '/mes/md/baseKnife',
@@ -26,7 +34,7 @@ export function addBaseKnife(data) {
   })
 }
 
-// 修改刀具台账
+// 修改工具台账
 export function updateBaseKnife(data) {
   return request({
     url: '/mes/md/baseKnife',
@@ -35,7 +43,7 @@ export function updateBaseKnife(data) {
   })
 }
 
-// 删除刀具台账
+// 删除工具台账
 export function delBaseKnife(baseKnifeId) {
   return request({
     url: '/mes/md/baseKnife/' + baseKnifeId,
@@ -43,7 +51,7 @@ export function delBaseKnife(baseKnifeId) {
   })
 }
 
-// 重置刀具台账寿命
+// 重置工具台账寿命
 export function resetBaseKnife(baseKnifeId) {
   return request({
     url: '/mes/md/baseKnife/reset/' + baseKnifeId,

src/api/mes/md/inventoryBatch.js

@@ -0,0 +1,61 @@
+import request from '@/utils/request'
+
+// 查询工具台账列表
+export function listInventoryBatch(query) {
+  return request({
+    url: '/mes/md/inventoryBatch/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询工具台账详细
+export function getBaseKnife(baseKnifeId) {
+  return request({
+    url: '/mes/md/baseKnife/' + baseKnifeId,
+    method: 'get'
+  })
+}
+
+// 新增工具台账
+export function addBaseKnife(data) {
+  return request({
+    url: '/mes/md/baseKnife',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改工具台账
+export function updateBaseKnife(data) {
+  return request({
+    url: '/mes/md/baseKnife',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除工具台账
+export function delBaseKnife(baseKnifeId) {
+  return request({
+    url: '/mes/md/baseKnife/' + baseKnifeId,
+    method: 'delete'
+  })
+}
+
+// 重置工具台账寿命
+export function resetBaseKnife(baseKnifeId) {
+  return request({
+    url: '/mes/md/baseKnife/reset/' + baseKnifeId,
+    method: 'put'
+  })
+}
+
+// 重置工具台账寿命
+export function submitZdTask(data) {
+  return request({
+    url: '/mes/md/baseKnife/zdTask',
+    method: 'put',
+    data: data
+  })
+}

src/components/Editor/index.vue

@@ -71,7 +71,7 @@ export default {
         bounds: document.body,
         debug: "warn",
         modules: {
-          // 刀具栏配置
+          // 工具栏配置
           toolbar: [
             ["bold", "italic", "underline", "strike"],       // 加粗 斜体 下划线 删除线
             ["blockquote", "code-block"],                    // 引用  代码块

src/components/qcindexSelect/single.vue

@@ -43,7 +43,7 @@
           <dict-tag :options="dict.type.mes_index_type" :value="scope.row.indexType"/>
         </template>
       </el-table-column>
-      <el-table-column label="检测刀具" align="center" prop="qcTool" />
+      <el-table-column label="检测工具" align="center" prop="qcTool" />
     </el-table>
     <pagination
       v-show="total>0"

src/layout/components/Sidebar/Logo.vue

@@ -37,7 +37,7 @@ export default {
   },
   data() {
     return {
-      title: '工刀具库WMS(内部)',
+      title: '工具库WMS(内部)',
       logo: ""
     }
   }

src/main.js

@@ -24,7 +24,7 @@ import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels,
 import { checkPermi } from './utils/permission';
 // 分页组件
 import Pagination from "@/components/Pagination";
-// 自定义表格刀具组件
+// 自定义表格工具组件
 import RightToolbar from "@/components/RightToolbar"
 // 富文本组件
 import Editor from "@/components/Editor"

src/utils/calendar.js

@@ -567,7 +567,7 @@ const calendar = {
         // 农历节日修正：农历12月小月则29号除夕，大月则30号除夕
         // 此处取巧修正：当前为农历12月29号时增加一次判断并且把lunarFestivalDate设置为12-30以正确取得除夕
         // 天朝农历节日遇闰月过前不过后的原则，此处取农历12月天数不考虑闰月
-        // 农历润12月在本刀具支持的200年区间内仅1574年出现
+        // 农历润12月在本工具支持的200年区间内仅1574年出现
         if (month === 12 && day === 29 && this.monthDays(year, month) === 29) {
             lunarFestivalDate = '12-30';
         }

src/views/index_v1.vue

@@ -364,7 +364,7 @@
                 <li>更多操作按钮添加权限控制</li>
                 <li>导入用户样式优化</li>
                 <li>提取通用方法到基类控制器</li>
-                <li>优化使用权限刀具获取用户信息</li>
+                <li>优化使用权限工具获取用户信息</li>
                 <li>优化用户不能删除自己</li>
                 <li>优化XSS跨站脚本过滤</li>
                 <li>优化代码生成模板</li>
@@ -394,7 +394,7 @@
                 <li>FileUpload组件支持多文件上传</li>
                 <li>文件上传组件添加数量限制属性</li>
                 <li>富文本编辑组件添加类型属性</li>
-                <li>富文本组件刀具栏配置视频</li>
+                <li>富文本组件工具栏配置视频</li>
                 <li>封装通用iframe组件</li>
                 <li>限制超级管理员不允许操作</li>
                 <li>用户信息长度校验限制</li>
@@ -412,7 +412,7 @@
                 <li>修复用户搜索分页变量错误</li>
                 <li>修复导出角色数据范围翻译缺少仅本人</li>
                 <li>修复表单构建选择下拉选择控制台报错问题</li>
-                <li>优化图片刀具类读取文件</li>
+                <li>优化图片工具类读取文件</li>
                 <li>其他细节优化</li>
               </ol>
             </el-collapse-item>
@@ -459,7 +459,7 @@
             <el-collapse-item title="v3.4.0 - 2021-02-22">
               <ol>
                 <li>代码生成模板支持主子表</li>
-                <li>表格右侧刀具栏组件支持显隐列</li>
+                <li>表格右侧工具栏组件支持显隐列</li>
                 <li>图片组件添加预览&移除功能</li>
                 <li>Excel注解支持Image图片导出</li>
                 <li>操作按钮组调整为朴素按钮样式</li>
@@ -477,7 +477,7 @@
                 <li>修正侧边栏静态路由丢失问题</li>
                 <li>修复角色管理-编辑角色-功能权限显示异常</li>
                 <li>配置文件新增redis数据库索引属性</li>
-                <li>权限刀具类增加admin判断</li>
+                <li>权限工具类增加admin判断</li>
                 <li>角色非自定义权限范围清空选择值</li>
                 <li>修复导入数据为负浮点数时丢失精度问题</li>
                 <li>移除path-to-regexp正则匹配插件</li>
@@ -582,7 +582,7 @@
                 <li>表格操作列间距调整</li>
                 <li>限制系统内置参数不允许删除</li>
                 <li>富文本组件优化，支持自定义高度&图片冲突问题</li>
-                <li>富文本刀具栏样式对齐</li>
+                <li>富文本工具栏样式对齐</li>
                 <li>导入excel整形值校验优化</li>
                 <li>修复页签关闭所有时固定标签路由不刷新问题</li>
                 <li>表单构建布局型组件新增按钮</li>
@@ -600,7 +600,7 @@
 
             <el-collapse-item title="v3.1.0 - 2020-08-13">
               <ol>
-                <li>表格刀具栏右侧添加刷新&显隐查询组件</li>
+                <li>表格工具栏右侧添加刷新&显隐查询组件</li>
                 <li>后端支持CORS跨域请求</li>
                 <li>代码生成支持选择上级菜单</li>
                 <li>代码生成支持自定义路径</li>
@@ -646,7 +646,7 @@
                 <li>修复布局为small者mini用户表单显示错位问题</li>
                 <li>修复热部署导致的强换异常问题</li>
                 <li>修改用户管理复选框宽度，防止部分浏览器出现省略号</li>
-                <li>IpUtils刀具，清除Xss特殊字符，防止Xff注入攻击</li>
+                <li>IpUtils工具，清除Xss特殊字符，防止Xff注入攻击</li>
                 <li>生成domain 如果是浮点型 统一用BigDecimal</li>
                 <li>定时任务调整label-width，防止部署出现错位</li>
                 <li>调整表头固定列默认样式</li>

src/views/login.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="login">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="title">智能刀具库WMS（内部）V1.0.0</h3>
+      <h3 class="title">智能工具库WMS（内部）V1.0.0</h3>
       <el-form-item prop="username">
         <el-input
           v-model="loginForm.username"

src/views/md/PLAN/index.vue

@@ -63,16 +63,6 @@
         >新增
         </el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          size="mini"
-          @click="removeItemsThatHaveNoLifeSpan"
-          v-hasPermi="['md:PLAN:add']"
-        >一键清退无寿命物品
-        </el-button>
-      </el-col>
       <!--      <el-col :span="1.5">-->
       <!--        <el-button-->
       <!--            type="success"-->

src/views/mes/md/baseKnife/baseKnifeSelectCmps.vue

@@ -9,10 +9,6 @@ export default {
     visible: {
       type: Boolean,
       require: true
-    },
-    knifeType: {
-      type: String,
-      require: true
     }
   },
   data() {
@@ -33,7 +29,7 @@ export default {
         knifeCode: null,
         knifeName: null,
         knifeUnit: null,
-        knifeType: this.knifeType,
+        knifeType: null,
         safeStock: null,
         standardQuantity: null,
         areaCode: null,
@@ -58,7 +54,7 @@ export default {
       this.$emit("change", e);
       this.handleClose();
     },
-    /** 查询刀具台账列表 */
+    /** 查询工具台账列表 */
     getList() {
       this.loading = true;
 
@@ -83,8 +79,8 @@ export default {
       <!--      <el-table-column label="更新时间" align="center" prop="baseKnifeId" />-->
       <el-table-column label="#" align="center" prop="baseKnifeId" min-width="55" :show-overflow-tooltip="true"/>
       <!--      <el-table-column label="rfid" align="center" prop="rfid" />-->
-      <el-table-column label="刀具编码" align="center" prop="knifeCode" min-width="180" :show-overflow-tooltip="true"/>
-      <el-table-column label="刀具名称" align="center" prop="knifeName" min-width="180" :show-overflow-tooltip="true"/>
+      <el-table-column label="工具编码" align="center" prop="knifeCode" min-width="180" :show-overflow-tooltip="true"/>
+      <el-table-column label="工具名称" align="center" prop="knifeName" min-width="180" :show-overflow-tooltip="true"/>
       <el-table-column label="物料类型" align="center" key="itemOrProduct" prop="itemOrProduct"
                        :show-overflow-tooltip="true">
         <template slot-scope="scope">
@@ -92,12 +88,12 @@ export default {
         </template>
       </el-table-column>
       <!--      <el-table-column label="计量单位" align="center" prop="knifeUnit" min-width="120" />-->
-      <!--      <el-table-column label="刀具类型" align="center" prop="knifeType" min-width="120" />-->
+      <!--      <el-table-column label="工具类型" align="center" prop="knifeType" min-width="120" />-->
       <!--      <el-table-column label="安全库存" align="center" prop="safeStock" />-->
       <!--      <el-table-column label="标准数量" align="center" prop="standardQuantity" />-->
       <el-table-column label="库位编码" align="center" prop="areaCode" min-width="120" :show-overflow-tooltip="true"/>
-      <el-table-column label="刀具寿命" align="center" prop="knifeLife" min-width="100" :show-overflow-tooltip="true"/>
-      <el-table-column label="刀具状态" align="center" prop="knifeFineState" min-width="100"
+      <el-table-column label="工具寿命" align="center" prop="knifeLife" min-width="100" :show-overflow-tooltip="true"/>
+      <el-table-column label="工具状态" align="center" prop="knifeFineState" min-width="100"
                        :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.knife_fine_status" :value="scope.row.knifeFineState"/>

src/views/mes/md/baseKnife/index.vue

@@ -17,18 +17,18 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="刀具类型" prop="itemOrProduct">
-        <el-select v-model="queryParams.itemOrProduct" placeholder="请选择物料类型" clearable>
-          <el-option
-            v-for="dict in dict.type.mes_item_product"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="刀具状态" prop="itemFineState">
-        <el-select v-model="queryParams.itemFineState" placeholder="请选择刀具状态" clearable>
+<!--      <el-form-item label="工具类型" prop="itemOrProduct">-->
+<!--        <el-select v-model="queryParams.itemOrProduct" placeholder="请选择物料类型" clearable>-->
+<!--          <el-option-->
+<!--            v-for="dict in dict.type.mes_item_product"-->
+<!--            :key="dict.value"-->
+<!--            :label="dict.label"-->
+<!--            :value="dict.value"-->
+<!--          />-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
+      <el-form-item label="工具状态" prop="itemFineState">
+        <el-select v-model="queryParams.itemFineState" placeholder="请选择工具状态" clearable>
           <el-option
             v-for="dict in dict.type.knife_fine_status"
             :key="dict.value"
@@ -59,21 +59,21 @@
       <!--      <el-table-column label="更新时间" align="center" prop="baseKnifeId" />-->
       <el-table-column label="台账ID" align="center" prop="baseKnifeId" min-width="55" :show-overflow-tooltip="true"/>
       <!--      <el-table-column label="rfid" align="center" prop="rfid" />-->
-      <el-table-column label="刀具编码" align="center" prop="knifeCode" min-width="180" :show-overflow-tooltip="true"/>
-      <el-table-column label="刀具名称" align="center" prop="knifeName" min-width="180" :show-overflow-tooltip="true"/>
-      <el-table-column label="物料类型" align="center" key="itemOrProduct" prop="itemOrProduct"
-                       :show-overflow-tooltip="true">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.mes_item_product" :value="scope.row.itemOrProduct"/>
-        </template>
-      </el-table-column>
+      <el-table-column label="工具编码" align="center" prop="knifeCode" min-width="180" :show-overflow-tooltip="true"/>
+      <el-table-column label="工具名称" align="center" prop="knifeName" min-width="180" :show-overflow-tooltip="true"/>
+<!--      <el-table-column label="物料类型" align="center" key="itemOrProduct" prop="itemOrProduct"-->
+<!--                       :show-overflow-tooltip="true">-->
+<!--        <template slot-scope="scope">-->
+<!--          <dict-tag :options="dict.type.mes_item_product" :value="scope.row.itemOrProduct"/>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
       <!--      <el-table-column label="计量单位" align="center" prop="knifeUnit" min-width="120" />-->
-      <!--      <el-table-column label="刀具类型" align="center" prop="knifeType" min-width="120" />-->
+      <!--      <el-table-column label="工具类型" align="center" prop="knifeType" min-width="120" />-->
       <!--      <el-table-column label="安全库存" align="center" prop="safeStock" />-->
       <!--      <el-table-column label="标准数量" align="center" prop="standardQuantity" />-->
       <el-table-column label="库位名称" align="center" prop="areaName" min-width="120" :show-overflow-tooltip="true"/>
-      <el-table-column label="刀具寿命" align="center" prop="knifeLife" min-width="100" :show-overflow-tooltip="true"/>
-      <el-table-column label="刀具状态" align="center" prop="knifeFineState" min-width="100"
+<!--      <el-table-column label="工具寿命" align="center" prop="knifeLife" min-width="100" :show-overflow-tooltip="true"/>-->
+      <el-table-column label="工具状态" align="center" prop="knifeFineState" min-width="100"
                        :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.knife_fine_status" :value="scope.row.knifeFineState"/>
@@ -87,11 +87,11 @@
       <!--      <el-table-column label="锁定开始时间" align="center" prop="lockedStartTime" min-width="180" :show-overflow-tooltip="true"/>-->
       <!--      <el-table-column label="锁定结束时间" align="center" prop="lockedEndTime" min-width="180" :show-overflow-tooltip="true"/>-->
       <el-table-column label="归属计划单" align="center" prop="planSheet" min-width="120"/>
-      <el-table-column label="重置次数" align="center" prop="resetCount" min-width="100">
-        <template slot-scope="scope">
-          <span v-if="scope.row.itemOrProduct == 'PRODUCT'">{{ scope.row.resetCount }}</span>
-        </template>
-      </el-table-column>
+<!--      <el-table-column label="重置次数" align="center" prop="resetCount" min-width="100">-->
+<!--        <template slot-scope="scope">-->
+<!--          <span v-if="scope.row.itemOrProduct == 'PRODUCT'">{{ scope.row.resetCount }}</span>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
       <!--      <el-table-column label="备注" align="center" prop="remark" />-->
       <!--      <el-table-column label="预留字段4" align="center" prop="attr4" />-->
       <!--      <el-table-column label="创建者" align="center" prop="createBy" />-->
@@ -144,10 +144,10 @@
             <el-form-item label="台账编号：">{{ form.baseKnifeId }}</el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="刀具编码：">{{ form.knifeCode }}</el-form-item>
+            <el-form-item label="工具编码：">{{ form.knifeCode }}</el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="刀具名称：">{{ form.knifeName }}</el-form-item>
+            <el-form-item label="工具名称：">{{ form.knifeName }}</el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="物料类型：">
@@ -155,7 +155,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="刀具类型：">{{ form.knifeType }}</el-form-item>
+            <el-form-item label="工具类型：">{{ form.knifeType }}</el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="计量单位：">{{ form.knifeUnit }}</el-form-item>
@@ -172,10 +172,10 @@
             <el-form-item label="计划单：">{{ form.planSheet }}</el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="刀具寿命：">{{ form.knifeLife }}</el-form-item>
+            <el-form-item label="工具寿命：">{{ form.knifeLife }}</el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="刀具状态：">
+            <el-form-item label="工具状态：">
               <dict-tag :options="dict.type.knife_fine_status" :value="form.knifeFineState"/>
             </el-form-item>
           </el-col>
@@ -246,19 +246,20 @@
               <dict-tag :options="dict.type.plan_source_type" :value="scope.row.planType"/>
             </template>
           </el-table-column>
-          <el-table-column label="领用人" align="center" prop="useUsername" :show-overflow-tooltip="true"/>
-          <el-table-column label="出库类型编码" align="center" prop="planTypeCode" :show-overflow-tooltip="true"/>
-          <el-table-column label="出库类型名称" align="center" prop="planTypeName" :show-overflow-tooltip="true"/>
+<!--          <el-table-column label="领用人" align="center" prop="useUsername" :show-overflow-tooltip="true"/>-->
+<!--          <el-table-column label="出库类型编码" align="center" prop="planTypeCode" :show-overflow-tooltip="true"/>-->
+          <el-table-column label="出库类型" align="center" prop="planTypeName" :show-overflow-tooltip="true"/>
           <el-table-column label="明细批次" align="center" prop="detailBatchNum" :show-overflow-tooltip="true"/>
-          <el-table-column label="库位编码" align="center" prop="wmStorageAreaCode" :show-overflow-tooltip="true"/>
+<!--          <el-table-column label="库位编码" align="center" prop="wmStorageAreaCode" :show-overflow-tooltip="true"/>-->
           <el-table-column label="库位名称" align="center" prop="wmStorageAreaName" :show-overflow-tooltip="true"/>
-          <el-table-column label="明细状态" align="center" prop="detailStatus" :show-overflow-tooltip="true"/>
+<!--          <el-table-column label="明细状态" align="center" prop="detailStatus" :show-overflow-tooltip="true"/>-->
           <el-table-column label="出库时间" align="center" prop="outTime" :show-overflow-tooltip="true"/>
           <el-table-column label="是否对刀" align="center" prop="isToolSetting" :show-overflow-tooltip="true">
             <template slot-scope="scope">
               {{ scope.row.isToolSetting == 0 ? '否' : '是' }}
             </template>
           </el-table-column>
+          <el-table-column label="对刀参数" align="center" prop="toolSettingParam" :show-overflow-tooltip="true"/>
         </el-table>
 
         <el-divider content-position="center">入库信息</el-divider>
@@ -313,7 +314,7 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
-      // 刀具台账表格数据
+      // 工具台账表格数据
       BaseKnifeList: [],
       // 物料产品表格数据
       mdItemList: [],
@@ -359,7 +360,7 @@ export default {
     this.getList();
   },
   methods: {
-    /** 查询刀具台账列表 */
+    /** 查询工具台账列表 */
     getList() {
       this.loading = true;
 
@@ -430,7 +431,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加刀具台账";
+      this.title = "添加工具台账";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -440,7 +441,7 @@ export default {
         this.form = response.data;
         this.mdItemList = response.data.mdItemList;
         this.open = true;
-        this.title = "修改刀具台账";
+        this.title = "修改工具台账";
       });
     },
     /** 提交按钮 */

src/views/mes/md/inventoryBatch/index.vue

@@ -0,0 +1,367 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="批次" prop="batchNum">
+        <el-input
+          v-model="queryParams.batchNum"
+          placeholder="请输入批次"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="物料编码" prop="mdItemCode">
+        <el-input
+          v-model="queryParams.mdItemCode"
+          placeholder="请输入物料编码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="TASKList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column label="状态" align="center" prop="status">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.in_plan_state" :value="scope.row.status"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="批次" align="center" prop="batchNum"/>
+      <el-table-column label="物料编码" align="center" prop="mdItemCode"/>
+      <el-table-column label="物料名称" align="center" prop="mdItemName"/>
+      <el-table-column label="物料单位" align="center" prop="mdItemUnit"/>
+      <el-table-column label="物料数量" align="center" prop="mdItemNum"/>
+      <el-table-column label="类型" align="center" prop="inOrOut">
+        <template slot-scope="scope">
+          <span>{{ scope.row.inOrOut == 0 ? '出库' : '入库' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="出/入库时间" align="center" prop="dateTime"/>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleLook(scope.row)"
+            v-hasPermi="['md:TASK:edit']"
+          >查看物料清单
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改出库任务对话框 -->
+    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="出库计划ID" prop="wmsOutPlanId">
+          <el-input v-model="form.wmsOutPlanId" placeholder="请输入出库计划ID"/>
+        </el-form-item>
+        <el-form-item label="出库计划编码" prop="wmsOutPlanCode">
+          <el-input v-model="form.wmsOutPlanCode" placeholder="请输入出库计划编码"/>
+        </el-form-item>
+        <el-form-item label="出库计划明细ID" prop="wmsOutPlanDetailId">
+          <el-input v-model="form.wmsOutPlanDetailId" placeholder="请输入出库计划明细ID"/>
+        </el-form-item>
+        <el-form-item label="出库类型ID" prop="wmsBusinessTypeId">
+          <el-input v-model="form.wmsBusinessTypeId" placeholder="请输入出库类型ID"/>
+        </el-form-item>
+        <el-form-item label="任务编码" prop="taskCode">
+          <el-input v-model="form.taskCode" placeholder="请输入任务编码"/>
+        </el-form-item>
+        <el-form-item label="任务数量" prop="taskNumber">
+          <el-input v-model="form.taskNumber" placeholder="请输入任务数量"/>
+        </el-form-item>
+        <el-form-item label="出库数量" prop="outNumber">
+          <el-input v-model="form.outNumber" placeholder="请输入出库数量"/>
+        </el-form-item>
+        <el-form-item label="目标库位ID" prop="wmStorageAreaId">
+          <el-input v-model="form.wmStorageAreaId" placeholder="请输入目标库位ID"/>
+        </el-form-item>
+        <el-form-item label="批次" prop="batchNum">
+          <el-input v-model="form.batchNum" placeholder="请输入批次"/>
+        </el-form-item>
+        <el-form-item label="物料ID" prop="mdItemId">
+          <el-input v-model="form.mdItemId" placeholder="请输入物料ID"/>
+        </el-form-item>
+        <el-form-item label="物料编码" prop="mdItemCode">
+          <el-input v-model="form.mdItemCode" placeholder="请输入物料编码"/>
+        </el-form-item>
+        <el-form-item label="物料名称" prop="mdItemName">
+          <el-input v-model="form.mdItemName" placeholder="请输入物料名称"/>
+        </el-form-item>
+        <el-form-item label="物料单位" prop="mdItemUnit">
+          <el-input v-model="form.mdItemUnit" placeholder="请输入物料单位"/>
+        </el-form-item>
+        <el-form-item label="任务状态" prop="taskState">
+          <el-select v-model="form.taskState" placeholder="请选择任务状态">
+            <el-option
+              v-for="dict in dict.type.in_plan_state"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="领料人" prop="recipientUsername">
+          <el-input v-model="form.recipientUsername" placeholder="请输入领料人"/>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog :close-on-click-modal="false" title="出库物品清单" :visible.sync="openLook" width="60%" append-to-body>
+      <el-table :data="outInfoList" >
+        <el-table-column label="计划状态" align="center" prop="planStatus" :show-overflow-tooltip="true"/>
+        <el-table-column label="计划类型" align="center" prop="planType" :show-overflow-tooltip="true"/>
+        <el-table-column label="出库类型编码" align="center" prop="planTypeCode" :show-overflow-tooltip="true"/>
+        <el-table-column label="出库类型名称" align="center" prop="planTypeName" :show-overflow-tooltip="true"/>
+        <el-table-column label="明细批次" align="center" prop="detailBatchNum" :show-overflow-tooltip="true"/>
+        <el-table-column label="台账ID" align="center" prop="baseKnifeId" :show-overflow-tooltip="true"/>
+        <el-table-column label="物料编码" align="center" prop="mdItemCode" :show-overflow-tooltip="true"/>
+        <el-table-column label="物料名称" align="center" prop="mdItemName" :show-overflow-tooltip="true"/>
+        <el-table-column label="库位编码" align="center" prop="wmStorageAreaCode" :show-overflow-tooltip="true"/>
+        <el-table-column label="库位名称" align="center" prop="wmStorageAreaName" :show-overflow-tooltip="true"/>
+        <el-table-column label="当时寿命%" align="center" prop="knifeLife" :show-overflow-tooltip="true"/>
+      </el-table>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="openLook = false">关 闭</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {listTASK, getTASK, delTASK, addTASK, updateTASK, runTASK, autoRunTASK} from "@/api/md/TASK";
+import {listInventoryBatch} from "@/api/mes/md/inventoryBatch"
+import {rgb} from "chalk";
+
+export default {
+  name: "TASK",
+  dicts: ['in_plan_state'],
+  data() {
+    return {
+      // 遮罩层
+      loading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 出库任务表格数据
+      TASKList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        wmsOutPlanId: null,
+        wmsOutPlanCode: null,
+        wmsOutPlanDetailId: null,
+        wmsBusinessTypeId: null,
+        taskCode: null,
+        taskNumber: null,
+        outNumber: null,
+        wmStorageAreaId: null,
+        batchNum: null,
+        mdItemId: null,
+        mdItemCode: null,
+        mdItemName: null,
+        mdItemUnit: null,
+        taskState: null,
+        recipientUsername: null,
+        remark: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {},
+      openLook: false,
+      outInfoList: []
+    };
+  },
+  created() {
+    // this.getList();
+  },
+  methods: {
+    /** 查询出库任务列表 */
+    getList() {
+      this.loading = true;
+      listInventoryBatch(this.queryParams).then(response => {
+        this.TASKList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        wmsOutTaskId: null,
+        wmsOutPlanId: null,
+        wmsOutPlanCode: null,
+        wmsOutPlanDetailId: null,
+        wmsBusinessTypeId: null,
+        taskCode: null,
+        taskNumber: null,
+        outNumber: null,
+        wmStorageAreaId: null,
+        batchNum: null,
+        mdItemId: null,
+        mdItemCode: null,
+        mdItemName: null,
+        mdItemUnit: null,
+        taskState: null,
+        recipientUsername: null,
+        remark: null,
+        attr1: null,
+        attr2: null,
+        attr3: null,
+        attr4: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.wmsOutTaskId)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加出库任务";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const wmsOutTaskId = row.wmsOutTaskId || this.ids
+      getTASK(wmsOutTaskId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改出库任务";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.wmsOutTaskId != null) {
+            updateTASK(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addTASK(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 查看按钮操作 */
+    handleLook(row) {
+      const wmsOutTaskIds = row.wmsOutTaskId || this.ids;
+      getTASK(wmsOutTaskIds).then(response => {
+        this.openLook = true;
+        this.outInfoList = []
+        this.outInfoList = response.data.outInfoList;
+      });
+    },
+    /** 执行按钮操作 */
+    handleRun(row) {
+      const wmsOutTaskIds = row.wmsOutTaskId || this.ids;
+      this.$modal.confirm('是否确认手动出库该数据项？').then(function () {
+        return runTASK(wmsOutTaskIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("执行成功");
+      }).catch(() => {
+      });
+    },
+    /** 执行按钮操作 */
+    handleAutoRun(row) {
+      const wmsOutTaskIds = row.wmsOutTaskId || this.ids;
+      this.$modal.confirm('是否确认WCS下发数据该数据项？').then(function () {
+        return autoRunTASK(wmsOutTaskIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("执行成功");
+      }).catch(() => {
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const wmsOutTaskIds = row.wmsOutTaskId || this.ids;
+      this.$modal.confirm('是否确认删除出库任务编号为"' + wmsOutTaskIds + '"的数据项？').then(function () {
+        return delTASK(wmsOutTaskIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('md/TASK/export', {
+        ...this.queryParams
+      }, `TASK_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

src/views/mes/qc/ipqc/line.vue

@@ -8,7 +8,7 @@
           <dict-tag :options="dict.type.mes_index_type" :value="scope.row.indexType"/>
         </template>
       </el-table-column>
-      <el-table-column label="检测刀具" align="center" prop="qcTool" />
+      <el-table-column label="检测工具" align="center" prop="qcTool" />
       <el-table-column label="检测要求" align="center" prop="checkMethod" />
       <el-table-column label="标准值" align="center" prop="standerVal" />
       <el-table-column label="单位" align="center" prop="unitOfMeasure" />

src/views/mes/qc/iqc/iqcline.vue

@@ -7,7 +7,7 @@
           <dict-tag :options="dict.type.mes_index_type" :value="scope.row.indexType"/>
         </template>
       </el-table-column>
-      <el-table-column label="检测刀具" align="center" prop="qcTool" />
+      <el-table-column label="检测工具" align="center" prop="qcTool" />
       <el-table-column label="检测要求" align="center" prop="checkMethod" />
       <el-table-column label="标准值" align="center" prop="standerVal" />
       <el-table-column label="单位" align="center" prop="unitOfMeasure" />

src/views/mes/qc/oqc/line.vue

@@ -9,7 +9,7 @@
           <dict-tag :options="dict.type.mes_index_type" :value="scope.row.indexType"/>
         </template>
       </el-table-column>
-      <el-table-column label="检测刀具" align="center" prop="qcTool" />
+      <el-table-column label="检测工具" align="center" prop="qcTool" />
       <el-table-column label="检测要求" width="150px" align="center" prop="checkMethod" :show-overflow-tooltip="true"/>
       <el-table-column label="标准值" align="center" prop="standerVal" />
       <el-table-column label="单位" align="center" prop="unitOfMeasure" />

src/views/mes/qc/qcindex/index.vue

@@ -88,7 +88,7 @@
           <dict-tag :options="dict.type.mes_index_type" :value="scope.row.indexType"/>
         </template>
       </el-table-column>
-      <el-table-column label="检测刀具" align="center" prop="qcTool" />
+      <el-table-column label="检测工具" align="center" prop="qcTool" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -155,8 +155,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="检测刀具" prop="qcTool">
-              <el-input v-model="form.qcTool" placeholder="请输入检测刀具" />
+            <el-form-item label="检测工具" prop="qcTool">
+              <el-input v-model="form.qcTool" placeholder="请输入检测工具" />
             </el-form-item>
           </el-col>
         </el-row>

src/views/mes/qc/qctemplate/templateindex.vue

@@ -44,7 +44,7 @@
           <dict-tag :options="dict.type.mes_index_type" :value="scope.row.indexType"/>
         </template>
       </el-table-column>
-      <el-table-column label="检测刀具" align="center" prop="qcTool" />
+      <el-table-column label="检测工具" align="center" prop="qcTool" />
       <el-table-column label="检测方法" align="center" prop="checkMethod" :show-overflow-tooltip="true"/>
       <el-table-column label="标准值" align="center" prop="standerVal" />
       <el-table-column label="单位" align="center" prop="unitOfMeasure" />
@@ -91,8 +91,8 @@
             </el-form-item>
           </el-col>
             <el-col :span="12">
-                <el-form-item label="检测刀具" prop="qcTool">
-                    <el-input v-model="form.qcTool" placeholder="请输入检测刀具" />
+                <el-form-item label="检测工具" prop="qcTool">
+                    <el-input v-model="form.qcTool" placeholder="请输入检测工具" />
                 </el-form-item>
             </el-col>
         </el-row>

src/views/mes/wm/inPlan/index.vue

@@ -354,7 +354,7 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        planCode: [{required: true}, {validator: planCodeValidator, trigger: "change"}],
+        planCode: [{required: true}, {validator: planCodeValidator, trigger: "blur"}],
         planTypeId: [{required: true}],
         relBillCode: [{required: true}],
       }
@@ -363,7 +363,7 @@ export default {
   computed: {
     /** 控制弹窗类型 */
     isKnifeBack() {
-      return this.form.planTypeId == 9 || this.form.planTypeId == 7 || this.form.planTypeId == 15;
+      return this.form.planTypeId == 19;
     }
   },
   created() {

src/views/mes/wm/inPlan/wmsInPlanDetailEntityTableCmps.vue

@@ -23,11 +23,11 @@ export default {
       selectIndex: -1
     }
   },
-  computed:{
-    getKnifeType(){
-      if(this.planTypeId==9){
+  computed: {
+    getKnifeType() {
+      if (this.planTypeId == 9 || this.planTypeId == 15) {
         return "整刀"
-      }else{
+      } else {
         return "刀柄类"
       }
     }
@@ -98,7 +98,7 @@ export default {
       </el-col>
     </el-row>
     <!--整刀回库-->
-    <el-table :data="localEntityList" v-if="planTypeId==9" @selection-change="handleSelectionChange">
+    <el-table :data="localEntityList" v-if="planTypeId==19" @selection-change="handleSelectionChange">
       <el-table-column label="台账ID" align="center" prop="knifeId">
         <template slot-scope="scope">
           <el-input v-model="scope.row.knifeId" @change="updateEntityList">
@@ -111,24 +111,19 @@ export default {
           <el-input v-model="scope.row.source" @change="updateEntityList"></el-input>
         </template>
       </el-table-column>
-      <el-table-column label="RFID" align="center" prop="rfid">
-        <template slot-scope="scope">
-          <el-input v-model="scope.row.rfid" @change="updateEntityList"></el-input>
-        </template>
-      </el-table-column>
-      <el-table-column label="消耗寿命" align="center" prop="consumeLife">
-        <template slot-scope="scope">
-          <el-input v-model="scope.row.consumeLife" type="number" min="0" @change="updateEntityList"></el-input>
-        </template>
-      </el-table-column>
+      <!--      <el-table-column label="消耗寿命" align="center" prop="consumeLife">-->
+      <!--        <template slot-scope="scope">-->
+      <!--          <el-input v-model="scope.row.consumeLife" type="number" min="0" @change="updateEntityList"></el-input>-->
+      <!--        </template>-->
+      <!--      </el-table-column>-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope)"
-            v-hasPermi="['wm:wmsInPlanDetailsEntity:remove']"
+              size="mini"
+              type="text"
+              icon="el-icon-delete"
+              @click="handleDelete(scope)"
+              v-hasPermi="['wm:wmsInPlanDetailsEntity:remove']"
           >删除
           </el-button>
         </template>
@@ -144,11 +139,11 @@ export default {
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope)"
-            v-hasPermi="['wm:wmsInPlanDetailsEntity:remove']"
+              size="mini"
+              type="text"
+              icon="el-icon-delete"
+              @click="handleDelete(scope)"
+              v-hasPermi="['wm:wmsInPlanDetailsEntity:remove']"
           >删除
           </el-button>
         </template>
@@ -168,26 +163,22 @@ export default {
           <el-input v-model="scope.row.source" @change="updateEntityList"></el-input>
         </template>
       </el-table-column>
-      <el-table-column label="RFID" align="center" prop="rfid">
-        <template slot-scope="scope">
-          <el-input v-model="scope.row.rfid" @change="updateEntityList"></el-input>
-        </template>
-      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope)"
-            v-hasPermi="['wm:wmsInPlanDetailsEntity:remove']"
+              size="mini"
+              type="text"
+              icon="el-icon-delete"
+              @click="handleDelete(scope)"
+              v-hasPermi="['wm:wmsInPlanDetailsEntity:remove']"
           >删除
           </el-button>
         </template>
       </el-table-column>
     </el-table>
 
-    <base-knife-select-cmps :visible.sync="baseKnifeVisible" :knife-type="getKnifeType" @change="selectBaseKnifeChange"></base-knife-select-cmps>
+    <base-knife-select-cmps :visible.sync="baseKnifeVisible"
+                            @change="selectBaseKnifeChange"></base-knife-select-cmps>
   </div>
 </template>
 

src/views/mes/wm/inPlan/wmsInPlanKnifeBackFormCmps.vue

@@ -4,6 +4,7 @@ import WmsInPlanDetailEntityTableCmps from "@/views/mes/wm/inPlan/wmsInPlanDetai
 import {addPLAN, updatePLAN} from "@/api/wm/PLAN";
 import {listMdItem} from "@/api/mes/md/mdItem";
 import {listTYPE} from "@/api/md/TYPE";
+import {isDuplicateRfid} from "@/api/mes/md/baseKnife";
 
 export default {
   name: "wmsInPlanKnifeBackFormCmps",
@@ -58,11 +59,23 @@ export default {
     },
     /** 对话框关闭 */
     handleClose() {
+      this.reset();
       this.$emit("update:visible", false)
     },
+    async validateRfid() {
+      const rfidList = this.wmsInPlanDetailEntityList.map(entity => entity.rfid);
+      if (rfidList.length === 0) return
+      const res = await isDuplicateRfid(rfidList.join(","));
+      return res.data
+    },
     /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
+    async submitForm() {
+      const validateRfidResult = await this.validateRfid();
+      if (validateRfidResult.length > 0) {
+        this.$modal.msgError(`RFID重复：${validateRfidResult}`);
+        return;
+      }
+      await this.$refs["form"].validate(valid => {
         if (valid) {
           this.localDataForm.wmsInPlanDetailsList = []
           // 根据入库计划明细实例 生成相应入库计划明细
@@ -130,6 +143,42 @@ export default {
         this.mdItemList = response.rows;
       });
     },
+    // 表单重置
+    reset() {
+      this.form = {
+        planId: null,
+        state: null,
+        sourceType: null,
+        wareId: null,
+        cellCode: null,
+        workOrderCode: null,
+        expectDate: null,
+        publishName: null,
+        publishTime: null,
+        closerId: null,
+        closeTime: null,
+        relBillCode: null,
+        createBy: null,
+        createTime: null,
+        updateTime: null,
+        updateBy: null,
+        remark: null,
+        customerId: null,
+        poCode: null,
+        departmentId: null,
+        contractNo: null,
+        supplierId: null,
+        businessTypeId: null,
+        srcOutTaskId: null,
+        isActive: null,
+        isDelete: null,
+        planCode: null,
+        planTypeId: null,
+        wmsInPlanDetailsList: []
+      };
+      this.wmsInPlanDetailsList = [];
+      this.resetForm("form");
+    },
   },
   mounted() {
     this.getAreaList();
@@ -145,7 +194,8 @@ export default {
 </script>
 
 <template>
-  <el-dialog :title="title" :visible="visible" width="50%" append-to-body @close="handleClose" :close-on-click-modal="false">
+  <el-dialog :title="title" :visible="visible" width="50%" append-to-body @close="handleClose"
+             :close-on-click-modal="false">
     <!--状态为1已执行 则禁用-->
     <el-form ref="form" :model="localDataForm" :rules="rules" label-width="80px" inline
              :disabled="localDataForm.state === '1'">

src/views/mes/wm/wmsSupplier/index.vue

@@ -16,7 +16,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['wm:wmsSupplier:add']"
-        >新增</el-button>
+        >新增
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -27,7 +28,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['wm:wmsSupplier:edit']"
-        >修改</el-button>
+        >修改
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -38,38 +40,21 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['wm:wmsSupplier:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['wm:wmsSupplier:export']"
-        >导出</el-button>
+        >删除
+        </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="wmsSupplierList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="主键" align="center" prop="id" />
-      <el-table-column label="供应商名称" align="center" prop="supplierName" />
-      <el-table-column label="供应商类型名称" align="center" prop="supplierTypeName" />
-      <el-table-column label="供应商类型编码" align="center" prop="supplierTypeCode" />
-      <el-table-column label="主要联系人姓名" align="center" prop="contactName" />
-      <el-table-column label="联系人电话" align="center" prop="contactPhone" />
-      <el-table-column label="联系人电子邮箱" align="center" prop="contactEmail" />
-      <el-table-column label="联系地址" align="center" prop="contactAddress" />
-      <el-table-column label="供应商所在地理位置/地区" align="center" prop="region" />
-      <el-table-column label="供应商公司官网" align="center" prop="website" />
-      <el-table-column label="供应商公司官网" align="center" prop="createBy" />
-      <el-table-column label="供应商公司官网" align="center" prop="createTime" />
-      <el-table-column label="供应商公司官网" align="center" prop="updateBy" />
-      <el-table-column label="供应商公司官网" align="center" prop="updateTime" />
-      <el-table-column label="供应商公司官网" align="center" prop="isDelete" />
+      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column label="主键" align="center" prop="id"/>
+      <el-table-column label="供应商名称" align="center" prop="supplierName"/>
+      <el-table-column label="主要联系人姓名" align="center" prop="contactName"/>
+      <el-table-column label="联系人电话" align="center" prop="contactPhone"/>
+      <el-table-column label="联系人邮箱" align="center" prop="contactEmail"/>
+      <el-table-column label="联系地址" align="center" prop="contactAddress"/>
+      <el-table-column label="供应商公司官网" align="center" prop="website"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -78,14 +63,16 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['wm:wmsSupplier:edit']"
-          >修改</el-button>
+          >修改
+          </el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['wm:wmsSupplier:remove']"
-          >删除</el-button>
+          >删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -99,8 +86,26 @@
     />
 
     <!-- 添加或修改供应商基础信息对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+    <el-dialog :title="title" :visible.sync="open" width="35%" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px" inline>
+        <el-form-item label="供应商名称" prop="supplierName">
+          <el-input v-model="form.supplierName"></el-input>
+        </el-form-item>
+        <el-form-item label="主要联系人" prop="contactName">
+          <el-input v-model="form.contactName"></el-input>
+        </el-form-item>
+        <el-form-item label="联系人电话" prop="contactPhone">
+          <el-input v-model="form.contactPhone"></el-input>
+        </el-form-item>
+        <el-form-item label="联系人邮箱" prop="contactEmail">
+          <el-input v-model="form.contactEmail"></el-input>
+        </el-form-item>
+        <el-form-item label="联系地址" prop="contactAddress">
+          <el-input v-model="form.contactAddress"></el-input>
+        </el-form-item>
+        <el-form-item label="供应商官网" prop="website">
+          <el-input v-model="form.website"></el-input>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -111,7 +116,13 @@
 </template>
 
 <script>
-import { listWmsSupplier, getWmsSupplier, delWmsSupplier, addWmsSupplier, updateWmsSupplier } from "@/api/mes/wm/wmsSupplier";
+import {
+  listWmsSupplier,
+  getWmsSupplier,
+  delWmsSupplier,
+  addWmsSupplier,
+  updateWmsSupplier
+} from "@/api/mes/wm/wmsSupplier";
 
 export default {
   name: "WmsSupplier",
@@ -139,12 +150,25 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        supplierName: null,        supplierTypeName: null,        supplierTypeCode: null,        contactName: null,        contactPhone: null,        contactEmail: null,        contactAddress: null,        region: null,        website: null,        createBy: null,        createTime: null,        updateBy: null,        updateTime: null,        isDelete: null      },
+        supplierName: null,
+        supplierTypeName: null,
+        supplierTypeCode: null,
+        contactName: null,
+        contactPhone: null,
+        contactEmail: null,
+        contactAddress: null,
+        region: null,
+        website: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        isDelete: null
+      },
       // 表单参数
       form: {},
       // 表单校验
-      rules: {
-      }
+      rules: {}
     };
   },
   created() {
@@ -168,7 +192,22 @@ export default {
     // 表单重置
     reset() {
       this.form = {
-        id: null,        supplierName: null,        supplierTypeName: null,        supplierTypeCode: null,        contactName: null,        contactPhone: null,        contactEmail: null,        contactAddress: null,        region: null,        website: null,        createBy: null,        createTime: null,        updateBy: null,        updateTime: null,        isDelete: null      };
+        id: null,
+        supplierName: null,
+        supplierTypeName: null,
+        supplierTypeCode: null,
+        contactName: null,
+        contactPhone: null,
+        contactEmail: null,
+        contactAddress: null,
+        region: null,
+        website: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        isDelete: null
+      };
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
@@ -184,7 +223,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -226,12 +265,13 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除供应商基础信息编号为"' + ids + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除供应商基础信息编号为"' + ids + '"的数据项？').then(function () {
         return delWmsSupplier(ids);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(() => {
+      });
     },
     /** 导出按钮操作 */
     handleExport() {

src/views/register.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="register">
     <el-form ref="registerForm" :model="registerForm" :rules="registerRules" class="register-form">
-      <h3 class="title">工刀具库WMS</h3>
+      <h3 class="title">工具库WMS</h3>
       <el-form-item prop="username">
         <el-input v-model="registerForm.username" type="text" auto-complete="off" placeholder="账号">
           <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />

vue.config.js

@@ -7,7 +7,7 @@ function resolve(dir) {
 
 const CompressionPlugin = require('compression-webpack-plugin')
 
-const name = process.env.VUE_APP_TITLE || '工刀具库WMS(内部)' // 网页标题
+const name = process.env.VUE_APP_TITLE || '工具库WMS(内部)' // 网页标题
 
 const port = process.env.port || process.env.npm_config_port || 3000 // 端口