no message

package.json

@@ -49,6 +49,7 @@
     "vue-count-to": "^1.0.13",
     "vue-cropper": "0.4.9",
     "vue-echarts": "^5.0.0-beta.0",
+    "vue-element-table-tooltip": "^0.6.0",
     "vue-image-crop-upload": "^2.5.0",
     "vue-router": "3.0.2",
     "vue-splitpane": "1.0.4",

src/main.js

@@ -1,30 +1,15 @@
 import Vue from 'vue'
-
 import Cookies from 'js-cookie'
-
 import 'normalize.css/normalize.css'
-
 import Element, { Table, TableColumn } from 'element-ui'
-const TableProps = Element.Table.props
+import elementTableTooltip from 'vue-element-table-tooltip';
-const TableColumnProps = Element.TableColumn.props
-TableProps.border = { type: Boolean, default: true } // 边框
-TableProps.align = { type: String, default: 'center' } // 居中
-TableProps.stripe = { type: Boolean, default: true } // 斑马纹
-TableColumnProps.showOverflowTooltip = { type: Boolean, default: true } // 文本溢出
-// TableColumnProps.sortable = { type: Boolean, default: true } // 置默认的排序列和排序顺序
-Vue.use(Table)
-Vue.use(TableColumn)
-
 // 数据字典
 import dict from './components/Dict'
-
 import dataV from '@jiaminghi/data-view'
-
 // 权限指令
 import checkPer from '@/utils/permission'
 import permission from './components/Permission'
 import './assets/styles/element-variables.scss'
-
 // global css
 import './assets/styles/index.scss'
 
@@ -35,6 +20,20 @@ import router from './router/routers'
 import './assets/icons' // icon
 import './router/index' // permission control
 
+
+const TableProps = Element.Table.props
+const TableColumnProps = Element.TableColumn.props
+TableProps.border = { type: Boolean, default: true } // 边框
+TableProps.align = { type: String, default: 'center' } // 居中
+TableProps.stripe = { type: Boolean, default: true } // 斑马纹
+TableColumnProps.showOverflowTooltip = { type: Boolean, default: true } // 文本溢出
+Vue.use(Table)
+Vue.use(TableColumn)
+Vue.use(elementTableTooltip, {
+  theme: "dark", // dark | light
+});
+
+
 Vue.use(checkPer)
 Vue.use(permission)
 Vue.use(dict)

src/views/business-data/businessTask/agvTask.vue

@@ -147,7 +147,7 @@
         <el-table-column
           fixed="right"
           label="操作"
-          width="200">
+          width="260">
           <template slot-scope="scope">
             <el-button type="warning" :disabled="scope.row.status!='ATCALL' && scope.row.status!='OPEN' "
                        align="center" size="mini"
@@ -168,6 +168,13 @@
                        @click="toAgvTaskCANCELED(scope.row)">
               取消
             </el-button>
+            <el-button type="primary"
+                       :disabled="scope.row.status!='CANCEL'  "
+                       align="center"
+                       size="mini"
+                       @click="toAgvTaskResend(scope.row)">
+              重送
+            </el-button>
           </template>
         </el-table-column>
 
@@ -220,6 +227,9 @@ export default {
     return CRUD({
       title: 'agvTask',
       url: 'api/agvTask',
+      query: {
+        status: 'ATCALL'
+      },
       idField: 'id',
       sort: 'id,desc',
       crudMethod: {...crudAgvTask},
@@ -234,7 +244,7 @@ export default {
   },
   data() {
     return {
-      radio3: '全部',
+      radio3: '执行中',
       permission: {
         add: ['admin', 'agvTask:add'],
         edit: ['admin', 'agvTask:edit'],
@@ -332,6 +342,30 @@ export default {
       }).catch(() => {
       })
     },
+    toAgvTaskResend(data) {
+      this.$confirm('此操作将重新发送任务, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        if (data.type == 'ASN') {
+          return this.crud.notify('原材料入库任务不允许重新发送!', CRUD.NOTIFICATION_TYPE.ERROR);
+        }
+        this.MissionStateCallback.missionCode = data.id
+        this.MissionStateCallback.missionStatus = 'RESEND'
+        crudAgvTask.missionStateCallback(this.MissionStateCallback).then(res => {
+          if (res.status == 200) {
+            this.crud.notify("发送成功!", CRUD.NOTIFICATION_TYPE.SUCCESS);
+            this.crud.toQuery()
+          } else {
+            this.crud.notify(res.message, CRUD.NOTIFICATION_TYPE.ERROR);
+          }
+        })
+
+      }).catch(() => {
+        this.crud.notify('已取消当前操作!', CRUD.NOTIFICATION_TYPE.WARNING);
+      });
+    },
     agvTaskCallbackMethod() {//顶升
       this.$refs['form1'].validate((valid) => {
         if (valid) {
@@ -359,12 +393,14 @@ export default {
       this.agvTaskCallbackStatus = true;
     },
     resetQuery() {
-      this.radio3 = '全部';
+      this.radio3 = '执行中';
-      this.crud.resetQuery()
+      this.query.status = 'ATCALL'
+      this.crud.toQuery();
+
     },
     clickChange(lab) {
       if (lab === "全部") {
-        this.crud.resetQuery();
+        this.query.status = ''
         this.crud.toQuery();
       } else if (lab === "待执行") {
         this.query.status = 'OPEN'

src/views/business-data/pick/index.vue

@@ -115,8 +115,8 @@
           </template>
         </el-table-column>
         <el-table-column prop="xh" label="序号" type="index"/>
-        <el-table-column prop="code" label="出库单编码"/>
+        <el-table-column prop="code" label="出库单编码" width="180" v-element-table-tooltip/>
-        <el-table-column prop="gdCode" label="工单编码"/>
+        <el-table-column prop="gdCode" label="工单编码" v-element-table-tooltip/>
         <el-table-column prop="lineNo" label="顺序号"/>
         <el-table-column prop="status" label="状态">
           <template slot-scope="scope">
@@ -271,11 +271,11 @@ export default {
 
     },
     handleRowClick(row, column, event) {
-      //点编辑按钮的时候不触发展开行
+      /* //点编辑按钮的时候不触发展开行
-      if (!event.target.classList.contains('el-button')) {
+       if (!event.target.classList.contains('el-button')) {
-        this.$refs.table.toggleRowExpansion(row)
+         this.$refs.table.toggleRowExpansion(row)
-      }
+       }
-
+       */
     }
 
   }

src/views/business-data/pickDetail/index.vue

@@ -9,7 +9,7 @@
                    class="filter-item">
           <el-option
             @keyup.enter.native="crud.toQuery"
-            v-for="item in this.itemListData"
+            v-for="item in this.items"
             :key="item.code"
             :label="item.code"
             :value="item.code">