update - 质检记录管理

src/api/report/qualityInspection.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询质检记录管理列表
+export function listQualityInspection(query) {
+  return request({
+    url: '/report/qualityInspection/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询质检记录管理详细
+export function getQualityInspection(objId) {
+  return request({
+    url: '/report/qualityInspection/' + objId,
+    method: 'get'
+  })
+}
+
+// 新增质检记录管理
+export function addQualityInspection(data) {
+  return request({
+    url: '/report/qualityInspection',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改质检记录管理
+export function updateQualityInspection(data) {
+  return request({
+    url: '/report/qualityInspection',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除质检记录管理
+export function delQualityInspection(objId) {
+  return request({
+    url: '/report/qualityInspection/' + objId,
+    method: 'delete'
+  })
+}

src/views/base/processStation/index.vue

@@ -271,7 +271,9 @@ export default {
     };
   },
   created() {
-    this.queryParams.productLineCode = this.$route.params && this.$route.params.productLineCode;
+    if (!this.$route.params){
+      this.queryParams.productLineCode = this.$route.params && this.$route.params.productLineCode;
+    }
     this.getList();
   },
   methods: {

src/views/base/productStation/index.vue

@@ -276,8 +276,10 @@ export default {
     };
   },
   created() {
-    this.queryParams.parentId = this.$route.params && this.$route.params.productLineCode;
+    if (!this.$route.params){
-    this.queryParams.processCode = this.$route.params && this.$route.params.processCode;
+      this.queryParams.parentId = this.$route.params && this.$route.params.productLineCode;
+      this.queryParams.processCode = this.$route.params && this.$route.params.processCode;
+    }
     this.getList();
     findFactoryList().then(response => {
       this.factoryList = response.data;

src/views/base/qualityInspectionItem/index.vue

@@ -185,15 +185,15 @@
             >{{dict.label}}</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="物料小类" prop="materialSubclass">
+<!--        <el-form-item label="物料小类" prop="materialSubclass">-->
-          <el-radio-group v-model="form.materialSubclass">
+<!--          <el-radio-group v-model="form.materialSubclass">-->
-            <el-radio
+<!--            <el-radio-->
-              v-for="dict in dict.type.material_subclass"
+<!--              v-for="dict in dict.type.material_subclass"-->
-              :key="dict.value"
+<!--              :key="dict.value"-->
-              :label="dict.value"
+<!--              :label="dict.value"-->
-            >{{dict.label}}</el-radio>
+<!--            >{{dict.label}}</el-radio>-->
-          </el-radio-group>
+<!--          </el-radio-group>-->
-        </el-form-item>
+<!--        </el-form-item>-->
 <!--        <el-form-item label="工厂编号" prop="plantCode">-->
 <!--          <el-input v-model="form.plantCode" placeholder="请输入工厂编号" />-->
 <!--        </el-form-item>-->
@@ -279,7 +279,7 @@ export default {
             { key: 2, label: `质检项名称`, visible: true },
             { key: 3, label: `父级编号`, visible: true },
             { key: 4, label: `物料大类`, visible: true },
-            { key: 5, label: `物料小类`, visible: true },
+            { key: 5, label: `物料小类`, visible: false },
             { key: 6, label: `工厂编号`, visible: true },
             { key: 7, label: `备注`, visible: true },
             { key: 8, label: `启用标识`, visible: true },
@@ -322,8 +322,8 @@ export default {
         qualityDefectCode: null,
         qualityDefectName: null,
         parentId: null,
-        materialCategories: 0,
+        materialCategories: '1',
-        materialSubclass: 0,
+        materialSubclass: null,
         plantCode: null,
         remark: null,
         isFlag: 0,

src/views/report/inventoryStatistics/index.vue

@@ -120,6 +120,9 @@ export default {
     }
   },
   created() {
+    if (!this.$route.params){
+      this.queryParams.storeCode = this.$route.params && this.$route.params.storeCode;
+    }
     this.getList()
     findStoreList().then(response => {
       this.storeList = response.data
@@ -135,7 +138,6 @@ export default {
     /** 查询货道信息列表 */
     getList() {
       this.loading = true
-      this.queryParams.storeCode = this.$route.params && this.$route.params.storeCode;
       getInventoryStatistics(this.queryParams).then(response => {
         this.reportList = response.data
         this.pieChartData = response.data.map(item => ({

src/views/report/qualityInspection/index.vue

@@ -0,0 +1,453 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="产品条码" prop="barCode">
+        <el-input
+          v-model="queryParams.barCode"
+          placeholder="请输入产品条码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="物料名称" prop="materialName">
+        <el-input
+          v-model="queryParams.materialName"
+          placeholder="请输入物料名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+<!--      <el-form-item label="工序编号" prop="processCode">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.processCode"-->
+<!--          placeholder="请输入工序编号"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+      <el-form-item label="检测项编号" prop="testItemCode">
+        <el-input
+          v-model="queryParams.testItemCode"
+          placeholder="请输入检测项编号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="处理措施" prop="treatmentMeasure">
+        <el-select v-model="queryParams.treatmentMeasure" placeholder="请选择处理措施" clearable>
+          <el-option
+            v-for="dict in dict.type.treatment_measures"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+
+<!--      <el-form-item label="检测时间" prop="inspectorTime">-->
+<!--        <el-date-picker clearable-->
+<!--          v-model="queryParams.inspectorTime"-->
+<!--          type="date"-->
+<!--          value-format="yyyy-MM-dd"-->
+<!--          placeholder="请选择检测时间">-->
+<!--        </el-date-picker>-->
+<!--      </el-form-item>-->
+
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="primary"-->
+<!--          plain-->
+<!--          icon="el-icon-plus"-->
+<!--          size="mini"-->
+<!--          @click="handleAdd"-->
+<!--          v-hasPermi="['report:qualityInspection:add']"-->
+<!--        >新增</el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="success"-->
+<!--          plain-->
+<!--          icon="el-icon-edit"-->
+<!--          size="mini"-->
+<!--          :disabled="single"-->
+<!--          @click="handleUpdate"-->
+<!--          v-hasPermi="['report:qualityInspection:edit']"-->
+<!--        >修改</el-button>-->
+<!--      </el-col>-->
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['report:qualityInspection:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['report:qualityInspection:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="qualityInspectionList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="主键标识" align="center" prop="objId" v-if="columns[0].visible"/>
+      <el-table-column label="产品条码" align="center" prop="barCode" v-if="columns[1].visible"/>
+      <el-table-column label="物料名称" align="center" prop="materialName" v-if="columns[2].visible"/>
+      <el-table-column label="工序编号" align="center" prop="processCode" v-if="columns[3].visible"/>
+      <el-table-column label="检测项编号" align="center" prop="testItemCode" v-if="columns[4].visible"/>
+      <el-table-column label="质量缺陷编码" align="center" prop="qualityDefectCode" v-if="columns[5].visible"/>
+      <el-table-column label="质量缺陷名称" align="center" prop="qualityDefectName" v-if="columns[6].visible"/>
+      <el-table-column label="处理措施" align="center" prop="treatmentMeasure" v-if="columns[7].visible">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.treatment_measures" :value="scope.row.treatmentMeasure"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="处理结果" align="center" prop="processResult" v-if="columns[8].visible"/>
+      <el-table-column label="是否下静态线" align="center" prop="isLowerLine" v-if="columns[9].visible">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.isLowerLine"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="班组编号" align="center" prop="groupCode" v-if="columns[10].visible"/>
+      <el-table-column label="检测人员" align="center" prop="inspectorCode" v-if="columns[11].visible"/>
+      <el-table-column label="检测时间" align="center" prop="inspectorTime" width="180" v-if="columns[12].visible">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.inspectorTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="返修次数" align="center" prop="reworkNumber" v-if="columns[13].visible"/>
+      <el-table-column label="完成时间" align="center" prop="finishTime" width="180" v-if="columns[14].visible">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.finishTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="是否标识" align="center" prop="isFlag" v-if="columns[15].visible"/>
+      <el-table-column label="更新人" align="center" prop="updatedBy" v-if="columns[16].visible"/>
+      <el-table-column label="更新时间" align="center" prop="updatedTime" width="180" v-if="columns[17].visible">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.updatedTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+        </template>
+      </el-table-column>
+<!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
+<!--        <template slot-scope="scope">-->
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-edit"-->
+<!--            @click="handleUpdate(scope.row)"-->
+<!--            v-hasPermi="['report:qualityInspection:edit']"-->
+<!--          >修改</el-button>-->
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-delete"-->
+<!--            @click="handleDelete(scope.row)"-->
+<!--            v-hasPermi="['report:qualityInspection:remove']"-->
+<!--          >删除</el-button>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改质检记录管理对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="产品条码" prop="barCode">
+          <el-input v-model="form.barCode" placeholder="请输入产品条码" />
+        </el-form-item>
+        <el-form-item label="物料名称" prop="materialName">
+          <el-input v-model="form.materialName" placeholder="请输入物料名称" />
+        </el-form-item>
+        <el-form-item label="工序编号" prop="processCode">
+          <el-input v-model="form.processCode" placeholder="请输入工序编号" />
+        </el-form-item>
+        <el-form-item label="检测项编号" prop="testItemCode">
+          <el-input v-model="form.testItemCode" placeholder="请输入检测项编号" />
+        </el-form-item>
+        <el-form-item label="质量缺陷编码" prop="qualityDefectCode">
+          <el-input v-model="form.qualityDefectCode" placeholder="请输入质量缺陷编码" />
+        </el-form-item>
+        <el-form-item label="质量缺陷名称" prop="qualityDefectName">
+          <el-input v-model="form.qualityDefectName" placeholder="请输入质量缺陷名称" />
+        </el-form-item>
+        <el-form-item label="处理措施" prop="treatmentMeasure">
+          <el-radio-group v-model="form.treatmentMeasure">
+            <el-radio
+              v-for="dict in dict.type.treatment_measures"
+              :key="dict.value"
+              :label="dict.value"
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="处理结果" prop="processResult">
+          <el-input v-model="form.processResult" placeholder="请输入处理结果" />
+        </el-form-item>
+        <el-form-item label="是否下静态线" prop="isLowerLine">
+          <el-radio-group v-model="form.isLowerLine">
+            <el-radio
+              v-for="dict in dict.type.sys_yes_no"
+              :key="dict.value"
+              :label="dict.value"
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="班组编号" prop="groupCode">
+          <el-input v-model="form.groupCode" placeholder="请输入班组编号" />
+        </el-form-item>
+        <el-form-item label="检测人员" prop="inspectorCode">
+          <el-input v-model="form.inspectorCode" placeholder="请输入检测人员" />
+        </el-form-item>
+        <el-form-item label="检测时间" prop="inspectorTime">
+          <el-date-picker clearable
+            v-model="form.inspectorTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择检测时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="返修次数" prop="reworkNumber">
+          <el-input v-model="form.reworkNumber" placeholder="请输入返修次数" />
+        </el-form-item>
+        <el-form-item label="完成时间" prop="finishTime">
+          <el-date-picker clearable
+            v-model="form.finishTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择完成时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="是否标识" prop="isFlag">
+          <el-input v-model="form.isFlag" placeholder="请输入是否标识" />
+        </el-form-item>
+        <el-form-item label="更新人" prop="updatedBy">
+          <el-input v-model="form.updatedBy" placeholder="请输入更新人" />
+        </el-form-item>
+        <el-form-item label="更新时间" prop="updatedTime">
+          <el-date-picker clearable
+            v-model="form.updatedTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择更新时间">
+          </el-date-picker>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listQualityInspection, getQualityInspection, delQualityInspection, addQualityInspection, updateQualityInspection } from "@/api/report/qualityInspection";
+
+export default {
+  name: "QualityInspection",
+  dicts: ['sys_yes_no', 'treatment_measures'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 质检记录管理表格数据
+      qualityInspectionList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        barCode: null,
+        materialName: null,
+        processCode: null,
+        testItemCode: null,
+        qualityDefectCode: null,
+        qualityDefectName: null,
+        treatmentMeasure: null,
+        processResult: null,
+        isLowerLine: null,
+        groupCode: null,
+        inspectorCode: null,
+        inspectorTime: null,
+        reworkNumber: null,
+        finishTime: null,
+        isFlag: null,
+        updatedBy: null,
+        updatedTime: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      },
+      columns: [
+            { key: 0, label: `主键标识`, visible: false },
+            { key: 1, label: `产品条码`, visible: true },
+            { key: 2, label: `物料名称`, visible: true },
+            { key: 3, label: `工序编号`, visible: true },
+            { key: 4, label: `检测项编号`, visible: true },
+            { key: 5, label: `质量缺陷编码`, visible: true },
+            { key: 6, label: `质量缺陷名称`, visible: true },
+            { key: 7, label: `处理措施`, visible: true },
+            { key: 8, label: `处理结果`, visible: true },
+            { key: 9, label: `是否下静态线`, visible: true },
+            { key: 10, label: `班组编号`, visible: true },
+            { key: 11, label: `检测人员`, visible: true },
+            { key: 12, label: `检测时间`, visible: true },
+            { key: 13, label: `返修次数`, visible: true },
+            { key: 14, label: `完成时间`, visible: true },
+            { key: 15, label: `是否标识`, visible: false },
+            { key: 16, label: `更新人`, visible: false },
+            { key: 17, label: `更新时间`, visible: false },
+        ]
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询质检记录管理列表 */
+    getList() {
+      this.loading = true;
+      listQualityInspection(this.queryParams).then(response => {
+        this.qualityInspectionList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        objId: null,
+        barCode: null,
+        materialName: null,
+        processCode: null,
+        testItemCode: null,
+        qualityDefectCode: null,
+        qualityDefectName: null,
+        treatmentMeasure: null,
+        processResult: null,
+        isLowerLine: null,
+        groupCode: null,
+        inspectorCode: null,
+        inspectorTime: null,
+        reworkNumber: null,
+        finishTime: null,
+        isFlag: null,
+        updatedBy: null,
+        updatedTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.objId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加质检记录管理";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const objId = row.objId || this.ids
+      getQualityInspection(objId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改质检记录管理";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.objId != null) {
+            updateQualityInspection(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addQualityInspection(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const objIds = row.objId || this.ids;
+      this.$modal.confirm('是否确认删除质检记录管理编号为"' + objIds + '"的数据项？').then(function() {
+        return delQualityInspection(objIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('report/qualityInspection/export', {
+        ...this.queryParams
+      }, `qualityInspection_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>