2022-02-13 10:50

imcs-ui/src/views/zuihou/runManageCenter/orderMgr/components/draftOrder/components/Edit.vue

@@ -131,11 +131,16 @@
         />
         <!-- 零件名称 -->
         <el-table-column
-          prop="name"
+          prop="bomName"
           :label="$t(&quot;runCenter.table.orderSldPro.name&quot;)"
           align="center"
-          width="100px"
-        />
+          width="100px" 
+        >
+	        <template slot-scope="{ row }">
+			      {{ row.name || row.bomName }}
+					</template>
+        </el-table-column>
+	        
         <!-- 零件代号 -->
         <el-table-column
           prop="partsAlias"

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

@@ -74,7 +74,7 @@
       <!-- 订单名称 -->
       <el-table-column prop="orderName" :label='$t("runCenter.table.oder.orderName")' :show-overflow-tooltip="true"></el-table-column>
       <!-- 简称 -->
-      <el-table-column prop="custDesc" :label='$t("runCenter.table.oder.custDesc")' :show-overflow-tooltip="true"></el-table-column>
+      <!--<el-table-column prop="custDesc" :label='$t("runCenter.table.oder.custDesc")' :show-overflow-tooltip="true"></el-table-column>-->
       <!-- 来源 -->
       <el-table-column prop="source" :label='$t("runCenter.table.oder.source")' :show-overflow-tooltip="true" width="80px">
       	<template slot-scope="{ row }">

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

@@ -92,37 +92,37 @@
 				</template>
       </el-table-column>
       <!-- 生产节拍 -->
-      <el-table-column prop="rhythmType" :label='$t("runCenter.table.oder.rhythmType")' :show-overflow-tooltip="true" width="100px">
+      <!--<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>
 				</template>
-      </el-table-column>
+      </el-table-column>-->
       <!-- 计划 -->
-      <el-table-column prop="planStatus" :label='$t("runCenter.table.oder.planStatus")' :show-overflow-tooltip="true" width="100px">
+      <!--<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.planStatus.noStart")}}</el-tag>
 					<el-tag v-if="row.planStatus == '2'">{{$t("runCenter.common.planStatus.run")}}</el-tag>
 					<el-tag v-if="row.planStatus == '3'" type="success">{{$t("runCenter.common.planStatus.finished")}}</el-tag>
 				</template>
-      </el-table-column>
+      </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.oder.schedulingStatus")' :show-overflow-tooltip="true" width="100px">
       	<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>
 					<el-tag v-if="row.schedulingStatus == '3'" type="success">{{$t("runCenter.common.schedulingStatus.finished")}}</el-tag>
 				</template>
-      </el-table-column>
+      </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.oder.produceStatus")' :show-overflow-tooltip="true" width="100px">
       	<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>
 					<el-tag v-if="row.produceStatus == '2'">{{$t("runCenter.common.produceStatus.run")}}</el-tag>
 					<el-tag v-if="row.produceStatus == '3'" type="success">{{$t("runCenter.common.produceStatus.finished")}}</el-tag>
 				</template>
-      </el-table-column>
+      </el-table-column>-->
       <!-- 审核状态 -->
       <el-table-column prop="auditStatus" :label='$t("runCenter.table.oder.auditStatus")' align="center" width="100px">
       	<template slot-scope="{ row }">

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

@@ -66,8 +66,10 @@
       <el-table-column align="center" type="selection" width="50" :reserve-selection="true" />
       <!-- 订单编号 -->
       <el-table-column prop="orderNo" :label='$t("runCenter.table.oder.orderNo")' :show-overflow-tooltip="true" width="120px"></el-table-column>
+      <!-- 订单名称 -->
+      <el-table-column prop="orderName" :label='$t("runCenter.table.oder.orderName")' :show-overflow-tooltip="true" width="120px"></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="custDesc" :label='$t("runCenter.table.oder.custDesc")' :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 }">
@@ -87,20 +89,20 @@
 				</template>
       </el-table-column>
       <!-- 生产节拍 -->
-      <el-table-column prop="rhythmType" :label='$t("runCenter.table.oder.rhythmType")' :show-overflow-tooltip="true" width="100px">
+      <!--<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>
 				</template>
-      </el-table-column>
+      </el-table-column>-->
       <!-- 计划 -->
-      <el-table-column prop="planStatus" :label='$t("runCenter.table.oder.planStatus")' :show-overflow-tooltip="true" width="100px">
+      <!--<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>
+      </el-table-column>-->
       <!-- 排产 -->
       <el-table-column prop="schedulingStatus" :label='$t("runCenter.table.oder.schedulingStatus")' :show-overflow-tooltip="true" width="100px">
       	<template slot-scope="{ row }">
@@ -118,22 +120,43 @@
 					<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>
+      <!-- 生产中（数量） -->
+      <el-table-column prop="produceNum" :label='$t("runCenter.table.oder.produceNum")' :show-overflow-tooltip="true" width="80px"></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="auditStatus" :label='$t("runCenter.table.oder.auditStatus")' align="center" width="90px">
+      <!--<el-table-column prop="auditStatus" :label='$t("runCenter.table.oder.auditStatus")' align="center" width="90px">
       	<template slot-scope="{ row }">
 	      	<el-tag v-if="row.auditStatus == '1'" type="info">{{$t("common.audio.daiAudio")}}</el-tag>
 					<el-tag v-if="row.auditStatus == '2'" type="success">{{$t("common.audio.audioOk")}}</el-tag>
 					<el-tag v-if="row.auditStatus == '3'" type="danger">{{$t("common.audio.aduioFail")}}</el-tag>
 				</template>
-      </el-table-column>
+      </el-table-column>-->
       <!-- 启用状态 -->
-      <el-table-column prop="status" :label='$t("runCenter.table.oder.status")' :show-overflow-tooltip="true" width="100px">
+      <!--<el-table-column prop="status" :label='$t("runCenter.table.oder.status")' :show-overflow-tooltip="true" width="100px">
       	<template slot-scope="{ row }">
           <el-tag :type="row.status=='1' ? 'success' : 'danger'">
           	{{ row.status=='1' ? $t("common.status.valid") : $t("common.frozen") }}
           </el-tag>
         </template>
-      </el-table-column>
+      </el-table-column>-->
       <!-- 下单日期 -->
       <el-table-column prop="orderTime" :label='$t("runCenter.table.oder.orderTime")' width="160px"></el-table-column>
       <!-- 创建时间 -->

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

@@ -92,37 +92,37 @@
 				</template>
       </el-table-column>
       <!-- 生产节拍 -->
-      <el-table-column prop="rhythmType" :label='$t("runCenter.table.oder.rhythmType")' :show-overflow-tooltip="true" width="100px">
+      <!--<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>
 				</template>
-      </el-table-column>
+      </el-table-column>-->
       <!-- 计划 -->
-      <el-table-column prop="planStatus" :label='$t("runCenter.table.oder.planStatus")' :show-overflow-tooltip="true" width="100px">
+      <!--<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.planStatus.noStart")}}</el-tag>
 					<el-tag v-if="row.planStatus == '2'">{{$t("runCenter.common.planStatus.run")}}</el-tag>
 					<el-tag v-if="row.planStatus == '3'" type="success">{{$t("runCenter.common.planStatus.finished")}}</el-tag>
 				</template>
-      </el-table-column>
+      </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.oder.schedulingStatus")' :show-overflow-tooltip="true" width="100px">
       	<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>
 					<el-tag v-if="row.schedulingStatus == '3'" type="success">{{$t("runCenter.common.schedulingStatus.finished")}}</el-tag>
 				</template>
-      </el-table-column>
+      </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.oder.produceStatus")' :show-overflow-tooltip="true" width="100px">
       	<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>
 					<el-tag v-if="row.produceStatus == '2'">{{$t("runCenter.common.produceStatus.run")}}</el-tag>
 					<el-tag v-if="row.produceStatus == '3'" type="success">{{$t("runCenter.common.produceStatus.finished")}}</el-tag>
 				</template>
-      </el-table-column>
+      </el-table-column>-->
       <!-- 审核状态 -->
       <el-table-column prop="auditStatus" :label='$t("runCenter.table.oder.auditStatus")' align="center" width="90px">
       	<template slot-scope="{ row }">