no message

hefeihvac_web.iml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

src/assets/styles/eladmin.scss

@@ -115,3 +115,11 @@
 .el-tabs{
   margin-bottom: 25px;
 }
+
+/* 全局修改el-table 表头和内容颜色 header color content color */
+.el-table th {
+  font-size: 14px;
+  background: #f5f7fa !important;
+  color: #606266;
+}
+

src/components/Crud/UD.operation.vue

@@ -157,11 +157,11 @@ export default {
       this.ContainerIn.containerCode = data.code
       this.ContainerIn.position = data.point.code
       stockUrl.containerOut(this.ContainerIn).then(res => {
-        if (res.status == 200) {
+        if (res.code == 200) {
-          this.crud.notify(res.message, CRUD.NOTIFICATION_TYPE.SUCCESS);
+          this.crud.notify(res.msg, CRUD.NOTIFICATION_TYPE.SUCCESS);
           this.crud.toQuery()
         } else {
-          this.crud.notify(res.message, CRUD.NOTIFICATION_TYPE.ERROR);
+          this.crud.notify(res.msg, CRUD.NOTIFICATION_TYPE.ERROR);
         }
       })
     },

src/main.js

@@ -4,12 +4,20 @@ import Cookies from 'js-cookie'
 
 import 'normalize.css/normalize.css'
 
-import Element from 'element-ui'
+import Element, { Table, TableColumn } from 'element-ui'
+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 } // 文本溢出
+// 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'
@@ -28,7 +36,6 @@ import './router/index' // permission control
 Vue.use(checkPer)
 Vue.use(permission)
 Vue.use(dict)
-Vue.use(dataV)
 Vue.use(Element, {
   size: Cookies.get('size') || 'small' // set element-ui default size
 })

src/views/base-data/box/bindOrderNumber.vue

@@ -74,7 +74,7 @@ export default {
             this.toQuery()
             this.$parent.crud.notify('绑定成功！', CRUD.NOTIFICATION_TYPE.SUCCESS);
           }).catch(() => {
-
+            this.$parent.crud.notify('绑定失败！', CRUD.NOTIFICATION_TYPE.ERROR);
           })
         } else {
           return false;

src/views/base-data/box/index.vue

@@ -371,15 +371,13 @@ export default {
     callBox(data) {
       this.CallBox.id=data.id
       crudBox.callBox(this.CallBox).then(res => {
-        if(res.status==200){
+        if(res.code){
-          this.crud.notify(res.message, CRUD.NOTIFICATION_TYPE.SUCCESS);
+          this.crud.notify(res.msg, CRUD.NOTIFICATION_TYPE.SUCCESS);
           this.$parent.shuaxinContainerList()
           this.$refs['form'].resetFields();
         }else{
-          this.crud.notify(res.message, CRUD.NOTIFICATION_TYPE.ERROR);
+          this.crud.notify(res.msg, CRUD.NOTIFICATION_TYPE.ERROR);
         }
-      }).catch(() => {
-        this.crud.notify("呼叫失败", CRUD.NOTIFICATION_TYPE.ERROR);
       })
     },
     //单选时触发

src/views/base-data/box/smallLine.vue

@@ -300,15 +300,13 @@ export default {
     callBox(data) {
       this.CallBox.id = data.id
       crudBox.callBox(this.CallBox).then(res => {
-        if (res.status == 200) {
+        if (res.code == 200) {
-          this.crud.notify(res.message, CRUD.NOTIFICATION_TYPE.SUCCESS);
+          this.crud.notify(res.msg, CRUD.NOTIFICATION_TYPE.SUCCESS);
           this.$parent.shuaxinContainerList()
           this.$refs['form'].resetFields();
         } else {
-          this.crud.notify(res.message, CRUD.NOTIFICATION_TYPE.ERROR);
+          this.crud.notify(res.msg, CRUD.NOTIFICATION_TYPE.ERROR);
         }
-      }).catch(() => {
-
       })
     }
   }

src/views/base-data/point/fullStockIn.vue

@@ -75,16 +75,14 @@ export default {
           this.FullStockIn.itemCode = this.form.itemCode
           this.FullStockIn.agvScene="ZC"
           pointUrl.fullStockIn(this.FullStockIn).then(res => {
-            if(res.status==200){
+            if(res.code=200){
               this.dialogVisible = false
-              this.$parent.crud.notify(res.message, CRUD.NOTIFICATION_TYPE.SUCCESS);
+              this.$parent.crud.notify(res.msg, CRUD.NOTIFICATION_TYPE.SUCCESS);
               this.$parent.shuaxinContainerList()
               this.$refs['form'].resetFields();
             }else{
-              this.$parent.crud.notify(res.message, CRUD.NOTIFICATION_TYPE.ERROR);
+              this.$parent.crud.notify(res.msg, CRUD.NOTIFICATION_TYPE.ERROR);
             }
-          }).catch(() => {
-
           })
         } else {
           return false;

src/views/base-data/point/fullStockOut.vue

@@ -65,16 +65,14 @@ export default {
           this.FullStockOut.itemCode = this.form.itemCode
           this.FullStockOut.agvScene="ZC"
           pointUrl.fullStockOut(this.FullStockOut).then(res => {
-            if(res.status==200){
+            if(res.code){
               this.dialogVisible = false
-              this.$parent.crud.notify(res.message, CRUD.NOTIFICATION_TYPE.SUCCESS);
+              this.$parent.crud.notify(res.msg, CRUD.NOTIFICATION_TYPE.SUCCESS);
               this.$parent.shuaxinContainerList()
               this.$refs['form'].resetFields();
             }else{
-              this.$parent.crud.notify(res.message, CRUD.NOTIFICATION_TYPE.ERROR);
+              this.$parent.crud.notify(res.msg, CRUD.NOTIFICATION_TYPE.ERROR);
             }
-          }).catch(() => {
-
           })
         } else {
           return false;

src/views/base-data/point/multiAdjust.vue

@@ -152,21 +152,19 @@ export default {
           this.multiadjust.enabled=this.form.enabled
 
           crudPoint.multiAdjust(this.multiadjust).then(res => {
-            if(res.status==200){
+            if(res.code=200){
               this.dialog = false
-              this.$parent.crud.notify(res.message, CRUD.NOTIFICATION_TYPE.SUCCESS);
+              this.$parent.crud.notify(res.msg, CRUD.NOTIFICATION_TYPE.SUCCESS);
               this.$parent.crud.toQuery();
               this.$refs['form'].resetFields();
               this.form.description=''
               this.form.areaId=''
             }else{
-              this.$parent.crud.notify(res.message, CRUD.NOTIFICATION_TYPE.ERROR);
+              this.$parent.crud.notify(res.msg, CRUD.NOTIFICATION_TYPE.ERROR);
               this.$refs['form'].resetFields();
               this.form.description=''
               this.form.areaId=''
             }
-          }).catch(() => {
-
           })
         } else {
           return false;

src/views/base-data/stock/containerIn.vue

@@ -70,16 +70,14 @@ export default {
           this.ContainerIn.position = this.form.position
           this.ContainerIn.itemCode=this.form.itemCode
           stockUrl.containerIn(this.ContainerIn).then(res => {
-            if(res.status==200){
+            if(res.code=200){
               this.dialogVisible = false
-              this.$parent.crud.notify(res.message, CRUD.NOTIFICATION_TYPE.SUCCESS);
+              this.$parent.crud.notify(res.msg, CRUD.NOTIFICATION_TYPE.SUCCESS);
               this.$parent.crud.toQuery();
               this.$refs['form'].resetFields();
             }else{
-              this.$parent.crud.notify(res.message, CRUD.NOTIFICATION_TYPE.ERROR);
+              this.$parent.crud.notify(res.msg, CRUD.NOTIFICATION_TYPE.ERROR);
             }
-          }).catch(() => {
-
           })
         } else {
           return false;

src/views/base-data/stock/returnContainer.vue

@@ -103,12 +103,12 @@ export default {
             stockCode: this.form.stockCode
           }
           stockUrl.lineReturn(LineReturn).then(res => {
-            if (res.status = 200) {
+            if ( res.code == 200) {
               this.returnContainerCancel(formName);
-              this.$parent.crud.notify(res.message, CRUD.NOTIFICATION_TYPE.SUCCESS);
+              this.$parent.crud.notify(res.msg, CRUD.NOTIFICATION_TYPE.SUCCESS);
               this.$parent.crud.toQuery();
             } else {
-              this.$parent.crud.notify(res.message, CRUD.NOTIFICATION_TYPE.ERROR);
+              this.$parent.crud.notify(res.msg, CRUD.NOTIFICATION_TYPE.ERROR);
             }
           })
         }

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

@@ -619,12 +619,12 @@ export default {
           return
         }
         doBindStock(this.BindStock).then(res => {
-          if (res.status = 200) {
+          if ( res.code === 200) {
             this.manliao = false;//关闭窗口
-            this.crud.notify(res.message, CRUD.NOTIFICATION_TYPE.SUCCESS);
+            this.crud.notify(res.msg, CRUD.NOTIFICATION_TYPE.SUCCESS);
             this.crud.toQuery();
           } else {
-            this.crud.notify(res.message, CRUD.NOTIFICATION_TYPE.ERROR);
+            this.crud.notify(res.msg, CRUD.NOTIFICATION_TYPE.ERROR);
           }
         })
       })

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

@@ -52,7 +52,6 @@
           <el-radio-button label="全部"> 全部</el-radio-button>
           <el-radio-button label="待执行">待执行</el-radio-button>
           <el-radio-button label="执行中">执行中</el-radio-button>
-          <el-radio-button label="顶升">顶升</el-radio-button>
           <el-radio-button label="已完成">已完成</el-radio-button>
           <el-radio-button label="任务取消">任务取消</el-radio-button>
         </el-radio-group>
@@ -147,9 +146,9 @@
         <el-table-column
           fixed="right"
           label="操作"
-          width="200">
+          width="140">
           <template slot-scope="scope">
-            <el-button type="warning" :disabled="scope.row.status!='ATCALL' && scope.row.status!='OPEN' "
+            <el-button type="warning" v-if="false" :disabled="scope.row.status!='ATCALL' && scope.row.status!='OPEN' "
                        align="center" size="mini"
                        @click="popUpBox(scope.row)">
               顶升
@@ -298,18 +297,15 @@ export default {
       return row.endSlotCode;
     },
     toAgvTaskFinish(data) {
-      if(data.status!='UP_CONTAINER'){
-        return this.crud.notify("容器未顶升，需顶升之后在做操作!", CRUD.NOTIFICATION_TYPE.ERROR);
-      }
       this.MissionStateCallback.missionCode = data.id
       this.MissionStateCallback.containerCode = data.stockCode
       this.MissionStateCallback.missionStatus = 'COMPLETED'
       crudAgvTask.missionStateCallback(this.MissionStateCallback).then(res => {
-        if (res.status == 200) {
+        if (res.code == 200) {
           this.crud.notify("任务完成!", CRUD.NOTIFICATION_TYPE.SUCCESS);
           this.crud.toQuery()
         } else {
-          this.crud.notify(res.message, CRUD.NOTIFICATION_TYPE.ERROR);
+          this.crud.notify(res.msg, CRUD.NOTIFICATION_TYPE.ERROR);
         }
       }).catch(() => {
       })
@@ -319,11 +315,11 @@ export default {
       this.MissionStateCallback.containerCode = data.stockCode
       this.MissionStateCallback.missionStatus = 'CANCELED'
       crudAgvTask.missionStateCallback(this.MissionStateCallback).then(res => {
-        if (res.status == 200) {
+        if (res.code == 200) {
           this.crud.notify("取消成功!", CRUD.NOTIFICATION_TYPE.SUCCESS);
           this.crud.toQuery()
         } else {
-          this.crud.notify(res.message, CRUD.NOTIFICATION_TYPE.ERROR);
+          this.crud.notify(res.msg, CRUD.NOTIFICATION_TYPE.ERROR);
         }
       }).catch(() => {
       })
@@ -368,9 +364,6 @@ export default {
       } else if (lab === "执行中") {
         this.query.status = 'ATCALL'
         this.crud.toQuery();
-      } else if (lab === "顶升") {
-        this.query.status = 'UP_CONTAINER'
-        this.crud.toQuery();
       } else if (lab === "已完成") {
         this.query.status = 'FINISH'
         this.crud.toQuery();

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

@@ -11,7 +11,7 @@
           :label="item.code"
           :value="item.code">
           <span style="float: left">{{ item.code }}</span>
-          <span style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</span>
+          <span  style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</span>
         </el-option>
       </el-select>
 
@@ -41,11 +41,17 @@
       <date-range-picker v-model="query.createTime" class="date-item" style="width: 100px"/>
 
       <div>
+        <label class="el-form-item-label">送货单号</label>
+        <el-input v-model="query.orderNumber" clearable placeholder="送货单" style="width: 170px;" class="filter-item"
+                  @keyup.enter.native="crud.toQuery"/>
+        <label class="el-form-item-label">Mo票</label>
+        <el-input v-model="query.propC1" clearable placeholder="Mo票" style="width: 190px;" class="filter-item"
+                  @keyup.enter.native="crud.toQuery"/>
         <label class="el-form-item-label">原点位</label>
-        <el-input v-model="query.srcPointCode" clearable placeholder="原点位" style="width: 185px;" class="filter-item"
+        <el-input v-model="query.srcPointCode" clearable placeholder="原点位" style="width: 165px;" class="filter-item"
                   @keyup.enter.native="crud.toQuery"/>
         <label class="el-form-item-label">目标点位</label>
-        <el-input v-model="query.dstPointCode" clearable placeholder="目标点位" style="width: 170px;"
+        <el-input v-model="query.dstPointCode" clearable placeholder="目标点位" style="width: 200px;"
                   class="filter-item" @keyup.enter.native="crud.toQuery"/>
         <rrOperation :crud="crud"/>
       </div>
@@ -59,6 +65,16 @@
                 @selection-change="crud.selectionChangeHandler">
         <el-table-column type="selection" width="55"/>
         <el-table-column prop="xh" type="index" :index="indexMethod" label="序号"/>
+        <el-table-column :show-overflow-tooltip="true" prop="orderNumber" label="送货单号">
+          <template slot-scope="scope">
+            <div>{{ scope.row.itemKey.orderNumber }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column :show-overflow-tooltip="true" prop="propC1" label="Mo票">
+          <template slot-scope="scope">
+            <div>{{ scope.row.itemKey.propC1 }}</div>
+          </template>
+        </el-table-column>
         <el-table-column :show-overflow-tooltip="true" prop="itemCode" label="物料编码">
           <template slot-scope="scope">
             <div>{{ scope.row.item.code }}</div>

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

@@ -15,25 +15,29 @@
       <!--
             <el-input v-model="query.itemCode" clearable placeholder="请输入物料编码" style="width: 140px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
       -->
+      <label class="el-form-item-label">送货单号</label>
+      <el-input v-model="query.orderNumber" clearable placeholder="请输入送货单号" style="width: 150px;"
+                class="filter-item" @keyup.enter.native="crud.toQuery"/>
+
+      <label class="el-form-item-label">Mo票</label>
+      <el-input v-model="query.propC1" clearable placeholder="请输入Mo票" style="width: 150px;" class="filter-item"
+                @keyup.enter.native="crud.toQuery"/>
+
       <label class="el-form-item-label">物料编码</label>
       <el-input v-model="query.itemCodeOne" clearable placeholder="请输入物料编码" style="width: 150px;"
                 class="filter-item" @keyup.enter.native="crud.toQuery"/>
-      <label class="el-form-item-label">物料名称</label>
-      <el-input v-model="query.itemName" clearable placeholder="请输入物料名称" style="width: 150px;"
-                class="filter-item" @keyup.enter.native="crud.toQuery"/>
 
-      <label class="el-form-item-label">批次号</label>
+
-      <el-input v-model="query.propC1" clearable placeholder="请输入批次号" style="width: 150px;" class="filter-item"
+
-                @keyup.enter.native="crud.toQuery"/>
 
       <label class="el-form-item-label">容器号</label>
-      <el-input v-model="query.stockName" clearable placeholder="请输入容器号" style="width: 150px;" class="filter-item"
+      <el-input v-model="query.stockCode" clearable placeholder="请输入容器号" style="width: 150px;" class="filter-item"
                 @keyup.enter.native="crud.toQuery"/>
       <rrOperation :crud="crud"/>
 
       <el-button class="filter-item" size="mini" type="warning" icon="el-icon-refresh-left" @click="resetQuery">重置
       </el-button>
-      
+
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation :permission="permission" :tableKey="this.$options.name"/>
       <!--表单组件-->
@@ -94,6 +98,16 @@
         height="70vh"
       >
         <el-table-column type="selection" width="55"/>
+        <el-table-column :show-overflow-tooltip="true" prop="orderNumber" label="送货单号">
+          <template slot-scope="scope">
+            <div>{{ scope.row.itemKey.orderNumber }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column :show-overflow-tooltip="true" prop="propC1" label="Mo票">
+          <template slot-scope="scope">
+            <div>{{ scope.row.itemKey.propC1 }}</div>
+          </template>
+        </el-table-column>
         <el-table-column :show-overflow-tooltip="true" prop="itemCode" label="物料编码">
           <template slot-scope="scope">
             <div>{{ scope.row.itemKey.item.code }}</div>
@@ -104,35 +118,20 @@
             <div>{{ scope.row.itemKey.item.name }}</div>
           </template>
         </el-table-column>
-        <el-table-column :show-overflow-tooltip="true" prop="areaName" label="区域">
+        <el-table-column prop="pointCode" label="库位号"/>
-          <template slot-scope="scope">
-            <div>{{ scope.row.point.area.name }}</div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="pointCode" label="点位号"/>
         <el-table-column prop="stockCode" label="容器号"/>
         <el-table-column prop="quantity" label="数量"/>
         <el-table-column prop="queuedQty" label="占用数"/>
-        <el-table-column prop="propC1" label="批次号">
+        <el-table-column prop="createTime" label="入库时间"/>
-          <template slot-scope="scope">
+        <!--        <el-table-column v-if="checkPer(['admin','fileManagement:edit','fileManagement:del'])" label="操作"
-            <div>{{ scope.row.itemKey.propC1 }}</div>
+                                 width="150px" align="center" fixed="right">
-          </template>
+                  <template slot-scope="scope">
-        </el-table-column>
+                    <el-popconfirm title="确定删除吗？"
-        <el-table-column prop="orderNumber" label="工单号">
+                                   @confirm="deleteDataM(scope.row.id)">
-          <template slot-scope="scope">
+                      <el-button slot="reference" type="danger">删除</el-button>
-            <div>{{ scope.row.itemKey.orderNumber }}</div>
+                    </el-popconfirm>
-          </template>
+                  </template>
-        </el-table-column>
+                </el-table-column>-->
-        <el-table-column prop="createTime" label="创建时间"/>
-        <el-table-column v-if="checkPer(['admin','fileManagement:edit','fileManagement:del'])" label="操作"
-                         width="150px" align="center" fixed="right">
-          <template slot-scope="scope">
-            <el-popconfirm title="确定删除吗？"
-                           @confirm="deleteDataM(scope.row.id)">
-              <el-button slot="reference" type="danger">删除</el-button>
-            </el-popconfirm>
-          </template>
-        </el-table-column>
       </el-table>
       <!--分页组件-->
       <div style="float: right;">

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

@@ -130,7 +130,7 @@ export default {
       title: 'Mo票管理',
       url: 'api/mo',
       idField: 'id',
-      sort: 'id,desc',
+      sort: 'labelNo,desc',
       crudMethod: {...crudMo},
       optShow: {
         add: false,

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

@@ -119,12 +119,12 @@ export default {
             scene: 2//1-空;2-满
           }
           stockUrl.callStock(CallStock).then(res => {
-            if (res.status = 200) {
+            if ( res.code == 200) {
               this.itemOutCancel();
-              this.$parent.crud.notify(res.message, CRUD.NOTIFICATION_TYPE.SUCCESS);
+              this.$parent.crud.notify(res.msg, CRUD.NOTIFICATION_TYPE.SUCCESS);
               this.$parent.shuaxin();
             } else {
-              this.$parent.crud.notify(res.message, CRUD.NOTIFICATION_TYPE.ERROR);
+              this.$parent.crud.notify(res.msg, CRUD.NOTIFICATION_TYPE.ERROR);
             }
           })
         }

src/views/system/user/index.vue

@@ -57,7 +57,7 @@
             </el-select>
             <rrOperation />
           </div>
-          <crudOperation show="" :permission="permission" :tableKey="this.$options.name" />/>
+          <crudOperation show="" :permission="permission" :tableKey="this.$options.name" />
         </div>
         <!--表单渲染-->
         <el-dialog append-to-body :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="570px">