偏置点管理

imcs-ui/src/api/machiningClient/measuringOffsetMgr.js

@@ -0,0 +1,39 @@
+/*********************** 【质量中心-查看质检结果】API ********************/
+import axiosApi from '../AxiosApi.js'
+
+const apiList = {
+	getList: {
+	    method: 'POST',
+	    url: `/authority/measuring/query`
+	},
+  page: {
+    method: 'POST',
+    url: `/authority/measuring/page`
+  },
+  download: {
+    method: 'POST',
+    url: `/authority/measuring/downloadFile`
+  }
+}
+
+export default {
+	getList (data) {
+    return axiosApi({
+      ...apiList.page,
+      data
+    })
+  },
+  page (data) {
+    return axiosApi({
+        ...apiList.page,
+        data
+    })
+  },
+  download (data) {
+    return axiosApi({
+        ...apiList.download,
+        responseType: "blob",
+      data
+    })
+  }
+}

imcs-ui/src/lang/zh/machining.js

@@ -1,116 +1,133 @@
-/***************************【机加工人端】***********************************/
-export default {
-	machining: {
-		// 本模型下的共通
-		common: {
-			uniqueCode: '请先输入入产线编码！',
-			marking: '标注处理',
-			viewTask: '任务详情',
-			viewOrder: '查看补单',
-			viewPlan: '查看计划',
-			custerm: '客户名称',
-			orderNo: '订单编号',
-			jiaohuTime: '交货期',
-			downloadReport: '下载报告',
-			status: '状态',
-			exeStatus:{
-				noStart: '待执行',
-				run: '进行中',
-				finished: '已完成'
-			},
-			testResult: {
-				one: '合格',
-				two: '不合格'
-			},
-			handleWay: {
-				one: '补单',
-				two: '废品发货'
-			},
-			handleStatus: {
-				one: '待处理',
-				two: '已处理'
-			}
-		},
-		// 列表搜索表单名称
-		searchForm: {
-			
-		},
-		// 按钮的名称
-	  	buttons: {
-	  		noFinished: '暂不完成',
-	  		finished: '我已完成'
-	  	},
-	  	// 列表的cell名称
-		table: {
-			// 【待完成任务】列表table字段名称
-			schedul: {
-				taskNodeNo: '节点任务编号',
-				prority: '优先级',
-				exeStatus: '节点任务状态',
-				overtimeStatus: '是否超时',
-				bomDesc: '产品名称',
-				procedureNo: '工序号',
-				procedureDesc: '工序名称',
-				resourceDesc: '执行位置',
-				planTime: '计划时间',
-				ratedWorkHours: '额定工时',
-				orderNo: '订单编号',
-				planNo: '计划编号',
-				taskNo: '任务编号'
-			},
-			// 质量中心-不合格品管理
-			unQuality: {
-				no: '单据编号',
-				bomName: '产品名称',
-				uniqueCode: '产品唯一码',
-				testResult: '质检结果',
-				bomNum: '数量',
-				handleUserName: '质检人',
-				handleStatus: '处理状态',
-				handleWay: '处理方式',
-				name9: '补单单号',
-				name10: '所属订单号',
-				name11: '所属计划',
-				name12: '生成单据时间',
-				createUserName: '生成人',
-				handleTime: '处理时间',
-				handleUserName: '处理人'
-			},
-			// 质量中心-质量管理
-			qualityMgr: {
-				no: '订单编号',
-				bomName: '客户简称',
-				uniqueCode: '来源',
-				testResult: '订单状态',
-				bomNum: '产品数量',
-				handleUserName: '生产中',
-				handleStatus: '已完成',
-				handleWay: '不合格产品',
-				name9: '合格产品',
-				name10: '补单次',
-				name12: '下单日期',
-				handleTime: '交货日期',
-			},
-			qualityResult: {
-				no: '单据编号',
-				bomName: '产品名称',
-				productCode: '产品编码',
-				uniqueCode: '产品系统唯一码',
-				testResult: '质检结果',				
-				name10: '所属订单号',
-				name11: '所属计划'				
-			}
-		},
-		// 表单数据名称
-		form: {
-			handleWay: '处理方式',
-			addOrderId: '补单订单',
-			handleStatus: '处理状态'
-			
-		},
-		// 表单验证规则提示信息
-		rules: {
-			
-		}
-	}
-}
+/***************************【机加工人端】***********************************/
+export default {
+	machining: {
+		// 本模型下的共通
+		common: {
+			uniqueCode: '请先输入入产线编码！',
+			marking: '标注处理',
+			viewTask: '任务详情',
+			viewOrder: '查看补单',
+			viewPlan: '查看计划',
+			custerm: '客户名称',
+			orderNo: '订单编号',
+			jiaohuTime: '交货期',
+			downloadReport: '下载报告',
+			status: '状态',
+			exeStatus:{
+				noStart: '待执行',
+				run: '进行中',
+				finished: '已完成'
+			},
+			testResult: {
+				one: '合格',
+				two: '不合格'
+			},
+			handleWay: {
+				one: '补单',
+				two: '废品发货'
+			},
+			handleStatus: {
+				one: '待处理',
+				two: '已处理'
+			}
+		},
+		// 列表搜索表单名称
+		searchForm: {
+      offset: {
+        workpieceName: '零件名称',
+        orderNo: '订单编号',
+        workpieceId: '零件编号',
+        createTime: '生成日期',
+      },
+		},
+		// 按钮的名称
+	  	buttons: {
+	  		noFinished: '暂不完成',
+	  		finished: '我已完成'
+	  	},
+	  	// 列表的cell名称
+		table: {
+			// 【待完成任务】列表table字段名称
+			schedul: {
+				taskNodeNo: '节点任务编号',
+				prority: '优先级',
+				exeStatus: '节点任务状态',
+				overtimeStatus: '是否超时',
+				bomDesc: '产品名称',
+				procedureNo: '工序号',
+				procedureDesc: '工序名称',
+				resourceDesc: '执行位置',
+				planTime: '计划时间',
+				ratedWorkHours: '额定工时',
+				orderNo: '订单编号',
+				planNo: '计划编号',
+				taskNo: '任务编号'
+			},
+			// 质量中心-不合格品管理
+			unQuality: {
+				no: '单据编号',
+				bomName: '产品名称',
+				uniqueCode: '产品唯一码',
+				testResult: '质检结果',
+				bomNum: '数量',
+				handleUserName: '质检人',
+				handleStatus: '处理状态',
+				handleWay: '处理方式',
+				name9: '补单单号',
+				name10: '所属订单号',
+				name11: '所属计划',
+				name12: '生成单据时间',
+				createUserName: '生成人',
+				handleTime: '处理时间',
+				handleUserName: '处理人'
+			},
+			// 质量中心-质量管理
+			qualityMgr: {
+				no: '订单编号',
+				bomName: '客户简称',
+				uniqueCode: '来源',
+				testResult: '订单状态',
+				bomNum: '产品数量',
+				handleUserName: '生产中',
+				handleStatus: '已完成',
+				handleWay: '不合格产品',
+				name9: '合格产品',
+				name10: '补单次',
+				name12: '下单日期',
+				handleTime: '交货日期',
+			},
+			qualityResult: {
+				no: '单据编号',
+				bomName: '产品名称',
+				productCode: '产品编码',
+				uniqueCode: '产品系统唯一码',
+				testResult: '质检结果',
+				name10: '所属订单号',
+				name11: '所属计划'
+			},
+      // 【偏置点管理】列表table字段名称
+      offset: {
+        no: '编号',
+        orderNo: '订单编号',
+        workpieceName: '零件名称',
+        workpieceId: '零件编号',
+        procedureName: '工序名称',
+        offsetX: 'X',
+        offsetY: 'Y',
+        offsetZ: 'Z',
+        createTime: '生成日期',
+      },
+		},
+		// 表单数据名称
+		form: {
+			handleWay: '处理方式',
+			addOrderId: '补单订单',
+			handleStatus: '处理状态'
+
+		},
+		// 表单验证规则提示信息
+		rules: {
+
+		}
+	}
+}

imcs-ui/src/views/zuihou/qualityCenter/measuringOffsetMgr/Index.vue

@@ -0,0 +1,176 @@
+<template>
+  <div class="app-container">
+		<!-- 搜索模块 -->
+    <div class="filter-container">
+    	<span>
+    		<span>{{$t("machining.searchForm.offset.workpieceName")}}：</span>
+    		<el-input v-model="queryParams.model.workpieceName" :placeholder='$t("common.pleaseEnter")' style="width: 120px;" size="medium"/>
+    	</span>
+    	<span style="margin-left: 10px;">
+    		<span>{{$t("machining.searchForm.offset.orderNo")}}：</span>
+    		<el-input v-model="queryParams.model.orderNo" :placeholder='$t("common.pleaseEnter")' style="width: 120px;" size="medium"/>
+    	</span>
+		<span style="margin-left: 10px;">
+    		<span>{{$t("machining.searchForm.offset.workpieceId")}}：</span>
+    		<el-input v-model="queryParams.model.workpieceId" :placeholder='$t("common.pleaseEnter")' style="width: 120px;" size="medium"/>
+    	</span>
+		<span style="margin-left: 10px;">
+    		<span>{{$t("machining.searchForm.offset.createTime")}}：</span>
+<!--    		<el-input v-model="queryParams.model.createTime" :placeholder='$t("common.pleaseEnter")' style="width: 120px;" size="medium"/>-->
+        <el-date-picker
+          v-model="queryParams.model.createTime"
+          type="datetime"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+          style="width: 20%;"
+        />
+    	</span>
+      <span style="margin-left: 10px;">
+	      <el-button plain type="primary" icon="el-icon-search" size="medium" @click="search">
+	        {{ $t("table.search") }}
+	      </el-button>
+	      <el-button plain type="warning" icon="el-icon-refresh" size="medium" @click="reset">
+	        {{ $t("table.reset") }}
+	      </el-button>
+      </span>
+    </div>
+	<!-- 列表数据 -->
+    <el-table
+      :key="tableKey"
+      ref="table"
+      v-loading="loading"
+      :data="tableData.records"
+      border
+      fit
+      row-key="id"
+      style="width: 100%;margin-top:50px;"
+    >
+
+	    <!-- 序号 -->
+      <el-table-column align="center" type="selection" width="50" :reserve-selection="true" />
+    	<!-- 序号 -->
+    	<el-table-column :label='$t("common.serialNo")' width="55px" align="center">
+	      <template slot-scope="scope">
+	        <div>
+	          {{scope.$index+(queryParams.current - 1) * queryParams.size + 1}}
+	        </div>
+	      </template>
+      </el-table-column>
+	    <!-- 订单编号 -->
+      <el-table-column prop="orderNo" :label='$t("machining.table.offset.orderNo")' :show-overflow-tooltip="true"></el-table-column>
+      <!-- '零件名称 -->
+      <el-table-column prop="workpieceName" :label='$t("machining.table.offset.workpieceName")' :show-overflow-tooltip="true"></el-table-column>
+      <!-- 零件编号 -->
+      <el-table-column prop="workpieceId" :label='$t("machining.table.offset.workpieceId")'  :show-overflow-tooltip="true"></el-table-column>
+      <!-- 工序名称 -->
+      <el-table-column prop="procedureName" :label='$t("machining.table.offset.procedureName")' :show-overflow-tooltip="true"></el-table-column>
+      <!-- X -->
+      <el-table-column prop="sketchyXaxisOffset" :label='$t("machining.table.offset.offsetX")' :show-overflow-tooltip="true"></el-table-column>
+      <!-- Y -->
+      <el-table-column prop="sketchyYaxisOffset" :label='$t("machining.table.offset.offsetY")' :show-overflow-tooltip="true"></el-table-column>
+      <!-- Z -->
+      <el-table-column prop="sketchyZaxisOffset" :label='$t("machining.table.offset.offsetZ")' :show-overflow-tooltip="true"></el-table-column>
+      <!-- 所属计划 -->
+      <el-table-column prop="createTime" :label='$t("machining.table.offset.createTime")' :show-overflow-tooltip="true"></el-table-column>
+
+      <!-- 操作 -->
+      <el-table-column
+        :label="$t('table.operation')"
+        fixed="right"
+        align="center"
+        column-key="operation"
+        width="80px"
+      >
+        <template slot-scope="{ row }">
+        	<el-tooltip class="item" :content="$t('machining.common.downloadReport')" effect="dark" placement="top-start">
+	          <i
+	            class="el-icon-view table-operation"
+	            style="color: #87d068"
+	            @click ="downloadReport(row)"
+			  />
+          </el-tooltip>
+        </template>
+      </el-table-column>
+    </el-table>
+    <pagination
+      v-show="tableData.total > 0"
+      :limit.sync="queryParams.size"
+      :page.sync="queryParams.current"
+      :total="Number(tableData.total)"
+      @pagination="fetch"
+    />
+  </div>
+</template>
+
+<script>
+	// 【分页】组件
+	import Pagination from "@/components/Pagination"
+	// 【不合格产品管理】-API
+	import measuringOffsetMgrApi from "@/api/machiningClient/measuringOffsetMgr"
+	// 共通函数
+	import { downloadFile, initQueryParams } from '@/utils/commons'
+
+	export default {
+	  name: "measuringOffsetMgr",
+	  directives: { },
+	  components: { Pagination },
+	  props: {
+	  },
+	  data () {
+	    return {
+	      tableKey: 0,
+	      queryParams: initQueryParams({
+		  }),
+	      selection: [],
+	      loading: false,
+	      tableData: {
+	        total: 0
+	      }
+	    }
+	  },
+	  // 实例已经在内存中创建好，此时data和methods已将ok,如果要操作data中的数据或是调用methods中的方法，最早只能在created中操作
+	  created() {
+	  	// 加载列表数据
+	  	this.fetch()
+	  },
+	  computed: {
+	    currentUser () {
+	      return this.$store.state.account.user
+	    }
+	  },
+	  mounted () {
+	  },
+	  methods: {
+	    search () {
+	      this.fetch({
+	        ...this.queryParams
+	      })
+	    },
+	    reset () {
+	      this.queryParams = initQueryParams({})
+	      this.$refs.table.clearSort()
+	      this.$refs.table.clearFilter()
+	      this.search()
+	    },
+	    downloadReport (row) {
+        this.queryParams.id = row.workpieceId
+          measuringOffsetMgrApi.download(this.queryParams).then(response => {
+			    downloadFile(response)
+        })
+	    },
+	    fetch (params = {}) {
+	      this.loading = true
+          this.queryParams.current = params.current ? params.current : this.queryParams.current
+          this.queryParams.size = params.size ? params.size : this.queryParams.size
+          console.log(this.queryParams.model.workpieceName)
+          measuringOffsetMgrApi.getList(this.queryParams).then(response => {
+	        const res = response.data
+	        if (res.isSuccess) {
+	          this.tableData = res.data
+	        }
+	      }).finally(() => this.loading = false)
+	    }
+	  }
+	}
+</script>
+<style lang="scss" scoped></style>