Merge remote-tracking branch 'origin/master'

src/api/base/qualityInspectionItem.js

@@ -9,6 +9,15 @@ export function listQualityInspectionItem(query) {
   })
 }
 
+// 查询缺陷下拉框
+export function getDefectList(query) {
+  return request({
+    url: '/base/qualityInspectionItem/getDefectList',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询质检项信息维护详细
 export function getQualityInspectionItem(objId) {
   return request({

src/api/base/stationDefectRelation.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询质检工位/缺陷维护列表
+export function listStationDefectRelation(query) {
+  return request({
+    url: '/base/stationDefectRelation/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询质检工位/缺陷维护详细
+export function getStationDefectRelation(objId) {
+  return request({
+    url: '/base/stationDefectRelation/' + objId,
+    method: 'get'
+  })
+}
+
+// 新增质检工位/缺陷维护
+export function addStationDefectRelation(data) {
+  return request({
+    url: '/base/stationDefectRelation',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改质检工位/缺陷维护
+export function updateStationDefectRelation(data) {
+  return request({
+    url: '/base/stationDefectRelation',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除质检工位/缺陷维护
+export function delStationDefectRelation(objId) {
+  return request({
+    url: '/base/stationDefectRelation/' + objId,
+    method: 'delete'
+  })
+}

src/api/production/calendarInfo.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询生产日历列表
+export function listCalendarInfo(query) {
+  return request({
+    url: '/production/calendarInfo/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询生产日历详细
+export function getCalendarInfo(objId) {
+  return request({
+    url: '/production/calendarInfo/' + objId,
+    method: 'get'
+  })
+}
+
+// 新增生产日历
+export function addCalendarInfo(data) {
+  return request({
+    url: '/production/calendarInfo',
+    method: 'post',
+    data: data
+  })
+}
+
+// 新增SAP生产日历
+export function addSAPCalendar(data) {
+  return request({
+    url: '/production/calendarInfo/addSAPCalendar',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改生产日历
+export function updateCalendarInfo(data) {
+  return request({
+    url: '/production/calendarInfo',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除生产日历
+export function delCalendarInfo(objId) {
+  return request({
+    url: '/production/calendarInfo/' + objId,
+    method: 'delete'
+  })
+}

src/views/base/processStation/index.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
       <el-form-item label="所属产线" prop="productLineCode" >
-        <el-select v-model="queryParams.productLineCode" placeholder="请选择产线工位">
+        <el-select v-model="queryParams.productLineCode" placeholder="请选择所属产线">
           <el-option
             v-for="item in productLineList"
             :key="item.productLineCode"
@@ -11,18 +11,20 @@
           ></el-option>
         </el-select>
       </el-form-item>
-<!--      <el-form-item label="工序编号" prop="processCode">-->
+<!--      <el-form-item label="工序类别" prop="processType">-->
-<!--        <el-input-->
+<!--      <el-select v-model="queryParams.processType" placeholder="请选择工序类别" clearable>-->
-<!--          v-model="queryParams.processCode"-->
+<!--        <el-option-->
-<!--          placeholder="请输入工序编号"-->
+<!--          v-for="dict in dict.type.process_type"-->
-<!--          clearable-->
+<!--          :key="dict.value"-->
-<!--          @keyup.enter.native="handleQuery"-->
+<!--          :label="dict.label"-->
+<!--          :value="dict.value"-->
 <!--        />-->
+<!--      </el-select>-->
 <!--      </el-form-item>-->
-      <el-form-item label="工序名称" prop="processName">
+      <el-form-item label="生产工序名称" prop="processName">
         <el-input
           v-model="queryParams.processName"
-          placeholder="请输入工序名称"
+          placeholder="请输入生产工序名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -91,12 +93,12 @@
     <el-table v-loading="loading" :data="processStationList" @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="processCode" v-if="columns[1].visible"/>
+      <el-table-column label="生产工序编号" align="center" prop="processCode" v-if="columns[1].visible"/>
-      <el-table-column label="工序名称" align="center" prop="processName" v-if="columns[2].visible"/>
+      <el-table-column label="生产工序名称" align="center" prop="processName" v-if="columns[2].visible"/>
       <el-table-column label="类别" align="center" prop="processType" v-if="columns[3].visible"/>
       <el-table-column label="所属产线" align="center" prop="productLineCode" v-if="columns[4].visible"/>
-      <el-table-column label="所属工位编号" align="center" prop="parentId" v-if="columns[13].visible"/>
+      <el-table-column label="下级工位编号" align="center" prop="parentId" v-if="columns[13].visible"/>
-      <el-table-column label="所属工位名称" align="center" prop="stationName" v-if="columns[14].visible"/>
+      <el-table-column label="下级工位名称" align="center" prop="stationName" v-if="columns[14].visible"/>
       <el-table-column label="单位生产时间" align="center" prop="productionTime" v-if="columns[5].visible"/>
       <el-table-column label="日产能" align="center" prop="capacityDay" v-if="columns[6].visible"/>
       <el-table-column label="月产能" align="center" prop="capacityMonth" v-if="columns[7].visible"/>
@@ -124,7 +126,7 @@
             type="text"
             icon="el-icon-s-grid"
             @click="findStation(scope.row)"
-          >所属工位</el-button>
+          >下级工位</el-button>
           <el-button
             size="mini"
             type="text"
@@ -154,11 +156,11 @@
     <!-- 添加或修改生产工序/工位信息对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-        <el-form-item label="工序编号" prop="processCode">
+        <el-form-item label="生产工序编号" prop="processCode">
-          <el-input v-model="form.processCode" placeholder="请输入工序/工位编号" />
+          <el-input v-model="form.processCode" placeholder="请输入生产工序编号" />
         </el-form-item>
-        <el-form-item label="工序名称" prop="processName">
+        <el-form-item label="生产工序名称" prop="processName">
-          <el-input v-model="form.processName" placeholder="请输入工序/工位名称" />
+          <el-input v-model="form.processName" placeholder="请输入生产工序名称" />
         </el-form-item>
         <el-form-item label="所属产线">
           <el-select v-model="form.productLineCode" placeholder="请输入所属产线">
@@ -170,8 +172,8 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="所属工位">
+        <el-form-item label="下级工位">
-          <el-select v-model="form.parentId" placeholder="请输入所属工位" multiple clearable>
+          <el-select v-model="form.parentId" placeholder="请输入下级工位" multiple clearable>
             <el-option
               v-for="item in findStationList"
               :key="item.productLineCode"
@@ -203,7 +205,7 @@ import { listProcessStation, getProcessStation, delProcessStation, addProcessSta
 import { findProductLineList } from "@/api/base/productLine";
 export default {
   name: "ProcessStation",
-  dicts: ['is_flag'],
+  dicts: ['is_flag','process_type'],
   data() {
     return {
       // 遮罩层
@@ -249,8 +251,8 @@ export default {
       },
       columns: [
             { key: 0, label: `主键标识`, visible: false },
-            { key: 1, label: `工序/工位编号`, visible: true },
+            { key: 1, label: `生产工序/工位编号`, visible: true },
-            { key: 2, label: `工序/工位名称`, visible: true },
+            { key: 2, label: `生产工序/工位名称`, visible: true },
             { key: 3, label: `类别`, visible: false },
             { key: 4, label: `所属产线`, visible: true },
             { key: 5, label: `单位生产时间`, visible: true },
@@ -271,7 +273,7 @@ export default {
     };
   },
   created() {
-    if (!this.$route.params){
+    if (this.$route.params != null){
       this.queryParams.productLineCode = this.$route.params && this.$route.params.productLineCode;
     }
     this.getList();
@@ -340,7 +342,7 @@ export default {
       this.open = true;
       this.title = "添加生产工序/工位信息";
     },
-    /** 查看所属工位 */
+    /** 查看下级工位 */
     findStation: function(row) {
       const processCode = row.processCode;
       this.$router.push("/base/productProcess-station/index/" + processCode);

src/views/base/productLine/index.vue

@@ -102,7 +102,7 @@
             type="text"
             icon="el-icon-s-grid"
             @click="findStation(scope.row)"
-          >所属工位</el-button>
+          >下级工位</el-button>
 <!--          <el-button-->
 <!--            size="mini"-->
 <!--            type="text"-->
@@ -308,7 +308,7 @@ export default {
       });
     },
 
-    /** 查看所属工位 */
+    /** 查看下级工位 */
     findStation: function(row) {
       const productLineCode = row.productLineCode;
       this.$router.push("/base/product-station/index/" + productLineCode);

src/views/base/productStation/index.vue

@@ -2,7 +2,8 @@
   <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="parentId" >
-        <el-select v-model="queryParams.parentId" placeholder="请选择产线" disabled>
+        <el-select v-model="queryParams.parentId" placeholder="请选择产线" >
+          <!--          disabled-->
           <el-option
             v-for="item in productLineList"
             :key="item.productLineCode"
@@ -27,6 +28,16 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="工位类型" prop="stationType">
+        <el-select v-model="queryParams.stationType" placeholder="请选择工位类型" >
+        <el-option
+          v-for="dict in dict.type.station_type"
+          :key="dict.value"
+          :label="dict.label"
+          :value="dict.value"
+        />
+        </el-select>
+      </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>
@@ -93,11 +104,11 @@
       <el-table-column label="主键标识" align="center" prop="objId" v-if="columns[0].visible"/>
       <el-table-column label="工位编号" align="center" prop="productLineCode" v-if="columns[1].visible"/>
       <el-table-column label="工位名称" align="center" prop="productLineName" v-if="columns[2].visible"/>
-<!--      <el-table-column label="工位类别" align="center" prop="productLineType" v-if="columns[3].visible">-->
+      <el-table-column label="工位类型" align="center" prop="stationType" v-if="columns[3].visible">
-<!--        <template slot-scope="scope">-->
+        <template slot-scope="scope">
-<!--          <dict-tag :options="dict.type.line_type" :value="scope.row.productLineType"/>-->
+          <dict-tag :options="dict.type.station_type" :value="scope.row.stationType"/>
-<!--        </template>-->
+        </template>
-<!--      </el-table-column>-->
+      </el-table-column>
       <el-table-column label="所属工厂" align="center" prop="plantName" v-if="columns[4].visible"/>
       <el-table-column label="所属产线" align="center" prop="parentName" v-if="columns[10].visible"/>
       <el-table-column label="启用标识" align="center" prop="isFlag" v-if="columns[5].visible" >
@@ -154,16 +165,15 @@
         <el-form-item label="工位名称" prop="productLineName">
           <el-input v-model="form.productLineName" placeholder="请输入工位名称" />
         </el-form-item>
-<!--        <el-form-item label="工位类别" prop="productLineType">-->
+        <el-form-item label="工位类型" prop="stationType">
-<!--          <el-select v-model="form.productLineType" placeholder="请选择工位类别">-->
+          <el-radio-group v-model="form.stationType">
-<!--            <el-option-->
+            <el-radio
-<!--              v-for="dict in dict.type.line_type"-->
+              v-for="dict in dict.type.station_type"
-<!--              :key="dict.value"-->
+              :key="dict.value"
-<!--              :label="dict.label"-->
+              :label="parseInt(dict.value)"
-<!--              :value="parseInt(dict.value)"-->
+            >{{dict.label}}</el-radio>
-<!--            ></el-option>-->
+          </el-radio-group>
-<!--          </el-select>-->
+        </el-form-item>
-<!--        </el-form-item>-->
         <el-form-item label="所属工厂">
           <el-select v-model="form.plantCode" placeholder="请选择所属工厂">
             <el-option
@@ -184,15 +194,6 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="启用标识" prop="isFlag">
-          <el-radio-group v-model="form.isFlag">
-            <el-radio
-              v-for="dict in dict.type.is_flag"
-              :key="dict.value"
-              :label="parseInt(dict.value)"
-            >{{dict.label}}</el-radio>
-          </el-radio-group>
-        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -215,7 +216,7 @@ import { findFactoryList } from '@/api/base/factory'
 
 export default {
   name: "ProductLine",
-  dicts: ['line_type', 'is_flag'],
+  dicts: ['station_type', 'is_flag'],
   data() {
     return {
       // 遮罩层
@@ -245,6 +246,7 @@ export default {
         productLineType: 2,
         plantCode: null,
         isFlag: null,
+        stationType: null,
         createdBy: null,
         createdTime: null,
         updatedBy: null,
@@ -262,10 +264,10 @@ 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: 6, label: `创建人`, visible: false },
             { key: 7, label: `创建时间`, visible: true },
-            { key: 8, label: `更新人`, visible: true },
+            { key: 8, label: `更新人`, visible: false },
             { key: 9, label: `更新时间`, visible: true },
             { key: 10, label: `所属产线`, visible: true },
         ],
@@ -276,8 +278,10 @@ export default {
     };
   },
   created() {
-    if (!this.$route.params){
+    if (this.$route.params.productLineCode != null){
       this.queryParams.parentId = this.$route.params && this.$route.params.productLineCode;
+    }
+    if (this.$route.params.processCode != null){
       this.queryParams.processCode = this.$route.params && this.$route.params.processCode;
     }
     this.getList();
@@ -311,6 +315,7 @@ export default {
         productLineName: null,
         productLineType: 2,
         plantCode: null,
+        stationType: 1,
         isFlag: 0,
         createdBy: null,
         createdTime: null,

src/views/base/qualityInspectionItem/defectIndex.vue

@@ -0,0 +1,403 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+      <el-form-item label="质量缺陷描述" prop="qualityDefectName">
+        <el-input
+          v-model="queryParams.qualityDefectName"
+          placeholder="请输入质量缺陷描述"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+<!--      <el-form-item label="缺陷大类" prop="materialCategories">-->
+<!--        <el-select v-model="queryParams.materialCategories" placeholder="请选择缺陷大类" clearable>-->
+<!--          <el-option-->
+<!--            v-for="dict in dict.type.defect_categories"-->
+<!--            :key="dict.value"-->
+<!--            :label="dict.label"-->
+<!--            :value="dict.value"-->
+<!--          />-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
+      <el-form-item label="缺陷小类" prop="materialSubclass">
+        <el-select v-model="queryParams.materialSubclass" placeholder="请选择缺陷大类" clearable>
+          <el-option
+            v-for="dict in dict.type.defect_subclass"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+<!--      <el-form-item label="工厂编号" prop="plantCode">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.plantCode"-->
+<!--          placeholder="请输入工厂编号"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="启用标识" prop="isFlag">-->
+<!--        <el-select v-model="queryParams.isFlag" placeholder="请选择启用标识" clearable>-->
+<!--          <el-option-->
+<!--            v-for="dict in dict.type.is_flag"-->
+<!--            :key="dict.value"-->
+<!--            :label="dict.label"-->
+<!--            :value="dict.value"-->
+<!--          />-->
+<!--        </el-select>-->
+<!--      </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="['base:qualityInspectionItem: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="['base:qualityInspectionItem: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="['base:qualityInspectionItem: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="['base:qualityInspectionItem:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="qualityInspectionItemList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="质量缺陷编码" align="center" prop="qualityDefectCode" v-if="columns[1].visible">
+      </el-table-column>
+      <el-table-column label="质量缺陷名称" align="center" prop="qualityDefectName" v-if="columns[2].visible"/>
+      <el-table-column label="缺陷大类" align="center" prop="materialCategories" v-if="columns[4].visible">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.defect_categories" :value="scope.row.materialCategories"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="缺陷小类" align="center" prop="materialSubclass" v-if="columns[5].visible">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.defect_subclass" :value="scope.row.materialSubclass"/>
+        </template>
+      </el-table-column>
+<!--      <el-table-column label="所属工位" align="center" prop="stationName" v-if="columns[6].visible"/>-->
+      <el-table-column label="启用标识" align="center" prop="isFlag" v-if="columns[8].visible">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.is_flag" :value="scope.row.isFlag"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="创建人" align="center" prop="createdBy" v-if="columns[9].visible"/>
+      <el-table-column label="创建时间" align="center" prop="createdTime" width="180" v-if="columns[10].visible">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createdTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="更新人" align="center" prop="updatedBy" v-if="columns[11].visible"/>
+      <el-table-column label="更新时间" align="center" prop="updatedTime" width="180" v-if="columns[12].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="['base:qualityInspectionItem:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['base:qualityInspectionItem: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="800px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <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="materialCategories">
+          <el-radio-group v-model="form.materialCategories">
+            <el-radio
+              v-for="dict in dict.type.defect_categories"
+              :key="dict.value"
+              :label="dict.value"
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="缺陷小类" prop="materialSubclass">
+          <el-radio-group v-model="form.materialSubclass">
+            <el-radio
+              v-for="dict in dict.type.defect_subclass"
+              :key="dict.value"
+              :label="dict.value"
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+<!--        <el-form-item label="工厂编号" prop="plantCode">-->
+<!--          <el-input v-model="form.plantCode" placeholder="请输入工厂编号" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="所属工位">-->
+<!--          <el-select v-model="form.stationCode" placeholder="请输入所属工位">-->
+<!--            <el-option-->
+<!--              v-for="item in findStationList"-->
+<!--              :key="item.productLineCode"-->
+<!--              :label="item.productLineName"-->
+<!--              :value="item.productLineCode"-->
+<!--            ></el-option>-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
+        <el-form-item label="启用标识" prop="isFlag">
+          <el-radio-group v-model="form.isFlag">
+            <el-radio
+              v-for="dict in dict.type.is_flag"
+              :key="dict.value"
+              :label="parseInt(dict.value)"
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </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 { listQualityInspectionItem, getQualityInspectionItem, delQualityInspectionItem, addQualityInspectionItem, updateQualityInspectionItem } from "@/api/base/qualityInspectionItem";
+import { findProductLineList } from '@//api/base/productLine'
+export default {
+  name: "QualityInspectionItem",
+  dicts: ['is_flag','defect_categories','defect_subclass'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 质量缺陷信息维护表格数据
+      qualityInspectionItemList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        qualityDefectCode: null,
+        qualityDefectName: null,
+        parentId: null,
+        materialCategories: null,
+        materialSubclass: null,
+        plantCode: null,
+        isFlag: null,
+        createdBy: null,
+        createdTime: null,
+        updatedBy: null,
+        updatedTime: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      },
+      columns: [
+            { key: 0, label: `主键标识`, visible: true },
+            { 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: false },
+            { key: 9, label: `创建人`, visible: false },
+            { key: 10, label: `创建时间`, visible: true },
+            { key: 11, label: `更新人`, visible: false },
+            { key: 12, label: `更新时间`, visible: false },
+        ],
+      // 工位选项
+      findStationList: []
+    };
+  },
+  created() {
+    findProductLineList({productLineType: 2}).then(response => {
+      this.findStationList = response.data;
+    });
+    this.getList();
+  },
+  methods: {
+
+    /** 查询质量缺陷信息维护列表 */
+    getList() {
+
+      this.loading = true;
+      listQualityInspectionItem(this.queryParams).then(response => {
+        this.qualityInspectionItemList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        objId: null,
+        qualityDefectCode: null,
+        qualityDefectName: null,
+        parentId: null,
+        materialCategories: '1',
+        materialSubclass: '1',
+        plantCode: null,
+        remark: null,
+        isFlag: 0,
+        createdBy: null,
+        createdTime: 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
+      getQualityInspectionItem(objId).then(response => {
+        console.log(response.data)
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改质量缺陷信息维护";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.objId != null) {
+            updateQualityInspectionItem(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addQualityInspectionItem(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 delQualityInspectionItem(objIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('base/qualityInspectionItem/export', {
+        ...this.queryParams
+      }, `qualityInspectionItem_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

src/views/base/qualityProcess/index.vue

@@ -0,0 +1,413 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+      <el-form-item label="所属产线" prop="productLineCode" >
+        <el-select v-model="queryParams.productLineCode" placeholder="请选择所属产线">
+          <el-option
+            v-for="item in productLineList"
+            :key="item.productLineCode"
+            :label="item.productLineName"
+            :value="item.productLineCode"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+<!--      <el-form-item label="工序类别" prop="processType">-->
+<!--      <el-select v-model="queryParams.processType" placeholder="请选择工序类别" clearable>-->
+<!--        <el-option-->
+<!--          v-for="dict in dict.type.process_type"-->
+<!--          :key="dict.value"-->
+<!--          :label="dict.label"-->
+<!--          :value="dict.value"-->
+<!--        />-->
+<!--      </el-select>-->
+<!--      </el-form-item>-->
+      <el-form-item label="质检工序名称" prop="processName">
+        <el-input
+          v-model="queryParams.processName"
+          placeholder="请输入质检工序名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </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="['base:processStation: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="['base:processStation: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="['base:processStation: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="['base:processStation:export']"
+        >导出</el-button>
+      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="danger"-->
+<!--          plain-->
+<!--          icon="el-icon-close"-->
+<!--          size="mini"-->
+<!--          @click="handleClose"-->
+<!--        >关闭</el-button>-->
+<!--      </el-col>-->
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="processStationList" @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="processCode" v-if="columns[1].visible"/>
+      <el-table-column label="质检工序名称" align="center" prop="processName" v-if="columns[2].visible"/>
+      <el-table-column label="类别" align="center" prop="processType" v-if="columns[3].visible">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.process_type" :value="scope.row.processType"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="所属产线" align="center" prop="productLineCode" v-if="columns[4].visible"/>
+      <el-table-column label="质检工位编号" align="center" prop="parentId" v-if="columns[13].visible"/>
+      <el-table-column label="质检工位名称" align="center" prop="stationName" v-if="columns[14].visible"/>
+      <el-table-column label="单位生产时间" align="center" prop="productionTime" v-if="columns[5].visible"/>
+      <el-table-column label="日产能" align="center" prop="capacityDay" v-if="columns[6].visible"/>
+      <el-table-column label="月产能" align="center" prop="capacityMonth" v-if="columns[7].visible"/>
+      <el-table-column label="启用标识" align="center" prop="isFlag" v-if="columns[8].visible">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.is_flag" :value="scope.row.isFlag"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="创建人" align="center" prop="createdBy" v-if="columns[9].visible"/>
+      <el-table-column label="创建时间" align="center" prop="createdTime" width="180" v-if="columns[10].visible">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createdTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="更新人" align="center" prop="updatedBy" v-if="columns[11].visible"/>
+      <el-table-column label="更新时间" align="center" prop="updatedTime" width="180" v-if="columns[12].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-s-grid"-->
+<!--            @click="findStation(scope.row)"-->
+<!--          >质检工位</el-button>-->
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['base:processStation:edit']"
+          >修改</el-button>
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-delete"-->
+<!--            @click="handleDelete(scope.row)"-->
+<!--            v-hasPermi="['base:processStation: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="100px">
+        <el-form-item label="质检工序编号" prop="processCode">
+          <el-input v-model="form.processCode" placeholder="请输入质检工序/工位编号" />
+        </el-form-item>
+        <el-form-item label="质检工序名称" prop="processName">
+          <el-input v-model="form.processName" placeholder="请输入质检工序/工位名称" />
+        </el-form-item>
+        <el-form-item label="所属产线">
+          <el-select v-model="form.productLineCode" placeholder="请输入所属产线">
+            <el-option
+              v-for="item in productLineList"
+              :key="item.productLineCode"
+              :label="item.productLineName"
+              :value="item.productLineCode"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="质检工位">
+          <el-select v-model="form.parentId" placeholder="请输入质检工位" multiple clearable>
+            <el-option
+              v-for="item in findStationList"
+              :key="item.productLineCode"
+              :label="item.productLineName"
+              :value="item.productLineCode"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+<!--        <el-form-item label="单位生产时间" prop="productionTime">-->
+<!--          <el-input v-model="form.productionTime" placeholder="请输入单位生产时间" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="日产能" prop="capacityDay">-->
+<!--          <el-input v-model="form.capacityDay" placeholder="请输入日产能" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="月产能" prop="capacityMonth">-->
+<!--          <el-input v-model="form.capacityMonth" placeholder="请输入月产能" />-->
+<!--        </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 { listProcessStation, getProcessStation, delProcessStation, addProcessStation, updateProcessStation } from "@/api/base/processStation";
+import { findProductLineList } from "@/api/base/productLine";
+export default {
+  name: "ProcessStation",
+  dicts: ['is_flag','process_type'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 生产质检工序/工位信息表格数据
+      processStationList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        processCode: null,
+        processName: null,
+        processType: 2,
+        productLineCode: null,
+        productionTime: null,
+        capacityDay: null,
+        capacityMonth: null,
+        isFlag: null,
+        createdBy: null,
+        createdTime: null,
+        updatedBy: null,
+        updatedTime: null,
+        parentId: 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: false },
+            { key: 6, label: `日产能`, visible: false },
+            { key: 7, label: `月产能`, visible: false },
+            { key: 8, label: `启用标识`, visible: false },
+            { key: 9, label: `创建人`, visible: false },
+            { key: 10, label: `创建时间`, visible: false },
+            { key: 11, label: `更新人`, visible: false },
+            { key: 12, label: `更新时间`, visible: false },
+            { key: 13, label: `工位编号`, visible: true },
+            { key: 14, label: `工位名称`, visible: true },
+        ],
+      // 产线选项
+      productLineList: [],
+      // 工位选项
+      findStationList: [],
+    };
+  },
+  created() {
+    if (!this.$route.params){
+      this.queryParams.productLineCode = this.$route.params && this.$route.params.productLineCode;
+    }
+    this.getList();
+  },
+  methods: {
+    /** 查询生产质检工序/工位信息列表 */
+    getList() {
+      this.loading = true;
+      listProcessStation(this.queryParams).then(response => {
+        this.processStationList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+      findProductLineList({productLineType: 1}).then(response => {
+        this.productLineList = response.data;
+      });
+      findProductLineList({productLineType: 2}).then(response => {
+        this.findStationList = response.data;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        objId: null,
+        processCode: null,
+        processName: null,
+        processType: 2,
+        productLineCode: null,
+        productionTime: null,
+        capacityDay: null,
+        capacityMonth: null,
+        isFlag: 0,
+        createdBy: null,
+        createdTime: null,
+        updatedBy: null,
+        updatedTime: null,
+        parentId: null
+      };
+      this.queryParams.productLineCode = 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 = "添加质检工序/工位信息";
+    },
+    /** 查看质检工位 */
+    findStation: function(row) {
+      const processCode = row.processCode;
+      this.$router.push("/base/productProcess-station/index/" + processCode);
+    },
+    /** 返回按钮操作 */
+    handleClose() {
+      const obj = { path: "/base/productLine" };
+      this.$tab.closeOpenPage(obj);
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const objId = row.objId || this.ids
+      getProcessStation(objId).then(response => {
+        this.form = response.data;
+        if (this.form.parentId != null) {
+          this.form.parentId = this.form.parentId.split(',');
+        }
+        this.open = true;
+        this.title = "修改质检工序/工位信息";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.parentId != null){
+            this.form.parentId = this.form.parentId.join(',');
+          }
+          if (this.form.objId != null) {
+            updateProcessStation(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addProcessStation(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 delProcessStation(objIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('base/processStation/export', {
+        ...this.queryParams
+      }, `processStation_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

src/views/base/stationDefectRelation/index.vue

@@ -0,0 +1,371 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80">
+      <el-form-item label="质检工位" prop="stationCode">
+        <el-select v-model="queryParams.stationCode" placeholder="请选择质检工位">
+          <el-option
+            v-for="item in productLineList"
+            :key="item.productLineCode"
+            :label="item.productLineName"
+            :value="item.productLineCode"
+          ></el-option>
+        </el-select>
+      </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="['base:stationDefectRelation: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="['base:stationDefectRelation: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="['base:stationDefectRelation: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="['base:stationDefectRelation:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="stationDefectRelationList" @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="productionLine" v-if="columns[5].visible"/>
+      <el-table-column label="质检工位编号" align="center" prop="stationCode" v-if="columns[1].visible"/>
+      <el-table-column label="质检工位名称" align="center" prop="stationName" v-if="columns[2].visible"/>
+      <el-table-column label="缺陷编号" align="center" prop="defectCode" v-if="columns[3].visible"/>
+      <el-table-column label="缺陷名称" align="center" prop="defectName" v-if="columns[4].visible"/>
+      <el-table-column label="缺陷大类" align="center" prop="materialCategories" v-if="columns[11].visible">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.defect_categories" :value="scope.row.materialCategories"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="缺陷小类" align="center" prop="materialSubclass" v-if="columns[12].visible">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.defect_subclass" :value="scope.row.materialSubclass"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="启用标识" align="center" prop="isFlag" v-if="columns[6].visible"/>
+      <el-table-column label="创建人" align="center" prop="createdBy" v-if="columns[7].visible"/>
+      <el-table-column label="创建时间" align="center" prop="createdTime" width="180" v-if="columns[8].visible">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createdTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="更新人" align="center" prop="updatedBy" v-if="columns[9].visible"/>
+      <el-table-column label="更新时间" align="center" prop="updatedTime" width="180" v-if="columns[10].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="['base:stationDefectRelation:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['base:stationDefectRelation: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="stationCode">
+          <el-select v-model="form.stationCode" placeholder="请选择质检工位">
+            <el-option
+              v-for="item in productLineList"
+              :key="item.productLineCode"
+              :label="item.productLineName"
+              :value="item.productLineCode"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+<!--        <el-form-item label="质检工位名称" prop="stationName">-->
+<!--          <el-input v-model="form.stationName" placeholder="请输入质检工位名称" />-->
+<!--        </el-form-item>-->
+        <el-form-item label="缺陷描述" prop="defectCode">
+          <el-select v-model="form.defectCode" placeholder="缺陷描述">
+            <el-option
+              v-for="item in defectList"
+              :key="item.qualityDefectCode"
+              :label="item.qualityDefectName"
+              :value="item.qualityDefectCode"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+<!--        <el-form-item label="缺陷名称" prop="defectName">-->
+<!--          <el-input v-model="form.defectName" placeholder="请输入缺陷名称" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="所属产线" prop="productionLine">-->
+<!--          <el-input v-model="form.productionLine" placeholder="请输入所属产线" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="启用标识" prop="isFlag">-->
+<!--          <el-input v-model="form.isFlag" placeholder="请输入启用标识" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="创建人" prop="createdBy">-->
+<!--          <el-input v-model="form.createdBy" placeholder="请输入创建人" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="创建时间" prop="createdTime">-->
+<!--          <el-date-picker clearable-->
+<!--            v-model="form.createdTime"-->
+<!--            type="date"-->
+<!--            value-format="yyyy-MM-dd"-->
+<!--            placeholder="请选择创建时间">-->
+<!--          </el-date-picker>-->
+<!--        </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 { listStationDefectRelation, getStationDefectRelation, delStationDefectRelation, addStationDefectRelation, updateStationDefectRelation } from "@/api/base/stationDefectRelation";
+import { findProductLineList } from '@//api/base/productLine'
+import { getDefectList } from '@//api/base/qualityInspectionItem'
+
+export default {
+  name: "StationDefectRelation",
+  dicts: ['defect_categories','defect_subclass'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 质检工位/缺陷维护表格数据
+      stationDefectRelationList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        stationCode: null,
+        stationName: null,
+        defectCode: null,
+        defectName: null,
+        productionLine: null,
+        isFlag: null,
+        createdBy: null,
+        createdTime: 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: false },
+            { key: 7, label: `创建人`, visible: false },
+            { key: 8, label: `创建时间`, visible: false },
+            { key: 9, label: `更新人`, visible: false },
+            { key: 10, label: `更新时间`, visible: false },
+            { key: 11, label: `缺陷大类`, visible: true },
+            { key: 12, label: `缺陷小类`, visible: true },
+        ],
+      productLineList: [],
+      defectList: []
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询质检工位/缺陷维护列表 */
+    getList() {
+      this.loading = true;
+      listStationDefectRelation(this.queryParams).then(response => {
+        this.stationDefectRelationList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+      findProductLineList({productLineType: 2, stationType: 2}).then(response => {
+        this.productLineList = response.data;
+      });
+      getDefectList(null).then(response => {
+        this.defectList = response.data;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        objId: null,
+        stationCode: null,
+        stationName: null,
+        defectCode: null,
+        defectName: null,
+        productionLine: null,
+        isFlag: null,
+        createdBy: null,
+        createdTime: 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.form.stationCode = this.queryParams.stationCode;
+      this.open = true;
+      this.title = "添加质检工位/缺陷维护";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const objId = row.objId || this.ids
+      getStationDefectRelation(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) {
+            updateStationDefectRelation(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addStationDefectRelation(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 delStationDefectRelation(objIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('base/stationDefectRelation/export', {
+        ...this.queryParams
+      }, `stationDefectRelation_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

src/views/base/storeInfo/index.vue

@@ -138,7 +138,7 @@
             type="text"
             icon="el-icon-d-arrow-right"
             @click="findSpaceInfo(scope.row)"
-          >所属货道</el-button>
+          >查看货道</el-button>
           <el-button
             size="mini"
             type="text"

src/views/base/teamMembers/index.vue

@@ -84,7 +84,7 @@
       <el-table-column label="班组编号" align="center" prop="teamCode" v-if="columns[1].visible"/>
       <el-table-column label="班组名称" align="center" prop="teamName" v-if="columns[2].visible"/>
       <el-table-column label="班组负责人" align="center" prop="teamHead" v-if="columns[3].visible"/>
-      <el-table-column label="所属产线" align="center" prop="productLineName" v-if="columns[4].visible"/>
+      <el-table-column label="所属产线/工位" align="center" prop="productLineName" v-if="columns[4].visible"/>
       <el-table-column label="启用标识" align="center" prop="isFlag" v-if="columns[5].visible">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.is_flag" :value="scope.row.isFlag"/>
@@ -132,7 +132,7 @@
 
     <!-- 添加或修改班组信息对话框 -->
     <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 ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="班组编号" prop="teamCode">
           <el-input v-model="form.teamCode" placeholder="请输入班组编号" />
         </el-form-item>
@@ -142,8 +142,8 @@
         <el-form-item label="班组负责人" prop="teamHead">
           <el-input v-model="form.teamHead" placeholder="请输入班组负责人" />
         </el-form-item>
-        <el-form-item label="所属产线">
+        <el-form-item label="所属产线/工位">
-          <el-select v-model="form.productLineCode" placeholder="请选择所属产线">
+          <el-select v-model="form.productLineCode" placeholder="请选择所属产线/工位">
             <el-option
               v-for="item in productLineList"
               :key="item.productLineCode"
@@ -221,7 +221,7 @@ export default {
             { key: 1, label: `班组编号`, visible: true },
             { key: 2, label: `班组名称`, visible: true },
             { key: 3, label: `班组负责人`, visible: true },
-            { key: 4, label: `所属产线`, visible: true },
+            { key: 4, label: `所属产线/工位`, visible: true },
             { key: 5, label: `启用标识`, visible: true },
             { key: 6, label: `创建人`, visible: false },
             { key: 7, label: `创建时间`, visible: false },

src/views/production/calendarInfo/index.vue

@@ -0,0 +1,522 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+      <!--      <el-form-item label="SAP计划编号" prop="sapPlanCode">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.sapPlanCode"-->
+      <!--          placeholder="请输入SAP计划编号"-->
+      <!--          clearable-->
+      <!--          @keyup.enter.native="handleQuery"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
+      <!--      <el-form-item label="物料编号" prop="materialCode">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.materialCode"-->
+      <!--          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="计划开始日期">
+        <el-date-picker
+          v-model="daterangePlanStartDate"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item label="计划排产日期">
+        <el-date-picker
+          v-model="daterangeSchedulingDate"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item label="是否已排产" prop="isScheduling">
+        <el-select v-model="queryParams.isScheduling" placeholder="请选择是否已排产" clearable>
+          <el-option
+            v-for="dict in dict.type.is_release"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </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"
+        >同步SAP周计划
+        </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="['production:calendarInfo: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="['production:calendarInfo: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="['production:calendarInfo:export']"
+        >导出
+        </el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="calendarInfoList" @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="SAP计划编号" align="center" prop="sapPlanCode" v-if="columns[1].visible"/>
+      <el-table-column label="物料编号" align="center" prop="materialCode" v-if="columns[2].visible"/>
+      <el-table-column label="物料名称" align="center" prop="materialName" v-if="columns[3].visible"/>
+      <el-table-column label="计划开始日期" align="center" prop="planStartDate" width="180" v-if="columns[4].visible">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.planStartDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="计划结束日期" align="center" prop="planEndDate" width="180" v-if="columns[5].visible">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.planEndDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="计划数量" align="center" prop="planAmount" v-if="columns[6].visible"/>
+      <el-table-column label="计划排产日期" align="center" prop="schedulingDate" width="180" v-if="columns[7].visible">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.schedulingDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="是否已排产" align="center" prop="isScheduling" v-if="columns[8].visible">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.is_release" :value="scope.row.isScheduling"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="排产班组" align="center" prop="schedulingTeam" v-if="columns[9].visible"/>
+      <el-table-column label="是否标识" align="center" prop="isFlag" v-if="columns[10].visible">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.is_flag" :value="scope.row.isFlag"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="创建人" align="center" prop="createdBy" v-if="columns[11].visible"/>
+      <el-table-column label="创建时间" align="center" prop="createdTime" width="180" v-if="columns[12].visible">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createdTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="更新人" align="center" prop="updatedBy" v-if="columns[13].visible"/>
+      <el-table-column label="更新时间" align="center" prop="updatedTime" width="180" v-if="columns[14].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="['production:calendarInfo:edit']"
+          >维护排产日期
+          </el-button>
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-delete"-->
+<!--            @click="handleDelete(scope.row)"-->
+<!--            v-hasPermi="['production:calendarInfo: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="600px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-form-item label="SAP计划编号" prop="sapPlanCode">
+          <el-input v-model="form.sapPlanCode" :disabled="true"/>
+        </el-form-item>
+        <el-form-item label="物料编号" prop="materialCode">
+          <el-input v-model="form.materialCode" :disabled="true"/>
+        </el-form-item>
+        <el-form-item label="物料名称" prop="materialName">
+          <el-input v-model="form.materialName" :disabled="true"/>
+        </el-form-item>
+        <el-row gutter="15">
+          <el-col :span="12">
+            <el-form-item label="计划开始日期" prop="planStartDate">
+              <el-input v-model="form.planStartDate" :disabled="true"/>
+              <!--          <el-date-picker clearable-->
+              <!--            v-model="form.planStartDate"-->
+              <!--            type="date"-->
+              <!--            value-format="yyyy-MM-dd"-->
+              <!--            placeholder="请选择计划开始日期">-->
+              <!--          </el-date-picker>-->
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="计划结束日期" prop="planEndDate">
+              <el-input v-model="form.planEndDate" :disabled="true"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-form-item label="计划数量" prop="planAmount">
+          <el-input v-model="form.planAmount" placeholder="请输入计划数量" :disabled="true"/>
+        </el-form-item>
+        <el-form-item label="计划排产日期" prop="schedulingDate">
+          <el-date-picker clearable
+                          v-model="form.schedulingDate"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="请选择计划排产日期"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <!--        <el-form-item label="是否已排产" prop="isScheduling">-->
+        <!--          <el-radio-group v-model="form.isScheduling" :disabled="true">-->
+        <!--            <el-radio-->
+        <!--              v-for="dict in dict.type.is_release"-->
+        <!--              :key="dict.value"-->
+        <!--              :label="parseInt(dict.value)"-->
+        <!--            >{{ dict.label }}-->
+        <!--            </el-radio>-->
+        <!--          </el-radio-group>-->
+        <!--        </el-form-item>-->
+        <!--        <el-form-item label="排产班组" prop="schedulingTeam">-->
+        <!--          <el-input v-model="form.schedulingTeam" placeholder="请输入排产班组" />-->
+        <!--        </el-form-item>-->
+        <!--        <el-form-item label="是否标识" prop="isFlag">-->
+        <!--          <el-radio-group v-model="form.isFlag">-->
+        <!--            <el-radio-->
+        <!--              v-for="dict in dict.type.is_flag"-->
+        <!--              :key="dict.value"-->
+        <!--              :label="parseInt(dict.value)"-->
+        <!--            >{{dict.label}}</el-radio>-->
+        <!--          </el-radio-group>-->
+        <!--        </el-form-item>-->
+        <!--        <el-form-item label="创建人" prop="createdBy">-->
+        <!--          <el-input v-model="form.createdBy" placeholder="请输入创建人" />-->
+        <!--        </el-form-item>-->
+        <!--        <el-form-item label="创建时间" prop="createdTime">-->
+        <!--          <el-date-picker clearable-->
+        <!--            v-model="form.createdTime"-->
+        <!--            type="date"-->
+        <!--            value-format="yyyy-MM-dd"-->
+        <!--            placeholder="请选择创建时间">-->
+        <!--          </el-date-picker>-->
+        <!--        </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>
+
+    <el-dialog :title="title" :visible.sync="sapOpen" width="600px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-form-item label="计划开始日期" prop="planStartDate">
+          <el-date-picker clearable
+                          v-model="form.planStartDate"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="请选择计划开始日期"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="计划结束日期" prop="planEndDate">
+          <el-date-picker clearable
+                          v-model="form.planEndDate"
+                          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="sapForm">开始同步</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  listCalendarInfo,
+  getCalendarInfo,
+  delCalendarInfo,
+  addCalendarInfo,
+  updateCalendarInfo, addSAPCalendar
+} from '@/api/production/calendarInfo'
+
+export default {
+  name: 'CalendarInfo',
+  dicts: ['is_release', 'is_flag'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 生产日历表格数据
+      calendarInfoList: [],
+      // 弹出层标题
+      title: '',
+      // 是否显示弹出层
+      open: false,
+      // 是否显示弹出层
+      sapOpen: false,
+      // 更新时间时间范围
+      daterangePlanStartDate: [],
+      // 更新时间时间范围
+      daterangeSchedulingDate: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        sapPlanCode: null,
+        materialCode: null,
+        materialName: null,
+        planStartDate: null,
+        planEndDate: null,
+        planAmount: null,
+        schedulingDate: null,
+        isScheduling: null,
+        schedulingTeam: null,
+        isFlag: null,
+        createdBy: null,
+        createdTime: null,
+        updatedBy: null,
+        updatedTime: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {},
+      columns: [
+        { key: 0, label: `主键标识`, visible: false },
+        { key: 1, label: `SAP计划编号`, 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: false },
+        { key: 10, label: `是否标识`, visible: false },
+        { key: 11, label: `创建人`, visible: false },
+        { key: 12, label: `创建时间`, visible: false },
+        { key: 13, label: `更新人`, visible: false },
+        { key: 14, label: `更新时间`, visible: false }
+      ]
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    /** 查询生产日历列表 */
+    getList() {
+      this.loading = true
+      this.queryParams.params = {}
+      if (null != this.daterangePlanStartDate && '' != this.daterangePlanStartDate) {
+        this.queryParams.params['beginPlanStartDate'] = this.daterangePlanStartDate[0]
+        this.queryParams.params['endPlanStartDate'] = this.daterangePlanStartDate[1]
+      }
+      if (null != this.daterangeSchedulingDate && '' != this.daterangeSchedulingDate) {
+        this.queryParams.params['beginSchedulingDate'] = this.daterangeSchedulingDate[0]
+        this.queryParams.params['endSchedulingDate'] = this.daterangeSchedulingDate[1]
+      }
+      listCalendarInfo(this.queryParams).then(response => {
+        this.calendarInfoList = response.rows
+        this.total = response.total
+        this.loading = false
+      })
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false
+      this.reset()
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        objId: null,
+        sapPlanCode: null,
+        materialCode: null,
+        materialName: null,
+        planStartDate: null,
+        planEndDate: null,
+        planAmount: null,
+        schedulingDate: null,
+        isScheduling: null,
+        schedulingTeam: null,
+        isFlag: null,
+        createdBy: null,
+        createdTime: null,
+        updatedBy: null,
+        updatedTime: null
+      }
+      this.resetForm('form')
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.daterangePlanStartDate = []
+      this.daterangeSchedulingDate = []
+      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.sapOpen = true
+      this.title = '同步SAP周计划'
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset()
+      const objId = row.objId || this.ids
+      getCalendarInfo(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) {
+            updateCalendarInfo(this.form).then(response => {
+              this.$modal.msgSuccess('修改成功')
+              this.open = false
+              this.getList()
+            })
+          } else {
+            addCalendarInfo(this.form).then(response => {
+              this.$modal.msgSuccess('新增成功')
+              this.open = false
+              this.getList()
+            })
+          }
+        }
+      })
+    },
+    sapForm() {
+      this.$refs['form'].validate(valid => {
+        addSAPCalendar(this.form).then(response => {
+          this.$modal.msgSuccess('同步成功')
+          this.sapOpen = false
+          this.getList()
+        })
+      })
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const objIds = row.objId || this.ids
+      this.$modal.confirm('是否确认删除生产日历编号为"' + objIds + '"的数据项？').then(function() {
+        return delCalendarInfo(objIds)
+      }).then(() => {
+        this.getList()
+        this.$modal.msgSuccess('删除成功')
+      }).catch(() => {
+      })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('production/calendarInfo/export', {
+        ...this.queryParams
+      }, `calendarInfo_${new Date().getTime()}.xlsx`)
+    }
+  }
+}
+</script>

src/views/report/electricalInspection/index.vue

@@ -35,29 +35,29 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
+<!--      <el-col :span="1.5">-->
-        <el-button
+<!--        <el-button-->
-          type="primary"
+<!--          type="primary"-->
-          plain
+<!--          plain-->
-          icon="el-icon-plus"
+<!--          icon="el-icon-plus"-->
-          size="mini"
+<!--          size="mini"-->
-          @click="handleAdd"
+<!--          @click="handleAdd"-->
-          v-hasPermi="['report:electricalInspection:add']"
+<!--          v-hasPermi="['report:electricalInspection:add']"-->
-        >新增
+<!--        >新增-->
-        </el-button>
+<!--        </el-button>-->
-      </el-col>
+<!--      </el-col>-->
-      <el-col :span="1.5">
+<!--      <el-col :span="1.5">-->
-        <el-button
+<!--        <el-button-->
-          type="success"
+<!--          type="success"-->
-          plain
+<!--          plain-->
-          icon="el-icon-edit"
+<!--          icon="el-icon-edit"-->
-          size="mini"
+<!--          size="mini"-->
-          :disabled="single"
+<!--          :disabled="single"-->
-          @click="handleUpdate"
+<!--          @click="handleUpdate"-->
-          v-hasPermi="['report:electricalInspection:edit']"
+<!--          v-hasPermi="['report:electricalInspection:edit']"-->
-        >修改
+<!--        >修改-->
-        </el-button>
+<!--        </el-button>-->
-      </el-col>
+<!--      </el-col>-->
       <el-col :span="1.5">
         <el-button
           type="danger"

src/views/report/inventoryStatistics/index.vue

@@ -46,7 +46,7 @@
       </div>
       <div class="chart">
         <el-card>
-          <div class="chart-title">货道占用统计</div>
+          <div class="chart-title">货道占用统计(货道容量:{{this.spaceNumber}} 已占用容量:{{this.occupancyNumber}})</div>
           <div ref="barChart" class="chart-content"></div>
         </el-card>
       </div>
@@ -116,11 +116,13 @@ export default {
         xValue: ['货道01', '货道02', '货道03', '货道04', '货道05', '货道06', '货道07'],
         yValueOne: [120, 132, 101, 134, 90, 230, 210],
         yValueTwo: [150, 232, 201, 154, 190, 330, 410]
-      }
+      },
+      spaceNumber: 0,
+      occupancyNumber: 0,
     }
   },
   created() {
-    if (!this.$route.params){
+    if (this.$route.params != null){
       this.queryParams.storeCode = this.$route.params && this.$route.params.storeCode;
     }
     this.getList()
@@ -130,6 +132,8 @@ export default {
   },
   mounted() {
     this.$nextTick(() => {
+      this.barChart = echarts.init(this.$refs.barChart);
+      this.pieChart = echarts.init(this.$refs.pieChart);
       this.initPieChart();
       this.initBarChart();
     });
@@ -151,13 +155,15 @@ export default {
         this.barChartData = {
           xValue: response.data.map(item =>  item.storeName + item.spaceName),
           yValueOne: response.data.map(item => item.spaceStock),
-          yValueTwo: response.data.map(item => item.spaceCapacity),
+          yValueTwo: response.data.map(item => item.spaceCapacity - item.spaceStock),
         };
+        this.spaceNumber = response.data.map(item => item.spaceCapacity).reduce((accumulator, currentValue) => accumulator + currentValue);
+        this.occupancyNumber = response.data.map(item => item.spaceStock).reduce((accumulator, currentValue) => accumulator + currentValue);
+        console.log(this.spaceNumber)
         this.initBarChart();
       });
     },
     initPieChart() {
-      this.pieChart = echarts.init(this.$refs.pieChart);
       // 在这里添加饼图的数据和配置
       const option = {
         tooltip: {
@@ -192,7 +198,6 @@ export default {
       this.pieChart.setOption(option);
     },
     initBarChart() {
-      this.barChart = echarts.init(this.$refs.barChart);
       // 在这里添加柱状图的数据和配置
       const option = {
         tooltip: {
@@ -230,13 +235,13 @@ export default {
             data: this.barChartData.yValueOne
           },
           {
-            name: '货道容量',
+            name: '货道空余容量',
             type: 'bar',
             stack: 'Ad',
             emphasis: {
               focus: 'series'
             },
-            data: this.barChartData.yValueTwo
+            data: this.barChartData.yValueTwo,
           },
         ]
       };

src/views/report/qualityInspection/index.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
-      <el-form-item label="产品条码" prop="barCode">
+      <el-form-item label="箱体码" prop="barCode">
         <el-input
           v-model="queryParams.barCode"
-          placeholder="请输入产品条码"
+          placeholder="请输入箱体码"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -108,7 +108,7 @@
     <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="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"/>
@@ -176,8 +176,8 @@
     <!-- 添加或修改质检记录管理对话框 -->
     <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-form-item label="箱体码" prop="barCode">
-          <el-input v-model="form.barCode" placeholder="请输入产品条码" />
+          <el-input v-model="form.barCode" placeholder="请输入箱体码" />
         </el-form-item>
         <el-form-item label="物料名称" prop="materialName">
           <el-input v-model="form.materialName" placeholder="请输入物料名称" />
@@ -318,7 +318,7 @@ export default {
       },
       columns: [
             { key: 0, label: `主键标识`, visible: false },
-            { key: 1, label: `产品条码`, visible: true },
+            { key: 1, label: `箱体码`, visible: true },
             { key: 2, label: `物料名称`, visible: true },
             { key: 3, label: `工序编号`, visible: true },
             { key: 4, label: `检测项编号`, visible: true },

src/views/report/repairMeasures/index.vue

@@ -68,7 +68,11 @@
       <el-table-column label="返修措施编码" align="center" prop="repairCode" v-if="columns[1].visible"/>
       <el-table-column label="返修措施名称" align="center" prop="repairName" 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="isFlag" v-if="columns[4].visible"/>
+      <el-table-column label="返修结果" align="center" prop="isFlag" v-if="columns[4].visible">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.rework_result" :value="scope.row.isFlag"/>
+        </template>
+      </el-table-column>
       <el-table-column label="创建人" align="center" prop="createdBy" v-if="columns[5].visible"/>
       <el-table-column label="创建时间" align="center" prop="createdTime" width="180" v-if="columns[6].visible">
         <template slot-scope="scope">
@@ -121,10 +125,15 @@
 <!--        <el-form-item label="工序编号" prop="processCode">-->
 <!--          <el-input v-model="form.processCode" placeholder="请输入工序编号" />-->
 <!--        </el-form-item>-->
-<!--        <el-form-item label="启用标识" prop="isFlag">-->
+        <el-form-item label="返修结果" prop="isFlag">
-<!--          <el-input v-model="form.isFlag" placeholder="请输入启用标识" />-->
+          <el-radio-group v-model="form.isFlag">
-<!--        </el-form-item>-->
+            <el-radio
-<!--  -->
+              v-for="dict in dict.type.rework_result"
+              :key="dict.value"
+              :label="parseInt(dict.value)"
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -139,6 +148,7 @@ import { listRepairMeasures, getRepairMeasures, delRepairMeasures, addRepairMeas
 
 export default {
   name: "RepairMeasures",
+  dicts: ['rework_result'],
   data() {
     return {
       // 遮罩层
@@ -182,7 +192,7 @@ export default {
             { key: 1, label: `返修措施编码`, visible: true },
             { key: 2, label: `返修措施名称`, visible: true },
             { key: 3, label: `工序编号`, visible: false },
-            { key: 4, label: `启用标识`, visible: false },
+            { key: 4, label: `返修结果`, visible: true },
             { key: 5, label: `创建人`, visible: false },
             { key: 6, label: `创建时间`, visible: false },
             { key: 7, label: `更新人`, visible: false },
@@ -215,7 +225,7 @@ export default {
         repairCode: null,
         repairName: null,
         processCode: null,
-        isFlag: null,
+        isFlag: 1,
         createdBy: null,
         createdTime: null,
         updatedBy: null,