是否显示label, 添加企业名称

jwtech-admin-page/src/views/marketSupervision/InformationQuery/goodCredit/index.vue

@@ -154,6 +154,19 @@
         align="left"
         prop="remark"
         min-width="120"
+      >
+
+        <template slot-scope="scope">
+            <span v-if="scope.row.remark == '1'">是</span>
+            <span v-else-if="scope.row.remark == '0'">否</span>
+            <span v-else>-</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="企业名称"
+        align="left"
+        prop="enterpriseName"
+        min-width="120"
       />
       <el-table-column
         label="申报管理区划"
@@ -655,10 +668,11 @@ import { getFileStream } from "@/api/system/upload";
 import { getAreasData } from "@/api/areas/index";
 import { regionData, codeToText, TextToCode } from "element-china-area-data";
 import Div from "../../../build/div/index.vue";
+import Template from "@/views/message/options/template/index.vue";
 
 export default {
   name: "goodCredit",
-  components: {Div},
+  components: {Template, Div},
   data() {
     return {
       areasOptionProps: {

jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/newGoodCredit.vue

@@ -24,8 +24,9 @@
         min-width="120"
       >
         <template slot-scope="scope">
-          <span v-if="scope.row.remark">是</span>
+          <span v-if="scope.row.remark == '1'">是</span>
-          <span v-else>否</span>
+          <span v-else-if="scope.row.remark == '0'">否</span>
+          <span v-else>-</span>
         </template>
       </el-table-column>
       <el-table-column

jwtech-admin-page/src/views/projectStatistics/peasantWorkers/index.vue

@@ -393,10 +393,10 @@ export default {
       totalDataType: [
         { lab: "投资总金额（万元）", key: "total", val: 0 },
         { lab: "合同总金额（万元）", key: "conPay", val: 0 },
-        { lab: "农民工总数（个）", key: "worksTotal", val: 0 },
+        { lab: "农民工总数（人）", key: "worksTotal", val: 0 },
-        { lab: "农民工在场数（个）", key: "enterNum", val: 0 },
+        { lab: "农民工在场数（人）", key: "enterNum", val: 0 },
-        { lab: "农民工退场数（个）", key: "exitNum", val: 0 },
+        { lab: "农民工退场数（人）", key: "exitNum", val: 0 },
-        { lab: "发放工资总数（元）", key: "payTotal", val: 0 },
+        { lab: "累计发放工资总数（元）", key: "payTotal", val: 0 },
         { lab: "总拖欠工资（元）", key: "unPayTotal", val: 0 },
       ],
     };