Bladeren bron

跳转二维码列表。财务报表的表头,填写日报的工号

Lijy 3 weken geleden
bovenliggende
commit
8512ced5dd

+ 11 - 1
fhKeeper/formulahousekeeper/timesheet/src/views/corpreport/list.vue

@@ -1579,10 +1579,20 @@
             <el-table-column prop="extraField4" align="center" label="工单号"></el-table-column>
             <el-table-column prop="extraField5" align="center" label="行号"></el-table-column>
             <el-table-column label="车间组装/维修工时(h)" align="center">
-              <el-table-column prop="maintanceTime" align="center" label="组装/维修工时(h)" width="130px">
+              <!-- <el-table-column prop="maintanceTime" align="center" label="组装/维修工时(h)" width="130px">
                 <template slot-scope="scope">
                   <el-link type="primary" :underline="false" @click="adjustWorkingHours(scope.row, '组装/维修工时',scope.row.maintanceTime,'maintanceTime')">{{ scope.row.maintanceTime }}</el-link>
                 </template>
+              </el-table-column> -->
+              <el-table-column prop="composeTime" align="center" label="组装工时(h)" width="120px">
+                <template slot-scope="scope">
+                  <el-link type="primary" :underline="false" @click="adjustWorkingHours(scope.row, '组装工时',scope.row.composeTime,'composeTime')">{{ scope.row.composeTime }}</el-link>
+                </template>
+              </el-table-column>
+              <el-table-column prop="repairTime" align="center" label="维修工时(h)" width="120px">
+                <template slot-scope="scope">
+                  <el-link type="primary" :underline="false" @click="adjustWorkingHours(scope.row, '维修工时',scope.row.repairTime,'repairTime')">{{ scope.row.repairTime }}</el-link>
+                </template>
               </el-table-column>
               <el-table-column prop="debugTime" align="center" label="调试工时(h)" width="120px">
                 <template slot-scope="scope">

+ 1 - 1
fhKeeper/formulahousekeeper/timesheet/src/views/project/qrCodeManagement.vue

@@ -25,7 +25,7 @@
       </div>
     </di>
     <div class="qrCodeManagement-con">
-      <el-table :data="tableData" style="width: 100%;height: 100%" border @selection-change="handleSelectionChange" :loading="tableLoading">
+      <el-table :data="tableData" style="width: 100%" height="58vh" border @selection-change="handleSelectionChange" :loading="tableLoading">
         <el-table-column type="selection" width="55" />
         <el-table-column prop="projectId" label="项目号" />
         <el-table-column prop="projectName" label="项目名" />

+ 6 - 0
fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -4984,6 +4984,9 @@
                             this.workForm.domains[index].extraField4 = ''
                             this.workForm.domains[index].extraField5 = ''
                         }
+                        if((res.data.orderIds || []).length > 0) {
+                            this.workForm.domains[index].extraField4 = res.data.orderIds[0]
+                        }
                         this.workForm.domains[index].reportExtraField4List = res.data.orderIds || []
                         this.workForm.domains[index].reportExtraField5List = res.data.lines || []
                         this.$forceUpdate();
@@ -6902,6 +6905,9 @@
                     if (res.code == "ok") {
                         this.zhoBao.reportExtraField4List = res.data.orderIds || []
                         this.zhoBao.reportExtraField5List = res.data.lines || []
+                        if((res.data.orderIds || []).length > 0) {
+                            this.zhoBao.extraField4 = res.data.orderIds[0]
+                        }
                         console.log(this.zhoBao, '<===== this.zhoBao')
                         this.$forceUpdate();
                     } 

+ 3 - 0
fhKeeper/formulahousekeeper/timesheet_h5/src/views/edit/index.vue

@@ -1178,6 +1178,9 @@ export default {
                             this.form.domains[index == null ? this.clickIndex : index].extraField4 = ''
                             this.form.domains[index == null ? this.clickIndex : index].extraField5 = ''
                         }
+                        if((res.data.orderIds || []).length > 0) {
+                            this.form.domains[index == null ? this.clickIndex : index].extraField4 = res.data.orderIds[0]
+                        }
                         this.form.domains[index == null ? this.clickIndex : index].reportExtraField4List = res.data.orderIds || []
                         this.form.domains[index == null ? this.clickIndex : index].reportExtraField5List = res.data.lines || []
                     }