Zimo 5 цаг өмнө
parent
commit
666c07a7fa

+ 1 - 1
src/components/ZmTable/ZmTableColumn.vue

@@ -108,7 +108,7 @@ const getTextWidth = (text: string, fontSize = 14) => {
 
 const calculativeWidth = () => {
   const values = tableContext.data.value
-    .map((item) => props.realValue?.(item[props.prop]) || item[props.prop])
+    .map((item) => props.realValue?.(item) || item[props.prop])
     .filter(Boolean)
 
   let labelWidth = getTextWidth(bindProps.value.label || '') + 34

+ 6 - 0
src/views/pms/iotprojecttask/index.vue

@@ -177,6 +177,12 @@
           prop="deptNames"
           :width="columnWidths.deptNames"
         />
+        <el-table-column
+          label="施工状态"
+          align="center"
+          prop="statusLabel"
+          :width="columnWidths.deptNames"
+        />
         <!-- <el-table-column :label="t('project.technology')" align="center" prop="technique" :width="columnWidths.technique">
           <template #default="scope">
             <dict-tag :type="DICT_TYPE.PMS_PROJECT_TECHNOLOGY" :value="scope.row.technique" />

+ 1 - 0
src/views/pms/iotrddailyreport/index.vue

@@ -415,6 +415,7 @@ onMounted(() => {
                   <span v-else class="text-gray-300">-</span>
                 </template>
               </zm-table-column>
+              <zm-table-column prop="constructionBrief" label="当日施工简报" />
               <zm-table-column prop="nextPlan" label="下步工作计划" />
               <zm-table-column label="当日">
                 <zm-table-column prop="cumulativeWorkingWell" label="施工井" />

+ 1 - 0
src/views/pms/iotrydailyreport/ry-table.vue

@@ -378,6 +378,7 @@ function handleCurrentChange(val: number) {
                 <span v-else class="text-gray-300">-</span>
               </template>
             </zm-table-column>
+            <zm-table-column prop="constructionBrief" label="当日施工简报" />
             <zm-table-column prop="contractName" label="项目" />
             <zm-table-column prop="drillingWorkingTime" label="进尺工作时间(H)" />
             <zm-table-column prop="otherProductionTime" label="其它生产时间(H)" />

+ 1 - 0
src/views/pms/iotrydailyreport/ry-xj-table.vue

@@ -433,6 +433,7 @@ function handleCurrentChange(val: number) {
                 <span v-else class="text-gray-300">-</span>
               </template>
             </zm-table-column>
+            <zm-table-column prop="constructionBrief" label="当日施工简报" />
             <zm-table-column prop="contractName" label="项目" />
             <zm-table-column prop="totalStaffNum" label="全员数量" />
             <zm-table-column