fix:检测信息格式维护

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/domain/BpLeaveFactory.java

@@ -38,22 +38,23 @@ public class BpLeaveFactory
     @ExcelProperty(value = "型号/名称")
     private String modelName;
 
-    /** 不合格原因 */
-    @ExcelProperty(value = "不合格原因")
+    /** 总数 */
+    @ExcelProperty(value = "总数")
     private String causeOfNonconformity;
 
     /** 不合格数量 */
-    @ExcelProperty(value = "不合格数")
+    @ExcelProperty(value = "不合格原因")
     private String disqualificationNumber;
 
     /** 处理情况 */
-    @ExcelProperty(value = "处理情况")
+    @ExcelProperty(value = "不合格数")
     private String handlingSituation;
 
-    /** 工号 */
-    @ExcelProperty(value = "工号")
+    /** 处理情况 */
+    @ExcelProperty(value = "处理情况")
     private String jobNumber;
 
+
     /** 检验日期 */
     @ExcelProperty(value = "检验日期")
     private String dateOfInspection;

zkqy-ui/.env.production

@@ -9,14 +9,14 @@ VUE_APP_BASE_API = '/prod-api'
 
 # 生产环境
 # VUE_APP_BASE_API1 = 'http://62.234.61.92:8055/'
- VUE_APP_BASE_API1 = 'http://192.168.2.135:8066/'
-# VUE_APP_BASE_API1 = 'http://62.234.61.92:8066/'
-#VUE_APP_BASE_API1 = 'http://192.168.110.83:8066/'
+ #VUE_APP_BASE_API1 = 'http://192.168.2.135:8066/'
+#VUE_APP_BASE_API1 = 'http://192.168.3.17:8066/'
+VUE_APP_BASE_API1 = 'http://192.168.110.83:8066/'
 #VUE_APP_BASE_API1 = 'http://175.27.169.173:8066/'
 
 
 # 图片路径
-#VUE_APP_BASE_IMG_API = 'http://192.168.3.17:1025/prod-api'
+#VUE_APP_BASE_IMG_API = 'http://192.168.3.17:1024/prod-api'
 VUE_APP_BASE_IMG_API = 'http://192.168.2.135:1025/prod-api'
 #VUE_APP_BASE_IMG_API = 'http://175.27.169.173:1025/prod-api'
 

zkqy-ui/src/api/amichi/qualityinspectioninformation/bpleavefactory.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询出厂检验列表
+export function listBpleavefactory(query) {
+  return request({
+    url: '/bpleavefactory/bpleavefactory/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询出厂检验详细
+export function getBpleavefactory(id) {
+  return request({
+    url: '/bpleavefactory/bpleavefactory/' + id,
+    method: 'get'
+  })
+}
+
+// 新增出厂检验
+export function addBpleavefactory(data) {
+  return request({
+    url: '/bpleavefactory/bpleavefactory',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改出厂检验
+export function updateBpleavefactory(data) {
+  return request({
+    url: '/bpleavefactory/bpleavefactory',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除出厂检验
+export function delBpleavefactory(id) {
+  return request({
+    url: '/bpleavefactory/bpleavefactory/' + id,
+    method: 'delete'
+  })
+}

zkqy-ui/src/api/amichi/qualityinspectioninformation/jlinspection.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询进料日志详情列表
+export function listInspection(query) {
+  return request({
+    url: '/jl_inspection/inspection/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询进料日志详情详细
+export function getInspection(id) {
+  return request({
+    url: '/jl_inspection/inspection/' + id,
+    method: 'get'
+  })
+}
+
+// 新增进料日志详情
+export function addInspection(data) {
+  return request({
+    url: '/jl_inspection/inspection',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改进料日志详情
+export function updateInspection(data) {
+  return request({
+    url: '/jl_inspection/inspection',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除进料日志详情
+export function delInspection(id) {
+  return request({
+    url: '/jl_inspection/inspection/' + id,
+    method: 'delete'
+  })
+}

zkqy-ui/src/views/amichi/qualityinspectioninformation/bp_inspection/index.vue

@@ -1,6 +1,6 @@
 <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="orderNumber">
         <el-input
           v-model="queryParams.orderNumber"
@@ -25,38 +25,38 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="不合格数量" prop="disqualificationNumber">
-        <el-input
-          v-model="queryParams.disqualificationNumber"
-          placeholder="请输入不合格数量"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="处理情况" prop="handlingSituation">
-        <el-input
-          v-model="queryParams.handlingSituation"
-          placeholder="请输入处理情况"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="工号" prop="jobNumber">
-        <el-input
-          v-model="queryParams.jobNumber"
-          placeholder="请输入工号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="检验日期" prop="dateOfInspection">
-        <el-input
-          v-model="queryParams.dateOfInspection"
-          placeholder="请输入检验日期"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+<!--      <el-form-item label="不合格数量" prop="disqualificationNumber">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.disqualificationNumber"-->
+<!--          placeholder="请输入不合格数量"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="处理情况" prop="handlingSituation">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.handlingSituation"-->
+<!--          placeholder="请输入处理情况"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="工号" prop="jobNumber">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.jobNumber"-->
+<!--          placeholder="请输入工号"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="检验日期" prop="dateOfInspection">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.dateOfInspection"-->
+<!--          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>
@@ -96,20 +96,29 @@
           v-hasPermi="['system:inspection: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="['system:inspection:export']"-->
+<!--        >导出</el-button>-->
+<!--      </el-col>-->
       <el-col :span="1.5">
         <el-button
-          type="warning"
+          type="primary"
           plain
-          icon="el-icon-download"
+          icon="el-icon-back"
           size="mini"
-          @click="handleExport"
-          v-hasPermi="['system:inspection:export']"
-        >导出</el-button>
+          @click="fhsy"
+        >返回上一页</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="inspectionList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="inspectionList" style="margin-top: 20px" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
 <!--      <el-table-column label="主键id" align="center" prop="id" />-->
       <el-table-column label="订单号" align="center" prop="orderNumber" />
@@ -121,20 +130,15 @@
       <el-table-column label="检验日期" align="center" prop="dateOfInspection" />
       <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="['system:inspection:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['system:inspection:remove']"
-          >删除</el-button>
+          <el-dropdown @command="(command)=>{handleCommand(command, scope.row)}">
+            <el-button type="warning">
+              操作<i class="el-icon-arrow-down el-icon--right"></i>
+            </el-button>
+            <el-dropdown-menu slot="dropdown">
+              <el-dropdown-item  icon="el-icon-edit"  command="handleUpdate">修改</el-dropdown-item>
+              <el-dropdown-item  icon="el-icon-delete" command="handleDelete">删除</el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown>
         </template>
       </el-table-column>
     </el-table>
@@ -148,8 +152,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-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-form-item label="订单号" prop="orderNumber">
           <el-input v-model="form.orderNumber" placeholder="请输入订单号" />
         </el-form-item>
@@ -181,7 +185,7 @@
 </template>
 
 <script>
-import { listInspection, getInspection, delInspection, addInspection, updateInspection } from "@/api/system/inspection";
+import { listInspection, getInspection, delInspection, addInspection, updateInspection } from "@/api/amichi/qualityinspectioninformation/inspection";
 
 export default {
   name: "Inspection",
@@ -228,6 +232,23 @@ export default {
     this.getList();
   },
   methods: {
+    fhsy(){
+      console.log("ddddde")
+      this.$router.back();
+    },
+    //下拉菜单点击事件
+    handleCommand(command, row) {
+      switch (command) {
+        case "handleUpdate":
+          this.handleUpdate(row)
+          break;
+        case "handleDelete":
+          this.handleDelete(row)
+          break;
+        default:
+          break;
+      }
+    },
     /** 查询白胚检验信息列表 */
     getList() {
       this.loading = true;

zkqy-ui/src/views/amichi/qualityinspectioninformation/bp_leavefactory/index.vue

@@ -17,46 +17,46 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="不合格原因" prop="causeOfNonconformity">
-        <el-input
-          v-model="queryParams.causeOfNonconformity"
-          placeholder="请输入不合格原因"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="不合格数量" prop="disqualificationNumber">
-        <el-input
-          v-model="queryParams.disqualificationNumber"
-          placeholder="请输入不合格数量"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="处理情况" prop="handlingSituation">
-        <el-input
-          v-model="queryParams.handlingSituation"
-          placeholder="请输入处理情况"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="工号" prop="jobNumber">
-        <el-input
-          v-model="queryParams.jobNumber"
-          placeholder="请输入工号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="检验日期" prop="dateOfInspection">
-        <el-input
-          v-model="queryParams.dateOfInspection"
-          placeholder="请输入检验日期"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+<!--      <el-form-item label="不合格原因" prop="causeOfNonconformity">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.causeOfNonconformity"-->
+<!--          placeholder="请输入不合格原因"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="不合格数量" prop="disqualificationNumber">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.disqualificationNumber"-->
+<!--          placeholder="请输入不合格数量"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="处理情况" prop="handlingSituation">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.handlingSituation"-->
+<!--          placeholder="请输入处理情况"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="工号" prop="jobNumber">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.jobNumber"-->
+<!--          placeholder="请输入工号"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="检验日期" prop="dateOfInspection">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.dateOfInspection"-->
+<!--          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>
@@ -96,49 +96,53 @@
           v-hasPermi="['bpleavefactory:bpleavefactory: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="['bpleavefactory:bpleavefactory:export']"-->
+<!--        >导出</el-button>-->
+<!--      </el-col>-->
       <el-col :span="1.5">
         <el-button
-          type="warning"
+          type="primary"
           plain
-          icon="el-icon-download"
+          icon="el-icon-back"
           size="mini"
-          @click="handleExport"
-          v-hasPermi="['bpleavefactory:bpleavefactory:export']"
-        >导出</el-button>
+          @click="fhsy"
+        >返回上一页</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="bpleavefactoryList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="bpleavefactoryList" style="margin-top: 20px" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="主键id" align="center" prop="id" />
       <el-table-column label="订单号" align="center" prop="orderNumber" />
       <el-table-column label="型号名称" align="center" prop="modelName" />
-      <el-table-column label="不合格原因" align="center" prop="causeOfNonconformity" />
-      <el-table-column label="不合格数量" align="center" prop="disqualificationNumber" />
-      <el-table-column label="处理情况" align="center" prop="handlingSituation" />
-      <el-table-column label="工号" align="center" prop="jobNumber" />
+      <el-table-column label="总数" align="center" prop="causeOfNonconformity" />
+      <el-table-column label="不合格原因" align="center" prop="disqualificationNumber" />
+      <el-table-column label="不合格数量" align="center" prop="handlingSituation" />
+      <el-table-column label="处理情况" align="center" prop="jobNumber" />
       <el-table-column label="检验日期" align="center" prop="dateOfInspection" />
       <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="['bpleavefactory:bpleavefactory:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['bpleavefactory:bpleavefactory:remove']"
-          >删除</el-button>
+          <el-dropdown @command="(command)=>{handleCommand(command, scope.row)}">
+            <el-button type="warning">
+              操作<i class="el-icon-arrow-down el-icon--right"></i>
+            </el-button>
+            <el-dropdown-menu slot="dropdown">
+              <el-dropdown-item  icon="el-icon-edit"  command="handleUpdate">修改</el-dropdown-item>
+              <el-dropdown-item  icon="el-icon-delete" command="handleDelete">删除</el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown>
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -148,25 +152,25 @@
     />
 
     <!-- 添加或修改出厂检验对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+    <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-form-item label="订单号" prop="orderNumber">
           <el-input v-model="form.orderNumber" placeholder="请输入订单号" />
         </el-form-item>
         <el-form-item label="型号名称" prop="modelName">
           <el-input v-model="form.modelName" placeholder="请输入型号名称" />
         </el-form-item>
-        <el-form-item label="不合格原因" prop="causeOfNonconformity">
-          <el-input v-model="form.causeOfNonconformity" placeholder="请输入不合格原因" />
+        <el-form-item label="总数" prop="causeOfNonconformity">
+          <el-input v-model="form.causeOfNonconformity" placeholder="请输入总数" />
         </el-form-item>
-        <el-form-item label="不合格数量" prop="disqualificationNumber">
-          <el-input v-model="form.disqualificationNumber" placeholder="请输入不合格数量" />
+        <el-form-item label="不合格原因" prop="disqualificationNumber">
+          <el-input v-model="form.disqualificationNumber" placeholder="请输入不合格原因" />
         </el-form-item>
-        <el-form-item label="处理情况" prop="handlingSituation">
+        <el-form-item label="不合格数" prop="handlingSituation">
           <el-input v-model="form.handlingSituation" placeholder="请输入处理情况" />
         </el-form-item>
-        <el-form-item label="工号" prop="jobNumber">
-          <el-input v-model="form.jobNumber" placeholder="请输入工号" />
+        <el-form-item label="处理情况" prop="jobNumber">
+          <el-input v-model="form.jobNumber" placeholder="请输入处理情况" />
         </el-form-item>
         <el-form-item label="检验日期" prop="dateOfInspection">
           <el-input v-model="form.dateOfInspection" placeholder="请输入检验日期" />
@@ -181,7 +185,7 @@
 </template>
 
 <script>
-import { listBpleavefactory, getBpleavefactory, delBpleavefactory, addBpleavefactory, updateBpleavefactory } from "@/api/bpleavefactory/bpleavefactory";
+import { listBpleavefactory, getBpleavefactory, delBpleavefactory, addBpleavefactory, updateBpleavefactory } from "@/api/amichi/qualityinspectioninformation/bpleavefactory";
 
 export default {
   name: "Bpleavefactory",
@@ -228,6 +232,23 @@ export default {
     this.getList();
   },
   methods: {
+    fhsy(){
+      console.log("ddddde")
+      this.$router.back();
+    },
+    //下拉菜单点击事件
+    handleCommand(command, row) {
+      switch (command) {
+        case "handleUpdate":
+          this.handleUpdate(row)
+          break;
+        case "handleDelete":
+          this.handleDelete(row)
+          break;
+        default:
+          break;
+      }
+    },
     /** 查询出厂检验列表 */
     getList() {
       this.loading = true;

zkqy-ui/src/views/amichi/qualityinspectioninformation/index.vue

@@ -1,6 +1,6 @@
 <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="reportName">
         <el-input
           v-model="queryParams.reportName"
@@ -72,16 +72,16 @@
           v-hasPermi="['qualityinspectioninformation:qualityinspectioninformation: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="['qualityinspectioninformation:qualityinspectioninformation:export']"
-        >导出</el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="warning"-->
+<!--          plain-->
+<!--          icon="el-icon-download"-->
+<!--          size="mini"-->
+<!--          @click="handleExport"-->
+<!--          v-hasPermi="['qualityinspectioninformation:qualityinspectioninformation:export']"-->
+<!--        >导出</el-button>-->
+<!--      </el-col>-->
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -103,7 +103,7 @@
         <el-radio-button label="出厂检验">出厂检验</el-radio-button>
       </el-radio-group>
     </el-row>
-    <el-table v-loading="loading" :data="qualityinspectioninformationList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="qualityinspectioninformationList" style="margin-top: 20px" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
 <!--      <el-table-column label="序号" align="center" prop="id" />-->
       <el-table-column label="制程" align="center" prop="manufacturingProcess" />
@@ -146,6 +146,7 @@
             <el-dropdown-menu slot="dropdown">
               <el-dropdown-item  icon="el-icon-edit"  command="handleUpdate">修改</el-dropdown-item>
               <el-dropdown-item  icon="el-icon-delete" command="handleDelete">删除</el-dropdown-item>
+              <el-dropdown-item  icon="el-icon-document" command="handleDetail">明细</el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
         </template>
@@ -336,10 +337,42 @@ export default {
         case "handleDelete":
           this.handleDelete(row)
           break;
+        case "handleDetail":
+          this.handleDetail(row);
+          break;
         default:
           break;
       }
     },
+    handleDetail(row){
+      console.log("查看明细信息")
+      if(row.manufacturingProcess=="来料检验"){
+        //完整写法
+        this.$router.push({
+          path: '/amichi/qualityContro/amichi/qualityinspectioninformation/jl_inspection/index.vue',
+          query: {
+            "id": row.id,
+          }
+        });
+      }else if(row.manufacturingProcess=="白胚检验"){
+        //完整写法
+        this.$router.push({
+          path: '/amichi/qualityContro/amichi/qualityinspectioninformation/bp_inspection/index.vue',
+          query: {
+            "id": row.id,
+          }
+        });
+      }else if(row.manufacturingProcess=="出厂检验"){
+        //完整写法
+        this.$router.push({
+          path: '/amichi/qualityContro/amichi/qualityinspectioninformation/bp_leavefactory/index.vue',
+          query: {
+            "id": row.id,
+          }
+        });
+      }
+
+    },
     /** 查询质检信息列表 */
     getList() {
       this.loading = true;

zkqy-ui/src/views/amichi/qualityinspectioninformation/jl_inspection/index.vue

@@ -1,6 +1,6 @@
 <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="orderNumber">
         <el-input
           v-model="queryParams.orderNumber"
@@ -17,46 +17,46 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="数量" prop="quantity">
-        <el-input
-          v-model="queryParams.quantity"
-          placeholder="请输入数量"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="不合格原因" prop="causeOfNonconformity">
-        <el-input
-          v-model="queryParams.causeOfNonconformity"
-          placeholder="请输入不合格原因"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="不合格数" prop="disqualificationNumber">
-        <el-input
-          v-model="queryParams.disqualificationNumber"
-          placeholder="请输入不合格数"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="处理情况" prop="handlingSituation">
-        <el-input
-          v-model="queryParams.handlingSituation"
-          placeholder="请输入处理情况"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="检验日期" prop="dateOfInspection">
-        <el-input
-          v-model="queryParams.dateOfInspection"
-          placeholder="请输入检验日期"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+<!--      <el-form-item label="数量" prop="quantity">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.quantity"-->
+<!--          placeholder="请输入数量"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="不合格原因" prop="causeOfNonconformity">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.causeOfNonconformity"-->
+<!--          placeholder="请输入不合格原因"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="不合格数" prop="disqualificationNumber">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.disqualificationNumber"-->
+<!--          placeholder="请输入不合格数"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="处理情况" prop="handlingSituation">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.handlingSituation"-->
+<!--          placeholder="请输入处理情况"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="检验日期" prop="dateOfInspection">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.dateOfInspection"-->
+<!--          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>
@@ -96,20 +96,29 @@
           v-hasPermi="['jl_inspection:inspection: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="['jl_inspection:inspection:export']"-->
+<!--        >导出</el-button>-->
+<!--      </el-col>-->
       <el-col :span="1.5">
         <el-button
-          type="warning"
+          type="primary"
           plain
-          icon="el-icon-download"
+          icon="el-icon-back"
           size="mini"
-          @click="handleExport"
-          v-hasPermi="['jl_inspection:inspection:export']"
-        >导出</el-button>
+          @click="fhsy"
+        >返回上一页</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="inspectionList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="inspectionList" @selection-change="handleSelectionChange" style="margin-top: 20px">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="主键" align="center" prop="id" />
       <el-table-column label="订单号/  数量" align="center" prop="orderNumber" />
@@ -121,24 +130,19 @@
       <el-table-column label="检验日期" align="center" prop="dateOfInspection" />
       <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="['jl_inspection:inspection:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['jl_inspection:inspection:remove']"
-          >删除</el-button>
+          <el-dropdown @command="(command)=>{handleCommand(command, scope.row)}">
+            <el-button type="warning">
+              操作<i class="el-icon-arrow-down el-icon--right"></i>
+            </el-button>
+            <el-dropdown-menu slot="dropdown">
+              <el-dropdown-item  icon="el-icon-edit"  command="handleUpdate">修改</el-dropdown-item>
+              <el-dropdown-item  icon="el-icon-delete" command="handleDelete">删除</el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown>
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -148,10 +152,10 @@
     />
 
     <!-- 添加或修改进料日志详情对话框 -->
-    <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="orderNumber">
-          <el-input v-model="form.orderNumber" placeholder="请输入订单号/  数量" />
+    <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-form-item label="订单号/数量" prop="orderNumber">
+          <el-input v-model="form.orderNumber" placeholder="请输入订单号/数量" />
         </el-form-item>
         <el-form-item label="型号/名称" prop="modelName">
           <el-input v-model="form.modelName" placeholder="请输入型号/名称" />
@@ -181,7 +185,7 @@
 </template>
 
 <script>
-import { listInspection, getInspection, delInspection, addInspection, updateInspection } from "@/api/jl_inspection/inspection";
+import { listInspection, getInspection, delInspection, addInspection, updateInspection } from "@/api/amichi/qualityinspectioninformation/jlinspection";
 
 export default {
   name: "Inspection",
@@ -228,6 +232,23 @@ export default {
     this.getList();
   },
   methods: {
+    fhsy(){
+      console.log("ddddde")
+      this.$router.back();
+    },
+    //下拉菜单点击事件
+    handleCommand(command, row) {
+      switch (command) {
+        case "handleUpdate":
+          this.handleUpdate(row)
+          break;
+        case "handleDelete":
+          this.handleDelete(row)
+          break;
+        default:
+          break;
+      }
+    },
     /** 查询进料日志详情列表 */
     getList() {
       this.loading = true;

zkqy-ui/src/views/login.vue

@@ -310,10 +310,10 @@ export default {
                 // uri: "?client_id=hmc&scope=basic&response_type=code&state=AB1357&redirect_uri=http://192.168.2.190:8066/oauth/callback",
                // uri:"?client_id=mestools&scope=basic&response_type=code&state=AB1357&redirect_uri=http://62.234.61.92:8055/oauth/callback",
                // uri:"?client_id=mestools&scope=basic&response_type=code&state=AB1357&redirect_uri=http://192.168.128.171:8066/oauth/callback",
-                uri:"?client_id=mestools&scope=basic&response_type=code&state=AB1357&redirect_uri=http://192.168.2.135:8066/oauth/callback",
-             //uri:"?client_id=hmc&scope=basic&response_type=code&state=AB1357&redirect_uri=http://192.168.110.85:8066/oauth/callback",
-             //uri:"?client_id=hmc&scope=basic&response_type=code&state=AB1357&redirect_uri=http://192.168.110.83:8066/oauth/callback",
-            //uri:"?client_id=hmc&scope=basic&response_type=code&state=AB1357&redirect_uri=http://172.20.10.5:8066/oauth/callback",
+               //  uri:"?client_id=mestools&scope=basic&response_type=code&state=AB1357&redirect_uri=http://192.168.2.135:8066/oauth/callback",
+             uri:"?client_id=hmc&scope=basic&response_type=code&state=AB1357&redirect_uri=http://192.168.110.83:8066/oauth/callback",
+             // uri:"?client_id=hmc&scope=basic&response_type=code&state=AB1357&redirect_uri=http://192.168.110.83:8066/oauth/callback",
+            // uri:"?client_id=hmc&scope=basic&response_type=code&state=AB1357&redirect_uri=http://172.20.10.5:8066/oauth/callback",
             //   uri:"?client_id=mestools&scope=basic&response_type=code&state=AB1357&redirect_uri=http://192.168.3.17:8066/oauth/callback",
             ...this.loginForm,
             tenantID: this.tenantId,

zkqy-ui/vue.config.js

@@ -39,12 +39,12 @@ module.exports = {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
          // target: `http://172.20.10.5:8066`,
-        // target: `http://192.168.110.83:8066`,
+        target: `http://192.168.110.83:8066`,
         // target: `http://192.168.128.171:8066`,
-        // target: `http://192.168.2.135:8066`, //铨一开发
+        //target: `http://192.168.2.135:8066`, //铨一开发
         // target: `http://192.168.2.190:8066`,
         // target: `http://192.168.3.17:8066`,
-        target: `http://192.168.2.135:8066`,
+        // target: `http://192.168.2.135:8066`,
         //  target: `http://192.168.128.171:8066`,
         // target: `http://175.27.169.173:8066`,//公网服务器
         changeOrigin: true,