二次确定

src/config/getData.js

@@ -44,6 +44,5 @@ export const pdaPause = (code) => post('api/pda/pause', {
 })
 // 生成退桶任务
 export const callTask = (scode, ncode) => post('api/pda/callTask', {
-  start_device_code: scode,
-  next_device_code: ncode
+  start_device_code: scode
 })

src/config/mork.js

@@ -12,6 +12,6 @@ export const startOrder = (code, order) => {
   return res
 }
 export const queryWorks = () => {
-  let res = [{mfg_order_name: '001'}, {mfg_order_name: '2'}, {mfg_order_name: '3'}, {mfg_order_name: '4'}]
+  let res = [{mfg_order_name: '001', work_code: 'aaaa'}, {mfg_order_name: '2'}, {mfg_order_name: '3'}, {mfg_order_name: '4'}]
   return res
 }

src/main.js

@@ -7,11 +7,13 @@ import store from './vuex/store'
 import '@config/rem.js'
 import '@style/reset.css'
 import '@style/layout.styl'
-import { Dialog, Button, Message, Select, Option, InputNumber } from 'element-ui'
+import { Dialog, Button, Message, MessageBox, Select, Option, InputNumber } from 'element-ui'
 import scroll from 'vue-seamless-scroll'
 import JSEncrypt from 'jsencrypt'
 
 Vue.prototype.$message = Message
+Vue.prototype.$msgbox = MessageBox
+Vue.prototype.$confirm = MessageBox.confirm
 Vue.use(Dialog)
 Vue.use(Button)
 Vue.use(Select)

src/pages/call-task.vue

@@ -17,21 +17,8 @@
               </el-select>
             </div>
           </div>
-          <div class="zd-row filter-item">
-            <div class="zd-col-6 filter-label">终&nbsp;&nbsp;点</div>
-            <div class="zd-col-18 filter-select">
-              <el-select v-model="val2" placeholder="请选择">
-                <el-option
-                  v-for="item in options"
-                  :key="item.device_code"
-                  :label="item.device_name"
-                  :value="item.device_code">
-                </el-option>
-              </el-select>
-            </div>
-          </div>
           <div class="zd-row jccenter button-wrap">
-            <button class="button btn-primary" :class="{'btn-info': !val1 || !val2}" :disabled="disabled" @click="_callTask">生成任务</button>
+            <button class="button btn-primary" :class="{'btn-info': !val1}" :disabled="disabled" @click="_callTask">生成任务</button>
           </div>
         </div>
       </div>
@@ -51,7 +38,6 @@ export default {
   data () {
     return {
       val1: '',
-      val2: '',
       options: [],
       disabled: false
     }
@@ -66,8 +52,12 @@ export default {
     },
     async _callTask () {
       this.disabled = true
+      if (!this.val1) {
+        this.disabled = false
+        return
+      }
       try {
-        let res = await callTask(this.val1, this.val2)
+        let res = await callTask(this.val1)
         this.$message({
           message: res.message,
           type: 'success'

src/pages/index.vue

@@ -67,8 +67,8 @@
 
 <script>
 import jxHeader from '@components/header.vue'
-// import {queryDevices, queryOrders} from '@config/mork.js'
-// import {updateOrder, startOrder, forceFinish} from '@config/getData.js'
+// import {queryDevices, queryOrders, startOrder} from '@config/mork.js'
+// import {updateOrder, forceFinish} from '@config/getData.js'
 import {queryDevices, queryOrders, updateOrder, startOrder, forceFinish} from '@config/getData.js'
 export default {
   name: 'index',

src/pages/task.vue

@@ -88,9 +88,21 @@ export default {
         this.$set(el, 'checked', false)
       })
     },
-    async _sendWork (e) {
+    _sendWork (e) {
       this.disabled1 = true
       e.checked = true
+      this.$confirm('确定下发任务？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.__sendWork(e)
+      }).catch(() => {
+        this.disabled1 = false
+        e.checked = false
+      })
+    },
+    async __sendWork (e) {
       try {
         let res = await sendWork(e.work_code)
         this._queryWorks()
@@ -122,9 +134,21 @@ export default {
         e.checked = false
       }
     },
-    async _pdaPause (e) {
+    _pdaPause (e) {
       this.disabled3 = true
       e.checked = true
+      this.$confirm('确定暂停任务？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.__pdaPause(e)
+      }).catch(() => {
+        this.disabled3 = false
+        e.checked = false
+      })
+    },
+    async __pdaPause (e) {
       try {
         let res = await pdaPause(e.work_code)
         this._queryWorks()
@@ -139,7 +163,21 @@ export default {
         e.checked = false
       }
     },
-    async _finishWork (e) {
+    _finishWork (e) {
+      this.disabled4 = true
+      e.checked = true
+      this.$confirm('确定完成任务？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.__finishWork(e)
+      }).catch(() => {
+        this.disabled4 = false
+        e.checked = false
+      })
+    },
+    async __finishWork (e) {
       this.disabled4 = true
       e.checked = true
       try {

src/style/layout.styl

@@ -102,7 +102,7 @@ header
   padding .37rem .4rem .4rem .4rem
   background: url('~@/images/bg_box.png') center / 100% 100% no-repeat
 .grid_wraper
-  height: calc(100% - 1rem)
+  height 100%
   overflow-y auto
   table
     table-layout: fixed;
@@ -264,4 +264,12 @@ header
 .el-button
   font-size .34rem
 .el-button+.el-button
-  margin-left .4rem
+  margin-left .4rem
+.el-message-box
+  width 600px
+  background: linear-gradient(45deg, rgba(28,95,161,0.7), rgba(20,67,120,0.7));
+  border: 1px solid #6fc4e2;
+  padding-bottom 20px;
+.el-message-box__title, .el-message-box__headerbtn, .el-message-box__content
+  font-size 24px
+  color #fff;