Merge branch 'master' of http://114.132.189.42:9002/r/zs-mes-before

Fixiaobai

2023-11-14 21d976db1dcdf9ea4b6c300c159a654a7cd62b63

 src/views/common/ztt-table.vue

@@ -327,10 +327,11 @@
              <template v-else>
                <template v-if="!item.render">
                  <template v-if="item.formatter">
                    <span v-if="item.isTag">
                      <el-tag type="success">aaa</el-tag>
                    </span>
                    <div v-if="item.isTag" style="margin: 2px;text-align: center;">
                      <el-tag :type="scope.row[item.prop]==0?'success':'info'">{{item.formatter(scope.row, item, scope.row[item.prop])}}</el-tag>
                    </div>
                    <span
                      v-else
                      v-html="
                        item.formatter(scope.row, item, scope.row[item.prop])
                      "