更新

2022-12-13 16:37:14 +08:00
parent 6f547d5dc5
commit 84359c8e43
7 changed files with 65 additions and 34 deletions
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2021-11-15 08:20:28
 * @LastEditors: zwq
- * @LastEditTime: 2022-11-21 14:51:52
+ * @LastEditTime: 2022-11-23 09:42:21
 * @Description:
 */
 /**
@@ -62,7 +62,8 @@ const mainRoutes = {
    { path: '/report-kiln-alarm', component: _import('report/kiln-alarm'), name: 'report-kiln-alarm', meta: { title: '工业炉报警', isTab: true } },
    { path: '/report-car-alarm', component: _import('report/car-alarm'), name: 'report-car-alarm', meta: { title: '车辆运行报警', isTab: true } },
    { path: '/report-order-history', component: _import('report/order-history'), name: 'report-order-history', meta: { title: '订单历史列表', isTab: true } },
-    { path: '/report-APMS-work', component: _import('report/APMS-table'), name: 'report-APMS-work', meta: { title: 'APMS报工', isTab: true } },
+    { path: '/report-APMS-table', component: _import('report/APMS-table'), name: 'report-APMS-table', meta: { title: 'APMS报工', isTab: true } },
+    { path: '/report-APMS-work', component: _import('report/APMS-work'), name: 'report-APMS-work', meta: { title: 'APMS未出单报工', isTab: true } },
    { path: '/report-order-history-task', component: _import('report/components/order-history-task'), name: 'report-order-history-task', meta: { title: '订单历史任务详情', isTab: true } },
    { path: '/report-task-history', component: _import('report/task-history'), name: 'report-task-history', meta: { title: '执行任务历史列表', isTab: true } },
    { path: '/report-task-history-detail', component: _import('report/components/task-history-detail'), name: 'report-task-history-detail', meta: { title: '执行任务历史详情', isTab: true } },
--- a/src/utils/validate.js
+++ b/src/utils/validate.js
@@ -1,3 +1,10 @@
+/*
+ * @Author: zwq
+ * @Date: 2021-11-15 08:20:28
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-11-30 15:44:44
+ * @Description:
+ */
 /**
 * 邮箱
 * @param {*} s
@@ -29,3 +36,11 @@ export function isPhone (s) {
 export function isURL (s) {
  return /^http[s]?:\/\/.*/.test(s)
 }
+
+/**
+ * 配炉号
+ * @param {*} s
+ */
+export function isStoveCode (s) {
+  return /^[A-Z]{3}\d{1}\W{1}\d{2}\W{1}\d{10}$/.test(s)
+}
--- a/src/views/main-sidebar.vue
+++ b/src/views/main-sidebar.vue
@@ -339,12 +339,19 @@
            <icon-svg name="job" class="site-sidebar__menu-icon"></icon-svg>
            <span slot="title">执行任务历史列表</span>
          </el-menu-item>
+          <el-menu-item
+            index="report-APMS-table"
+            @click="$router.push({ name: 'report-APMS-table' })"
+          >
+            <icon-svg name="job" class="site-sidebar__menu-icon"></icon-svg>
+            <span slot="title">APMS报工</span>
+          </el-menu-item>
          <el-menu-item
            index="report-APMS-work"
            @click="$router.push({ name: 'report-APMS-work' })"
          >
            <icon-svg name="job" class="site-sidebar__menu-icon"></icon-svg>
-            <span slot="title">APMS报工</span>
+            <span slot="title">APMS未出单报工</span>
          </el-menu-item>
        </el-submenu>
        <el-menu-item index="Problem" @click="$router.push({ name: 'Problem' })">
--- a/src/views/report/APMS-table.vue
+++ b/src/views/report/APMS-table.vue
@@ -58,7 +58,6 @@ export default {
    return {
      dataList: [],
      updataList: [],
-      kilnInfoArr: [],
      dataListLoading: false,
      tableEditVisible: false
    }
@@ -70,20 +69,6 @@ export default {
    this.getDataList()
  },
  created () {
-    this.$http({
-      url: this.$http.adornUrl('/kilnInfo/list'),
-      method: 'post',
-      data: this.$http.adornData({
-        current: 1,
-        size: 500
-      })
-    }).then(({ data }) => {
-      if (data && data.code === 0) {
-        this.kilnInfoArr = data.data
-      } else {
-        this.kilnInfoArr = []
-      }
-    })
  },
  methods: {
    // 获取数据列表
--- a/src/views/report/APMS-work.vue
+++ b/src/views/report/APMS-work.vue
@@ -35,7 +35,13 @@
          </el-col>
          <el-col :span="8">
            <el-form-item label="配炉号" prop="stoveCode">
-              <el-select
+              <el-input
+                v-model="dataForm.stoveCode"
+                placeholder="请输入配炉号"
+                clearable
+                :style="{ width: '100%' }"
+              ></el-input>
+              <!-- <el-select
                v-model="dataForm.stoveCode"
                :style="{ width: '100%' }"
                filterable
@@ -48,7 +54,7 @@
                  :value="item.code"
                >
                </el-option>
-              </el-select>
+              </el-select> -->
            </el-form-item>
          </el-col>
          <el-col :span="8">
@@ -91,7 +97,7 @@
              </el-input>
            </el-form-item>
          </el-col>
-          <el-col :span="8">
+          <!-- <el-col :span="8">
            <el-form-item label="备注" prop="remark">
              <el-input
                v-model="dataForm.remark"
@@ -100,7 +106,7 @@
                :style="{ width: '100%' }"
              ></el-input>
            </el-form-item>
-          </el-col>
+          </el-col> -->
        </el-row>
      </div>
      <el-card class="box-card">
@@ -162,10 +168,18 @@
 </template>

 <script>
+import { isStoveCode } from '@/utils/validate'
 export default {
  components: {},
  props: [],
  data () {
+    var validateMobile = (rule, value, callback) => {
+      if (!isStoveCode(value)) {
+        callback(new Error('配炉号格式错误'))
+      } else {
+        callback()
+      }
+    }
    return {
      stoveCodeArr: [],
      techCodeArr: [],
@@ -205,7 +219,8 @@ export default {
            required: true,
            message: '请输入配炉号',
            trigger: 'blur'
-          }
+          },
+          { validator: validateMobile, trigger: 'blur' }
        ],
        workShopCode: [
          {
@@ -215,7 +230,13 @@ export default {
          }
        ],
        techCode: [],
-        stoveRemark: [],
+        stoveRemark: [
+          {
+            required: true,
+            message: '请输入炉号备注',
+            trigger: 'blur'
+          }
+        ],
        remark: [],
        itemCode: []
      }
--- a/src/views/report/components/APMS-table-edit.vue
+++ b/src/views/report/components/APMS-table-edit.vue
@@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2021-11-18 14:16:25
 * @LastEditors: zwq
- * @LastEditTime: 2022-11-21 14:56:51
+ * @LastEditTime: 2022-11-21 16:26:53
 * @Description:
 -->
 <template>
@@ -68,7 +68,7 @@ export default {
      this.btnLoad = false
      this.showForm = false
      this.autoExeTaskId = autoExeTaskId
-      this.updataList = updataList
+      this.updataList = JSON.parse(JSON.stringify(updataList))
      const list = JSON.parse(JSON.stringify(dataList))
      this.subList = list.filter(item => {
        if (item.allStep === allStep) {
@@ -86,8 +86,10 @@ export default {
        if (item.autoExeTaskId === this.autoExeTaskId) {
          item.currTaskDetVoList.forEach(item1 => {
            const index = this.subList.findIndex(value => { return value.id === item1.id })
+            if (index >= 0) {
              item1.weight = this.subList[index].weight
              item1.quantity = this.subList[index].quantity
+            }
          })
          return item
        }
--- a/src/views/report/components/task-ele.vue
+++ b/src/views/report/components/task-ele.vue
@@ -2,7 +2,7 @@
 * @Author: gtz
 * @Date: 2022-03-05 16:06:02
 * @LastEditors: zwq
- * @LastEditTime: 2022-11-18 15:03:21
+ * @LastEditTime: 2022-11-30 15:12:05
 * @Description: file content
 * @FilePath: \mt-qj-wms-ui\src\views\report\components\task-ele.vue
 -->
@@ -359,19 +359,19 @@ export default {
        temp: []
      },
      eleName: [
-        'ele',
-        'ammon',
-        'car',
+        'temp',
        'carbon',
        'met',
+        'propane',
+        'ammon',
        'nit',
+        'ele',
+        'car',
        'oilTemp',
        'outer1Temp',
        'outer2Temp',
-        'propane',
        'rot1',
        'rot2',
-        'temp',
        'aCurr',
        'aVol',
        'bCurr',