feat: update production reporting workflows

src/views/PlanManagement/SelfMakePlando/index.vue

@@ -197,6 +197,12 @@
                     @click="getitemdata(scope.row.订单号)">查看</el-button>
                 </template>
               </el-table-column>
+              <el-table-column align="center" label="历史工时" width="100">
+                <template slot-scope="scope">
+                  <el-button type="text" size="mini"
+                    @click="getWorkHour(scope.row.产品编码)">查看</el-button>
+                </template>
+              </el-table-column>
               <el-table-column align="center" label="图纸" width="200">
                 <template slot-scope="scope">
                   <el-button v-if="scope.row.worker !=0"
@@ -372,6 +378,95 @@
           </el-table>
         </el-card>
     </el-dialog>
+    <el-dialog :visible.sync="dialogcasual2" title="历史工时" center style="min-height: 300px;" width="1400px">
+        <el-card style="height: 550px">
+          <el-table
+            :data="itemdata"
+            :height="'55vh'"
+            border
+            size="mini"
+            style="margin-top: 20px; width: 95%;"
+            >
+            <el-table-column prop="taskDescription" label="任务描述" min-width="380" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <span :class="{ 'bold-text': scope.row.level === 1 }">{{ scope.row.taskDescription || '' }}</span>
+              </template>
+            </el-table-column>
+
+            <el-table-column prop="productionOrderNo" label="生产订单号" width="130" align="center" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ scope.row.productionOrderNo || '' }}
+              </template>
+            </el-table-column>
+
+            <el-table-column prop="station" label="工位" width="110" align="center" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ scope.row.station || '' }}
+              </template>
+            </el-table-column>
+
+            <el-table-column prop="reportWorkHours" label="报工工时" width="100" align="center">
+              <template slot-scope="scope">
+                <span :class="{ 'bold-text': scope.row.level <= 2 }">{{ scope.row.reportWorkHours || '' }}</span>
+              </template>
+            </el-table-column>
+
+            <el-table-column prop="auxiliaryWorkHours" label="辅助工时" width="100" align="center">
+              <template slot-scope="scope">
+                <span :class="{ 'bold-text': scope.row.level <= 2 }">{{ scope.row.auxiliaryWorkHours || '' }}</span>
+              </template>
+            </el-table-column>
+
+            <el-table-column prop="reportFinishQty" label="报工完成数" width="110" align="center">
+              <template slot-scope="scope">
+                <span :class="{ 'bold-text': scope.row.level <= 2 }">{{ scope.row.reportFinishQty || '' }}</span>
+              </template>
+            </el-table-column>
+
+            <el-table-column prop="auxiliaryFinishQty" label="辅助完成数" width="110" align="center">
+              <template slot-scope="scope">
+                <span :class="{ 'bold-text': scope.row.level <= 2 }">{{ scope.row.auxiliaryFinishQty || '' }}</span>
+              </template>
+            </el-table-column>
+
+            <el-table-column prop="totalWorkHours" label="合计工时" width="100" align="center">
+              <template slot-scope="scope">
+                <span :class="{ 'bold-text': scope.row.level <= 2 }">{{ scope.row.totalWorkHours || '' }}</span>
+              </template>
+            </el-table-column>
+
+            <el-table-column prop="clampingTime" label="装夹时间" width="100" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.clampingTime || '' }}
+              </template>
+            </el-table-column>
+
+            <el-table-column prop="programTime" label="程序时间" width="100" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.programTime || '' }}
+              </template>
+            </el-table-column>
+
+            <el-table-column prop="settlementReportPieceHours" label="结算报工单件工时" width="140" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.settlementReportPieceHours || '' }}
+              </template>
+            </el-table-column>
+
+            <el-table-column prop="settlementAuxiliaryPieceHours" label="结算辅助单件工时" width="140" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.settlementAuxiliaryPieceHours || '' }}
+              </template>
+            </el-table-column>
+
+            <el-table-column prop="operatorNames" label="操作人" width="180" align="center" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ scope.row.operatorNames || '' }}
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-card>
+    </el-dialog>
     <!-- 图纸弹框 -->
     <el-dialog :visible.sync="seeVisible" title="图纸" center width="1200px" overflow="scroll" >
         <div id="el-dialog__body" style="min-height: 500px;"></div>
@@ -503,7 +598,8 @@ export default {
       },
       currentTime: "",
       itemdata:[],
-      dialogcasual:false
+      dialogcasual:false,
+      dialogcasual2:false
     }
   },
   computed: {
@@ -698,6 +794,25 @@ export default {
         })
       })
     },
+    getWorkHour(item){
+      var param = []
+      this.dialogcasual2  = true
+      this.itemdata = []
+      param.push(["产品编码",item])
+      param.push(["合同号",''])
+      param.push(["订单号",''])
+      param.push(["工位",''])
+      param.push(["开始日期",''])
+      param.push(["结束日期",''])
+      param.push(["数据条数",100])
+      var Data = this.CreateData('11', '生产管理_结算工时_查询',param)
+      this.ExecDatabase(Data).then(response => {
+        response.data.forEach(element => {
+          if(element.Level == 2)
+            this.itemdata.push(element)
+        })
+      })
+    },
     getCurrentTime() {
       const now = new Date();
       const year = now.getFullYear();

src/views/PlanManagement/SelfMakePlandone/index.vue

@@ -180,6 +180,12 @@
                     @click="getitemdata(scope.row.订单号)">查看</el-button>
                 </template>
               </el-table-column>
+              <el-table-column align="center" label="历史工时" width="100">
+                <template slot-scope="scope">
+                  <el-button type="text" size="mini"
+                    @click="getWorkHour(scope.row.产品编码)">查看</el-button>
+                </template>
+              </el-table-column>
               <el-table-column align="center" prop="备注" label="备注" width="150" show-overflow-tooltip/>
               <el-table-column align="center" prop="行文本备注" label="工艺备注" width="120" />
               <el-table-column align="center" prop="任务概述" label="工艺说明" width="120" />
@@ -334,7 +340,95 @@
           </el-table>
         </el-card>
     </el-dialog>
-    
+    <el-dialog :visible.sync="dialogcasual2" title="历史工时" center style="min-height: 300px;" width="1400px">
+        <el-card style="height: 550px">
+          <el-table
+            :data="itemdata"
+            :height="'55vh'"
+            border
+            size="mini"
+            style="margin-top: 20px; width: 95%;"
+            >
+            <el-table-column prop="taskDescription" label="任务描述" min-width="380" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <span :class="{ 'bold-text': scope.row.level === 1 }">{{ scope.row.taskDescription || '' }}</span>
+              </template>
+            </el-table-column>
+
+            <el-table-column prop="productionOrderNo" label="生产订单号" width="130" align="center" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ scope.row.productionOrderNo || '' }}
+              </template>
+            </el-table-column>
+
+            <el-table-column prop="station" label="工位" width="110" align="center" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ scope.row.station || '' }}
+              </template>
+            </el-table-column>
+
+            <el-table-column prop="reportWorkHours" label="报工工时" width="100" align="center">
+              <template slot-scope="scope">
+                <span :class="{ 'bold-text': scope.row.level <= 2 }">{{ scope.row.reportWorkHours || '' }}</span>
+              </template>
+            </el-table-column>
+
+            <el-table-column prop="auxiliaryWorkHours" label="辅助工时" width="100" align="center">
+              <template slot-scope="scope">
+                <span :class="{ 'bold-text': scope.row.level <= 2 }">{{ scope.row.auxiliaryWorkHours || '' }}</span>
+              </template>
+            </el-table-column>
+
+            <el-table-column prop="reportFinishQty" label="报工完成数" width="110" align="center">
+              <template slot-scope="scope">
+                <span :class="{ 'bold-text': scope.row.level <= 2 }">{{ scope.row.reportFinishQty || '' }}</span>
+              </template>
+            </el-table-column>
+
+            <el-table-column prop="auxiliaryFinishQty" label="辅助完成数" width="110" align="center">
+              <template slot-scope="scope">
+                <span :class="{ 'bold-text': scope.row.level <= 2 }">{{ scope.row.auxiliaryFinishQty || '' }}</span>
+              </template>
+            </el-table-column>
+
+            <el-table-column prop="totalWorkHours" label="合计工时" width="100" align="center">
+              <template slot-scope="scope">
+                <span :class="{ 'bold-text': scope.row.level <= 2 }">{{ scope.row.totalWorkHours || '' }}</span>
+              </template>
+            </el-table-column>
+
+            <el-table-column prop="clampingTime" label="装夹时间" width="100" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.clampingTime || '' }}
+              </template>
+            </el-table-column>
+
+            <el-table-column prop="programTime" label="程序时间" width="100" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.programTime || '' }}
+              </template>
+            </el-table-column>
+
+            <el-table-column prop="settlementReportPieceHours" label="结算报工单件工时" width="140" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.settlementReportPieceHours || '' }}
+              </template>
+            </el-table-column>
+
+            <el-table-column prop="settlementAuxiliaryPieceHours" label="结算辅助单件工时" width="140" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.settlementAuxiliaryPieceHours || '' }}
+              </template>
+            </el-table-column>
+
+            <el-table-column prop="operatorNames" label="操作人" width="180" align="center" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ scope.row.operatorNames || '' }}
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-card>
+    </el-dialog>
   </div>
 </template>
 
@@ -351,6 +445,7 @@ export default {
   data() {
     return {
       dialogcasual:false,
+      dialogcasual2:false,
       activeTab: 'form',
       doneactiveTab: 'form',
       orderNo: '',
@@ -613,6 +708,25 @@ export default {
         })
       })
     },
+    getWorkHour(item){
+      var param = []
+      this.dialogcasual2  = true
+      this.itemdata = []
+      param.push(["产品编码",item])
+      param.push(["合同号",''])
+      param.push(["订单号",''])
+      param.push(["工位",''])
+      param.push(["开始日期",''])
+      param.push(["结束日期",''])
+      param.push(["数据条数",100])
+      var Data = this.CreateData('11', '生产管理_结算工时_查询',param)
+      this.ExecDatabase(Data).then(response => {
+        response.data.forEach(element => {
+          if(element.Level == 2)
+            this.itemdata.push(element)
+        })
+      })
+    },
     getCurrentTime() {
       const now = new Date();
       const year = now.getFullYear();

src/views/PlanManagement/TimelyKitTrackingResult/index.vue

@@ -396,7 +396,12 @@ export default {
       return this.getProcessBaseClass(process)
     },
     getRouteProcessName(process) {
-      return String(process.工序名称 || '')
+      const name = String(process.工序名称 || '')
+      const assignee = String(process.指派对象 || '')
+      if (!assignee || name.includes(`(${assignee})`) || name.includes(`（${assignee}）`)) {
+        return name
+      }
+      return `${name}(${assignee})`
     },
     escapeProcessHtml(value) {
       return String(value == null ? '' : value)