Merge branch 'master' of ssh://192.168.5.5:29418/web/SRM

haoxuan

2023-08-25 641ce71b7b29c32105c82619fa7abfb9b2f38e3b

 src/components/makepager/TableCommonView.vue

@@ -33,7 +33,7 @@
              ? "--"
              : dateFormat("YYYY-mm-dd HH:MM:SS", scope.row[item.prop])
          }}</span>
          <span v-else-if="item.isClick && scope.row[item.prop]" class="sel-name" @click="selNameClick(scope.row)">{{
          <span v-else-if="item.isClick && scope.row[item.prop]" class="sel-name" @click="selCommonClick(scope.row)">{{
            scope.row[item.prop]
          }}</span>
          <span v-else-if="item.isFirst">{{ scope.row[item.prop] ? "是" : "否" }}</span>
@@ -119,7 +119,7 @@
          show: false,
          sumProp: [],
          mergeNumber: 1,
          totalName:'本页总计'
          totalName: "本页总计"
        }
      }
    }