质检和导入

src/views/Assembly/QualityBasicData/index.vue

@@ -0,0 +1,127 @@
+<template>
+  <div class="app-container">
+    <el-card>
+      <div style="width: 49.8%; float: left;margin-left: 2px">
+        <el-card>
+          <el-row>
+            <div style="margin-left: 43%;margin-top: 20px;font-weight: bold;font-size: 24px">关键节点记录</div>
+          </el-row>
+          <el-button size="small" type="primary" icon="el-icon-circle-plus-outline" style="margin-left: 90%;margin-top: 15px" @click="handleAdd()">增加</el-button>
+          <el-table
+            v-loading="loading"
+            :data="tableData"
+            :row-class-name="tableRowClassName"
+            border
+            style="width: 100%;max-height: 450px;margin-top: 10px"
+            height="450px"
+            highlight-current-row
+            size="small">
+            <el-table-column
+              type="index"
+              label="序号"
+              align="center"
+              width="50"/>
+            <el-table-column label="关键节点" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.关键节点 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="完成情况" align="center" width="100px">
+              <template slot-scope="scope">
+                {{ scope.row.完成情况 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="备注" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.备注 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" fixed="right" width="200px">
+              <template slot-scope="scope">
+                <el-button
+                  size="mini"
+                  type="primary"
+                  icon="el-icon-edit"
+                  @click="handleEdit(scope.row)">编辑</el-button>
+                <el-button
+                  size="mini"
+                  type="danger"
+                  icon="el-icon-delete"
+                  @click="handleDelete(scope.row)">删除</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+          <div class="block" style="margin-top: 10px;">
+            <el-pagination
+              :current-page="pageCurrent"
+              :page-sizes="[10, 20, 30, 40]"
+              :page-size="pageSize"
+              :total="total"
+              style="display:inline-block;width:50%"
+              layout="total, sizes, prev, pager, next, jumper"
+              @size-change="handleSizeChange"
+              @current-change="handleCurrentChange"/>
+          </div>
+        </el-card>
+      </div>
+      <div style="width: 49.8%; float: right; margin-right: 2px">
+        <el-card>
+          <el-row>
+            <div style="margin-left: 43%;margin-top: 20px;font-weight: bold;font-size: 24px">每日工作记录</div>
+          </el-row>
+          <el-button size="small" type="primary" icon="el-icon-circle-plus-outline" style="margin-left: 90%;margin-top: 15px" @click="handleAdd1()">增加</el-button>
+          <el-table v-loading="loading" :data="tableData1" border style="width: 100%;max-height: 450px;margin-top: 10px" height="450px" highlight-current-row size="small">
+            <el-table-column
+              type="index"
+              label="序号"
+              align="center"
+              width="50"/>
+            <el-table-column label="工作情况" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.工作情况 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="工作日期" align="center" width="130px">
+              <template slot-scope="scope">
+                {{ scope.row.工作日期 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" fixed="right" width="200px">
+              <template slot-scope="scope">
+                <el-button
+                  size="mini"
+                  type="primary"
+                  icon="el-icon-edit"
+                  @click="handleEdit1(scope.row)">编辑</el-button>
+                <el-button
+                  size="mini"
+                  type="danger"
+                  icon="el-icon-delete"
+                  @click="handleDelete1(scope.row)">删除</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+          <div class="block" style="margin-top: 10px;">
+            <el-pagination
+              :current-page="pageCurrent1"
+              :page-sizes="[10, 20, 30, 40]"
+              :page-size="pageSize1"
+              :total="total1"
+              style="display:inline-block;width:50%"
+              layout="total, sizes, prev, pager, next, jumper"
+              @size-change="handleSizeChange1"
+              @current-change="handleCurrentChange1"/>
+          </div>
+        </el-card>
+      </div>
+    </el-card>
+  </div>
+</template>
+
+<script>
+
+</script>
+
+<style scoped>
+
+</style>

src/views/Assembly/QualityInspectionInformationInquiry/index.vue

@@ -21,6 +21,8 @@
             :label="item.label"
             :value="item.value"/>
         </el-select>
+        <span>零件:</span>
+        <el-input v-model="SpareParts" filterable placeholder="请输入零件名称" style="width: 200px" size="small" clearable/>
         <span>质检类型:</span>
         <el-select v-model="QualityTypeValue" filterable placeholder="质检类型" size="small" clearable>
           <el-option
@@ -29,8 +31,8 @@
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <span>零件:</span>
-        <el-input v-model="SpareParts" filterable placeholder="请输入零件名称" style="width: 200px" size="small" clearable/>
+      </el-row>
+      <el-row style="margin-top: 20px">
         <span class="demonstration">时间区间:</span>
         <el-date-picker
           v-model="startTime"
@@ -47,6 +49,14 @@
           style="width: 160px"
           type="date"
           placeholder="选择日期"/>
+        <span>质检情况:</span>
+        <el-select v-model="qualityInspectionValue" filterable placeholder="质检情况" size="small" clearable>
+          <el-option
+            v-for="item in qualityInspection"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"/>
+        </el-select>
         <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="pageSize=10; pageCurrent= 1;selecttable()">查询</el-button>
       </el-row>
     </el-card>
@@ -226,7 +236,7 @@
     </el-card>
     <el-card>
       <h3 align="center">正在加工零件列表</h3>
-      <el-table :data="tableData10" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="300px">
+      <el-table :data="tableData10" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="475px">
         <el-table-column label="机床图号" align="center">
           <template slot-scope="scope">
             {{ scope.row.机床图号 }}
@@ -244,7 +254,7 @@
         </el-table-column>
         <el-table-column label="零件图号" align="center">
           <template slot-scope="scope">
-            {{ scope.row.零件图号_零件工艺计划 }}
+            {{ scope.row.零件图号 }}
           </template>
         </el-table-column>
         <el-table-column label="零件名称" align="center">
@@ -295,7 +305,7 @@
     </el-card>
     <el-card>
       <h3 align="center">待加工零件列表</h3>
-      <el-table :data="tableData20" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="300px">
+      <el-table :data="tableData20" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="475px">
         <el-table-column label="机床图号" align="center">
           <template slot-scope="scope">
             {{ scope.row.机床图号 }}
@@ -363,9 +373,15 @@
       </div>
     </el-card>
     <el-dialog :visible.sync="dialogFormVisible4" title="工序完成情况" center style="min-height: 300px">
+      <el-row>
+        <span>零件图号:</span>
+        <el-input v-model="SparePartsNumber" style="width: 200px" size="small"/>
+        <span>零件名称:</span>
+        <el-input v-model="SparePartsName" style="width: 200px" size="small"/>
+      </el-row>
       <el-table
         :data="tableData5"
-        style="width: 100%;max-height: 400px;"
+        style="width: 100%;max-height: 400px;margin-top: 20px"
         size="mini"
         height="300"
         highlight-current-row
@@ -385,6 +401,11 @@
             {{ scope.row.工艺要求 }}
           </template>
         </el-table-column>
+        <el-table-column align="center" label="操作工">
+          <template slot-scope="scope">
+            {{ scope.row.员工姓名 }}
+          </template>
+        </el-table-column>
         <el-table-column align="center" label="工艺是否完成" width="130">
           <template slot-scope="scope">
             <el-tag v-if="parseInt(scope.row.工序状态)===4" type="success" size="small">已完成</el-tag>
@@ -428,11 +449,23 @@ export default {
       gridData: [],
       QualityTypeNumber: [],
       QualityTypeValue: '',
+      qualityInspectionValue: '',
+      qualityInspection: [
+        {
+          value: 1,
+          label: '合格'
+        }, {
+          value: 2,
+          label: '不合格'
+        }
+      ],
       tableData1: [],
       tableData10: [],
       tableData20: [],
       tableData5: [],
       SpareParts: '',
+      SparePartsNumber: '',
+      SparePartsName: '',
       dialogFormVisible: false,
       dialogFormVisible4: false,
       loading: false,
@@ -517,7 +550,8 @@ export default {
       if (this.QualityTypeValue !== '' && this.QualityTypeValue !== null) { this.check4 = 1 } else { this.check4 = 0 }
       if (this.startTime !== '' && this.startTime !== null) { this.check5 = 1 } else { this.check5 = 0 }
       if (this.endTime !== '' && this.endTime !== null) { this.check6 = 1 } else { this.check6 = 0 }
-      selecttable(this.check1, this.machineNumberValue, this.check2, this.groupNumberValue, this.check3, this.SpareParts, this.check4, this.QualityTypeValue, this.check5, this.startTime, this.check6, this.endTime, this.pageCurrent, this.pageSize).then(response => {
+      if (this.qualityInspectionValue !== '' && this.qualityInspectionValue !== null) { this.check7 = 1 } else { this.check7 = 0 }
+      selecttable(this.check1, this.machineNumberValue, this.check2, this.groupNumberValue, this.check3, this.SpareParts, this.check4, this.QualityTypeValue, this.check5, this.startTime, this.check6, this.endTime, this.check7, this.qualityInspectionValue, this.pageCurrent, this.pageSize).then(response => {
         this.tableData1 = response.data.rows
         this.loading = false
         this.total = response.data.total
@@ -538,6 +572,8 @@ export default {
     },
     viewProcedures(row) {
       this.dialogFormVisible4 = true
+      this.SparePartsNumber = row.零件图号
+      this.SparePartsName = row.零件名称
       processingStatus(row.工艺计划流水号).then(response => {
         this.tableData5 = response.data
       })