Merge remote-tracking branch 'origin/develop' into develop

2021-09-23 09:49:52 +08:00
parent 16c470132a 1edffa1239
commit 43368e9617
3 changed files with 4 additions and 4 deletions
@@ -117,7 +117,7 @@
              <span>{{ scope.row.creatTime ? $moment(scope.row.creatTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
            </template>
          </el-table-column>
-          <el-table-column
+          <!-- <el-table-column
            prop="overTime"
            label="完成日期"
            align="center"
@@ -126,7 +126,7 @@
            <template slot-scope="scope">
              <span>{{ scope.row.overTime ? $moment(scope.row.overTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
            </template>
-          </el-table-column>
+          </el-table-column> -->
          <el-table-column :label="$t('m.operation')" align="center" width="50">
            <template slot-scope="scope">
              <div @click.stop style="display: inline-block">
@@ -267,7 +267,7 @@
                <span v-else>{{ textStatusMap[scope.row.textStatus] }}</span>
              </template>
            </el-table-column>
-            <el-table-column label="操作" align="center" width="50" fixed="right">
+            <el-table-column label="操作" align="center" width="50">
              <template slot-scope="scope">
                <div @click.stop style="display: inline-block">
                  <el-dropdown trigger="click" @command="handleCommand">
@@ -275,7 +275,7 @@
                <span v-else style="color: #333333">{{ textStatusMap[scope.row.textStatus] }}</span>
              </template>
            </el-table-column>
-            <el-table-column label="操作" align="center" width="50" fixed="right">
+            <el-table-column label="操作" align="center" width="50" >
              <template slot-scope="scope">
                <div @click.stop style="display: inline-block">
                  <el-dropdown trigger="click" @command="handleCommand">