已完成计划跟踪及公益卡片联调及问题修改

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

@@ -334,6 +334,12 @@ export default {
         machine: '可生产设备',
         cuttingToolName: '刀具名称',
         checkResult: '检查结果',
+      },
+      task: {
+        procedureNo: '工序号',
+        resourceName: '所在设备',
+        startTime:'开始时间',
+        endTime: '结束时间'
       }
 		},
 		// 表单数据名称

imcs-ui/src/views/zuihou/runManageCenter/orderMgr/components/finishedOrder/components/craftCards/index.vue

@@ -1,88 +1,89 @@
-<template>
-  <div class="app-container">
-		<!-- 列表数据 -->
-    <el-table
-      :key="tableKey"
-      ref="table"
-      v-loading="loading"
-      :data="tableData"
-      border
-      fit
-      row-key="id"
-      style="width: 100%;"
-    >
-      <!-- 零件名称 -->
-      <el-table-column prop="name" :label='$t("order.form.craftCard.partName")' :show-overflow-tooltip="true"></el-table-column>
-      <!-- 零部件编号 -->
-      <el-table-column prop="no" :label='$t("order.form.craftCard.partCode")' :show-overflow-tooltip="true"></el-table-column>
-      <!-- 零件交货日期 -->
-      <el-table-column prop="deliveryTime" :label='$t("order.form.craftCard.deliveryTime")' :show-overflow-tooltip="true"></el-table-column>
-      <!-- 零件总数 -->
-      <el-table-column prop="planBomNum" :label='$t("order.form.craftCard.partCount")'></el-table-column>
-      <!-- 操作 -->
-      <el-table-column
-        :label="$t('table.operation')"
-        fixed="right"
-        align="center"
-        column-key="operation"
-      >
-        <template slot-scope="{ row }">
-          <a @click="downloadCraftCards(row)" style="color: #2db7f5">导出工艺流程卡</a>
-        </template>
-      </el-table-column>
-    </el-table>
-  </div>
-</template>
-
-<script>
-	// 【完成订单计划】-API
-	import planMgrApi from "@/api/runManageCenter/planMgr"
-  import { downloadFile } from '@/utils/commons'
-	export default {
-	  name: "craftCard",
-	  directives: {},
-	  components: {},
-    props: {
-      orderId: {
-        type:String,
-        default:''
-      }
-    },
-	  data () {
-	    return {
-	      tableKey: 0,
-	      loading: false,
-        rowData: {},
-        tableData:[]
-	    }
-	  },
-	  // 实例已经在内存中创建好，此时data和methods已将ok,如果要操作data中的数据或是调用methods中的方法，最早只能在created中操作
-	  created() {
-	  	// 加载列表数据
-	  	this.fetch()
-		},
-	  computed: {
-	  },
-	  mounted () {
-	  },
-	  methods: {
-	    fetch () {
-        console.log("this.orderId="+this.orderId)
-	      this.loading = true
-        planMgrApi.getFinishPlanList({ "orderId": this.orderId }).then(response => {
-	        const res = response.data
-	        if (res.isSuccess) {
-	          this.tableData = res.data
-	        }
-	      }).finally(() => this.loading = false)
-	    },
-
-      downloadCraftCards(data){
-        planMgrApi.downloadCraftCards(data).then(response => {
-          downloadFile(response)
-        })
-      }
-	  }
-	}
-</script>
-<style lang="scss" scoped></style>
+<template>
+  <div class="app-container">
+		<!-- 列表数据 -->
+    <el-table
+      :key="tableKey"
+      ref="table"
+      v-loading="loading"
+      :data="tableData"
+      border
+      fit
+      row-key="id"
+      style="width: 100%;"
+    >
+      <!-- 零件名称 -->
+      <el-table-column prop="name" :label='$t("order.form.craftCard.partName")' :show-overflow-tooltip="true"></el-table-column>
+      <!-- 零部件编号 -->
+      <el-table-column prop="no" :label='$t("order.form.craftCard.partCode")' :show-overflow-tooltip="true"></el-table-column>
+      <!-- 零件交货日期 -->
+      <el-table-column prop="deliveryTime" :label='$t("order.form.craftCard.deliveryTime")' :show-overflow-tooltip="true"></el-table-column>
+      <!-- 零件总数 -->
+      <el-table-column prop="planBomNum" :label='$t("order.form.craftCard.partCount")'></el-table-column>
+      <!-- 操作 -->
+      <el-table-column
+        :label="$t('table.operation')"
+        fixed="right"
+        align="center"
+        column-key="operation"
+      >
+        <template slot-scope="{ row }">
+          <a @click="downloadCraftCards(row)" style="color: #2db7f5">导出工艺流程卡</a>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+	// 【完成订单计划】-API
+	import planMgrApi from "@/api/runManageCenter/planMgr"
+  import { downloadFile } from '@/utils/commons'
+	export default {
+	  name: "craftCard",
+	  directives: {},
+	  components: {},
+    props: {
+      planId: {
+        type:String,
+        default:''
+      }
+    },
+	  data () {
+	    return {
+	      tableKey: 0,
+	      loading: false,
+        rowData: {},
+        tableData:[]
+	    }
+	  },
+	  // 实例已经在内存中创建好，此时data和methods已将ok,如果要操作data中的数据或是调用methods中的方法，最早只能在created中操作
+	  created() {
+	  	// 加载列表数据
+	  	this.fetch()
+		},
+	  computed: {
+	  },
+	  mounted () {
+	  },
+	  methods: {
+	    fetch () {
+        console.log("this.planId="+this.planId)
+	      this.loading = true
+        planMgrApi.getFinishPlanList({ "planId": this.planId }).then(response => {
+	        const res = response.data
+	        if (res.isSuccess) {
+	          this.tableData = res.data
+	        }
+	      }).finally(() => this.loading = false)
+	    },
+
+      downloadCraftCards(data){
+	      console.log(data)
+        planMgrApi.downloadCraftCards(data).then(response => {
+          downloadFile(response)
+        })
+      }
+	  }
+	}
+</script>
+<style lang="scss" scoped></style>

imcs-ui/src/views/zuihou/runManageCenter/orderMgr/components/finishedOrder/components/prodTracedBack/index.vue

@@ -12,13 +12,13 @@
       style="width: 100%;"
     >
       <!-- 工序号 -->
-      <el-table-column prop="procedureNo" :label='$t("order.form.craftCard.partName")' :show-overflow-tooltip="true"></el-table-column>
+      <el-table-column prop="procedureNo" :label='$t("runCenter.table.task.procedureNo")' :show-overflow-tooltip="true"></el-table-column>
       <!-- 所在设备 -->
-      <el-table-column prop="resourceName" :label='$t("order.form.craftCard.partCode")' :show-overflow-tooltip="true"></el-table-column>
+      <el-table-column prop="resourceName" :label='$t("runCenter.table.task.resourceName")' :show-overflow-tooltip="true"></el-table-column>
       <!-- 开始时间 -->
-      <el-table-column prop="startTime" :label='$t("menu.optLog.startTime")' :show-overflow-tooltip="true"></el-table-column>
+      <el-table-column prop="startTime" :label='$t("runCenter.table.task.startTime")' :show-overflow-tooltip="true"></el-table-column>
       <!-- 结束时间 -->
-      <el-table-column prop="endTime" :label='$t("menu.optLog.finishTime")' :show-overflow-tooltip="true"></el-table-column>
+      <el-table-column prop="endTime" :label='$t("runCenter.table.task.endTime")' :show-overflow-tooltip="true"></el-table-column>
 
     </el-table>
     <pagination
@@ -31,15 +31,19 @@
   </div>
 </template>
 
-<script> 
+<script>
   import planMgrApi from "@/api/runManageCenter/planMgr"
-  import Pagination from "@/components/Pagination"  
+  import Pagination from "@/components/Pagination"
   import { initQueryParams } from '@/utils/commons'
 	export default {
 	  name: "prodTracedBackCard",
 	  directives: {},
 	  components: {Pagination },
-    props: { 
+    props: {
+      completeBatchNo: {
+        type:String,
+        default:''
+      }
     },
 	  data () {
 	    return {
@@ -47,6 +51,7 @@
         loading: false,
         queryParams: initQueryParams({}),
         rowData: {},
+
         tableData: {
 	        total: 0
 	      },
@@ -62,13 +67,14 @@
 	  mounted () {
 	  },
 	  methods: {
+
 	    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;
-        this.queryParams.model.planNo = this.planIds ? this.planIds :this.queryParams.planId
+        this.queryParams.model.completeBatchNo = this.completeBatchNo
         planMgrApi.prodTracedBackPage(this.queryParams ).then(response => {
-          const res = response.data 
+          const res = response.data
 	        if (res.isSuccess) {
             this.tableData = res.data
              // 给列表设置条数

imcs-ui/src/views/zuihou/runManageCenter/orderMgr/components/finishedOrder/components/tracedBack/index.vue

@@ -15,7 +15,7 @@
       <el-table-column prop="bomName" :label='$t("order.form.craftCard.partName")' :show-overflow-tooltip="true"></el-table-column>
       <!-- 零部件编号 -->
       <el-table-column prop="uniqueCode" :label='$t("order.form.craftCard.partCode")' :show-overflow-tooltip="true"></el-table-column>
-     
+
       <!-- 操作 -->
       <el-table-column
         :label="$t('table.operation')"
@@ -24,7 +24,7 @@
         column-key="operation"
       >
         <template slot-scope="{ row }">
-          <a @click="partsTracedBackPage(row)" style="color: #2db7f5">生产追溯</a>
+          <a @click="prodTracedBackPage(row)" style="color: #2db7f5">生产追溯</a>
         </template>
       </el-table-column>
     </el-table>
@@ -41,37 +41,42 @@
       :visible.sync="prodTracedBackCardVisible"
       :title='$t("order.common.partsTracedBackDialogName")'
       width="80%"
+      append-to-body
       custom-class="dialogNoTop"
       @close="prodTracedBackCardClose"
     >
       <!--【零件追溯卡片】 -->
-      <partsTracedBackCards
+      <prodTracedBackCards
         :row-data="rowData"
-        :order-id="orderId"
+        :complete-batch-no="completeBatchNo"
         @close="prodTracedBackCardClose"
       />
-    </el-dialog>    
+    </el-dialog>
   </div>
 </template>
 
 <script>
   // 【完成订单计划】-API
   import planMgrApi from "@/api/runManageCenter/planMgr"
-  import Pagination from "@/components/Pagination"  
+  import Pagination from "@/components/Pagination"
   import prodTracedBackCards from "@/views/zuihou/runManageCenter/orderMgr/components/finishedOrder/components/prodTracedBack/index"
   import { initQueryParams } from '@/utils/commons'
 	export default {
 	  name: "partsTracedBackCard",
 	  directives: {},
-	  components: {Pagination },
-    props: { 
+	  components: {Pagination,prodTracedBackCards },
+    props: {
+      planId: {
+        type:String,
+        default:''
+      }
     },
 	  data () {
 	    return {
 	      tableKey: 0,
         loading: false,
         prodTracedBackCardVisible: false,
-        orderId:"",
+        completeBatchNo:"",
         queryParams: initQueryParams({}),
         rowData: {},
         tableData: {
@@ -93,9 +98,10 @@
         this.loading = true
         this.queryParams.current = params.current ? params.current : this.queryParams.current;
         this.queryParams.size = params.size ? params.size : this.queryParams.size;
-        this.queryParams.model.planNo = this.planIds ? this.planIds :this.queryParams.planId
+        this.queryParams.model.planId = this.planId
+        console.log("this.planIds" + this.planId);
         planMgrApi.partsTracedBackPage(this.queryParams ).then(response => {
-          const res = response.data 
+          const res = response.data
 	        if (res.isSuccess) {
             this.tableData = res.data
              // 给列表设置条数
@@ -107,7 +113,7 @@
           this.prodTracedBackCardVisible = false
       },
 			prodTracedBackPage(row){
-          this.planIds = row.planIds
+          this.completeBatchNo = row.completeBatchNo
           this.rowData = row
           this.prodTracedBackCardVisible = true
       },

imcs-ui/src/views/zuihou/runManageCenter/orderMgr/components/finishedOrder/index.vue

@@ -147,7 +147,7 @@
 	            @click="view(row)"
 	          />
           </el-tooltip>
-          <a @click="partsTracedBackPage(row)" style="color: #2db7f5">零件追溯</a> 
+          <a @click="partsTracedBackPage(row)" style="color: #2db7f5">零件追溯</a>
 					<a @click="down(row)" style="color: #2db7f5">导出工艺卡</a>
         </template>
       </el-table-column>
@@ -197,7 +197,7 @@
       <!--【工艺卡片】 -->
       <craftCards
         :row-data="rowData"
-        :order-id="orderId"
+        :plan-id="planId"
         @close="craftCardsClose"
       />
     </el-dialog>
@@ -212,7 +212,7 @@
       <!--【零件追溯卡片】 -->
       <partsTracedBackCards
         :row-data="rowData"
-        :order-id="orderId"
+        :plan-id="planId"
         @close="partsTracedBackCardClose"
       />
     </el-dialog>
@@ -523,12 +523,12 @@
       },
       //【工艺卡下载】按钮-事件
       down(row){
-          this.orderId = row.id
+          this.planId = row.id
           this.rowData = row
           this.craftCardsVisible = true
 			},
 			partsTracedBackPage(row){
-          this.planIds = row.planIds
+          this.planId = row.id
           this.rowData = row
           this.partsTracedBackCardVisible = true
       },