From cb96836f8fcc102b791985457be79446490119fc Mon Sep 17 00:00:00 2001
From: "qianhao.xu" <qianhao.xu@doan-tech.com>
Date: Thu, 18 Apr 2024 11:36:08 +0800
Subject: [PATCH] 123456

---
 src/api/wmsManagement/wmFgentryInspect.js    |  13 +
 src/views/wmsManagement/WmFgentryInspect.vue | 408 +++++--------------
 2 files changed, 124 insertions(+), 297 deletions(-)

diff --git a/src/api/wmsManagement/wmFgentryInspect.js b/src/api/wmsManagement/wmFgentryInspect.js
index 55914a8..3334b3b 100644
--- a/src/api/wmsManagement/wmFgentryInspect.js
+++ b/src/api/wmsManagement/wmFgentryInspect.js
@@ -26,6 +26,19 @@ export function listWmFgentryInspect_firstLevel(query) {
   })
 }
 
+
+/**
+* 成品入库检验分页查询  二级级
+* @param {查询条件} data
+*/
+export function listWmFgentryInspect_secondLevel(query) {
+  return request({
+    url: '/mes/wm/WmFgentryInspect/second_level_list',
+    method: 'get',
+    params: query,
+  })
+}
+
 /**
 * 新增成品入库检验
 * @param data
diff --git a/src/views/wmsManagement/WmFgentryInspect.vue b/src/views/wmsManagement/WmFgentryInspect.vue
index d6dc49f..577fdab 100644
--- a/src/views/wmsManagement/WmFgentryInspect.vue
+++ b/src/views/wmsManagement/WmFgentryInspect.vue
@@ -9,16 +9,7 @@
 <template>
   <div class="app-container">
     <!-- :model属性用于表单验证使用 比如下面的el-form-item 的 prop属性用于对表单值进行验证操作 -->
-    <el-form
-      :model="queryParams"
-      size="small"
-      label-position="right"
-      inline
-      ref="queryForm"
-      :label-width="labelWidth"
-      v-show="showSearch"
-      @submit.native.prevent
-    >
+    <el-form :model="queryParams" size="small" inline ref="queryForm" :label-width="labelWidth" v-show="showSearch" @submit.native.prevent>
       <el-form-item label="工单号">
         <el-input v-model="queryParams.workorder"></el-input>
       </el-form-item>
@@ -65,12 +56,18 @@
       @sort-change="sortChange"
       @selection-change="handleSelectionChange"
     >
-      <el-table-column type="selection" width="50" align="center" />
       <!-- <el-table-column prop="id" label="主键" align="center" /> -->
       <el-table-column prop="workorder" label="工单号" align="center" :show-overflow-tooltip="true" />
       <el-table-column prop="productionNum" label="箱子里产品个数" align="center" />
       <el-table-column prop="partnumber" label="零件号" align="center" :show-overflow-tooltip="true" />
-      <el-table-column label="操作" align="center" width="140">
+      <el-table-column label="检验结果" align="center">
+        <template slot-scope="scope">
+          <el-tag type="success" v-if="scope.result == 1">检验合格</el-tag>
+          <el-tag type="danger" v-else-if="scope.result == 2">检验不合格</el-tag>
+          <el-tag type="info" v-else>未检</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="检验" align="center" width="140">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -78,183 +75,69 @@
             type="success"
             icon="el-icon-edit"
             title="编辑"
-            @click="handleUpdate(scope.row)"
-          ></el-button>
-          <el-button
-            size="mini"
-            v-hasPermi="['wmsManagement:wmfgentryinspect:delete']"
-            type="danger"
-            icon="el-icon-delete"
-            title="删除"
-            @click="handleDelete(scope.row)"
+            @click="handle_secondLevel(scope.row.workorder)"
           ></el-button>
         </template>
       </el-table-column>
     </el-table>
-    <pagination class="mt10" background :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
+    <pagination
+      class="mt10"
+      background
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="firstLevel_dataList"
+    />
 
     <!-- 二级菜单区 -->
-    <!-- 工具区域 -->
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button type="primary" v-hasPermi="['wmsManagement:wmfgentryinspect:add']" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-          >新增</el-button
-        >
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          :disabled="single"
-          v-hasPermi="['wmsManagement:wmfgentryinspect:edit']"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          @click="handleUpdate"
-          >修改</el-button
-        >
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          :disabled="multiple"
-          v-hasPermi="['wmsManagement:wmfgentryinspect:delete']"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          @click="handleDelete"
-          >删除</el-button
-        >
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+    <el-dialog :title="first_level.title" :lock-scroll="false" :visible.sync="first_level.open" width="1200px">
+      <!-- 工具区 -->
+      <el-row :gutter="10" class="mb8">
+        <el-col :span="1.5">
+          <el-button type="success" plain   @click="handleAdd">合格</el-button>
+        </el-col>
+        <el-col :span="1.5">
+          <el-button type="danger" plain   @click="handleAdd">不合格</el-button>
+        </el-col>
+      </el-row>
 
-    <!-- 数据区域 -->
-    <el-table
-      :data="dataList"
-      v-loading="loading"
-      ref="table"
-      border
-      highlight-current-row
-      @sort-change="sortChange"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column type="selection" width="50" align="center" />
-      <!-- <el-table-column prop="id" label="主键" align="center" /> -->
-      <el-table-column prop="workorder" label="工单号" align="center" :show-overflow-tooltip="true" />
-      <el-table-column prop="packcode" label="外箱标签" align="center" :show-overflow-tooltip="true" />
-      <el-table-column prop="machine" label="工位" align="center" :show-overflow-tooltip="true" />
-      <el-table-column prop="productionNum" label="箱子里产品个数" align="center" />
-      <el-table-column prop="partnumber" label="零件号" align="center" :show-overflow-tooltip="true" />
-      <el-table-column prop="bfilled" label="是否满箱" align="center" />
-      <el-table-column prop="result" label="检验结果" align="center" />
-      <el-table-column prop="createdBy" label="创建人" align="center" :show-overflow-tooltip="true" />
-      <el-table-column prop="createdTime" label="创建时间" align="center" :show-overflow-tooltip="true" />
-      <el-table-column prop="updatedBy" label="更新人" align="center" :show-overflow-tooltip="true" />
-      <el-table-column prop="updatedTime" label="更新时间" align="center" :show-overflow-tooltip="true" />
+      <!-- 数据区域 -->
+      <el-table
+        :data="secondLevel_dataList"
+        ref="table"
+        border
+        highlight-current-row
+        @sort-change="sortChange"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="50" align="center" label="合格" />
+        <el-table-column prop="workorder" label="工单号" align="center" width="150" :show-overflow-tooltip="true" />
+        <el-table-column prop="packcode" label="外箱标签" align="center" width="190" :show-overflow-tooltip="true" />
+        <el-table-column prop="machine" label="工位" align="center" :show-overflow-tooltip="true" />
+        <el-table-column prop="productionNum" label="箱子里产品个数" align="center" />
+        <el-table-column prop="partnumber" label="零件号" align="center" :show-overflow-tooltip="true" />
+        <el-table-column prop="bfilled" label="是否满箱" align="center" />
 
-      <el-table-column label="操作" align="center" width="140">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            v-hasPermi="['wmsManagement:wmfgentryinspect:edit']"
-            type="success"
-            icon="el-icon-edit"
-            title="编辑"
-            @click="handleUpdate(scope.row)"
-          ></el-button>
-          <el-button
-            size="mini"
-            v-hasPermi="['wmsManagement:wmfgentryinspect:delete']"
-            type="danger"
-            icon="el-icon-delete"
-            title="删除"
-            @click="handleDelete(scope.row)"
-          ></el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <pagination class="mt10" background :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
-
-    <!-- 添加或修改成品入库检验对话框 -->
-    <el-dialog :title="title" :lock-scroll="false" :visible.sync="open">
-      <el-form ref="form" :model="form" :rules="rules" :label-width="formLabelWidth">
-        <el-row :gutter="20">
-          <el-col :lg="12" v-if="opertype == 2">
-            <el-form-item label="主键">{{ form.id }}</el-form-item>
-          </el-col>
-
-          <el-col :lg="12">
-            <el-form-item label="工单号" prop="workorder">
-              <el-input v-model="form.workorder" placeholder="请输入工单号" />
-            </el-form-item>
-          </el-col>
-
-          <el-col :lg="12">
-            <el-form-item label="外箱标签" prop="packcode">
-              <el-input-number
-                v-model.number="form.packcode"
-                controls-position="right"
-                placeholder="请输入箱子号"
-                :disabled="title == '修改数据'"
-              />
-            </el-form-item>
-          </el-col>
-
-          <el-col :lg="12">
-            <el-form-item label="工位" prop="machine">
-              <el-input v-model="form.machine" placeholder="请输入工位" />
-            </el-form-item>
-          </el-col>
-
-          <el-col :lg="12">
-            <el-form-item label="箱子里产品个数" prop="productionNum">
-              <el-input v-model="form.productionNum" placeholder="请输入箱子里产品个数" />
-            </el-form-item>
-          </el-col>
-
-          <el-col :lg="12">
-            <el-form-item label="零件号" prop="partnumber">
-              <el-input v-model="form.partnumber" placeholder="请输入零件号" />
-            </el-form-item>
-          </el-col>
-
-          <el-col :lg="12">
-            <el-form-item label="是否满箱" prop="bfilled">
-              <el-input v-model="form.bfilled" placeholder="请输入是否满箱" />
-            </el-form-item>
-          </el-col>
-
-          <el-col :lg="12">
-            <el-form-item label="检验结果（0未检，1合格，2不合格）" prop="result">
-              <el-input v-model="form.result" placeholder="请输入检验结果（0未检，1合格，2不合格）" />
-            </el-form-item>
-          </el-col>
-
-          <el-col :lg="12">
-            <el-form-item label="创建人" prop="createdBy">
-              <el-input v-model="form.createdBy" placeholder="请输入创建人" />
-            </el-form-item>
-          </el-col>
-
-          <el-col :lg="12">
-            <el-form-item label="创建时间" prop="createdTime">
-              <el-date-picker v-model="form.createdTime" type="datetime" placeholder="选择日期时间"></el-date-picker>
-            </el-form-item>
-          </el-col>
-
-          <el-col :lg="12">
-            <el-form-item label="更新人" prop="updatedBy">
-              <el-input v-model="form.updatedBy" placeholder="请输入更新人" />
-            </el-form-item>
-          </el-col>
-
-          <el-col :lg="12">
-            <el-form-item label="更新时间" prop="updatedTime">
-              <el-date-picker v-model="form.updatedTime" type="datetime" placeholder="选择日期时间"></el-date-picker>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+        <el-table-column prop="result" label="检验结果" align="center">
+          <template slot-scope="scope">
+            <el-tag type="success" v-if="scope.result == 1">检验合格</el-tag>
+            <el-tag type="danger" v-else-if="scope.result == 2">检验不合格</el-tag>
+            <el-tag type="info" v-else>未检</el-tag>
+          </template>
+        </el-table-column>
+        <!-- <el-table-column prop="createdBy" label="创建人" align="center" :show-overflow-tooltip="true" />
+        <el-table-column prop="createdTime" label="创建时间" align="center" :show-overflow-tooltip="true" />
+        <el-table-column prop="updatedBy" label="更新人" align="center" :show-overflow-tooltip="true" />
+        <el-table-column prop="updatedTime" label="更新时间" align="center" :show-overflow-tooltip="true" /> -->
+      </el-table>
+      <pagination
+        class="mt10"
+        background
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList_first"
+      />
       <div slot="footer" class="dialog-footer">
         <el-button type="text" @click="cancel">取 消</el-button>
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -266,6 +149,7 @@
 import {
   listWmFgentryInspect,
   listWmFgentryInspect_firstLevel,
+  listWmFgentryInspect_secondLevel,
   addWmFgentryInspect,
   delWmFgentryInspect,
   updateWmFgentryInspect,
@@ -317,6 +201,8 @@ export default {
       showSearch: true,
       // 查询参数
       queryParams: {
+        starttime: new Date(new Date(new Date().toLocaleDateString()).getTime()),
+        endtime: new Date(new Date(new Date().toLocaleDateString()).getTime() + 24 * 60 * 60 * 1000 - 1),
         workorder: '',
         partnumber: '',
         packcode: '',
@@ -325,6 +211,13 @@ export default {
         sort: undefined,
         sortType: undefined,
       },
+      second_queryParams: {
+        workorder: '',
+        partnumber: '',
+        packcode: '',
+        pageNum: 1,
+        pageSize: 10,
+      },
       // 弹出层标题
       title: '',
       // 操作类型 1、add 2、edit
@@ -349,6 +242,7 @@ export default {
       ],
       // 一级 数据列表
       firstLevel_dataList: [],
+      secondLevel_dataList: [],
       // 总记录数
       total: 0,
       // 提交按钮是否显示
@@ -357,17 +251,33 @@ export default {
       rules: {
         packcode: [{ required: true, message: '箱子号不能为空', trigger: 'blur' }],
       },
+      first_level: {
+        title: '检验',
+        open: false,
+      },
+      full_loading: null,
     }
   },
   created() {
     // 列表数据查询
-    this.getList()
-
-    var dictParams = []
+    this.getList_first()
   },
   methods: {
-    // 查询数据
-    getList() {
+    //todo  一级菜单调 二级
+    handle_secondLevel(workorder) {
+      this.first_level.open = true
+      this.first_level.title = '检验：' + workorder
+      this.full_loading = this.$loading({
+        lock: true,
+        text: 'Loading',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)',
+      })
+      // 获取二级菜单目录
+      this.getList_second(workorder)
+    },
+    // 获取一级菜单目录
+    getList_first() {
       this.loading = true
       listWmFgentryInspect_firstLevel(this.queryParams).then((res) => {
         if (res.code == 200) {
@@ -377,126 +287,30 @@ export default {
         }
       })
     },
+    // 获取二级菜单目录
+    getList_second(workorder) {
+      this.full_loading.close()
+      this.loading = true
+      this.second_queryParams.workorder = workorder
+      listWmFgentryInspect_secondLevel(this.second_queryParams).then((res) => {
+        if (res.code == 200) {
+          this.secondLevel_dataList = res.data.result
+          this.total = res.data.totalNum
+          this.loading = false
+        }
+      })
+    },
     // 取消按钮
     cancel() {
-      this.open = false
-      this.reset()
-    },
-    // 重置数据表单
-    reset() {
-      this.form = {
-        id: undefined,
-        workorder: undefined,
-        packcode: undefined,
-        machine: undefined,
-        productionNum: undefined,
-        partnumber: undefined,
-        bfilled: undefined,
-        result: undefined,
-        createdBy: undefined,
-        createdTime: undefined,
-        updatedBy: undefined,
-        updatedTime: undefined,
-      }
-      this.resetForm('form')
-    },
-    // 重置查询操作
-    resetQuery() {
-      this.timeRange = []
-      this.resetForm('queryForm')
-      this.handleQuery()
+      this.first_level.open = false
     },
+
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map((item) => item.id)
       this.single = selection.length != 1
       this.multiple = !selection.length
     },
-    // 自定义排序
-    sortChange(column) {
-      if (column.prop == null || column.order == null) {
-        this.queryParams.sort = undefined
-        this.queryParams.sortType = undefined
-      } else {
-        this.queryParams.sort = column.prop
-        this.queryParams.sortType = column.order
-      }
-
-      this.handleQuery()
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1
-      this.getList()
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset()
-      this.open = true
-      this.title = '添加'
-      this.opertype = 1
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const Ids = row.id || this.ids
-
-      this.$confirm('是否确认删除参数编号为"' + Ids + '"的数据项？')
-        .then(function () {
-          return delWmFgentryInspect(Ids)
-        })
-        .then(() => {
-          this.handleQuery()
-          this.msgSuccess('删除成功')
-        })
-        .catch(() => {})
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset()
-      const id = row.id || this.ids
-      getWmFgentryInspect(id).then((res) => {
-        const { code, data } = res
-        if (code == 200) {
-          this.open = true
-          this.title = '修改数据'
-          this.opertype = 2
-
-          this.form = {
-            ...data,
-          }
-        }
-      })
-    },
-    /** 提交按钮 */
-    submitForm: function () {
-      this.$refs['form'].validate((valid) => {
-        if (valid) {
-          console.log(JSON.stringify(this.form))
-
-          if (this.form.id != undefined && this.opertype === 2) {
-            updateWmFgentryInspect(this.form)
-              .then((res) => {
-                this.msgSuccess('修改成功')
-                this.open = false
-                this.getList()
-              })
-              .catch((err) => {
-                //TODO 错误逻辑
-              })
-          } else {
-            addWmFgentryInspect(this.form)
-              .then((res) => {
-                this.msgSuccess('新增成功')
-                this.open = false
-                this.getList()
-              })
-              .catch((err) => {
-                //TODO 错误逻辑
-              })
-          }
-        }
-      })
-    },
   },
 }
 </script>