2022-02-14 13:26

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

@@ -2,13 +2,15 @@
   <div class="app-container">
 		<!-- 搜索模块 -->
     <div class="filter-container">
+    	<!-- 零件名称 -->
     	<span>
     		<span>{{$t("runCenter.searchForm.bomName")}}：</span>
-    		<el-input v-model="queryParams.model.bomName" :placeholder='$t("common.pleaseEnter")' style="width: 120px;" size="medium"/>
+    		<el-input v-model="queryParams.model.bomDesc" :placeholder='$t("common.pleaseEnter")' style="width: 120px;" size="medium"/>
     	</span>
+    	<!-- 订单名称 -->
     	<span style="margin-left: 15px;">
-    		<span>{{$t("runCenter.searchForm.orderNo")}}：</span>
-    		<el-input v-model="queryParams.model.orderNo" :placeholder='$t("common.pleaseEnter")' style="width: 120px;" size="medium"/>
+    		<span>{{$t("runCenter.searchForm.orderName")}}：</span>
+    		<el-input v-model="queryParams.model.orderName" :placeholder='$t("common.pleaseEnter")' style="width: 120px;" size="medium"/>
     	</span>
     	<span style="margin-left: 15px;">
     		<span>{{$t("runCenter.searchForm.deliveryTime")}}：</span>
@@ -24,6 +26,30 @@
 		      align="right">
 		    </el-date-picker>
     	</span>
+      <!--<span style="margin-left: 15px;">
+	      <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>
+    <div class="filter-container">
+    	<span>
+    		<span>{{$t("runCenter.searchForm.deliveryTime2")}}：</span>
+    		<el-date-picker
+		      v-model="queryParams.pdeliveryTime"
+		      type="daterange"
+		      :picker-options="pickerOptions"
+		      :range-separator='$t("common.separator")'
+		      :start-placeholder='$t("common.startTime")'
+		      :end-placeholder='$t("common.endTime")'
+		      format="yyyy-MM-dd"
+			    value-format="yyyy-MM-dd"
+		      align="right">
+		    </el-date-picker>
+    	</span>
       <span style="margin-left: 15px;">
 	      <el-button plain type="primary" icon="el-icon-search" size="medium" @click="search">
 	        {{ $t("table.search") }}
@@ -82,8 +108,8 @@
       <el-table-column prop="orderNo" :label='$t("runCenter.table.oder.orderNo")' :show-overflow-tooltip="true" width="180px"></el-table-column>
       <!-- 订单名称 -->
       <el-table-column prop="orderName" :label='$t("runCenter.table.oder.orderName")' :show-overflow-tooltip="true" width="180px"></el-table-column>
-      <!-- 简称 -->
-      <!--<el-table-column prop="custDesc" :label='$t("runCenter.table.oder.custDesc")' :show-overflow-tooltip="true" width="120px"></el-table-column>-->
+      <!-- 交货日期 -->
+      <el-table-column prop="deliveryTime" :label='$t("runCenter.table.oder.deliveryTime")' :show-overflow-tooltip="true" width="120px"></el-table-column>
       <!-- 来源 -->
       <el-table-column prop="source" :label='$t("runCenter.table.oder.source")' :show-overflow-tooltip="true" width="80px">
       	<template slot-scope="{ row }">
@@ -91,36 +117,32 @@
 					<el-tag v-if="row.source == '2'" type="success">{{$t("runCenter.common.source.out")}}</el-tag>
 				</template>
       </el-table-column>
-      <!-- 交货日期 -->
-      <el-table-column prop="deliveryTime" :label='$t("runCenter.table.oder.deliveryTime")' :show-overflow-tooltip="true" width="120px"></el-table-column>
-      <!-- 订单状态 -->
-      <el-table-column prop="orderStatus" :label='$t("runCenter.table.oder.orderStatus")' align="center" width="90px">
-      	<template slot-scope="{ row }">
-      		<el-tag v-if="row.orderStatus == '0'" type="info">{{$t("runCenter.common.orderStatus.zero")}}</el-tag>
-	      	<el-tag v-if="row.orderStatus == '1'" type="warn">{{$t("runCenter.common.orderStatus.one")}}</el-tag>
-					<el-tag v-if="row.orderStatus == '2'" type="success">{{$t("runCenter.common.orderStatus.two")}}</el-tag>
-					<el-tag v-if="row.orderStatus == '3'" type="">{{$t("runCenter.common.orderStatus.three")}}</el-tag>
-				</template>
-      </el-table-column>
-      <!-- 生产节拍 -->
-      <el-table-column prop="rhythmType" :label='$t("runCenter.table.oder.rhythmType")' :show-overflow-tooltip="true" width="100px">
-      	<template slot-scope="{ row }">
-      		<el-tag v-if="row.rhythmType == '1'" type="success">{{$t("runCenter.common.rhythmType.auto")}}</el-tag>
-					<el-tag v-if="row.rhythmType == '2'">{{$t("runCenter.common.rhythmType.myself")}}</el-tag>
+      <!-- 零件 -->
+      <el-table-column prop="bomDesc" :label='$t("runCenter.table.oder.bomName")' :show-overflow-tooltip="true" width="100px"></el-table-column>
+      <!-- 产品代号 -->
+      <el-table-column prop="bomAlias" :label='$t("runCenter.table.oder.bomAlias")' :show-overflow-tooltip="true" width="100px"></el-table-column>
+     	<!-- 零件交货日期 -->
+      <el-table-column prop="pdeliveryTime" :label='$t("runCenter.table.oder.pdeliveryTime")' :show-overflow-tooltip="true" width="120px"></el-table-column> 	
+      <!-- 计划状态 -->
+      <el-table-column prop="planStatus" :label='$t("runCenter.table.plan.planStatus")' :show-overflow-tooltip="true" width="120" align="center">
+        <template slot-scope="{ row }">
+	      	<el-tag v-if="row.planStatus == '0'" type="warning">{{$t("runCenter.common.planStatus.zero")}}</el-tag>
+	      	<el-tag v-if="row.planStatus == '1'" type="info">{{$t("runCenter.common.planStatus.one")}}</el-tag>
+					<el-tag v-if="row.planStatus == '2'">{{$t("runCenter.common.planStatus.two")}}</el-tag>
+					<el-tag v-if="row.planStatus == '3'" type="success">{{$t("runCenter.common.planStatus.three")}}</el-tag>
 				</template>
       </el-table-column>
-      <!-- 生产单元 -->
-      <el-table-column prop="zoenDesc" :label='$t("runCenter.table.oder.zoenDesc")' :show-overflow-tooltip="true" width="100px"></el-table-column>
-      <!-- 计划 -->
-      <el-table-column prop="planStatus" :label='$t("runCenter.table.oder.planStatus")' :show-overflow-tooltip="true" width="100px">
-      	<template slot-scope="{ row }">
-	      	<el-tag v-if="row.planStatus == '1'" type="info">{{$t("runCenter.common.orderPlanStatus.noStart")}}</el-tag>
-					<el-tag v-if="row.planStatus == '2'">{{$t("runCenter.common.orderPlanStatus.run")}}</el-tag>
-					<el-tag v-if="row.planStatus == '3'" type="success">{{$t("runCenter.common.orderPlanStatus.finished")}}</el-tag>
-				</template>
+      <!-- 计划进度 -->
+      <el-table-column prop="process" :label='$t("runCenter.table.plan.planProgress")' :show-overflow-tooltip="true" width="200">
+      	<template slot-scope="scope">
+		  		<!--<el-progress v-if="scope.row.jindu <= 25" :text-inside="true" :stroke-width="24" :percentage="scope.row.jindu" status="exception"></el-progress>
+		  		<el-progress v-if="scope.row.jindu > 25 && scope.row.jindu <= 50" :text-inside="true" :stroke-width="24" :percentage="scope.row.jindu" status="warning"></el-progress>-->
+		  		<el-progress :text-inside="true" :stroke-width="24" :percentage="scope.row.process"></el-progress>
+		  		<!--<el-progress v-if="scope.row.jindu > 80" :text-inside="true" :stroke-width="24" :percentage="scope.row.jindu" status="success"></el-progress>-->
+		  	</template>
       </el-table-column>
       <!-- 排产 -->
-      <el-table-column prop="schedulingStatus" :label='$t("runCenter.table.oder.schedulingStatus")' :show-overflow-tooltip="true" width="100px">
+      <el-table-column prop="schedulingStatus" :label='$t("runCenter.table.plan.schedulingStatus")' :show-overflow-tooltip="true" width="120" align="center">
       	<template slot-scope="{ row }">
 	      	<el-tag v-if="row.schedulingStatus == '1'" type="info">{{$t("runCenter.common.schedulingStatus.noStart")}}</el-tag>
 					<el-tag v-if="row.schedulingStatus == '2'">{{$t("runCenter.common.schedulingStatus.run")}}</el-tag>
@@ -128,7 +150,7 @@
 				</template>
       </el-table-column>
       <!-- 生产 -->
-      <el-table-column prop="produceStatus" :label='$t("runCenter.table.oder.produceStatus")' :show-overflow-tooltip="true" width="100px">
+      <el-table-column prop="produceStatus" :label='$t("runCenter.table.plan.produceStatus")' :show-overflow-tooltip="true" width="120" align="center">
       	<template slot-scope="{ row }">
       		<el-tag v-if="row.produceStatus == '0'" type="warning">{{$t("runCenter.common.produceStatus.panse")}}</el-tag>
 	      	<el-tag v-if="row.produceStatus == '1'" type="info">{{$t("runCenter.common.produceStatus.noStart")}}</el-tag>
@@ -136,31 +158,18 @@
 					<el-tag v-if="row.produceStatus == '3'" type="success">{{$t("runCenter.common.produceStatus.finished")}}</el-tag>
 				</template>
       </el-table-column>
-      <!-- 生产进度 -->
-      <el-table-column prop="percent" :label='$t("runCenter.table.plan.planProgress")' :show-overflow-tooltip="true" width="200">
-      	<template slot-scope="scope">
-		  		<!--<el-progress v-if="scope.row.jindu <= 25" :text-inside="true" :stroke-width="24" :percentage="scope.row.jindu" status="exception"></el-progress>
-		  		<el-progress v-if="scope.row.jindu > 25 && scope.row.jindu <= 50" :text-inside="true" :stroke-width="24" :percentage="scope.row.jindu" status="warning"></el-progress>-->
-		  		<el-progress :text-inside="true" :stroke-width="24" :percentage="scope.row.process"></el-progress>
-		  		<!--<el-progress v-if="scope.row.jindu > 80" :text-inside="true" :stroke-width="24" :percentage="scope.row.jindu" status="success"></el-progress>-->
-		  	</template>
-      </el-table-column>
       <!-- 优先级 -->
-      <el-table-column prop="priority" :label='$t("runCenter.table.oder.priority")' :show-overflow-tooltip="true" width="80px"></el-table-column>
-      <!-- 产品数量 -->
-      <el-table-column prop="productNum" :label='$t("runCenter.table.oder.orderNum")' :show-overflow-tooltip="true" width="80px">
-      	<template slot-scope="scope">
-      		<div class="pointerCls" @click="view(scope.row)">{{ scope.row.produceNum }}</div>
-      	</template>
+      <el-table-column prop="prority" :label='$t("runCenter.table.plan.priority")' :show-overflow-tooltip="true" width="120"></el-table-column>
+      <!-- 零件总数 -->
+      <el-table-column prop="planBomNum" :label='$t("runCenter.table.oder.planAllNum")' :show-overflow-tooltip="true" width="80px">
+      	<!--<template slot-scope="scope">
+      		<div class="pointerCls" @click="view(scope.row)">{{ scope.row.planBomNum }}</div>
+      	</template>-->
       </el-table-column>
-      <!-- 生产中（数量） -->
-      <el-table-column prop="produceNum" :label='$t("runCenter.table.oder.produceNum")' :show-overflow-tooltip="true" width="80px"></el-table-column>
+      <!-- 不合格数量 -->
+      <el-table-column prop="produceNum" :label='$t("runCenter.table.oder.buhegeNum")' :show-overflow-tooltip="true" width="100px"></el-table-column>
       <!-- 已完成（数量） -->
       <el-table-column prop="completeNum" :label='$t("runCenter.table.oder.completeNum")' :show-overflow-tooltip="true" width="80px"></el-table-column>
-      <!-- 下单日期 -->
-      <el-table-column prop="orderTime" :label='$t("runCenter.table.oder.orderTime")' width="160px"></el-table-column>
-      <!-- 创建时间 -->
-      <el-table-column prop="createTime" :label='$t("runCenter.table.oder.createTime")' width="160px"></el-table-column>
       <!-- 操作 -->
       <el-table-column
         :label="$t('table.operation')"
@@ -328,6 +337,8 @@
   import checkCuttingTools from "@/views/zuihou/runManageCenter/orderMgr/components/runningOrder/components/checkCuttingTools/index"
 	// 【订单管理】-API
 	import orderMgrApi from "@/api/runManageCenter/orderMgr"
+	// 【计划管理】-API
+	import planMgrApi from "@/api/runManageCenter/planMgr"
 	import elDragDialog from '@/directive/el-drag-dialog'
 	import { downloadFile, initEnums, initDicts, initQueryParams } from '@/utils/commons'
 	import axios from 'axios'
@@ -882,16 +893,22 @@
 	    },
 	    fetch (params = {}) {
 	      this.loading = true
+	      // 如果【订单交货日期】有值
 	      if (this.queryParams.timeRange) {
 	        this.queryParams.map.deliveryTime_st = this.queryParams.timeRange[0]
 	        this.queryParams.map.deliveryTime_ed = this.queryParams.timeRange[1]
 	      }
+	      // 如果【零件交货日期】有值
+	      if (this.queryParams.pdeliveryTime) {
+	        this.queryParams.model.pdeliveryTimeStart = this.queryParams.pdeliveryTime[0]
+	        this.queryParams.model.pdeliveryTimeEnd = this.queryParams.pdeliveryTime[1]
+	      }
 
 	      this.queryParams.current = params.current ? params.current : this.queryParams.current
 	      this.queryParams.size = params.size ? params.size : this.queryParams.size
 	      // 查询必须参数：进行中（当审核完成的时候，同时设置orderstaut=2）
 	      this.queryParams.model.orderStatus = '2'
-	      orderMgrApi.page(this.queryParams).then(response => {
+	      planMgrApi.page(this.queryParams).then(response => {
 	        const res = response.data
 	        if (res.isSuccess) {
 	          this.tableData = res.data