.env.production

@@ -2,6 +2,6 @@
 ENV = 'production'
 
 # base api
-VUE_APP_BASE_API = ''
+VUE_APP_BASE_API = '/api'
 VUE_APP_REPORT_DESIGN_URL = '/ureport/designer'
 VUE_APP_REPORT_VIEW_URL = '/ureport/preview'

package.json

@@ -97,7 +97,7 @@
     "@vue/test-utils": "1.0.0-beta.29",
     "autoprefixer": "^9.5.1",
     "babel-core": "7.0.0-bridge.0",
-    "babel-eslint": "^8.2.2",
+    "babel-eslint": "10.0.1",
     "babel-jest": "23.6.0",
     "chalk": "2.4.2",
     "chokidar": "2.1.5",

src/api/basicData/Cache/processLocation.js

@@ -4,7 +4,7 @@
  * @Author: fzq
  * @Date: 2022-03-06 18:13:49
  * @LastEditors: fzq
- * @LastEditTime: 2022-03-09 10:44:04
+ * @LastEditTime: 2022-03-06 18:29:43
  */
 import request from '@/utils/request'
 
@@ -46,27 +46,3 @@ export function locaDelete(id) { // 删除工序库位信息单条数据
     data: { id }
   })
 }
-
-export function locationList(data) { // 获取库位id列表
-  return request({
-    url: '/api/wms/processlocation/locationList',
-    method: 'post',
-    data
-  })
-}
-
-export function portAttrList(data) { // 获取库位属性列表，关联数据字典
-  return request({
-    url: '/api/wms/processlocation/portAttrList',
-    method: 'post',
-    data
-  })
-}
-
-export function workSequenList(data) { // 获取工序id列表
-  return request({
-    url: '/api/wms/processlocation/workSequenList',
-    method: 'post',
-    data
-  })
-}

src/api/orderManage/00A.js

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2022-01-17 14:55:09
  * @LastEditors: zwq
- * @LastEditTime: 2022-03-10 14:13:22
+ * @LastEditTime: 2022-01-17 14:59:07
  * @Description:
  */
 
@@ -16,14 +16,6 @@ export function ProcessInfoList(data) { // 获取工单工艺列表
   })
 }
 
-export function ProcessInfoUpdata(data) { // 获取工单工艺列表
-  return request({
-    url: '/api/wms/work/order/update',
-    method: 'post',
-    data
-  })
-}
-
 export function ProcessInfoDetail(id) { // 获取工单工艺单条数据
   const data = {
     'id': id

src/api/org.js

@@ -1,7 +1,7 @@
 /*
  * @Date: 2021-01-04 17:34:38
  * @LastEditors: zwq
- * @LastEditTime: 2022-03-10 16:42:55
+ * @LastEditTime: 2021-04-12 14:23:30
  * @FilePath: \basic-admin\src\api\org.js
  * @Description: 框架基础模块——组织结构
  */
@@ -10,7 +10,7 @@ import request from '@/utils/request'
 // 获取组织结构列表
 export function getOrgList(data) {
   return request({
-    url: '/api/upms/org/page',
+    url: '/upms/org/page',
     method: 'post',
     data
   })
@@ -18,7 +18,7 @@ export function getOrgList(data) {
 
 export function getOrgDetail(id) { // 获取组织结构单条数据
   return request({
-    url: '/api/upms/org/get',
+    url: '/upms/org/get',
     method: 'post',
     data: { id }
   })
@@ -26,7 +26,7 @@ export function getOrgDetail(id) { // 获取组织结构单条数据
 
 // export function getOrgAllList(data) {
 //   return request({
-//     url: '/api/upms/org/list',
+//     url: '/upms/org/list',
 //     method: 'post',
 //     data
 //   })
@@ -35,7 +35,7 @@ export function getOrgDetail(id) { // 获取组织结构单条数据
 // 添加组织结构
 export function addOrg(data) {
   return request({
-    url: '/api/upms/org/add',
+    url: '/upms/org/add',
     method: 'post',
     data
   })
@@ -44,7 +44,7 @@ export function addOrg(data) {
 // 修改组织
 export function editOrg(data) {
   return request({
-    url: '/api/upms/org/update',
+    url: '/upms/org/update',
     method: 'post',
     data
   })
@@ -53,7 +53,7 @@ export function editOrg(data) {
 // 删除组织结构
 export function delOrg(id) {
   return request({
-    url: '/api/upms/org/delete',
+    url: '/upms/org/delete',
     method: 'post',
     data: { id }
   })

src/api/report-manage/report.js

@@ -2,7 +2,7 @@
  * @Author: gtz
  * @Date: 2021-03-07 18:39:03
  * @LastEditors: fzq
- * @LastEditTime: 2022-03-08 15:31:13
+ * @LastEditTime: 2022-03-06 19:27:01
  * @Description: file content
  */
 import request from '@/utils/request'
@@ -28,8 +28,7 @@ export function download(data) {
     url: '/api/report/report-storage-box/excel-download',
     method: 'post',
     data,
-    responseType: 'blob',
-    timeout: 60000
+    'responseType': 'arraybuffer'
   })
 }
 

src/api/role.js

@@ -10,7 +10,7 @@ import request from '@/utils/request'
 // 获取角色详细信息
 export function getRoleInfo(data) {
   return request({
-    url: `/api/upms/role/get`,
+    url: `/upms/role/get`,
     method: 'post',
     data
   })
@@ -18,7 +18,7 @@ export function getRoleInfo(data) {
 
 export function RoleCode() { // 获取code
   return request({
-    url: '/api/upms/role/get-code',
+    url: '/upms/role/get-code',
     method: 'post'
   })
 }
@@ -26,7 +26,7 @@ export function RoleCode() { // 获取code
 // 获取角色列表
 export function getRoleList(data) {
   return request({
-    url: '/api/upms/role/list',
+    url: '/upms/role/list',
     method: 'post',
     data
   })
@@ -35,7 +35,7 @@ export function getRoleList(data) {
 // 添加角色
 export function addRole(data) {
   return request({
-    url: '/api/upms/role/add',
+    url: '/upms/role/add',
     method: 'post',
     data
   })
@@ -44,7 +44,7 @@ export function addRole(data) {
 // 修改角色
 export function updateRole(data) {
   return request({
-    url: '/api/upms/role/update',
+    url: '/upms/role/update',
     method: 'post',
     data
   })
@@ -53,7 +53,7 @@ export function updateRole(data) {
 // 删除角色
 export function deleteRole(data) {
   return request({
-    url: `/api/upms/role/delete`,
+    url: `/upms/role/delete`,
     method: 'post',
     data
   })
@@ -62,7 +62,7 @@ export function deleteRole(data) {
 // 启停角色
 export function enableRole(data) {
   return request({
-    url: `/api/upms/role/enabled`,
+    url: `/upms/role/enabled`,
     method: 'post',
     data
   })
@@ -71,7 +71,7 @@ export function enableRole(data) {
 // 用户-角色关联授权
 export function saveUserRole(data) {
   return request({
-    url: '/api/upms/role/saveUserRole',
+    url: '/upms/role/saveUserRole',
     method: 'post',
     data
   })
@@ -80,7 +80,7 @@ export function saveUserRole(data) {
 // 用户-角色关联获取
 export function listByUser(id) {
   return request({
-    url: '/api/upms/role/listByUser',
+    url: '/upms/role/listByUser',
     method: 'post',
     data: { id }
   })

src/api/user.js

@@ -1,7 +1,7 @@
 /*
  * @Date: 2020-12-14 09:07:03
  * @LastEditors: zwq
- * @LastEditTime: 2022-03-10 16:41:55
+ * @LastEditTime: 2022-01-11 15:45:54
  * @FilePath: \basic-admin\src\api\user.js
  * @Description: 用户管理 & 登录用户的相关api接口定义
  */
@@ -38,7 +38,7 @@ export function getUserInfo(data) {
 // 修改当前用户密码
 export function editUserPW(data) {
   return request({
-    url: '/api/upms/user/modifyPassword',
+    url: '/upms/user/modifyPassword',
     method: 'post',
     data
   })
@@ -47,17 +47,17 @@ export function editUserPW(data) {
 // 当前用户 找回密码
 export function findUserPW(data) {
   return request({
-    url: '/api/upms/user/findPassword',
+    url: '/upms/user/findPassword',
     method: 'post',
     data
   })
 }
 
 // 下面为：用户管理列表
-// 获取用户列表 （根据需求可以考虑换成带分页的 /api/upms/user/page）
+// 获取用户列表 （根据需求可以考虑换成带分页的 /upms/user/page）
 export function getUserList(data) {
   return request({
-    url: '/api/upms/user/page',
+    url: '/upms/user/page',
     method: 'post',
     data
   })
@@ -66,7 +66,7 @@ export function getUserList(data) {
 // 新增用户
 export function addUser(data) {
   return request({
-    url: '/api/upms/user/add',
+    url: '/upms/user/add',
     method: 'post',
     data
   })
@@ -75,7 +75,7 @@ export function addUser(data) {
 // 删除用户
 export function delUser(data) {
   return request({
-    url: '/api/upms/user/delete',
+    url: '/upms/user/delete',
     method: 'post',
     data
   })
@@ -84,7 +84,7 @@ export function delUser(data) {
 // 修改用户信息
 export function editUser(data) {
   return request({
-    url: '/api/upms/user/update',
+    url: '/upms/user/update',
     method: 'post',
     data
   })
@@ -93,7 +93,7 @@ export function editUser(data) {
 // 获取用户详细信息
 export function getUserDetail(data) {
   return request({
-    url: '/api/upms/user/get',
+    url: '/upms/user/get',
     method: 'post',
     data
   })
@@ -102,7 +102,7 @@ export function getUserDetail(data) {
 // 管理员重置用户的密码
 export function resetUserPW(data) {
   return request({
-    url: '/api/upms/user/resetPassword',
+    url: '/upms/user/resetPassword',
     method: 'post',
     data
   })
@@ -111,7 +111,7 @@ export function resetUserPW(data) {
 // 启停用户信息
 export function enableUser(data) {
   return request({
-    url: '/api/upms/user/enabled',
+    url: '/upms/user/enabled',
     method: 'post',
     data
   })

src/lang/i18n.js

@@ -68,10 +68,6 @@ export default {
       zh: '返回',
       en: 'Back'
     },
-    export: {
-      zh: '导出',
-      en: 'Export'
-    },
     checkLog: {
       zh: '查看日志',
       en: 'Check Log'
@@ -258,8 +254,8 @@ export default {
   },
   routerTitle: {
     dashboard: {
-      zh: '首页',
-      en: 'Home'
+      zh: '仪表盘',
+      en: 'Dashboard'
     },
     basic: {
       zh: '系统管理',
@@ -751,10 +747,6 @@ export default {
       HistoricalTask: {
         zh: '历史任务',
         en: 'Historical Task'
-      },
-      ProcessStorageManagement: {
-        zh: '工序存储区域管理',
-        en: 'Process Storage Management'
       }
     },
     order: {
@@ -765,8 +757,8 @@ export default {
         en: 'Power Classification'
       },
       ProcessInfo: {
-        zh: '工单工艺信息',
-        en: 'Order Process Info'
+        zh: '工艺信息',
+        en: 'Process Info'
       },
       ExecutionInfo: {
         zh: '执行信息',

src/lang/i18n/en/btn/index.js

@@ -1,8 +1,8 @@
 /*
  * @Author: gtz
  * @Date: 2021-03-04 16:19:14
- * @LastEditors: fzq
- * @LastEditTime: 2022-03-08 15:48:54
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2021-07-13 20:32:02
  * @Description: file content
  */
 
@@ -90,9 +90,5 @@ export default {
   download: {
     zh: '下载',
     en: 'download'
-  },
-  export: {
-    zh: '导出',
-    en: 'export'
   }
 }

src/lang/i18n/en/module/art.js

@@ -1,8 +1,8 @@
 /*
  * @Author: gtz
  * @Date: 2021-03-08 09:45:54
- * @LastEditors: zwq
- * @LastEditTime: 2022-03-04 15:07:12
+ * @LastEditors: gtz
+ * @LastEditTime: 2021-04-15 19:34:46
  * @Description: file content
  */
 
@@ -47,7 +47,6 @@ export default {
   sameEqError: 'Can not choice same equipment!',
   processList: {
     processName: 'Process Step Name',
-    processCode: 'process Code',
     processEq: 'Process Step Equipment',
     description: 'Description',
     addProcess: 'Add a Process Step',

src/lang/i18n/en/module/basicData.js

@@ -1,13 +1,8 @@
 /*
  * @Author: gtz
  * @Date: 2021-03-04 16:13:51
-<<<<<<< HEAD
- * @LastEditors: fzq
- * @LastEditTime: 2022-03-10 14:05:21
-=======
  * @LastEditors: zwq
- * @LastEditTime: 2022-03-09 16:34:56
->>>>>>> develop
+ * @LastEditTime: 2022-03-04 10:13:58
  * @Description: file content
  */
 export default {
@@ -35,7 +30,6 @@ export default {
     cancelButtonText: 'cancel',
     Tips: 'Tips',
     TipsBefore: 'Are you sure you want to delete',
-    TipsStorageBefore: 'Confirm to add location:',
     Description: 'Description',
     Remarks: 'Remarks',
     Yes: 'Yes',
@@ -132,20 +126,6 @@ export default {
     AlarmTypeCode: 'Alarm Type Code',
     LevelCode: 'Level Code'
   },
-  processLocation: {
-    sequence: 'Sequence',
-    locationName: 'Location Name',
-    isProcess: 'Location Type',
-    locationId: 'Location Id',
-    workSequenId: 'Work Sequence Id',
-    equipmentMark: 'Equipment Mark',
-    portAttrId: 'Port Attribute Id',
-    goodsShelves: 'Goods Shelves',
-    ProcessLocation: 'Process Location',
-    CacheLocation: 'Cache Location',
-    aShelf: 'Shelf A',
-    bShelf: 'Shelf B'
-  },
   cache: {
     CacheCode: 'Ports Code',
     CacheName: 'Ports Name',
@@ -167,10 +147,7 @@ export default {
     LocationName: 'Location Name',
     anotherName: 'Another Name',
     place: 'Place',
-    addCacheArea: 'add Ports Shelf',
-    warning: 'Layers and Columns must be integer!',
-    logisticsEquipment: 'Logistics Equipment',
-    processEquipment: 'Process Equipment'
+    addCacheArea: 'add Ports Shelf'
   },
   storageBox: {
     name: 'Name',
@@ -310,7 +287,6 @@ export default {
     BoxStatus: 'Box Status',
     BoxNumber: 'Box Number',
     PreviousOperation: 'Previous Operation',
-    ExecutionOperation: 'Execution Operation',
     NextOperation: 'Next Operation',
     CompletionTime: 'Completion Time',
     StartLocation: 'Start Location',
@@ -318,20 +294,15 @@ export default {
     TaskLocation: 'Task Location',
     TargetLocation: 'Target Location',
     OrderName: 'Order Name',
-    OrderType: 'Order Type',
     OrderCode: 'Order Code',
     IssueOrderTime: 'Issue Order Time',
-    startProduceTime: 'Start Produce Time',
     TotalProcessName: 'Total Process Name',
     Priority: 'Priority',
     OrderStatus: 'Order Status',
-    triggerOrigin: 'Trigger Origin',
     ProcessOrNot: 'Process Or Not',
     Unit: 'Unit',
-    scrapQuantity: 'Scrap Quantity',
     RelateProcess: 'Relate Process',
     PlanProcessQuantity: 'Plan Process Quantity',
-    actualProcessQuantity: 'Actual Process Quantity',
     SubProcessName: 'Sub Process Name',
     TaskBoxNumber: 'Task Box Number',
     FullBoxNumber: 'Full Box Number',
@@ -344,10 +315,6 @@ export default {
     IsEmpty: 'Is Empty',
     IsEmptyBox: 'Is Empty Box',
     LocationName: 'Location Name',
-    LocationCode: 'Location Code',
-    PerformTaskManual: 'Perform Task Manual',
-    processStorageLink: 'Process Storage Link',
-    SelectStorageType: 'Select Storage Type',
-    LocationStorageSetting: 'Location Storage Setting'
+    LocationCode: 'Location Code'
   }
 }

src/lang/i18n/zh/module/art.js

@@ -1,8 +1,8 @@
 /*
  * @Author: gtz
  * @Date: 2021-03-08 09:46:00
- * @LastEditors: zwq
- * @LastEditTime: 2022-03-04 15:07:02
+ * @LastEditors: gtz
+ * @LastEditTime: 2021-04-15 19:35:00
  * @Description: file content
  */
 
@@ -47,7 +47,6 @@ export default {
   sameEqError: '不能选择相同的设备!',
   processList: {
     processName: '工序名称',
-    processCode: '工序编码',
     processEq: '工序设备',
     description: '描述',
     addProcess: '添加一道工序',

src/lang/i18n/zh/module/basicData.js

@@ -3,12 +3,12 @@
  * @Date: 2021-03-04 16:13:51
 <<<<<<< HEAD
  * @LastEditors: fzq
- * @LastEditTime: 2022-03-10 14:05:01
- * @Description: file content
+ * @LastEditTime: 2022-03-06 19:53:27
 =======
  * @LastEditors: zwq
- * @LastEditTime: 2022-03-09 16:34:50
+ * @LastEditTime: 2022-03-04 10:13:41
 >>>>>>> develop
+ * @Description: file content
  */
 export default {
   visual: {
@@ -35,7 +35,6 @@ export default {
     cancelButtonText: '取消',
     Tips: '提示',
     TipsBefore: '确定删除',
-    TipsStorageBefore: '确定添加库位:',
     Description: '描述',
     Remarks: '备注',
     Or: '或',
@@ -158,10 +157,7 @@ export default {
     place: '位置',
     addCacheArea: '添加货架',
     addLocation: '添加库位',
-    status: '状态',
-    warning: '行列标必须为整数！',
-    logisticsEquipment: '物流设备',
-    processEquipment: '工艺设备'
+    status: '状态'
   },
   storageBox: {
     name: '存储箱名称',
@@ -258,16 +254,10 @@ export default {
   processLocation: {
     sequence: '顺序',
     locationName: '库位名',
-    isProcess: '库位类型',
+    isProcess: '是否为工序准备箱',
     locationId: '库位ID',
     workSequenId: '工序ID',
-    equipmentMark: '设备标记',
-    portAttrId: '库位属性ID',
-    goodsShelves: '货架',
-    CacheLocation: '缓存区库位',
-    ProcessLocation: '工序库位',
-    aShelf: 'a货架',
-    bShelf: 'b货架'
+    equipmentMark: '设备标记'
   },
   productPool: {
     productName: '产品名称',
@@ -317,7 +307,6 @@ export default {
     BoxStatus: '箱状态',
     BoxNumber: '箱号',
     PreviousOperation: '上一个工序',
-    ExecutionOperation: '执行工序',
     NextOperation: '下一个工序',
     CompletionTime: '完成时间',
     StartLocation: '开始库位',
@@ -325,20 +314,15 @@ export default {
     TaskLocation: '任务库位',
     TargetLocation: '目标库位',
     OrderName: '工单名',
-    OrderType: '工单类型',
     OrderCode: '工单编码',
     IssueOrderTime: '下发工单时间',
-    startProduceTime: '开始生产时间',
     TotalProcessName: '总工艺名称',
     Priority: '优先级',
-    scrapQuantity: '废片数量',
     OrderStatus: '工单状态',
-    triggerOrigin: '工单发起方',
     ProcessOrNot: '是否关联工艺',
     Unit: '单位',
     RelateProcess: '关联工艺',
     PlanProcessQuantity: '计划加工数量',
-    actualProcessQuantity: '实际加工数量',
     SubProcessName: '分工艺',
     TaskBoxNumber: '任务箱号',
     FullBoxNumber: '空箱号',
@@ -351,10 +335,7 @@ export default {
     IsEmpty: '是否有基板',
     IsEmptyBox: '是否空箱',
     LocationName: '库位名',
-    LocationCode: '库位编码',
-    PerformTaskManual: '手动执行任务',
-    processStorageLink: '工序关联库位',
-    SelectStorageType: '选择库位类型',
-    LocationStorageSetting: '库位存储箱设置'
+    LocationCode: '库位编码'
+
   }
 }

src/layout/components/Navbar.vue

@@ -34,6 +34,16 @@
           <!-- <i class="el-icon-caret-bottom" /> -->
         </div>
         <el-dropdown-menu slot="dropdown">
+          <router-link to="/profile/index">
+            <el-dropdown-item>
+              <svg-icon class="item-icon" icon-class="user" />
+              {{ 'navbar.profile' | i18nFilter }}
+            </el-dropdown-item>
+          </router-link>
+          <el-dropdown-item @click.native="toHome">
+            <svg-icon class="item-icon" icon-class="help" />
+            {{ 'navbar.help' | i18nFilter }}
+          </el-dropdown-item>
           <el-dropdown-item @click.native="logout">
             <svg-icon class="item-icon" icon-class="logout" />
             {{ 'navbar.logOut' | i18nFilter }}

src/router/index.js

@@ -57,19 +57,19 @@ export const constantRoutes = [
     component: () => import('@/views/login/index'),
     hidden: true
   },
-  {
-    path: '/',
-    component: Layout,
-    redirect: '/dashboard',
-    children: [
-      {
-        path: 'dashboard',
-        component: () => import('@/views/dashboard/index'),
-        name: 'Dashboard',
-        meta: { title: routerTitle.dashboard?.[language] || routerTitle.dashboard.en, icon: 'form', iconPart: 'dashboard', affix: true, required: true, requireToken: true }
-      }
-    ]
-  },
+  // {
+  //   path: '/',
+  //   component: Layout,
+  //   redirect: '/dashboard',
+  //   children: [
+  //     {
+  //       path: 'dashboard',
+  //       component: () => import('@/views/dashboard/index'),
+  //       name: 'Dashboard',
+  //       meta: { title: routerTitle.dashboard?.[language] || routerTitle.dashboard.en, icon: 'form', iconPart: 'dashboard', affix: true, required: true, requireToken: true }
+  //     }
+  //   ]
+  // },
   // {
   //   path: '/',
   //   component: () => import('@/views/ChoicePart'),
@@ -159,7 +159,6 @@ export const constantRoutes = [
         path: 'processInfo',
         component: () => import('@/views/basicData/Process/processInfo'),
         name: 'processInfo',
-        hidden: true,
         meta: { title: routerTitle.basicData.process.processInfo?.[language] || routerTitle.basicData.process.processInfo.en, icon: 'form', affix: true, required: true, requireToken: true }
       },
       {
@@ -299,29 +298,6 @@ export const constantRoutes = [
           import('@/views/basicData/Warehouse/HistoricalTask'),
         name: 'HistoricalTask',
         meta: { title: routerTitle.Warehouse.HistoricalTask?.[language] || routerTitle.Warehouse.HistoricalTask.en, icon: 'form', affix: true, required: true, requireToken: true }
-      },
-      {
-        path: '/ProcessStorageManagement',
-        component: () =>
-          import('@/views/basicData/Warehouse/ProcessStorageManagement'),
-        name: 'ProcessStorageManagement',
-        meta: { title: routerTitle.Warehouse.ProcessStorageManagement?.[language] || routerTitle.Warehouse.ProcessStorageManagement.en, icon: 'form', affix: true, required: true, requireToken: true }
-      },
-      {
-        path: '/ProcessStorageManagementInfo',
-        hidden: true,
-        component: () =>
-          import('@/views/basicData/Warehouse/components/ProcessStorageManagement-info'),
-        name: 'ProcessStorageManagementInfo',
-        meta: { title: routerTitle.Warehouse.ProcessStorageManagement?.[language] || routerTitle.Warehouse.ProcessStorageManagement.en, icon: 'form', affix: true, required: true, requireToken: true }
-      },
-      {
-        path: '/ProcessStorageLink',
-        hidden: true,
-        component: () =>
-          import('@/views/basicData/Warehouse/components/processStorageLink'),
-        name: 'ProcessStorageLink',
-        meta: { title: routerTitle.Warehouse.ProcessStorageManagement?.[language] || routerTitle.Warehouse.ProcessStorageManagement.en, icon: 'form', affix: true, required: true, requireToken: true }
       }
     ]
   },
@@ -435,7 +411,6 @@ export const constantRoutes = [
       path: 'currentSubstrate',
       component: () => import('@/views/report-manage/CurrentSubstrate'),
       name: 'currentSubstrate',
-      hidden: true,
       meta: { title: routerTitle.form.currentSubstrate?.[language] || routerTitle.form.currentSubstrate.en, icon: 'form', affix: true, required: true, requireToken: true }
     },
     {

src/styles/index.scss

@@ -198,40 +198,3 @@ aside {
 .el-dialog__wrapper {
   backdrop-filter: blur(5px);
 }
-
-::-webkit-scrollbar {
-  width: 8px;
-  height: 8px;
-  background-color: transparent;
-}
-
-::-webkit-scrollbar-track-piece {
-  background-color:rgba(144,147,153,0);
-}
-
-::-webkit-scrollbar-corner {
-  background-color:rgba(144,147,153,0);
-}
-
-::-webkit-scrollbar-track {
-  width: 6px;
-  background: rgba(144,147,153,0);
-  -webkit-border-radius: 2em;
-  -moz-border-radius: 2em;
-  border-radius: 2em;
-}
-
-::-webkit-scrollbar-thumb {
-  background-color: rgba(144,147,153,.5);
-  background-clip: padding-box;
-  min-height: 28px;
-  -webkit-border-radius: 2em;
-  -moz-border-radius: 2em;
-  border-radius: 2em;
-  transition: background-color .3s;
-  cursor: pointer;
-}
-
-::-webkit-scrollbar-thumb:hover {
-  background-color: rgba(144,147,153,.3);
-}

src/views/QualityManager/scrap/ScrapInfo-add.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2020-12-29 16:37:56
  * @LastEditors: zwq
- * @LastEditTime: 2022-03-09 14:59:52
+ * @LastEditTime: 2022-03-04 10:39:52
  * @Description:
 -->
 <template>
@@ -91,7 +91,7 @@
         </el-form-item>
 
         <el-form-item :label="$t('module.basicData.ScrapInfo.name')" prop="equipmentId">
-          <el-select v-model="dataForm.equipmentId" filterable :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.ScrapInfo.name')])" clearable :style="{width: '100%'}">
+          <el-select v-model="dataForm.equipmentId" filterable :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.ScrapInfo.name')])" clearable :style="{width: '100%'}" @change="getScrapGrade">
             <el-option
               v-for="(item, index) in device"
               :key="index"
@@ -101,6 +101,10 @@
           </el-select>
         </el-form-item>
 
+        <el-form-item v-if="tag" :label="$t('module.basicData.ScrapInfo.wasteGrade')" prop="ewasteGrade">
+          <el-input v-model="wasteGrade" clear readonly :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.ScrapInfo.wasteGrade')])" :disabled="true" />
+        </el-form-item>
+
         <el-form-item :label="$t('module.basicData.ScrapInfo.cause')" prop="scrapReasonId">
           <!-- <el-input v-model="dataForm.registerPerson" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.ScrapInfo.RegisterPerson')])" clearable :style="{width: '100%'}" /> -->
           <el-select
@@ -136,7 +140,7 @@
 
 <script>
 import i18n from '@/lang'
-import { getScrapInfo, editScrapInfo, addScrapInfo } from '@/api/quality-manage/scrap'
+import { getScrapInfo, editScrapInfo, addScrapInfo, getScrap } from '@/api/quality-manage/scrap'
 import { scrapReasonList } from '@/api/dict'
 import { getDictWorker } from '@/api/dict'
 import { getEqList } from '@/api/equipment/maintain'
@@ -178,9 +182,19 @@ export default {
       wasteGradeArr,
       entryType,
       rules: {
+        name: [{
+          required: true,
+          message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.ScrapInfo.WasteName')]),
+          trigger: 'blur'
+        }],
+        code: [{
+          required: true,
+          message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.ScrapInfo.WasteCode')]),
+          trigger: 'blur'
+        }],
         equipmentId: [{
           required: true,
-          message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.ScrapInfo.name')]),
+          message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.ScrapInfo.equipmentId')]),
           trigger: 'change'
         }],
         substrateId: [{
@@ -192,11 +206,6 @@ export default {
           required: true,
           message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.ScrapInfo.registerPerson')]),
           trigger: 'change'
-        }],
-        scrapReasonId: [{
-          required: true,
-          message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.ScrapInfo.cause')]),
-          trigger: 'change'
         }]
       },
       dict: {
@@ -205,6 +214,7 @@ export default {
         orderList: []
       },
       device: [],
+      wasteGrade: '',
       tag: false
     }
   },
@@ -212,6 +222,19 @@ export default {
     this.getDict()
   },
   methods: {
+    getScrapGrade(val) {
+      getScrap(val).then(res => {
+        if (res.code === 0) {
+          if (res.data) {
+            this.tag = true
+            this.wasteGrade = res.data.dataName
+          } else {
+            this.tag = false
+            this.wasteGrade = ''
+          }
+        }
+      })
+    },
     onClose() {
       this.$refs['dataForm'].resetFields()
     },

src/views/UserPage/usermanage.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-04-06 19:33:11
  * @LastEditors: zwq
- * @LastEditTime: 2022-03-10 16:54:48
+ * @LastEditTime: 2021-07-09 09:42:54
  * @Description:
 -->
 <template>
@@ -257,7 +257,7 @@ export default {
       if (res.code === 0) {
         this.list = res.data.records
         this.list.forEach(item => {
-          item.roleName = item.stringList?.toString()
+          item.roleName = item.stringList.toString()
         })
         this.total = res.data.total
         this.listLoading = false

src/views/art/components/Process-add.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2020-12-29 16:37:56
  * @LastEditors: zwq
- * @LastEditTime: 2022-03-09 16:53:23
+ * @LastEditTime: 2022-03-03 16:43:26
  * @Description:
 -->
 <template>
@@ -16,7 +16,7 @@
       </el-form-item>
       <el-form-item :label="$t('module.art.processList.processEq')" prop="equipmentIds">
         <el-select v-model="dataForm.equipmentIds" clearable filterable multiple>
-          <el-option v-for="item in eqList" :key="item.id" :value="item.id" :label="item.name" />
+          <el-option v-for="item in eqList" :key="item.id" :value="item.id" :label="item.enName" />
         </el-select>
       </el-form-item>
       <!-- <el-form-item :label="$t('module.art.processList.type')" prop="type">
@@ -24,7 +24,7 @@
           <el-option v-for="item in typeList" :key="item.id" :value="item.id" :label="item.name" />
         </el-select>
       </el-form-item> -->
-      <el-form-item :label="$t('module.art.processList.description')" prop="description">
+      <el-form-item :label="$t('module.art.processList.description')" prop="address">
         <el-input v-model="dataForm.description" :placeholder="$i18nForm(['placeholder.input', $t('module.art.processList.description')])" clearable />
       </el-form-item>
     </el-form>
@@ -88,7 +88,10 @@ export default {
         this.$refs['dataForm'].resetFields()
         if (this.dataForm.id) {
           getInfo({ id: this.dataForm.id }).then(res => {
-            this.dataForm = res.data
+            this.dataForm.id = res.data.id
+            this.dataForm.name = res.data.name
+            this.dataForm.type = res.data.type
+            this.dataForm.description = res.data.description
             this.dataForm.equipmentIds = res.data.equipments.map(item => {
               return item.id
             })
@@ -98,6 +101,7 @@ export default {
     },
     // 表单提交
     dataFormSubmit() {
+      console.log(!this.dataForm.id)
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
           const data = {

src/views/art/components/add-dialog.vue

@@ -32,7 +32,7 @@
           />
         </el-select>
       </el-form-item> -->
-      <!-- <el-form-item v-if="false" :label="$t('module.art.artBOM')" prop="bomId">
+      <el-form-item v-if="false" :label="$t('module.art.artBOM')" prop="bomId">
         <el-select
           v-model="obj.bomId"
           :class="$style.select"
@@ -47,7 +47,7 @@
             :value="item.id"
           />
         </el-select>
-      </el-form-item> -->
+      </el-form-item>
       <el-form-item :label="$t('module.art.description')" prop="description">
         <el-input v-model="obj.description" />
       </el-form-item>
@@ -63,7 +63,7 @@
 </template>
 
 <script>
-import { add, update, getInfo, getCode } from '@/api/art-manage/art.js'
+import { add, update, getInfo, listSubstrate, listBom, getCode } from '@/api/art-manage/art.js'
 import SubmitBar from '@/views/art/components/submit-bar'
 
 export default {
@@ -91,6 +91,8 @@ export default {
         substrateId: '',
         bomId: ''
       },
+      substrateList: [],
+      bomList: [],
       rules: {
         name: [
           { required: true, message: this.$t('module.art.artName') + this.$t('module.art.notNull'), trigger: 'blur' },
@@ -127,6 +129,14 @@ export default {
   },
   methods: {
     init: async function() {
+      if (this.substrateList.length === 0) {
+        const substrateRes = await listSubstrate()
+        this.substrateList = substrateRes.data
+      }
+      if (this.bomList.length === 0) {
+        const bomRes = await listBom()
+        this.bomList = bomRes.data
+      }
       if (this.id) {
         const res = await getInfo({ id: this.id })
         this.obj = res.data

src/views/art/processList.vue

@@ -2,7 +2,7 @@
  * @Author: gtz
  * @Date: 2021-04-06 20:07:22
  * @LastEditors: zwq
- * @LastEditTime: 2022-03-09 16:19:15
+ * @LastEditTime: 2022-03-03 17:00:54
  * @Description: file content
 -->
 <template>
@@ -128,7 +128,7 @@ export default {
       // edit here
       const res = await equipmentlistList()
       if (res.code === 0) {
-        this.eqList = res.data
+        this.eqList = res.data.records
       }
       this.getList()
     },

src/views/basicData/Cache/components/location-add.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2020-12-29 15:41:11
  * @LastEditors: fzq
- * @LastEditTime: 2022-03-10 21:00:58
+ * @LastEditTime: 2022-03-04 19:08:00
  * @Description:
 -->
 <template>
@@ -17,9 +17,7 @@
       @getDataList="getList"
       @add="addNew"
     />
-    <div style="title">货架编码:{{ shCode }}    货架名称：{{ shName }}    库存量：{{ num }}
-      <el-button type="success" @click="goback()">{{ 'btn.back' | i18nFilter }}</el-button>
-    </div>
+    <el-button type="success" @click="goback()">{{ 'btn.back' | i18nFilter }}</el-button>
     <base-table
       :page="listQuery.current"
       :limit="listQuery.size"
@@ -108,7 +106,7 @@ const tableProps = [
     align: 'center'
   },
   {
-    prop: 'statusName',
+    prop: 'status',
     label: i18n.t('module.basicData.cache.status'),
     align: 'center'
   }
@@ -129,18 +127,13 @@ export default {
   },
   data() {
     return {
-      shCode: '',
-      shName: '',
-      num: 0,
       addOrUpdateVisible: false,
       keyNameAdd: i18n.t('module.basicData.visual.keyword'),
       placeholderName: this.$t('module.basicData.cache.LocationName'),
       tableBtn,
       trueWidth: 200,
       tableProps,
-      list: [{
-        statusName: ''
-      }],
+      list: [],
       listLoading: true,
       listQuery: {
         current: 1,
@@ -152,9 +145,6 @@ export default {
   },
   created() {
     this.listQuery.shelfId = this.$route.query.id
-    this.shCode = this.$route.query.code
-    this.shName = this.$route.query.shelfName
-    this.num = this.$route.query.columnNum
     this.getList()
   },
   methods: {
@@ -190,16 +180,6 @@ export default {
         if (response.data.records) {
           this.list = response.data.records
           console.log(this.list)
-          // 1是Working Port，2是Buffer Port，3是Exception Port与status进行替换
-          for (var x = 0; x < this.list.length; x++) {
-            if (this.list[x].status === 1) {
-              this.list[x].statusName = 'Working Port'
-            } else if (this.list[x].status === 2) {
-              this.list[x].statusName = 'Buffer Port'
-            } else if (this.list[x].status === 3) {
-              this.list[x].statusName = 'Exception Port'
-            }
-          }
         } else {
           this.list.splice(0, this.list.length)
         }

src/views/basicData/Cache/components/locationAttr-add.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2020-12-29 16:37:56
  * @LastEditors: fzq
- * @LastEditTime: 2022-03-10 21:14:13
+ * @LastEditTime: 2022-03-04 18:59:53
  * @Description:
 -->
 <template>
@@ -29,18 +29,8 @@
       <el-form-item :label="$t('module.basicData.cache.locationType')" prop="locationType">
         <el-input v-model="dataForm.locationType" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.locationType')])" clearable />
       </el-form-item>
-      <!-- <el-form-item :label="$t('module.basicData.cache.status')" prop="status">
-        <el-input v-model="dataForm.status" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.status')])" clearable />
-      </el-form-item> -->
       <el-form-item :label="$t('module.basicData.cache.status')" prop="status">
-        <el-select v-model="dataForm.status">
-          <el-option
-            v-for="item in options"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
-        </el-select>
+        <el-input v-model="dataForm.status" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.status')])" clearable />
       </el-form-item>
     </el-form>
     <span slot="footer" class="dialog-footer">
@@ -71,25 +61,11 @@ export default {
         code: '',
         locationNameAlias: '',
         rowNum: '',
-        columns: 0,
-        layers: 0,
-        status: null,
+        columns: '',
+        layers: '',
+        status: '',
         locationType: ''
       },
-      options: [
-        {
-          value: 1,
-          label: 'Working Port'
-        },
-        {
-          value: 2,
-          label: 'Buffer Port'
-        },
-        {
-          value: 3,
-          label: 'Exception Port'
-        }
-      ],
       dataRule: {
         name: [
           { required: true, message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.cache.LocationName')]), trigger: 'blur' }
@@ -97,16 +73,6 @@ export default {
         code: [
           { required: true, message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.cache.LocationCode')]), trigger: 'blur' }
         ]
-        // layers: [{
-        // type: 'number',
-        // message: this.$t('module.basicData.cache.warning'),
-        // trigger: "blur"
-        // }],
-        // columns:  [{
-        // type: 'number',
-        // message: this.$t('module.basicData.cache.warning'),
-        // trigger: "blur"
-        // }]
       }
     }
   },
@@ -119,7 +85,6 @@ export default {
         if (this.dataForm.id) {
           locationDetail(this.dataForm.id).then(res => {
             this.dataForm = res.data
-            console.log(this.dataForm)
           })
         } else {
           locationCode().then(res => {

src/views/basicData/Cache/components/locationBtn.vue

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2021-01-07 20:09:37
  * @LastEditors: fzq
- * @LastEditTime: 2022-03-10 20:20:44
+ * @LastEditTime: 2022-03-03 18:39:03
  * @FilePath: \basic-admin\src\components\BaseTable\subcomponents\CheckDetail.vue
  * @Description:
 -->
@@ -24,10 +24,7 @@ export default {
       this.$router.push({
         name: 'locationAdd',
         query: {
-          id: this.injectData.id,
-          code: this.injectData.code,
-          columnNum: this.injectData.columnNum,
-          shelfName: this.injectData.shelfName
+          id: this.injectData.id
         }
       })
     }

src/views/basicData/Cache/components/shelf-add.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: zwq
  * @Date: 2020-12-29 15:41:11
- * @LastEditors: fzq
- * @LastEditTime: 2022-03-10 19:20:22
+ * @LastEditors: zwq
+ * @LastEditTime: 2021-03-11 09:22:52
  * @Description:
 -->
 <template>
@@ -25,7 +25,7 @@
         @clickBtn="handleClick"
       />
     </base-table>
-    <shelfAttr-add v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getList" />
+    <shelfAttr-add v-if="addOrUpdateVisible" ref="addOrUpdate" :area-id="listQuery.areaId" @refreshDataList="getList" />
   </div>
 </template>
 
@@ -163,7 +163,7 @@ export default {
     addNew(id) {
       this.addOrUpdateVisible = true
       this.$nextTick(() => {
-        this.$refs.addOrUpdate.init(id, true)
+        this.$refs.addOrUpdate.init(id)
       })
     },
     goback() {

src/views/basicData/Cache/components/shelfAttr-add.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2020-12-29 16:37:56
  * @LastEditors: fzq
- * @LastEditTime: 2022-03-10 19:38:31
+ * @LastEditTime: 2022-03-03 19:00:08
  * @Description:
 -->
 <template>
@@ -47,7 +47,7 @@
 </template>
 
 <script>
-import { shelfDetail, shelfUpdate, shelfAdd, shelfCode } from '@/api/basicData/Cache/shelf'
+import { shelfList, shelfDetail, shelfUpdate, shelfAdd, shelfCode } from '@/api/basicData/Cache/shelf'
 
 export default {
   props: {
@@ -86,60 +86,36 @@ export default {
     }
   },
   methods: {
-    // init(id, isPage) {
-    //   this.isPage = isPage || false
-    //   this.dataForm.id = id || ''
-    //   if (!this.isPage) {
-    //     this.dataForm.areaId = this.areaId
-    //   }
-    //   this.areaArr.splice(0, this.areaArr.length)
-    //   const params = {
-    //     current: 1,
-    //     size: 500
-    //   }
-    //   shelfList(params).then(response => {
-    //     if (response.data.records) {
-    //       this.areaArr = response.data.records
-    //     }
-    //   })
-    //   this.visible = true
-    //   this.$nextTick(() => {
-    //     this.$refs['dataForm'].resetFields()
-    //     if (this.dataForm.id) {
-    //       shelfDetail(this.dataForm.id).then(res => {
-    //         this.dataForm = res.data
-    //       })
-    //     } else {
-    //       shelfCode().then(res => {
-    //         this.dataForm.code = res.data
-    //       })
-    //     }
-    //   })
-    // },
-    init(id) {
+    init(id, isPage) {
+      this.isPage = isPage || false
       this.dataForm.id = id || ''
+      if (!this.isPage) {
+        this.dataForm.areaId = this.areaId
+      }
+      this.areaArr.splice(0, this.areaArr.length)
+      const params = {
+        current: 1,
+        size: 500
+      }
+      shelfList(params).then(response => {
+        if (response.data.records) {
+          this.areaArr = response.data.records
+        }
+      })
       this.visible = true
       this.$nextTick(() => {
         this.$refs['dataForm'].resetFields()
         if (this.dataForm.id) {
-          // console.log(this.dataForm)
           shelfDetail(this.dataForm.id).then(res => {
-            // console.log(res)
             this.dataForm = res.data
           })
         } else {
-          this.dataForm.shelfName = ''
           shelfCode().then(res => {
             this.dataForm.code = res.data
           })
         }
       })
-      // console.log(this.dataForm)
     },
-    // getClose() {
-    //   this.dataForm.shelfName = ''
-    //   console.log(this.dataForm)
-    // },
     // 表单提交
     dataFormSubmit() {
       this.$refs['dataForm'].validate((valid) => {
@@ -160,7 +136,7 @@ export default {
             })
           } else {
             shelfAdd(data).then(res => {
-              // console.log(res)
+              console.log(res)
               this.$message({
                 message: this.$t('module.basicData.visual.success'),
                 type: 'success',

src/views/basicData/Cache/components/storageBox-add.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: zwq
  * @Date: 2020-12-29 16:37:56
- * @LastEditors: fzq
- * @LastEditTime: 2022-03-09 16:53:31
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-01-11 16:45:30
  * @Description:
 -->
 <template>
@@ -52,7 +52,7 @@ export default {
         id: 0,
         storageBoxName: '',
         code: '',
-        status: '',
+        status: 0,
         enName: '',
         note: ''
       },

src/views/basicData/Cache/shelf.vue

@@ -2,17 +2,17 @@
  * @Author: zwq
  * @Date: 2020-12-29 15:41:11
  * @LastEditors: fzq
- * @LastEditTime: 2022-03-10 20:18:52
+ * @LastEditTime: 2022-03-04 19:00:14
  * @Description:
 -->
 <template>
   <div class="app-container">
-    <head-form
+    <!-- <head-form
       :placeholder-name="placeholderName"
       :key-name="keyName"
       @getDataList="getList"
       @add="addNew"
-    />
+    /> -->
     <base-table
       :page="listQuery.current"
       :limit="listQuery.size"
@@ -39,7 +39,7 @@
 </template>
 
 <script>import i18n from '@/lang'
-import HeadForm from '@/components/basicData/HeadForm'
+// import HeadForm from '@/components/basicData/HeadForm'
 import BaseTable from '@/components/BaseTable'
 import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
 import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn'
@@ -108,7 +108,7 @@ const tableProps = [
 
 export default {
   name: 'Area',
-  components: { Pagination, BaseTable, MethodBtn, HeadForm, shelfAttrAdd },
+  components: { Pagination, BaseTable, MethodBtn, shelfAttrAdd },
   filters: {
     statusFilter(status) {
       const statusMap = {
@@ -122,7 +122,7 @@ export default {
   data() {
     return {
       addOrUpdateVisible: false,
-      keyName: this.$t('module.basicData.cache.ShelfName'),
+      keyName: i18n.t('module.basicData.visual.keyword'),
       placeholderName: this.$t('module.basicData.cache.ShelfName'),
       tableBtn,
       trueWidth: 200,
@@ -178,9 +178,9 @@ export default {
     getList(key) {
       this.listLoading = true
       this.listQuery.shelfName = key
-      // console.log(this.listQuery)
+      console.log(this.listQuery)
       shelfList(this.listQuery).then(response => {
-        console.log(response)
+        // console.log(response)
         if (response.data.records) {
           this.list = response.data.records
           this.list.forEach(item => {

src/views/basicData/Cache/storageBox.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: zwq
  * @Date: 2020-12-29 15:41:11
- * @LastEditors: fzq
- * @LastEditTime: 2022-03-10 10:55:34
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-01-11 16:46:48
  * @Description:
 -->
 <template>
@@ -81,13 +81,13 @@ const tableProps = [
     align: 'center'
   },
   {
-    prop: 'code',
-    label: i18n.t('module.basicData.storageBox.code'),
+    prop: 'storageBoxName',
+    label: i18n.t('module.basicData.storageBox.name'),
     align: 'center'
   },
   {
-    prop: 'storageBoxName',
-    label: i18n.t('module.basicData.storageBox.name'),
+    prop: 'code',
+    label: i18n.t('module.basicData.storageBox.code'),
     align: 'center'
   },
   {
@@ -124,8 +124,8 @@ export default {
   data() {
     return {
       addOrUpdateVisible: false,
-      keyName: this.$t('module.basicData.storageBox.name'),
-      placeholderName: this.$t('module.basicData.storageBox.name'),
+      keyName: i18n.t('module.basicData.visual.keyword'),
+      placeholderName: this.$t('module.basicData.storageBox.name') + this.$t('module.basicData.visual.Or') + this.$t('module.basicData.storageBox.code'),
       tableBtn,
       trueWidth: 200,
       tableProps,

src/views/basicData/Equipment/components/equipmentInfo-add.vue

@@ -54,18 +54,8 @@
                 />
               </el-select>
             </el-form-item> -->
-            <!-- <el-form-item :label="$t('module.basicData.equipment.EquipmentType')" prop="equipmentType">
+            <el-form-item :label="$t('module.basicData.equipment.EquipmentType')" prop="equipmentType">
               <el-input v-model="dataForm.equipmentType" :disabled="isdetail" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.equipment.EquipmentType')])" clearable :style="{width: '100%'}" />
-            </el-form-item> -->
-            <el-form-item :label="$t('module.basicData.equipment.EquipmentType')" prop="EquipmentType">
-              <el-select v-model="dataForm.equipmentType" :placeholder="dataForm.equipmentType">
-                <el-option
-                  v-for="item in options"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                />
-              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -422,16 +412,6 @@ export default {
         maintenanceTime: '',
         maintenanceCycle: ''
       },
-      options: [
-        {
-          value: '1',
-          label: this.$t('module.basicData.cache.logisticsEquipment')
-        },
-        {
-          value: '2',
-          label: this.$t('module.basicData.cache.processEquipment')
-        }
-      ],
       rules: {
         name: [{
           required: true,
@@ -442,6 +422,11 @@ export default {
           required: true,
           message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.equipment.EquipmentCode')]),
           trigger: 'blur'
+        }],
+        equipmentType: [{
+          required: true,
+          message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.equipment.EquipmentType')]),
+          trigger: 'change'
         }]
         // maintenanceCycle: [{
         //   required: true,
@@ -511,7 +496,6 @@ export default {
           this.listLoading = true
           equipmentInfoDetail(this.listQuery.equipmentId).then(res => {
             this.dataForm = res.data
-            console.log(this.dataForm)
           })
           equipmentInfoAttrList(this.listQuery).then(response => {
             if (response.data.records) {
@@ -530,9 +514,9 @@ export default {
     },
     getList() {
       this.listLoading = true
-      // console.log(this.listQuery)
+      console.log(this.listQuery)
       equipmentInfoAttrList(this.listQuery).then(response => {
-        // console.log(response)
+        console.log(response)
         if (response.data.records) {
           this.list = response.data.records
         } else {
@@ -565,14 +549,13 @@ export default {
     },
     // 表单提交
     dataFormSubmit() {
-      // console.log(this.dataForm)
-      // console.log(this.dataForm.eInfo)
+      console.log(this.dataForm)
+      console.log(this.dataForm.eInfo)
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
           const data = this.dataForm
           data.id = this.listQuery.equipmentId
           if (this.listQuery.equipmentId) {
-            // console.log(data)
             equipmentInfoUpdate(data).then(res => {
               this.$message({
                 message: this.$t('module.basicData.visual.success'),
@@ -638,9 +621,9 @@ export default {
           'fileUrl': res.data[0].fileUrl,
           'typeCode': this.typeCode.typeCode
         }
-      // console.log(data)
+      console.log(data)
       equipmentInfoFileAdd(data).then(res => {
-        // console.log(res)
+        console.log(res)
       })
     },
     downloadFile(id) {

src/views/basicData/Equipment/equipmentInfo.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2020-12-29 15:41:11
  * @LastEditors: fzq
- * @LastEditTime: 2022-03-10 15:09:41
+ * @LastEditTime: 2022-03-05 11:01:57
  * @Description:
 -->
 <template>
@@ -93,7 +93,7 @@ const tableProps = [
     align: 'center'
   },
   {
-    prop: 'typeName',
+    prop: 'equipmentType',
     label: i18n.t('module.basicData.equipment.EquipmentType'),
     align: 'center'
   },
@@ -130,14 +130,12 @@ export default {
   },
   data() {
     return {
-      keyName: this.$t('module.basicData.equipment.EquipmentCode'),
-      placeholderName: this.$t('module.basicData.equipment.EquipmentCode'),
+      keyName: i18n.t('module.basicData.visual.keyword'),
+      placeholderName: this.$t('module.basicData.equipment.EquipmentName') + this.$t('module.basicData.visual.Or') + this.$t('module.basicData.equipment.EquipmentCode'),
       tableBtn,
       trueWidth: 240,
       tableProps,
-      list: [{
-        typeName: ''
-      }],
+      list: [],
       total: 0,
       listLoading: true,
       listQuery: {
@@ -182,20 +180,11 @@ export default {
         console.log(response)
         if (response.data.records) {
           this.list = response.data.records
-          // 1是物流设备，2是工艺设备，与equipmentType进行替换
-          for (var x = 0; x < this.list.length; x++) {
-            if (this.list[x].equipmentType === '1') {
-              this.list[x].typeName = this.$t('module.basicData.cache.logisticsEquipment')
-            } else if (this.list[x].equipmentType === '2') {
-              this.list[x].typeName = this.$t('module.basicData.cache.processEquipment')
-            }
-          }
         } else {
           this.list.splice(0, this.list.length)
         }
         this.total = response.data.total
         this.listLoading = false
-        console.log(this.list)
       })
     },
     // 新增 / 修改

src/views/basicData/GroupModule/staff.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: zwq
  * @Date: 2020-12-29 15:41:11
- * @LastEditors: fzq
- * @LastEditTime: 2022-03-10 13:43:01
+ * @LastEditors: zwq
+ * @LastEditTime: 2021-05-21 14:41:36
  * @Description:
 -->
 <template>
@@ -127,6 +127,11 @@ const tableProps = [
     label: i18n.t('module.basicData.staff.Wechat'),
     align: 'center'
   },
+  {
+    prop: 'majorArr',
+    label: i18n.t('module.basicData.staff.Profession'),
+    align: 'center'
+  },
   {
     prop: 'workshop',
     label: i18n.t('module.basicData.staff.Workshop'),

src/views/basicData/Process/components/processInfo-add.vue

@@ -4,64 +4,31 @@
  * @Author: fzq
  * @Date: 2022-03-04 11:12:42
  * @LastEditors: fzq
- * @LastEditTime: 2022-03-09 16:12:04
+ * @LastEditTime: 2022-03-06 19:17:36
 -->
 <template>
   <el-dialog
-    :title="!dataForm.id ? 'btn.add' : 'btn.edit' | i18nFilter"
+    :title="!dataForm.locationId ? 'btn.add' : 'btn.edit' | i18nFilter"
     :visible.sync="visible"
   >
     <el-form ref="dataForm" :model="dataForm" label-width="130px" @keyup.enter.native="dataFormSubmit()">
-      <el-form-item :label="$t('module.basicData.processLocation.workSequenId')" prop="workSequenId">
-        <el-input v-model="dataForm.workSequenId" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.processLocation.workSequenId')])" clearable />
-      </el-form-item>
-      <!-- <el-form-item :label="$t('module.basicData.processLocation.locationName')" prop="locationName">
-        <el-input v-model="dataForm.locationId" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.processLocation.locationName')])" clearable />
-      </el-form-item> -->
-      <el-form-item :label="$t('module.basicData.processLocation.locationName')" prop="locationName">
-        <el-select v-model="dataForm.locationName" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.processLocation.locationName')])">
-          <el-option
-            v-for="item in dataForm"
-            :key="item.locationName"
-            :label="item.locationName"
-            :value="item.locationName"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item :label="$t('module.basicData.processLocation.portAttrId')" prop="portAttrId">
-        <el-input v-model="dataForm.portAttrId" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.processLocation.portAttrId')])" clearable />
-      </el-form-item>
-      <!-- <el-form-item :label="$t('module.basicData.processLocation.isProcess')" prop="isProcess">
-        <el-input v-model="dataForm.isProcess" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.processLocation.isProcess')])" clearable />
-      </el-form-item> -->
-      <el-form-item :label="$t('module.basicData.processLocation.isProcess')" prop="isProcess">
-        <el-select v-model="dataForm.isProcess" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.processLocation.isProcess')])">
-          <el-option
-            v-for="item in options"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item :label="$t('module.basicData.processLocation.equipmentMark')" prop="equipmentMark">
-        <el-input v-model="dataForm.equipmentMark" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.processLocation.equipmentMark')])" clearable />
-      </el-form-item>
       <el-form-item :label="$t('module.basicData.processLocation.sequence')" prop="sequence">
         <el-input v-model="dataForm.sequence" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.processLocation.sequence')])" clearable />
       </el-form-item>
-      <!-- <el-form-item :label="$t('module.basicData.processLocation.goodsShelves')" prop="goodsShelves">
-        <el-input v-model="dataForm.goodsShelves" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.processLocation.goodsShelves')])" clearable />
-      </el-form-item> -->
-      <el-form-item :label="$t('module.basicData.processLocation.goodsShelves')" prop="goodsShelves">
-        <el-select v-model="dataForm.goodsShelves" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.processLocation.goodsShelves')])">
-          <el-option
-            v-for="item in options2"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
-        </el-select>
+      <el-form-item :label="$t('module.basicData.processLocation.workSequenId')" prop="workSequenId">
+        <el-input v-model="dataForm.workSequenId" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.processLocation.workSequenId')])" clearable />
+      </el-form-item>
+      <el-form-item :label="$t('module.basicData.processLocation.locationName')" prop="locationName">
+        <el-input v-model="dataForm.locationName" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.processLocation.locationName')])" clearable />
+      </el-form-item>
+      <el-form-item :label="$t('module.basicData.processLocation.locationId')" prop="locationId">
+        <el-input v-model="dataForm.locationId" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.processLocation.locationId')])" clearable />
+      </el-form-item>
+      <el-form-item :label="$t('module.basicData.processLocation.isProcess')" prop="isProcess">
+        <el-input v-model="dataForm.isProcess" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.processLocation.isProcess')])" clearable />
+      </el-form-item>
+      <el-form-item :label="$t('module.basicData.processLocation.equipmentMark')" prop="equipmentMark">
+        <el-input v-model="dataForm.equipmentMark" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.processLocation.equipmentMark')])" clearable />
       </el-form-item>
     </el-form>
     <span slot="footer" class="dialog-footer">
@@ -72,88 +39,40 @@
 </template>
 
 <script>
-import { detail, update, add, locationList } from '@/api/basicData/Cache/processLocation'
+import { detail, update, add } from '@/api/basicData/Cache/processLocation'
 
 export default {
   data() {
     return {
       visible: false,
       dataForm: {
-        workSequenId: '',
-        locationId: '',
-        portAttrId: '',
-        isProcess: '',
-        equipmentMark: '',
+        id: 0,
         sequence: '',
-        goodsShelves: '',
-        locationName: ''
+        locationName: '',
+        isProcess: '',
+        equipmentMark: ''
       },
-      options: [
-        {
-          value: 0,
-          label: this.$t('module.basicData.processLocation.CacheLocation')
-        },
-        {
-          value: 1,
-          label: this.$t('module.basicData.processLocation.ProcessLocation')
-        }
-      ],
-      options2: [
-        {
-          value: 0,
-          label: this.$t('module.basicData.processLocation.aShelf')
-        },
-        {
-          value: 1,
-          label: this.$t('module.basicData.processLocation.bShelf')
-        }
-      ],
-      // options3: [
-      //   {
-      //     value: this.dataForm.locationId,
-      //     label: this.dataForm.locationName
-      //   }
-      // ],
       listQuery: {
-        id: ''
+        current: 1,
+        size: 10,
+        locationId: '',
+        workSequenId: '',
+        locationName: ''
       }
     }
   },
   methods: {
-    init(id) {
-      this.listQuery.id = id || ''
+    init(LocationId) {
+      this.listQuery.LocationId = LocationId || ''
       this.visible = true
       this.$nextTick(() => {
         this.$refs['dataForm'].resetFields()
-        locationList().then(res => {
-          // console.log(res)
-          // this.dataForm.locationId = res.data.id'
-          for (var i = 0; i < res.data.length; i++) {
-            this.dataForm.locationId = res.data[i].id
-            this.dataForm.locationName = res.data[i].locationName
-          }
-          // console.log(this.dataForm)
-        })
-        // portAttrList().then(res => {
-        //   console.log(res)
-        // })
-        // workSequenList().then(res => {
-        //   console.log(res)
-        // })
-        // console.log(this.listQuery)
-        if (this.listQuery.id) {
+        if (this.listQuery.LocationId) {
           // list(this.listQuery).then(res =>{
           //   this.list = response.data.records
           // })
-          detail(this.listQuery.id).then(res => {
-            this.dataForm.equipmentMark = res.data.equipmentMark
-            this.dataForm.goodsShelves = res.data.goodsShelves
-            this.dataForm.id = res.data.id
-            this.dataForm.isProcess = res.data.isProcess
-            this.dataForm.portAttrId = res.data.portAttrId
-            this.dataForm.sequence = res.data.sequence
-            this.dataForm.workSequenId = res.data.workSequenId
-            console.log(this.dataForm)
+          detail(this.dataForm.id).then(res => {
+            this.dataForm = res.data
           })
         } else {
           // storageBoxCode().then(res => {

src/views/basicData/Process/processInfo.vue

@@ -4,7 +4,7 @@
  * @Author: fzq
  * @Date: 2022-03-03 09:51:25
  * @LastEditors: fzq
- * @LastEditTime: 2022-03-08 16:56:40
+ * @LastEditTime: 2022-03-06 19:15:25
 -->
 <template>
   <div class="app-container">
@@ -35,7 +35,7 @@
       :limit.sync="listQuery.size"
       @pagination="getList()"
     />
-    <processInfo-add v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getList" />
+    <processInfo-add v-if="addOrUpdateVisible" ref="addOrUpdate" :cache-id="listQuery.cacheId" @refreshDataList="getList" />
   </div>
 </template>
 
@@ -46,6 +46,7 @@ import processInfoAdd from './components/processInfo-add'
 import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
 import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn'
 import { list, locaDelete } from '@/api/basicData/Cache/processLocation'
+import { timeFormatter } from '@/filters'
 /**
  * 表格表头配置项 TypeScript接口注释
  * tableConfig<ConfigItem> = []
@@ -74,28 +75,9 @@ const tableBtn = [
 ]
 const tableProps = [
   {
-    prop: 'workSequenId',
-    label: i18n.t('module.basicData.processLocation.workSequenId'),
-    align: 'center'
-  },
-  {
-    prop: 'locationId',
-    label: i18n.t('module.basicData.processLocation.locationId'),
-    align: 'center'
-  },
-  {
-    prop: 'portAttrId',
-    label: i18n.t('module.basicData.processLocation.portAttrId'),
-    align: 'center'
-  },
-  {
-    prop: 'isProcess',
-    label: i18n.t('module.basicData.processLocation.isProcess'),
-    align: 'center'
-  },
-  {
-    prop: 'equipmentMark',
-    label: i18n.t('module.basicData.processLocation.equipmentMark'),
+    prop: 'createTime',
+    label: i18n.t('module.basicData.factory.createTime'),
+    filter: timeFormatter,
     align: 'center'
   },
   {
@@ -104,13 +86,28 @@ const tableProps = [
     align: 'center'
   },
   {
-    prop: 'goodsShelves',
-    label: i18n.t('module.basicData.processLocation.goodsShelves'),
+    prop: 'locationName',
+    label: i18n.t('module.basicData.processLocation.locationName'),
     align: 'center'
   },
   {
-    prop: 'locationName',
-    label: i18n.t('module.basicData.processLocation.locationName'),
+    prop: 'isProcess',
+    label: i18n.t('module.basicData.processLocation.isProcess'),
+    align: 'center'
+  },
+  {
+    prop: 'locationId',
+    label: i18n.t('module.basicData.processLocation.locationId'),
+    align: 'center'
+  },
+  {
+    prop: 'workSequenId',
+    label: i18n.t('module.basicData.processLocation.workSequenId'),
+    align: 'center'
+  },
+  {
+    prop: 'equipmentMark',
+    label: i18n.t('module.basicData.processLocation.equipmentMark'),
     align: 'center'
   }
 ]
@@ -155,11 +152,12 @@ export default {
   methods: {
     handleClick(raw) {
       if (raw.type === 'delete') {
-        this.$confirm(`${this.$t('module.basicData.visual.TipsBefore')}[${raw.data.id}]?`, this.$t('module.basicData.visual.Tips'), {
+        this.$confirm(`${this.$t('module.basicData.visual.TipsBefore')}[${raw.data.locationName}]?`, this.$t('module.basicData.visual.Tips'), {
           confirmButtonText: this.$t('module.basicData.visual.confirmButtonText'),
           cancelButtonText: this.$t('module.basicData.visual.cancelButtonText'),
           type: 'warning'
         }).then(() => {
+          console.log(raw.data)
           locaDelete(raw.data.id).then(response => {
             this.$message({
               message: this.$t('module.basicData.visual.success'),
@@ -172,9 +170,9 @@ export default {
           })
         }).catch(() => {})
       } else if (raw.type === 'edit') {
-        this.addNew(raw.data.id)
+        this.addNew(raw.data.locationId)
       } else {
-        this.addNew(raw.data.id, true)
+        this.addNew(raw.data.locationId, true)
       }
     },
     getList(key) {
@@ -187,7 +185,7 @@ export default {
           this.list.splice(0, this.list.length)
         }
         this.total = response.data.total
-        // console.log(response)
+        console.log(response)
         this.listLoading = false
       })
     },

src/views/basicData/Warehouse/CurrentTask.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2020-12-29 15:41:11
  * @LastEditors: zwq
- * @LastEditTime: 2022-03-04 10:56:41
+ * @LastEditTime: 2022-01-14 15:54:12
  * @Description:
 -->
 <template>
@@ -46,7 +46,6 @@
       </el-form-item>
       <el-form-item>
         <el-button type="primary" @click="getList()"> {{ 'btn.search' | i18nFilter }} </el-button>
-        <el-button type="primary" @click="manualTask()"> {{ $t('module.basicData.Warehouse.PerformTaskManual') | i18nFilter }} </el-button>
       </el-form-item>
     </el-form>
     <base-table
@@ -71,14 +70,12 @@
       @pagination="getList()"
     />
     <current-task-info v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getList" />
-    <current-task-add v-if="manualTaskVisible" ref="manualTaskRef" @refreshDataList="getList" />
   </div>
 </template>
 
 <script>
 import { CurrentTaskList } from '@/api/basicData/Warehouse/HistoricalTask'
 import CurrentTaskInfo from './components/CurrentTaskInfo.vue'
-import CurrentTaskAdd from './components/CurrentTask-add.vue'
 import i18n from '@/lang'
 import BaseTable from '@/components/BaseTable'
 import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
@@ -171,12 +168,11 @@ const tableProps = [
 
 export default {
   name: 'ScrapInfo',
-  components: { Pagination, BaseTable, MethodBtn, CurrentTaskInfo, CurrentTaskAdd },
+  components: { Pagination, BaseTable, MethodBtn, CurrentTaskInfo },
   data() {
     return {
       trueWidth: 100,
       addOrUpdateVisible: false,
-      manualTaskVisible: false,
       tableProps,
       tableBtn,
       list: [],
@@ -241,13 +237,6 @@ export default {
       this.$nextTick(() => {
         this.$refs.addOrUpdate.init(id)
       })
-    },
-    // 手动执行任务
-    manualTask() {
-      this.manualTaskVisible = true
-      this.$nextTick(() => {
-        this.$refs.manualTaskRef.init()
-      })
     }
   }
 }

src/views/basicData/Warehouse/ProcessStorageManagement.vue

@@ -1,202 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2020-12-29 15:41:11
- * @LastEditors: zwq
- * @LastEditTime: 2022-03-04 15:45:23
- * @Description:
--->
-<template>
-  <div class="app-container">
-    <el-form
-      ref="formData"
-      :rules="rules"
-      :model="listQuery"
-      :inline="true"
-      size="medium"
-      label-width="100px"
-    >
-      <el-form-item :label="$t('module.art.processList.processName')" prop="processId">
-        <el-select
-          v-model="listQuery.processId"
-          :placeholder="$i18nForm(['placeholder.input', $t('module.art.processList.processName')])"
-          clearable
-          filterable
-          :style="{width: '100%'}"
-        >
-          <el-option
-            v-for="(item, index) in processArr"
-            :key="index"
-            :label="item.name"
-            :value="item.id"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" @click="getList()"> {{ 'btn.search' | i18nFilter }} </el-button>
-      </el-form-item>
-    </el-form>
-    <base-table
-      :page="listQuery.current"
-      :limit="listQuery.size"
-      :table-config="tableProps"
-      :table-data="list"
-      :is-loading="listLoading"
-    >
-      <method-btn
-        slot="handleBtn"
-        :width="trueWidth"
-        :method-list="tableBtn"
-        @clickBtn="handleClick"
-      />
-    </base-table>
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      :page.sync="listQuery.current"
-      :limit.sync="listQuery.size"
-      @pagination="getList()"
-    />
-  </div>
-</template>
-
-<script>
-import { list } from '@/api/art-manage/process'
-import BaseTable from '@/components/BaseTable'
-import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
-import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn'
-import { timeFormatter } from '@/filters'
-import i18n from '@/lang'
-/**
- * 表格表头配置项 TypeScript接口注释
- * tableConfig<ConfigItem> = []
- *
- * Interface ConfigItem = {
- *  prop: string,
- *  label: string,
- *  width: string,
- *  align: string,
- *  subcomponent: function,
- *  filter: function
- * }
- *
- *
- */
-
-const tableBtn = [
-  {
-    type: 'see',
-    btnName: i18n.t('module.basicData.Warehouse.processStorageLink')
-  }
-]
-const tableProps = [
-  {
-    prop: 'code',
-    label: i18n.t('module.art.processList.processCode'),
-    align: 'center'
-  },
-  {
-    prop: 'name',
-    label: i18n.t('module.art.processList.processName'),
-    align: 'center'
-  },
-  {
-    prop: 'createTime',
-    label: i18n.t('module.art.eqName'),
-    filter: timeFormatter,
-    align: 'center'
-  }
-]
-
-export default {
-  name: 'ExecutionInfo',
-  components: { Pagination, BaseTable, MethodBtn },
-  filters: {
-    statusFilter(status) {
-      const statusMap = {
-        published: 'success',
-        draft: 'info',
-        deleted: 'danger'
-      }
-      return statusMap[status]
-    }
-  },
-  data() {
-    return {
-      tableBtn,
-      trueWidth: 200,
-      tableProps,
-      list: [],
-      processArr: [],
-      total: 0,
-      listLoading: true,
-      rules: {},
-      listQuery: {
-        current: 1,
-        size: 10,
-        processId: ''
-      }
-    }
-  },
-  created() {
-    this.getList()
-    this.init()
-  },
-  methods: {
-    handleClick(raw) {
-      this.addNew(raw.data.id)
-    },
-    init() {
-      const lparams = {
-        current: 1,
-        size: 999
-      }
-      list(lparams).then(response => {
-        if (response.data.records) {
-          this.processArr = response.data.records
-        } else {
-          this.processArr.splice(0, this.list.length)
-        }
-        this.total = response.data.total
-      })
-    },
-    getList() {
-      // this.listLoading = true
-      // ExecutionInfoList(this.listQuery).then(response => {
-      //   if (response.data.records) {
-      //     this.list = response.data.records
-      //   } else {
-      //     this.list.splice(0, this.list.length)
-      //   }
-      //   this.total = response.data.total
-      this.list = [
-        {
-          code: 11,
-          name: '11'
-        }
-      ]
-      this.listLoading = false
-      // })
-    },
-    // 新增 / 修改
-    addNew(id) {
-      this.$router.push({
-        name: 'ProcessStorageManagementInfo',
-        query: {
-          dictTypeId: id
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style scoped>
-.edit-input {
-  padding-right: 100px;
-}
-.cancel-btn {
-  position: absolute;
-  right: 15px;
-  top: 10px;
-}
-</style>

src/views/basicData/Warehouse/components/CurrentTask-add.vue

@@ -1,125 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2020-12-29 16:37:56
- * @LastEditors: zwq
- * @LastEditTime: 2022-03-04 11:05:23
- * @Description:
--->
-<template>
-  <el-dialog
-    :title="'btn.see' | i18nFilter"
-    :visible.sync="visible"
-  >
-    <el-row :gutter="10">
-      <el-form
-        ref="dataForm"
-        :model="dataForm"
-        size="medium"
-        label-width="110px"
-        label-position="left"
-      >
-        <el-col :span="12">
-          <el-row>
-            <el-col :span="24">
-              <el-form-item :label="$t('module.basicData.Warehouse.TaskBoxNumber')" prop="taskCode">
-                <el-input v-model="dataForm.taskCode" readonly :style="{width: '100%'}" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item :label="$t('module.basicData.Warehouse.FullBoxNumber')" prop="orderName">
-                <el-input v-model="dataForm.orderName" readonly :style="{width: '100%'}" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item :label="$t('module.basicData.Warehouse.ExecutionOperation')" prop="fullCode">
-                <el-input v-model="dataForm.fullCode" readonly :style="{width: '100%'}" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item :label="$t('module.basicData.Warehouse.TaskStatus')" prop="name">
-                <el-input v-model="dataForm.name" readonly :style="{width: '100%'}" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item :label="$t('module.basicData.ScrapInfo.remark')" prop="remark">
-                <el-input v-model="dataForm.remark" readonly :style="{width: '100%'}" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-col>
-        <el-col :span="12">
-          <el-row>
-            <el-col :span="24">
-              <el-form-item :label="$t('module.basicData.Warehouse.TaskLocation')" prop="createTime">
-                <el-input v-model="dataForm.createTime" readonly :style="{width: '100%'}" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item :label="$t('module.basicData.Warehouse.FullBoxStartLocation')" prop="taskType">
-                <el-input v-model="dataForm.taskType" readonly :style="{width: '100%'}" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item :label="$t('module.basicData.Warehouse.Priority')" prop="emptyCode">
-                <el-input v-model="dataForm.emptyCode" readonly :style="{width: '100%'}" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item :label="$t('module.basicData.Warehouse.NextOperation')" prop="anotherCurrLocation">
-                <el-input
-                  v-model="dataForm.anotherCurrLocation"
-                  readonly
-                  :style="{width: '100%'}"
-                />
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-col>
-      </el-form>
-    </el-row>
-    <span slot="footer" class="dialog-footer">
-      <el-button @click="visible = false">{{ 'btn.cancel' | i18nFilter }}</el-button>
-      <el-button type="primary" @click="visible = false">{{ $t('module.basicData.Warehouse.PerformTaskManual') | i18nFilter }} </el-button>
-    </span>
-  </el-dialog>
-</template>
-
-<script>
-// import { CurrentTaskDetail } from '@/api/basicData/Warehouse/HistoricalTask'
-
-export default {
-  data() {
-    return {
-      visible: false,
-      dataForm: {
-        id: '',
-        taskCode: undefined,
-        orderName: undefined,
-        fullCode: undefined,
-        name: undefined,
-        remark: undefined,
-        field119: undefined,
-        createTime: undefined,
-        taskType: undefined,
-        emptyCode: undefined,
-        anotherCurrLocation: undefined,
-        field121: undefined,
-        taskSource: undefined,
-        anotherCurrProcessCode: undefined,
-        anotherNextProcessCode: undefined,
-        anotherTargetLocation: undefined,
-        field126: undefined
-      }
-    }
-  },
-  methods: {
-    init(id) {
-      this.dataForm.id = id
-      this.visible = true
-      this.$nextTick(() => {
-        this.$refs['dataForm'].resetFields()
-      })
-    }
-  }
-}
-</script>

src/views/basicData/Warehouse/components/ProcessStorageManagement-info.vue

@@ -1,165 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2020-12-29 15:41:11
- * @LastEditors: zwq
- * @LastEditTime: 2022-03-09 09:57:41
- * @Description:
--->
-<template>
-  <div class="app-container">
-    <div style="margin:10px 50px">
-      <el-button type="success" @click="goback()">{{ 'btn.back' | i18nFilter }}</el-button>
-      <el-button type="primary" @click="addNew()">{{ 'btn.add' | i18nFilter }}</el-button>
-    </div>
-    <base-table
-      :page="listQuery.current"
-      :limit="listQuery.size"
-      :table-config="tableProps"
-      :table-data="list"
-      :is-loading="listLoading"
-    >
-      <method-btn
-        slot="handleBtn"
-        :width="trueWidth"
-        :method-list="tableBtn"
-        @clickBtn="handleClick"
-      />
-    </base-table>
-  </div>
-</template>
-
-<script>
-import i18n from '@/lang'
-import BaseTable from '@/components/BaseTable'
-import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn'
-import { timeFormatter } from '@/filters'
-/**
- * 表格表头配置项 TypeScript接口注释
- * tableConfig<ConfigItem> = []
- *
- * Interface ConfigItem = {
- *  prop: string,
- *  label: string,
- *  width: string,
- *  align: string,
- *  subcomponent: function,
- *  filter: function
- * }
- *
- *
- */
-
-const tableBtn = [
-  {
-    type: 'delete',
-    btnName: 'btn.delete'
-  }
-]
-const tableProps = [
-  {
-    prop: 'code',
-    label: i18n.t('module.basicData.cache.LocationCode'),
-    filter: timeFormatter,
-    align: 'center'
-  },
-  {
-    prop: 'name',
-    label: i18n.t('module.basicData.cache.LocationName'),
-    align: 'center'
-  },
-  {
-    prop: 'shelfName',
-    label: i18n.t('module.basicData.cache.locationType'),
-    align: 'center'
-  }
-]
-
-export default {
-  name: 'Shelf',
-  components: { BaseTable, MethodBtn },
-  filters: {
-    statusFilter(status) {
-      const statusMap = {
-        published: 'success',
-        draft: 'info',
-        deleted: 'danger'
-      }
-      return statusMap[status]
-    }
-  },
-  data() {
-    return {
-      tableBtn,
-      trueWidth: 200,
-      tableProps,
-      list: [],
-      listLoading: true,
-      listQuery: {
-        current: 1,
-        size: 990,
-        areaId: ''
-      }
-    }
-  },
-  created() {
-    this.listQuery.areaId = this.$route.query.id
-    this.getList()
-  },
-  methods: {
-    handleClick(raw) {
-      if (raw.type === 'delete') {
-        this.$confirm(`${this.$t('module.basicData.visual.TipsBefore')}[${raw.data.name}]?`, this.$t('module.basicData.visual.Tips'), {
-          confirmButtonText: this.$t('module.basicData.visual.confirmButtonText'),
-          cancelButtonText: this.$t('module.basicData.visual.cancelButtonText'),
-          type: 'warning'
-        }).then(() => {
-          // shelfDelete(raw.data.id).then(response => {
-          //   this.$message({
-          //     message: this.$t('module.basicData.visual.success'),
-          //     type: 'success',
-          //     duration: 1500,
-          //     onClose: () => {
-          //       this.getList()
-          //     }
-          //   })
-          // })
-        }).catch(() => {})
-      }
-    },
-    getList(key) {
-      this.listLoading = true
-      // shelfList(this.listQuery).then(response => {
-      //   if (response.data.records) {
-      //     this.list = response.data.records
-      //   } else {
-      //     this.list.splice(0, this.list.length)
-      //   }
-      this.listLoading = false
-      // })
-    },
-    // 新增 / 修改
-    addNew(id) {
-      this.$router.push({
-        name: 'ProcessStorageLink',
-        query: {
-          dictTypeId: id
-        }
-      })
-    },
-    goback() {
-      this.$router.go(-1)
-    }
-  }
-}
-</script>
-
-<style scoped>
-.edit-input {
-  padding-right: 100px;
-}
-.cancel-btn {
-  position: absolute;
-  right: 15px;
-  top: 10px;
-}
-</style>

src/views/basicData/Warehouse/components/StorageBoxRack-add.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: zwq
  * @Date: 2020-12-29 16:37:56
- * @LastEditors: fzq
- * @LastEditTime: 2022-03-10 18:44:36
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-01-17 11:21:26
  * @Description:
 -->
 <template>

src/views/basicData/Warehouse/components/processStorageLink.vue

@@ -1,477 +0,0 @@
-<!--
- * @Author: gtz
- * @Date: 2022-03-03 09:16:10
- * @LastEditors: zwq
- * @LastEditTime: 2022-03-09 15:17:46
- * @Description: file content
- * @FilePath: \mt-ck-wms-ui\src\views\dashboard\index.vue
--->
-<template>
-  <div class="dashboard-container">
-    <el-card class="dashboard-main">
-      <el-row class="dashboard-title">
-        <div class="dashboard-header-line" />
-        <div class="dashboard-header-title">WMS库存信息</div>
-      </el-row>
-      <el-row class="dashboard-legend">
-        <div
-          v-for="item in cassetteStatusList"
-          :key="'cassette' + item.id"
-          class="dashboard-legend-cassette"
-        >
-          <div
-            class="dashboard-legend-cassette-cricle"
-            :style="{ background: item.color }"
-          />
-          {{ item.name }}
-        </div>
-        |
-        <div
-          v-for="item in portAttributeList"
-          :key="'port' + item.id"
-          class="dashboard-legend-port"
-          :style="{ background: item.color }"
-        >
-          {{ item.name }}
-        </div>
-        <div class="dashboard-legend-btn">
-          <el-button type="primary" size="mini" @click="submitLinkList">{{
-            "btn.submit" | i18nFilter
-          }}</el-button>
-        </div>
-        <div class="dashboard-legend-search">
-          <el-select
-            v-model="current"
-            size="mini"
-            placeholder="请选择库存范围"
-            @change="handleChange"
-          >
-            <el-option
-              v-for="item in totalPage"
-              :key="'select' + item"
-              :label="'第' + item + '页'"
-              :value="item"
-            />
-          </el-select>
-        </div>
-      </el-row>
-      <el-row
-        v-if="current * 80 < shelfList[0].rowList[0].portList.length"
-        class="dashboard-layout"
-        :gutter="12"
-      >
-        <el-col
-          v-for="item in 4"
-          :key="'shelfbox' + item"
-          class="dashboard-layout-shelf-box"
-          :span="6"
-        >
-          <el-row>
-            <el-col
-              v-for="(i, index) in shelfList"
-              :key="item + 'shelf' + i.id"
-              :span="12"
-              class="dashboard-layout-shelf"
-            >
-              <el-row>
-                <el-col
-                  v-for="z in i.rowList"
-                  :key="item + 'shelf' + i + 'row' + z.id"
-                  :span="12"
-                  class="dashboard-layout-row"
-                >
-                  <div
-                    v-for="x in 20"
-                    :key="item + 'shelf' + i + 'row' + z + 'item' + x"
-                    class="dashboard-layout-item"
-                    :style="{
-                      background:
-                        portAttributeObj[
-                          z.portList[
-                            (current - 1) * 80 + (item - 1) * 20 + (x - 1)
-                          ].attribute
-                        ],
-                      cursor:
-                        z.portList[
-                          (current - 1) * 80 + (item - 1) * 20 + (x - 1)
-                        ].attribute === 3
-                          ? 'not-allowed'
-                          : 'pointer',
-                      color:
-                        z.portList[
-                          (current - 1) * 80 + (item - 1) * 20 + (x - 1)
-                        ].attribute === 3
-                          ? '#A2A8B5'
-                          : '',
-                      border:
-                        selectStorageList.some(StorageItem=>StorageItem.id===z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].id)
-                          ? '1px solid red' : ''
-                    }"
-                    @click="
-                      setType(
-                        z.portList[
-                          (current - 1) * 80 + (item - 1) * 20 + (x - 1)
-                        ]
-                      )
-                    "
-                  >
-                    <div
-                      v-if="
-                        z.portList[
-                          (current - 1) * 80 + (item - 1) * 20 + (x - 1)
-                        ].attribute !== 3
-                      "
-                      class="dashboard-layout-item-cricle"
-                      :style="{
-                        background:
-                          cassetteStatusObj[
-                            z.portList[
-                              (current - 1) * 80 + (item - 1) * 20 + (x - 1)
-                            ].cassetteList[0].status
-                          ]
-                      }"
-                    />
-                    {{
-                      z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)]
-                        .name
-                    }}
-                  </div>
-                </el-col>
-              </el-row>
-              <div class="dashboard-layout-footer">
-                {{
-                  "第" + (index + 1) + "排(" + ((current - 1) * 4 + item) + ")"
-                }}
-              </div>
-            </el-col>
-          </el-row>
-        </el-col>
-      </el-row>
-      <el-row v-else class="dashboard-layout" :gutter="12">
-        <el-col
-          v-for="item in Math.ceil(
-            (shelfList[0].rowList[0].portList.length - (current - 1) * 80) / 20
-          )"
-          :key="'shelfbox' + item"
-          class="dashboard-layout-shelf-box"
-          :span="6"
-        >
-          <el-row>
-            <el-col
-              v-for="(i, index) in shelfList"
-              :key="item + 'shelf' + i.id"
-              :span="12"
-              class="dashboard-layout-shelf"
-            >
-              <el-row
-                v-if="
-                  item <
-                    Math.ceil(
-                      (shelfList[0].rowList[0].portList.length -
-                        (current - 1) * 80) /
-                        20
-                    )
-                "
-              >
-                <el-col
-                  v-for="z in i.rowList"
-                  :key="item + 'shelf' + i + 'row' + z.id"
-                  :span="12"
-                  class="dashboard-layout-row"
-                >
-                  <div
-                    v-for="x in 20"
-                    :key="item + 'shelf' + i + 'row' + z + 'item' + x"
-                    class="dashboard-layout-item"
-                    :style="{
-                      background:
-                        portAttributeObj[
-                          z.portList[
-                            (current - 1) * 80 + (item - 1) * 20 + (x - 1)
-                          ].attribute
-                        ],
-                      cursor:
-                        z.portList[
-                          (current - 1) * 80 + (item - 1) * 20 + (x - 1)
-                        ].attribute === 3
-                          ? 'not-allowed'
-                          : 'pointer',
-                      color:
-                        z.portList[
-                          (current - 1) * 80 + (item - 1) * 20 + (x - 1)
-                        ].attribute === 3
-                          ? '#A2A8B5'
-                          : '',
-                      border:
-                        selectStorageList.some(StorageItem=>StorageItem.id===z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].id)
-                          ? '1px solid red' : ''
-                    }"
-                    @click="
-                      setType(
-                        z.portList[
-                          (current - 1) * 80 + (item - 1) * 20 + (x - 1)
-                        ]
-                      )
-                    "
-                  >
-                    <div
-                      v-if="
-                        z.portList[
-                          (current - 1) * 80 + (item - 1) * 20 + (x - 1)
-                        ].attribute !== 3
-                      "
-                      class="dashboard-layout-item-cricle"
-                      :style="{
-                        background:
-                          cassetteStatusObj[
-                            z.portList[
-                              (current - 1) * 80 + (item - 1) * 20 + (x - 1)
-                            ].cassetteList[0].status
-                          ]
-                      }"
-                    />
-                    {{
-                      z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)]
-                        .name
-                    }}
-                  </div>
-                </el-col>
-              </el-row>
-              <el-row v-else>
-                <el-col
-                  v-for="z in i.rowList"
-                  :key="item + 'shelf' + i + 'row' + z.id"
-                  :span="12"
-                  class="dashboard-layout-row"
-                >
-                  <div
-                    v-for="x in shelfList[0].rowList[0].portList.length -
-                      (item - 1) * 20 -
-                      (current - 1) * 80"
-                    :key="item + 'shelf' + i + 'row' + z + 'item' + x"
-                    class="dashboard-layout-item"
-                    :style="{
-                      background:
-                        portAttributeObj[
-                          z.portList[
-                            (current - 1) * 80 + (item - 1) * 20 + (x - 1)
-                          ].attribute
-                        ],
-                      cursor:
-                        z.portList[
-                          (current - 1) * 80 + (item - 1) * 20 + (x - 1)
-                        ].attribute === 3
-                          ? 'not-allowed'
-                          : 'pointer',
-                      color:
-                        z.portList[
-                          (current - 1) * 80 + (item - 1) * 20 + (x - 1)
-                        ].attribute === 3
-                          ? '#A2A8B5'
-                          : '',
-                      border:
-                        selectStorageList.some(StorageItem=>StorageItem.id===z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].id)
-                          ? '1px solid red' : ''
-                    }"
-                    @click="
-                      setType(
-                        z.portList[
-                          (current - 1) * 80 + (item - 1) * 20 + (x - 1)
-                        ]
-                      )
-                    "
-                  >
-                    <div
-                      v-if="
-                        z.portList[
-                          (current - 1) * 80 + (item - 1) * 20 + (x - 1)
-                        ].attribute !== 3
-                      "
-                      class="dashboard-layout-item-cricle"
-                      :style="{
-                        background:
-                          cassetteStatusObj[
-                            z.portList[
-                              (current - 1) * 80 + (item - 1) * 20 + (x - 1)
-                            ].cassetteList[0].status
-                          ]
-                      }"
-                    />
-                    {{
-                      z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)]
-                        .name
-                    }}
-                  </div>
-                </el-col>
-              </el-row>
-              <div class="dashboard-layout-footer">
-                {{
-                  "第" + (index + 1) + "排(" + ((current - 1) * 4 + item) + ")"
-                }}
-              </div>
-            </el-col>
-          </el-row>
-        </el-col>
-      </el-row>
-    </el-card>
-    <process-storage-type
-      v-if="typeVisible"
-      ref="typeRef"
-      @refreshDataList="setStorageList"
-    />
-  </div>
-</template>
-
-<script>
-import testdata from './testdata'
-import processStorageType from './processStorageType'
-
-export default {
-  name: 'Dashboard',
-  components: { processStorageType },
-  data() {
-    return testdata
-  },
-  created() {
-    console.log(this.shelfList)
-    this.totalPage = Math.ceil(
-      this.shelfList[0].rowList[0].portList.length / 80
-    )
-    this.init()
-  },
-  methods: {
-    init() {
-      this.selectStorageList.splice(0, this.selectStorageList.length)
-    },
-    setType(item) {
-      if (item.attribute !== 3) {
-        if (this.selectStorageList.findIndex(StorageItem => StorageItem.id === item.id) + 1) {
-          this.selectStorageList.splice(this.selectStorageList.findIndex(StorageItem => StorageItem.id === item.id), 1)
-        } else {
-          this.typeVisible = true
-          this.$nextTick(() => {
-            this.$refs.typeRef.init(item.id)
-          })
-        }
-      }
-    },
-    setStorageList(id, dataForm) {
-      const obj = Object.assign({ id }, dataForm)
-      this.selectStorageList.push(obj)
-    },
-    handleChange(v) {
-      console.log(v)
-    },
-    submitLinkList() {
-      const tipArr = this.selectStorageList.map(item => {
-        return item.id
-      })
-      this.$confirm(`${this.$t('module.basicData.visual.TipsStorageBefore')}[${tipArr.join(',')}]?`, this.$t('module.basicData.visual.Tips'), {
-        confirmButtonText: this.$t('module.basicData.visual.confirmButtonText'),
-        cancelButtonText: this.$t('module.basicData.visual.cancelButtonText'),
-        type: 'warning'
-      }).then(() => {
-      }).catch(() => {})
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.dashboard-container {
-  background: #f2f4f9;
-  min-height: calc(100vh - 134px);
-  overflow-x: scroll;
-  padding: 0 16px;
-  padding-top: 24px;
-  font-size: 14px;
-  .dashboard-main {
-    width: 100%;
-    min-width: 1380px;
-    background-color: #fff;
-    border-radius: 8px;
-    min-height: calc(100vh - 186px);
-    .dashboard-title {
-      .dashboard-header-line {
-        display: inline-block;
-        width: 4px;
-        height: 16px;
-        background: #0b58ff;
-        border-radius: 1px;
-        position: relative;
-        top: 2px;
-        margin-right: 4px;
-      }
-      .dashboard-header-title {
-        display: inline-block;
-        font-size: 16px;
-        font-family: PingFangSC-Regular, PingFang SC;
-        font-weight: 400;
-        color: #000000;
-        line-height: 16px;
-      }
-    }
-    .dashboard-legend {
-      margin-top: 20px;
-      .dashboard-legend-cassette {
-        display: inline-block;
-        margin-right: 24px;
-        .dashboard-legend-cassette-cricle {
-          display: inline-block;
-          width: 12px;
-          height: 12px;
-          border-radius: 6px;
-        }
-      }
-      .dashboard-legend-port {
-        display: inline-block;
-        height: 24px;
-        line-height: 24px;
-        border-radius: 4px;
-        padding: 0 16px;
-        margin-left: 24px;
-      }
-      .dashboard-legend-btn {
-        margin: 0 20px;
-        float: right;
-      }
-      .dashboard-legend-search {
-        float: right;
-      }
-    }
-    .dashboard-layout {
-      margin: 20px 0;
-      .dashboard-layout-shelf-box {
-        .dashboard-layout-footer {
-          text-align: center;
-          margin-top: 12px;
-        }
-        .dashboard-layout-shelf {
-          padding: 0 8px;
-          .dashboard-layout-row {
-            padding: 0 1px;
-            .dashboard-layout-item {
-              width: 100%;
-              text-align: center;
-              height: 32px;
-              box-shadow: 0px 3px 6px 0px rgba(166, 174, 190, 0.8);
-              border-radius: 2px 4px 4px 2px;
-              margin-bottom: 8px;
-              display: flex;
-              align-items: center;
-              justify-content: center;
-              .dashboard-layout-item-cricle {
-                display: inline-block;
-                width: 12px;
-                height: 12px;
-                border-radius: 6px;
-                margin-right: 6px;
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}
-</style>

src/views/basicData/Warehouse/components/processStorageType.vue

@@ -1,94 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2020-12-29 16:37:56
- * @LastEditors: zwq
- * @LastEditTime: 2022-03-10 14:27:47
- * @Description:
--->
-<template>
-  <el-dialog
-    :title="$t('module.basicData.Warehouse.LocationStorageSetting') | i18nFilter"
-    :visible.sync="visible"
-  >
-    <el-form
-      ref="dataForm"
-      :model="dataForm"
-      size="medium"
-      :rules="dataRule"
-      label-width="110px"
-      label-position="left"
-    >
-      <el-form-item :label="$t('module.basicData.Warehouse.SelectStorageType')" prop="storageType">
-        <el-radio v-model="dataForm.storageType" :label="1">Working Port</el-radio>
-        <el-radio v-model="dataForm.storageType" :label="2">Buffer Port</el-radio>
-        <el-radio v-model="dataForm.storageType" :label="3">Exception Port</el-radio>
-      </el-form-item>
-      <el-form-item :label="$t('module.basicData.storageBox.name')" prop="storageBoxName">
-        <el-select v-model="dataForm.storageBoxName" filterable :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.storageBox.name')])" clearable>
-          <el-option
-            v-for="item in storageBoxArr"
-            :key="item.id"
-            :label="item.storageBoxName"
-            :value="item.id"
-          />
-        </el-select>
-      </el-form-item>
-    </el-form>
-    <span slot="footer" class="dialog-footer">
-      <el-button @click="visible = false">{{ 'btn.cancel' | i18nFilter }}</el-button>
-      <el-button type="primary" @click="dataFormSubmit()">{{ 'btn.confirm' | i18nFilter }}</el-button>
-    </span>
-  </el-dialog>
-</template>
-
-<script>
-import { storageBoxList } from '@/api/basicData/Cache/storageBox'
-
-export default {
-  data() {
-    return {
-      visible: false,
-      storageId: '',
-      dataForm: {
-        storageType: 1,
-        storageBoxName: ''
-      },
-      dataRule: {
-        storageBoxName: [
-          {
-            required: true,
-            message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.storageBox.name')]),
-            trigger: 'change' }
-        ]
-      },
-      storageBoxArr: []
-    }
-  },
-  methods: {
-    init(id) {
-      this.storageId = id
-      const listQuery = {
-        current: 1,
-        size: 999
-      }
-      storageBoxList(listQuery).then(response => {
-        if (response.data.records) {
-          this.storageBoxArr = response.data.records
-        } else {
-          this.storageBoxArr.splice(0, this.list.length)
-        }
-      })
-      this.visible = true
-    },
-    // 表单提交
-    dataFormSubmit() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.visible = false
-          this.$emit('refreshDataList', this.storageId, this.dataForm)
-        }
-      })
-    }
-  }
-}
-</script>

src/views/dashboard/index.vue

@@ -1,194 +1,15 @@
-<!--
- * @Author: gtz
- * @Date: 2022-03-03 09:16:10
- * @LastEditors: gtz
- * @LastEditTime: 2022-03-08 14:34:24
- * @Description: file content
- * @FilePath: \mt-ck-wms-ui\src\views\dashboard\index.vue
--->
 <template>
   <div class="dashboard-container">
-    <el-card class="dashboard-main">
-      <el-row class="dashboard-title">
-        <div class="dashboard-header-line" />
-        <div class="dashboard-header-title">WMS库存信息</div>
-      </el-row>
-      <el-row class="dashboard-legend">
-        <div v-for="item in cassetteStatusList" :key="'cassette' + item.id" class="dashboard-legend-cassette">
-          <div class="dashboard-legend-cassette-cricle" :style="{background: item.color}" />
-          {{ item.name }}
-        </div>
-        |
-        <div v-for="item in portAttributeList" :key="'port' + item.id" class="dashboard-legend-port" :style="{background: item.color}">
-          {{ item.name }}
-        </div>
-        <div class="dashboard-legend-search">
-          <el-select v-model="current" size="mini" placeholder="请选择库存范围" @change="handleChange">
-            <el-option v-for="item in totalPage" :key="'select' + item" :label="'第' + item + '页'" :value="item" />
-          </el-select>
-        </div>
-      </el-row>
-      <el-row v-if="current * 80 < shelfList[0].rowList[0].portList.length" class="dashboard-layout" :gutter="12">
-        <el-col v-for="item in 4" :key="'shelfbox' + item" class="dashboard-layout-shelf-box" :span="6">
-          <el-row>
-            <el-col v-for="(i, index) in shelfList" :key="item + 'shelf' + i.id" :span="12" class="dashboard-layout-shelf">
-              <el-row>
-                <el-col v-for="z in i.rowList" :key="item + 'shelf' + i + 'row' + z.id" :span="12" class="dashboard-layout-row">
-                  <div v-for="x in 20" :key="item + 'shelf' + i + 'row' + z + 'item' + x" class="dashboard-layout-item" :style="{background: portAttributeObj[z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute], cursor: z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute === 3 ? 'not-allowed' : 'pointer', color: z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute === 3 ? '#A2A8B5' : ''}">
-                    <div v-if="z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== 3" class="dashboard-layout-item-cricle" :style="{background: cassetteStatusObj[z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteList[0].status]}" />
-                    {{ z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].name }}
-                  </div>
-                </el-col>
-              </el-row>
-              <div class="dashboard-layout-footer">
-                {{ '第' + (index + 1) + '排(' + ((current - 1) * 4 + item) + ')' }}
-              </div>
-            </el-col>
-          </el-row>
-        </el-col>
-      </el-row>
-      <el-row v-else class="dashboard-layout" :gutter="12">
-        <el-col v-for="item in Math.ceil((shelfList[0].rowList[0].portList.length - (current - 1) * 80) / 20)" :key="'shelfbox' + item" class="dashboard-layout-shelf-box" :span="6">
-          <el-row>
-            <el-col v-for="(i, index) in shelfList" :key="item + 'shelf' + i.id" :span="12" class="dashboard-layout-shelf">
-              <el-row v-if="item < Math.ceil((shelfList[0].rowList[0].portList.length - (current - 1) * 80) / 20)">
-                <el-col v-for="z in i.rowList" :key="item + 'shelf' + i + 'row' + z.id" :span="12" class="dashboard-layout-row">
-                  <div v-for="x in 20" :key="item + 'shelf' + i + 'row' + z + 'item' + x" class="dashboard-layout-item" :style="{background: portAttributeObj[z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute], cursor: z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute === 3 ? 'not-allowed' : 'pointer', color: z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute === 3 ? '#A2A8B5' : ''}">
-                    <div v-if="z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== 3" class="dashboard-layout-item-cricle" :style="{background: cassetteStatusObj[z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteList[0].status]}" />
-                    {{ z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].name }}
-                  </div>
-                </el-col>
-              </el-row>
-              <el-row v-else>
-                <el-col v-for="z in i.rowList" :key="item + 'shelf' + i + 'row' + z.id" :span="12" class="dashboard-layout-row">
-                  <div v-for="x in shelfList[0].rowList[0].portList.length - (item - 1) * 20 - (current - 1) * 80" :key="item + 'shelf' + i + 'row' + z + 'item' + x" class="dashboard-layout-item" :style="{background: portAttributeObj[z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute], cursor: z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute === 3 ? 'not-allowed' : 'pointer', color: z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute === 3 ? '#A2A8B5' : ''}">
-                    <div v-if="z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== 3" class="dashboard-layout-item-cricle" :style="{background: cassetteStatusObj[z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteList[0].status]}" />
-                    {{ z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].name }}
-                  </div>
-                </el-col>
-              </el-row>
-              <div class="dashboard-layout-footer">
-                {{ '第' + (index + 1) + '排(' + ((current - 1) * 4 + item) + ')' }}
-              </div>
-            </el-col>
-          </el-row>
-        </el-col>
-      </el-row>
-    </el-card>
+    <!-- <component :is="currentRole" /> -->
+    <admin-dashboard />
   </div>
 </template>
 
 <script>
-import testdata from './testdata'
+import AdminDashboard from './admin'
 
 export default {
   name: 'Dashboard',
-  data() {
-    return testdata
-  },
-  created() {
-    console.log(this.shelfList)
-    this.totalPage = Math.ceil(this.shelfList[0].rowList[0].portList.length / 80)
-  },
-  methods: {
-    handleChange(v) {
-      console.log(v)
-    }
-  }
+  components: { AdminDashboard }
 }
 </script>
-
-<style lang="scss" scoped>
-.dashboard-container {
-  background: #F2F4F9;
-  min-height: calc(100vh - 134px);
-  overflow-x: scroll;
-  padding: 0 16px;
-  padding-top: 24px;
-  font-size: 14px;
-  .dashboard-main {
-    width: 100%;
-    min-width: 1380px;
-    background-color: #fff;
-    border-radius: 8px;
-    min-height: calc(100vh - 186px);
-    .dashboard-title {
-      .dashboard-header-line{
-        display: inline-block;
-        width: 4px;
-        height: 16px;
-        background: #0B58FF;
-        border-radius: 1px;
-        position: relative;
-        top: 2px;
-        margin-right: 4px;
-      }
-      .dashboard-header-title{
-        display: inline-block;
-        font-size: 16px;
-        font-family: PingFangSC-Regular, PingFang SC;
-        font-weight: 400;
-        color: #000000;
-        line-height: 16px;
-      }
-    }
-    .dashboard-legend {
-      margin-top: 20px;
-      .dashboard-legend-cassette {
-        display: inline-block;
-        margin-right: 24px;
-        .dashboard-legend-cassette-cricle {
-          display: inline-block;
-          width: 12px;
-          height: 12px;
-          border-radius: 6px;
-        }
-      }
-      .dashboard-legend-port {
-        display: inline-block;
-        height: 24px;
-        line-height: 24px;
-        border-radius: 4px;
-        padding: 0 16px;
-        margin-left: 24px;
-      }
-      .dashboard-legend-search {
-        float: right;
-      }
-    }
-    .dashboard-layout {
-      margin: 20px 0;
-      .dashboard-layout-shelf-box {
-        .dashboard-layout-footer {
-          text-align: center;
-          margin-top: 12px;
-        }
-        .dashboard-layout-shelf {
-          padding: 0 8px;
-          .dashboard-layout-row {
-            padding: 0 1px;
-            .dashboard-layout-item {
-              width: 100%;
-              text-align: center;
-              height: 32px;
-              box-shadow: 0px 3px 6px 0px rgba(166, 174, 190, 0.8);
-              border-radius: 2px 4px 4px 2px;
-              margin-bottom: 8px;
-              display: flex;
-              align-items: center;
-              justify-content: center;
-              .dashboard-layout-item-cricle{
-                display: inline-block;
-                width: 12px;
-                height: 12px;
-                border-radius: 6px;
-                margin-right: 6px;
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}
-</style>

src/views/orderManage/ExecutionInfo.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2020-12-29 15:41:11
  * @LastEditors: zwq
- * @LastEditTime: 2022-03-09 14:46:12
+ * @LastEditTime: 2022-01-17 15:26:35
  * @Description:
 -->
 <template>
@@ -143,7 +143,7 @@ export default {
     },
     getList(key) {
       this.listLoading = true
-      this.listQuery.name = key
+      this.listQuery.code = key
       ExecutionInfoList(this.listQuery).then(response => {
         if (response.data.records) {
           this.list = response.data.records

src/views/orderManage/ProcessInfo.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2020-12-29 15:41:11
  * @LastEditors: zwq
- * @LastEditTime: 2022-03-09 14:44:58
+ * @LastEditTime: 2022-01-17 15:32:00
  * @Description:
 -->
 <template>
@@ -150,7 +150,7 @@ export default {
     },
     getList(key) {
       this.listLoading = true
-      this.listQuery.name = key
+      this.listQuery.code = key
       ProcessInfoList(this.listQuery).then(response => {
         if (response.data.records) {
           this.list = response.data.records

src/views/orderManage/components/ExecutionInfoDetail.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2020-12-29 16:37:56
  * @LastEditors: zwq
- * @LastEditTime: 2022-03-09 16:43:01
+ * @LastEditTime: 2022-01-17 15:21:50
  * @Description:
 -->
 <template>
@@ -26,8 +26,8 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item :label="$t('module.basicData.Warehouse.OrderStatus')" prop="status">
-                <el-input v-model="dataForm.status" :placeholder="$t('module.basicData.Warehouse.OrderStatus')" readonly :style="{width: '100%'}" />
+              <el-form-item :label="$t('module.basicData.Warehouse.IssueOrderTime')" prop="createTime">
+                <el-input v-model="dataForm.createTime" :placeholder="$t('module.basicData.Warehouse.IssueOrderTime')" readonly :style="{width: '100%'}" />
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -35,33 +35,18 @@
                 <el-input v-model="dataForm.planQuantity" :placeholder="$t('module.basicData.Warehouse.PlanProcessQuantity')" readonly :style="{width: '100%'}" />
               </el-form-item>
             </el-col>
-            <el-col :span="24">
-              <el-form-item :label="$t('module.basicData.Warehouse.Priority')" prop="priority">
-                <el-input v-model="dataForm.priority" :placeholder="$t('module.basicData.Warehouse.Priority')" readonly :style="{width: '100%'}" />
-              </el-form-item>
-            </el-col>
           </el-row>
         </el-col>
         <el-col :span="8">
           <el-row>
             <el-col :span="24">
-              <el-form-item :label="$t('module.basicData.Warehouse.OrderCode')" prop="code">
-                <el-input v-model="dataForm.code" :placeholder="$t('module.basicData.Warehouse.OrderCode')" readonly :style="{width: '100%'}" />
+              <el-form-item :label="$t('module.basicData.Warehouse.OrderCode')" prop="taskCode">
+                <el-input v-model="dataForm.taskCode" :placeholder="$t('module.basicData.Warehouse.OrderCode')" readonly :style="{width: '100%'}" />
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item :label="$t('module.basicData.Warehouse.startProduceTime')" prop="startProduceTime">
-                <el-input v-model="dataForm.startProduceTime" :placeholder="$t('module.basicData.Warehouse.startProduceTime')" readonly :style="{width: '100%'}" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item :label="$t('module.basicData.Warehouse.actualProcessQuantity')" prop="actualQuantity">
-                <el-input v-model="dataForm.actualQuantity" :placeholder="$t('module.basicData.Warehouse.actualProcessQuantity')" readonly :style="{width: '100%'}" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item :label="$t('module.basicData.Warehouse.triggerOrigin')" prop="triggerOrigin">
-                <el-input v-model="dataForm.triggerOrigin" :placeholder="$t('module.basicData.Warehouse.triggerOrigin')" readonly :style="{width: '100%'}" />
+              <el-form-item :label="$t('module.basicData.Warehouse.OrderStatus')" prop="taskType">
+                <el-input v-model="dataForm.taskType" :placeholder="$t('module.basicData.Warehouse.OrderStatus')" readonly :style="{width: '100%'}" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -83,16 +68,6 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="24">
-              <el-form-item :label="$t('module.basicData.Warehouse.scrapQuantity')" prop="scrapQuantity">
-                <el-input v-model="dataForm.scrapQuantity" :placeholder="$t('module.basicData.Warehouse.scrapQuantity')" readonly :style="{width: '100%'}" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item :label="$t('module.basicData.Warehouse.OrderType')" prop="type">
-                <el-input v-model="dataForm.type" :placeholder="$t('module.basicData.Warehouse.OrderType')" readonly :style="{width: '100%'}" />
-              </el-form-item>
-            </el-col>
           </el-row>
         </el-col>
       </el-form>
@@ -104,7 +79,7 @@
 </template>
 
 <script>
-import { ProcessInfoDetail } from '@/api/orderManage/00A'
+import { ExecutionInfoDetail } from '@/api/orderManage/00A'
 
 export default {
   data() {
@@ -114,14 +89,8 @@ export default {
         id: 0,
         name: undefined,
         createTime: undefined,
-        priority: '',
-        actualQuantity: '',
-        startProduceTime: '',
-        scrapQuantity: '',
-        triggerOrigin: '',
-        type: '',
-        code: undefined,
-        status: undefined,
+        taskCode: undefined,
+        taskType: undefined,
         craftName: undefined,
         planQuantity: undefined,
         subProccessName: undefined
@@ -135,44 +104,11 @@ export default {
       this.$nextTick(() => {
         this.$refs['dataForm'].resetFields()
         if (this.dataForm.id) {
-          ProcessInfoDetail(this.dataForm.id).then(res => {
-            res.data.status = this.statusfilter('orderStatus', res.data.status)
-            res.data.type = this.statusfilter('orderType', res.data.type)
-            res.data.priority = this.statusfilter('priority', res.data.priority)
-            res.data.triggerOrigin = this.statusfilter('triggerOrigin', res.data.triggerOrigin)
+          ExecutionInfoDetail(this.dataForm.id).then(res => {
             this.dataForm = res.data
           })
         }
       })
-    },
-    statusfilter(type, val) {
-      const filterObj = {
-        orderStatus: {
-          '1': '未激活',
-          '2': '等待',
-          '3': '激活',
-          '4': '暂停',
-          '9': '完成'
-        },
-        priority: {
-          '1': '低',
-          '2': '正常',
-          '3': '高'
-        },
-        orderType: {
-          '1': '生产工单',
-          '2': '重工工单',
-          '3': '测试工单'
-        },
-        triggerOrigin: {
-          '1': 'MES',
-          '2': 'ERP',
-          '3': 'PID1',
-          '4': '00A',
-          '5': '00C'
-        }
-      }
-      return filterObj?.[type]?.[val]
     }
   }
 }

src/views/orderManage/components/ProcessInfoDetail.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2020-12-29 16:37:56
  * @LastEditors: zwq
- * @LastEditTime: 2022-03-09 16:40:11
+ * @LastEditTime: 2022-01-17 15:22:08
  * @Description:
 -->
 <template>
@@ -26,8 +26,8 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item :label="$t('module.basicData.Warehouse.OrderStatus')" prop="status">
-                <el-input v-model="dataForm.status" :placeholder="$t('module.basicData.Warehouse.OrderStatus')" readonly :style="{width: '100%'}" />
+              <el-form-item :label="$t('module.basicData.Warehouse.IssueOrderTime')" prop="createTime">
+                <el-input v-model="dataForm.createTime" :placeholder="$t('module.basicData.Warehouse.IssueOrderTime')" readonly :style="{width: '100%'}" />
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -35,33 +35,18 @@
                 <el-input v-model="dataForm.planQuantity" :placeholder="$t('module.basicData.Warehouse.PlanProcessQuantity')" readonly :style="{width: '100%'}" />
               </el-form-item>
             </el-col>
-            <el-col :span="24">
-              <el-form-item :label="$t('module.basicData.Warehouse.Priority')" prop="priority">
-                <el-input v-model="dataForm.priority" :placeholder="$t('module.basicData.Warehouse.Priority')" readonly :style="{width: '100%'}" />
-              </el-form-item>
-            </el-col>
           </el-row>
         </el-col>
         <el-col :span="8">
           <el-row>
             <el-col :span="24">
-              <el-form-item :label="$t('module.basicData.Warehouse.OrderCode')" prop="code">
-                <el-input v-model="dataForm.code" :placeholder="$t('module.basicData.Warehouse.OrderCode')" readonly :style="{width: '100%'}" />
+              <el-form-item :label="$t('module.basicData.Warehouse.OrderCode')" prop="taskCode">
+                <el-input v-model="dataForm.taskCode" :placeholder="$t('module.basicData.Warehouse.OrderCode')" readonly :style="{width: '100%'}" />
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item :label="$t('module.basicData.Warehouse.startProduceTime')" prop="startProduceTime">
-                <el-input v-model="dataForm.startProduceTime" :placeholder="$t('module.basicData.Warehouse.startProduceTime')" readonly :style="{width: '100%'}" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item :label="$t('module.basicData.Warehouse.actualProcessQuantity')" prop="actualQuantity">
-                <el-input v-model="dataForm.actualQuantity" :placeholder="$t('module.basicData.Warehouse.actualProcessQuantity')" readonly :style="{width: '100%'}" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item :label="$t('module.basicData.Warehouse.triggerOrigin')" prop="triggerOrigin">
-                <el-input v-model="dataForm.triggerOrigin" :placeholder="$t('module.basicData.Warehouse.triggerOrigin')" readonly :style="{width: '100%'}" />
+              <el-form-item :label="$t('module.basicData.Warehouse.OrderStatus')" prop="taskType">
+                <el-input v-model="dataForm.taskType" :placeholder="$t('module.basicData.Warehouse.OrderStatus')" readonly :style="{width: '100%'}" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -83,16 +68,6 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="24">
-              <el-form-item :label="$t('module.basicData.Warehouse.scrapQuantity')" prop="scrapQuantity">
-                <el-input v-model="dataForm.scrapQuantity" :placeholder="$t('module.basicData.Warehouse.scrapQuantity')" readonly :style="{width: '100%'}" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item :label="$t('module.basicData.Warehouse.OrderType')" prop="type">
-                <el-input v-model="dataForm.type" :placeholder="$t('module.basicData.Warehouse.OrderType')" readonly :style="{width: '100%'}" />
-              </el-form-item>
-            </el-col>
           </el-row>
         </el-col>
       </el-form>
@@ -114,14 +89,8 @@ export default {
         id: 0,
         name: undefined,
         createTime: undefined,
-        priority: '',
-        actualQuantity: '',
-        startProduceTime: '',
-        scrapQuantity: '',
-        triggerOrigin: '',
-        type: '',
-        code: undefined,
-        status: undefined,
+        taskCode: undefined,
+        taskType: undefined,
         craftName: undefined,
         planQuantity: undefined,
         subProccessName: undefined
@@ -136,43 +105,10 @@ export default {
         this.$refs['dataForm'].resetFields()
         if (this.dataForm.id) {
           ProcessInfoDetail(this.dataForm.id).then(res => {
-            res.data.status = this.statusfilter('orderStatus', res.data.status)
-            res.data.type = this.statusfilter('orderType', res.data.type)
-            res.data.priority = this.statusfilter('priority', res.data.priority)
-            res.data.triggerOrigin = this.statusfilter('triggerOrigin', res.data.triggerOrigin)
             this.dataForm = res.data
           })
         }
       })
-    },
-    statusfilter(type, val) {
-      const filterObj = {
-        orderStatus: {
-          '1': '未激活',
-          '2': '等待',
-          '3': '激活',
-          '4': '暂停',
-          '9': '完成'
-        },
-        priority: {
-          '1': '低',
-          '2': '正常',
-          '3': '高'
-        },
-        orderType: {
-          '1': '生产工单',
-          '2': '重工工单',
-          '3': '测试工单'
-        },
-        triggerOrigin: {
-          '1': 'MES',
-          '2': 'ERP',
-          '3': 'PID1',
-          '4': '00A',
-          '5': '00C'
-        }
-      }
-      return filterObj?.[type]?.[val]
     }
   }
 }

src/views/orderManage/components/processLinkBtn.vue

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2021-01-07 20:09:37
  * @LastEditors: zwq
- * @LastEditTime: 2022-03-10 14:25:50
+ * @LastEditTime: 2022-01-17 15:16:29
  * @FilePath: \basic-admin\src\components\BaseTable\subcomponents\CheckDetail.vue
  * @Description:
 -->
@@ -16,9 +16,9 @@
         <el-select v-model="value" placeholder="请选择">
           <el-option
             v-for="item in options"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
           />
         </el-select>
       </div>
@@ -32,8 +32,6 @@
 </template>
 
 <script>
-import { list } from '@/api/art-manage/art.js'
-import { ProcessInfoUpdata } from '@/api/orderManage/00A'
 export default {
   props: {
     injectData: {
@@ -44,37 +42,22 @@ export default {
   data() {
     return {
       visible: false,
-      options: [],
+      options: [{
+        value: '选项1',
+        label: '黄金糕'
+      }, {
+        value: '选项2',
+        label: '双皮奶'
+      }
+      ],
       value: ''
     }
   },
-  created() {
-    this.init()
-  },
   methods: {
-    init() {
-      list({
-        current: 1,
-        size: 999
-      }).then(response => {
-        this.options = response.data.records
-      })
-    },
     emitClick() {
-      const data = {
-        id: this.injectData.id,
-        subProcessId: this.value
-      }
-      ProcessInfoUpdata(data).then(res => {
-        this.$message({
-          message: this.$t('module.basicData.visual.success'),
-          type: 'success',
-          duration: 1500,
-          onClose: () => {
-            this.visible = false
-          }
-        })
-      })
+      console.log(this.injectData)
+      console.log(this.value)
+      this.visible = false
     }
   }
 }

src/views/report-manage/CurrentInventory.vue

@@ -4,7 +4,7 @@
  * @Author: fzq
  * @Date: 2022-03-04 20:54:54
  * @LastEditors: fzq
- * @LastEditTime: 2022-03-07 09:46:36
+ * @LastEditTime: 2022-03-06 19:32:34
 -->
 <template>
   <div class="app-container">
@@ -195,22 +195,7 @@ export default {
       this.listQuery.code = key
       // console.log(this.listQuery)
       download(this.listQuery).then(res => {
-        let fileName = ''
-        const contentDisposition = res.headers['content-disposition']
-        if (contentDisposition) {
-          fileName = contentDisposition.slice(contentDisposition.indexOf('filename=') + 9)
-        }
-        const blob = new Blob([res.data])
-        const reader = new FileReader()
-        reader.readAsDataURL(blob)
-        reader.onload = (e) => {
-          const a = document.createElement('a')
-          a.download = fileName
-          a.href = e.target.result
-          document.body.appendChild(a)
-          a.click()
-          document.body.removeChild(a)
-        }
+        console.log(res)
         // const fileName = `${+new Date()}.xlsx`
         // const blob = new Blob([res], { type: 'application/vnd.ms-excel;charset=utf-8' })
         // if (navigator.msSaveBlob) {

src/views/report-manage/components/HeadForm.vue

@@ -4,7 +4,7 @@
  * @Author: fzq
  * @Date: 2022-03-06 17:06:51
  * @LastEditors: fzq
- * @LastEditTime: 2022-03-07 10:35:29
+ * @LastEditTime: 2022-03-06 17:10:16
 -->
 <template>
   <el-form :inline="true" @keyup.enter.native="getDataList()">
@@ -14,7 +14,7 @@
     <el-form-item>
       <el-button type="primary" @click="getDataList()">{{ 'btn.search' | i18nFilter }}</el-button>
       <el-button v-if="showAdd" type="primary" @click="add()">{{ 'btn.add' | i18nFilter }}</el-button>
-      <el-button type="success" @click="downl()">{{ 'btn.export' | i18nFilter }}</el-button>
+      <el-button type="success" @click="downl()">{{ '导出' | i18nFilter }}</el-button>
     </el-form-item>
   </el-form>
 </template>

src/views/report-manage/components/edit-substrate.vue

@@ -4,7 +4,7 @@
  * @Author: fzq
  * @Date: 2022-03-05 17:45:46
  * @LastEditors: fzq
- * @LastEditTime: 2022-03-07 09:19:34
+ * @LastEditTime: 2022-03-06 16:46:54
 -->
 <template>
   <!-- <el-dialog
@@ -112,7 +112,6 @@ export default {
       this.dataForm.storageBoxId = this.$route.query.id
       this.dataForm.storageCode = this.$route.query.code
       this.visible = true
-      // console.log(this.dataForm)
       listSubstrate(this.dataForm).then(res => {
         console.log(res.data[0])
         this.dataForm.id = res.data[0].id

src/views/report-manage/components/viewSubstrate.vue

@@ -4,7 +4,7 @@
  * @Author: fzq
  * @Date: 2022-03-05 15:55:45
  * @LastEditors: fzq
- * @LastEditTime: 2022-03-07 09:28:21
+ * @LastEditTime: 2022-03-05 19:44:47
 -->
 <template>
   <div class="app-container">
@@ -112,14 +112,12 @@ export default {
       listQuery: {
         current: 1,
         size: 10,
-        storageBoxCode: '',
-        storageBoxId: ''
+        substrateCode: ''
       }
     }
   },
   created() {
-    this.listQuery.storageBoxCode = this.$route.query.code
-    this.listQuery.storageBoxId = this.$route.query.id
+    this.listQuery.substrateCode = this.$route.query.code
     this.getList()
   },
   methods: {
@@ -152,7 +150,6 @@ export default {
       this.listQuery.code = this.$route.query.code
       console.log(this.listQuery)
       listSubstrate(this.listQuery).then(response => {
-        console.log(response)
         if (response.data) {
           this.list = response.data
           console.log(this.list)

vue.config.js

@@ -46,9 +46,9 @@ module.exports = {
     // 这里写入需要代理的api和对应的目标地址
     proxy: {
       '/api': {
-        // target: 'http://localhost:8080',
+        target: 'http://localhost:8080',
         // target: 'http://192.168.0.148:8080',
-        target: 'http://a.wms.picaiba.com/api',
+        // target: 'http://a.wms.picaiba.com/api',
         // target: 'http://192.168.0.127:8080',
         // target: 'http://192.168.0.165:8080',
         // target: 'http://192.168.43.105:8080',