刻字工序

src/config/getData2.js

@@ -365,42 +365,42 @@ export const bcpInCallVehicle = () => post('api/pda/bcp/in/callVehicle', {})
  * 刻字工序
  */
 // 1.1刻字上料物料列表
-// export const bypda = (page, size) => post('api/bcp/bypda', {
+export const bypda = (page, size) => post('api/bcp/bypda', {
-//   page: page,
+  page: page,
-//   size: size,
+  size: size,
-//   stor_id: '15286279952695336962'
+  stor_id: '15286279952695336962'
-// })
+})
-export const bypda = (page, size) => {
+// export const bypda = (page, size) => {
-  let res = {
+//   let res = {
-    code: 200,
+//     code: 200,
-    content: [{struct_code: '1', canuse_qty: '200'}]
+//     content: [{struct_code: '1', canuse_qty: '200'}]
-  }
+//   }
-  return res
+//   return res
-}
+// }
 // 1.2刻字机选择
-// export const kzDeviceList = () => post('api/device/list', {
+export const kzDeviceList = () => post('api/device/list', {
-//   product_area: 'A1'
+  product_area: 'A1'
-// })
+})
-export const kzDeviceList = () => {
+// export const kzDeviceList = () => {
-  let res = {
+//   let res = {
-    code: 200,
+//     code: 200,
-    content: [{workorder_code: '1', device_code: '1'}, {workorder_code: '11', device_code: '11'}]
+//     content: [{workorder_code: '1', device_code: '1'}, {workorder_code: '11', device_code: '11'}]
-  }
+//   }
-  return res
+//   return res
-}
+// }
 // 1.3确认上料
 export const kzSubmitkz = (arr) => post('api/pda/kz/submitkz', arr)
 // 1.1任务列表
-// export const KzTasks = () => post('api/pda/kz/kzTasks', {
+export const KzTasks = () => post('api/pda/kz/kzTasks', {
-//   product_area: 'A1'
+  product_area: 'A1'
-// })
+})
-export const KzTasks = () => {
+// export const KzTasks = () => {
-  let res = {
+//   let res = {
-    code: 200,
+//     code: 200,
-    content: [{task_id: '1', device_code: '1'}, {task_id: '11', device_code: '11'}]
+//     content: [{task_id: '1', device_code: '1'}, {task_id: '11', device_code: '11'}]
-  }
+//   }
-  return res
+//   return res
-}
+// }
 // 1.2强制完成取消
 export const operation = (id, method) => post('api/task/operation', {
   task_id: id,

src/pages/homeset/HomePage.vue

@@ -57,7 +57,7 @@ export default {
     toPage2 (e) {
       let url = e.path
       let name = url.substr(1)
-      if (name === 'semifinishedinstore' || name === 'semifinishedoutstore' || name === 'semifinishedcheck' || name === 'finishedinstore' || name === 'manpour') {
+      if (name === 'semifinishedinstore' || name === 'semifinishedoutstore' || name === 'semifinishedcheck' || name === 'finishedinstore' || name === 'manpour' || name === 'letteringprocess') {
         this.$store.dispatch('setKeepAlive', [name])
       }
       if (name === 'cleaningloading') {

src/pages/modules/lettering/index.vue

@@ -11,7 +11,7 @@
                       <router-link :to="i.router" :class="{'router-link-active': i.router === $route.path}">{{i.label}}</router-link>
                   </li>
                   <li v-show="Number($route.meta.guidePath) >= 4" v-for="i in menus2" :key="i.index">
-                      <router-link :to="i.router" :class="{'router-link-active': i.router === $route.path}">{{i.label}}</router-link>
+                      <router-link :to="i.router" :class="{'router-link-active': i.router === $route.path || i.router2 === $route.path}">{{i.label}}</router-link>
                   </li>
               </ul>
           </div>
@@ -50,11 +50,8 @@ export default {
       menus2: [
         {
           label: '刻字工序',
-          router: '/letteringprocess'
+          router: '/letteringprocess',
-        },
+          router2: '/letteringmachineselect'
-        {
-          label: '刻字机选择',
-          router: '/letteringmachineselect'
         },
         {
           label: '任务列表',

src/pages/modules/lettering/lettering-machine-select.vue

@@ -14,10 +14,11 @@
                         <input type="number" class="filter-input" v-model="$route.query.weight" disabled>
                     </div>
                 </div>
-                <div class="search-item">
+                <div class="search-item flex-end">
                     <button class="button button--primary" :class="{'button--defalut': dataList.length === 0}" @click="distribute">平均分配</button>
                     <button class="button button--primary" :class="{'button--defalut': dataList.length === 0}" @click="toCancle">取消分配</button>
-                    <button class="button button--primary" :disabled="disabled1" :class="{'button--defalut': checkArr.length === 0}" @click="_kzSubmitkz">确认上料</button>
+                    <button class="button button--primary" :disabled="disabled1" :class="{'button--defalut': checkArr.length === 0}" @click="_kzSubmitkz">刻字机选择</button>
+                    <button class="button button--primary" @click="toClose">关闭</button>
                 </div>
             </div>
         </div>
@@ -139,6 +140,9 @@ export default {
     toRadio (e) {
       e.checked = !e.checked
       this.checkArr = this.dataList.filter(i => { return i.checked === true })
+    },
+    toClose () {
+      this.$router.push('/letteringprocess')
     }
   }
 }
@@ -147,9 +151,9 @@ export default {
 <style lang="stylus" scoped>
 .search-item
   &:nth-child(1), &:nth-child(2)
-    width 29%
+    width 24%
   &:nth-child(3)
-    width 38%
+    width 48%
 .search-label
   width .55rem
 .filter_input_wraper

src/pages/modules/lettering/lettering-process.vue

@@ -45,6 +45,7 @@
 <script>
 import { bypda } from '@config/getData2.js'
 export default {
+  name: 'letteringprocess',
   data () {
     return {
       dataList: [],
@@ -59,6 +60,14 @@ export default {
   created () {
     this._bypda()
   },
+  beforeRouteLeave (to, from, next) {
+    if (to.path === '/home' || to.path === '/login' || to.path === '/letteringtasklist') {
+      this.$store.dispatch('setKeepAlive', [])
+    }
+    next()
+  },
+  activated () {
+  },
   methods: {
     // grid
     async _bypda () {

src/style/reset.css

@@ -128,6 +128,10 @@ div, input, button {
      cursor: pointer;
 }
 
+.flex-end {
+     justify-content: flex-end
+}
+
 .mgb40 {
      margin-bottom: .4rem !important;
 }