代码更新

2022-07-21 15:44:14 +08:00
parent 3c23807c4f
commit bf4154797d
7 changed files with 74 additions and 66 deletions
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairmstServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairmstServiceImpl.java
@@ -765,6 +765,9 @@ public class DevicerepairmstServiceImpl implements DevicerepairmstService {
        io_mst.put("input_time", now);
        io_mst.put("update_optid", currentUserId + "");
        io_mst.put("update_optname", nickName);
+        io_mst.put("dis_optid", currentUserId);
+        io_mst.put("dis_optname", nickName);
+        io_mst.put("dis_time", DateUtil.now());
        io_mst.put("update_time", now);
        io_mst.put("device_id", jsonMst.get("device_id"));
        io_mst.put("device_code", jsonMst.get("device_code"));
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/service/impl/DevicesparepartivtServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/service/impl/DevicesparepartivtServiceImpl.java
@@ -161,6 +161,7 @@ public class DevicesparepartivtServiceImpl implements DevicesparepartivtService
            dtl_map.put("库区名称", jo.getString("sect_name"));
            dtl_map.put("物料编码", jo.getString("material_code"));
            dtl_map.put("物料名称", jo.getString("material_name"));
+            dtl_map.put("备件唯一码", jo.getString("sparepart_only_id"));
            dtl_map.put("型号", jo.getString("material_model"));
            dtl_map.put("技术规格", jo.getString("material_spec"));
            dtl_map.put("批次", jo.getString("pcsn"));
--- a/mes/qd/src/views/wms/sb/repair/devicerepairpa/index.vue
+++ b/mes/qd/src/views/wms/sb/repair/devicerepairpa/index.vue
@@ -311,16 +311,17 @@ export default {
    executeRepair() {
      const _selectData = this.$refs.table.selection
      const data = _selectData[0]
-      if (data.invstatus !== '03') {
-        return this.crud.notify('只能对开始状态的单据执行', CRUD.NOTIFICATION_TYPE.INFO)
+      if (data.invstatus === '03' || data.invstatus === '04' || data.invstatus === '05') {
+        crudDevicerepairmst.getDtl(data).then(res => {
+          this.openParam = {
+            'form': data,
+            'tableData': res
+          }
+          this.executeDialog = true
+        })
+      } else {
+        return this.crud.notify('单据状态不正确', CRUD.NOTIFICATION_TYPE.INFO)
      }
-      crudDevicerepairmst.getDtl(data).then(res => {
-        this.openParam = {
-          'form': data,
-          'tableData': res
-        }
-        this.executeDialog = true
-      })
    },
    confirmRepair() {
      const _selectData = this.$refs.table.selection
--- a/mes/qd/src/views/wms/sb/stat/deviceivtquery/index.vue
+++ b/mes/qd/src/views/wms/sb/stat/deviceivtquery/index.vue
@@ -65,9 +65,9 @@
        <el-table-column type="selection" width="55" />
        <el-table-column prop="sect_code" label="库区编码" />
        <el-table-column prop="sect_name" label="库区名称" />
-        <el-table-column prop="material_code" label="物料编码" show-overflow-tooltip/>
-        <el-table-column prop="material_name" label="名称" show-overflow-tooltip/>
-        <el-table-column prop="sparepart_only_id" label="备件唯一码" show-overflow-tooltip/>
+        <el-table-column prop="material_code" label="物料编码" width="130px"  show-overflow-tooltip/>
+        <el-table-column prop="material_name" label="名称" width="130px" show-overflow-tooltip/>
+        <el-table-column prop="sparepart_only_id" label="备件唯一码" width="130px"  show-overflow-tooltip/>
        <el-table-column prop="material_model" label="型号" />
        <el-table-column prop="material_spec" label="技术规格" />
        <el-table-column prop="pcsn" label="批次" />
--- a/mes/qd/src/views/wms/sb/stat/devicesafetyqtyquery/index.vue
+++ b/mes/qd/src/views/wms/sb/stat/devicesafetyqtyquery/index.vue
@@ -55,8 +55,8 @@
        <el-table-column prop="material_code" label="物料编码" />
        <el-table-column prop="material_name" label="物料名称" />
        <el-table-column prop="class_name" label="物料分类" />
-        <el-table-column prop="safe_ivt_up" label="安全库存上限" :formatter="crud.formatNum2" />
        <el-table-column prop="safe_ivt_down" label="安全库存下限" :formatter="crud.formatNum2" />
+        <el-table-column prop="safe_ivt_up" label="安全库存上限" :formatter="crud.formatNum2" />
        <el-table-column prop="ivt_qty" label="库存" :formatter="crud.formatNum2" />
        <el-table-column prop="qty_unit_name" label="单位" />
      </el-table>
--- a/mes/qd/src/views/wms/sb/stat/task/bigScreen.vue
+++ b/mes/qd/src/views/wms/sb/stat/task/bigScreen.vue
@@ -1,46 +1,19 @@
 <template>
-  <div style="border: 1px solid #938d8d;margin-left: 10px;margin-right: 10px;">
-    <el-row>
-      <el-col :span="12">
-        <div class="grid-content bg-purple"><h2 style="margin-left: 30px;padding-top: 10px;">统计任务看板</h2></div>
-      </el-col>
-
-      <el-col :span="12">
-        <div class="grid-content bg-purple-light">
-          <h2 style="text-align:right;margin-right: 140px;">{{ getTime }}</h2>
-        </div>
-        <div class="grid-content bg-purple-light">
-          <p style="text-align:right;margin-right: 110px;"><b>{{ getDate }}</b></p>
-        </div>
-
-      </el-col>
-    </el-row>
-    <br>
-    <br>
-    <div>
-      <!--表格渲染-->
-      <el-table
-        ref="table"
-        :data="tableData"
-        size="small"
-        style="width: 100%;"
-        border
-        :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
-      >
+  <div>
+    <div style="font-size: 22px; color: #f4f4f5; padding: 6px 50px 6px 700px;background-color: #2c3e50">当日任务列表</div>
+    <div class="my_table">
+      <el-table border style="width: 100%;" :data="tableData" max-height="800" :cell-style="cellStyle" :highlight-current-row="true" >
        <el-table-column type="index" label="序号" width="55" align="center" />
        <el-table-column prop="input_time" label="生成时间" />
        <el-table-column prop="repair_code" label="任务号" />
        <el-table-column prop="maintenancecycle" label="任务类型" />
-<!--        <el-table-column prop="" label="部门" />-->
+        <!--        <el-table-column prop="" label="部门" />-->
        <el-table-column prop="device_code" label="设备编码" />
        <el-table-column prop="device_name" label="设备名称" />
        <el-table-column prop="invstatus" label="状态" />
        <el-table-column prop="real_start_date" label="开始时间" />
        <el-table-column prop="real_end_date" label="结束时间" />
      </el-table>
-
-      <!--分页组件-->
-
    </div>
  </div>

@@ -58,34 +31,17 @@ export default {
      currentDate: new Date(),
      getTime: '',
      getDate: '',
-      tableData: []
+      tableData: [
+        { 'input_time': '暂无数据', 'repair_code': '暂无数据', 'maintenancecycle': '暂无数据', 'device_code': '暂无数据', 'device_name': '暂无数据' }
+      ]
    }
  },
  created() {
  },
  mounted() {
-    // 定时器
-    const timer = setInterval(() => {
-      this.settime()// 你所加载数据的方法
-    }, 1000)
-    // 销毁定时器
-    this.$once('hook:beforeDestroy', () => {
-      clearInterval(timer)
-    })
    this.init()
  },
  methods: {
-    settime() {
-      const _this = this
-      const yy = new Date().getFullYear()
-      const mm = new Date().getMonth() + 1
-      const dd = new Date().getDate()
-      const hh = new Date().getHours()
-      const mf = new Date().getMinutes() < 10 ? '0' + new Date().getMinutes() : new Date().getMinutes()
-      const ss = new Date().getSeconds() < 10 ? '0' + new Date().getSeconds() : new Date().getSeconds()
-      _this.getDate = yy + '年' + mm + '月' + dd + '日 ' + '星期' + '日一二三四五六'.charAt(new Date().getDay())
-      _this.getTime = hh + ':' + mf + ':' + ss
-    },
    // webSocket
    init: function() {
      if (typeof (WebSocket) === 'undefined') {
@@ -118,11 +74,56 @@ export default {
    },
    close: function() {
      console.log('socket已经关闭')
+    },
+    cellStyle(row, column, rowIndex, columnIndex) {
+      return 'font-size: 14px;'
    }
+  },
+  beforeCreate() {
+    this.$nextTick(() => {
+      document.body.setAttribute('style', 'background-color: #2D2F3F')
+    })
+  },
+  // 实例销毁之前钩子--移除body 标签的属性style
+  beforeDestroy() {
+    document.body.removeAttribute('style')
  }
 }
 </script>

-<style rel="stylesheet/scss" lang="scss" scoped>
+<style scoped>
+
+/*.my_table >>> .el-table::before {
+  !* 去除下边框 *!
+  height: 0;
+}*/
+
+.my_table >>> .el-table__row>td {
+  /* 去除表格线 */
+  border: none;
+}
+
+.my_table >>> .el-table th.is-leaf {
+  /* 去除上边框 */
+  border: none;
+}
+
+.my_table >>> .el-table tr {
+  /* 设置每行的颜色和字体颜色 */
+  background-color: #2D2F3F;
+  color: #FFFFFF;
+  font-weight: 500;
+}
+
+.my_table >>> .el-table th {
+  /* 设置表头的颜色和字体颜色 */
+  background-color: rgb(19, 71, 98);
+  color: #FFFFFF;
+  font-size: 17px;
+}
+.my_span {
+  padding: 10px 50px 10px 0px;
+  font-size: 17px;
+}

 </style>
--- a/mes/qd/src/views/wms/sb/stat/taskscreen/taskScreen.vue
+++ b/mes/qd/src/views/wms/sb/stat/taskscreen/taskScreen.vue
@@ -1,5 +1,6 @@
 <template>
  <div>
+    <div style="font-size: 22px; color: #f4f4f5; padding: 6px 50px 6px 700px; background-color: #3184d7">维修班组任务列表</div>
    <div style="font-size: 20px; color: #f4f4f5; padding: 6px 50px 6px 10px; background-color: #2c3e50">报修任务</div>
    <div class="my_table">
      <el-table border style="width: 100%;" :data="table" max-height="300" :cell-style="cellStyle" :highlight-current-row="true" >
@@ -12,6 +13,7 @@
        <el-table-column align="center" property="create_name" label="报修人"/>
      </el-table>
    </div>
+    <br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br />
    <div style="font-size: 20px; color: #f4f4f5; background-color: #2c3e50; padding: 6px 50px 6px 10px">在修任务</div>
    <div class="my_table">
      <el-table border style="width: 100%;" :data="table2" max-height="300" :cell-style="cellStyle2" :highlight-current-row="true" >