NULL1222 3 giorni fa
parent
commit
46e4eed36c

+ 5 - 5
src/bgj/terminalWorkBillModule/modules/taskDetail/index.vue

@@ -49,14 +49,14 @@
                 prop="workname"
                 prop="workname"
                 :label="$t(`工序内容`)"
                 :label="$t(`工序内容`)"
                 show-overflow-tooltip
                 show-overflow-tooltip
-                width="160"
+                 min-width="160"
             >
             >
             </el-table-column>
             </el-table-column>
             <el-table-column
             <el-table-column
                 prop="remarks"
                 prop="remarks"
                 show-overflow-tooltip
                 show-overflow-tooltip
                 :label="$t(`操作说明`)"
                 :label="$t(`操作说明`)"
-                width="160"
+                min-width="180"
             >
             >
                 <template slot-scope="scope">
                 <template slot-scope="scope">
                     {{ scope.row.remarks ? scope.row.remarks : "--" }}
                     {{ scope.row.remarks ? scope.row.remarks : "--" }}
@@ -65,7 +65,7 @@
             <el-table-column
             <el-table-column
                 prop="fileupload"
                 prop="fileupload"
                 :label="$t(`上传附件`)"
                 :label="$t(`上传附件`)"
-                width="100"
+                width="120"
             >
             >
                 <template slot-scope="scope">
                 <template slot-scope="scope">
                     {{
                     {{
@@ -80,7 +80,7 @@
             <el-table-column
             <el-table-column
                 prop="additem"
                 prop="additem"
                 :label="$t(`是否添加物料`)"
                 :label="$t(`是否添加物料`)"
-                width="100"
+                width="120"
             >
             >
                 <template slot-scope="scope">
                 <template slot-scope="scope">
                     {{
                     {{
@@ -104,7 +104,7 @@
             <el-table-column
             <el-table-column
                 prop="panorama"
                 prop="panorama"
                 :label="$t(`上传全景影像`)"
                 :label="$t(`上传全景影像`)"
-                width="120"
+                width="140"
             >
             >
                 <template slot-scope="scope">
                 <template slot-scope="scope">
                     {{
                     {{

+ 22 - 0
src/bgj/workOrderManage/index.vue

@@ -123,6 +123,28 @@
             }}{{ $t(scope.data.column.data.county) }}
             }}{{ $t(scope.data.column.data.county) }}
           </span>
           </span>
         </div>
         </div>
+        <div v-else-if="scope.data.column.columnname == 'progress'">
+          <div style="display: flex; align-items: center">
+            <el-progress
+              status="success"
+              :percentage="
+                Math.round(
+                  (scope.data.column.data.progress_now /
+                    scope.data.column.data.progress_total) *
+                    100
+                )
+              "
+              :show-text="false"
+              style="flex: 1"
+            >
+            </el-progress>
+            <span style="margin-left: 10px">
+              {{ scope.data.column.data.progress_now }}/{{
+                scope.data.column.data.progress_total
+              }}
+            </span>
+          </div>
+        </div>
         <div v-else>
         <div v-else>
           {{
           {{
             scope.data.column.data[[scope.data.column.columnname]]
             scope.data.column.data[[scope.data.column.columnname]]