Merge branch 'crm_15.9' into debug

src/views/custom_manage/contacts/mutualList.vue

@@ -49,9 +49,13 @@
       <template v-if="activeName != 4">
         <el-table style="margin-top: 20px" :data="tableData" v-loading="tableLoading" element-loading-text="数据加载中..." border>
           <el-table-column v-for="item in tableColumsList" :key="item.label" :label="item.label" :width="item.widthsty" :min-width="item.minwidthsty" align="center">
-            <template slot-scope="{ row }" >
+            <template slot-scope="{ row }">
               <span v-if="item.key !== 'LabelKeyWord'" @click="handleRowClick(row, item.key)" :style="handleRowStyle(item.key)">{{ handleRowContent(row, item.key) }}</span>
-              <div v-else>  <el-tag style="margin: 5px" type="info" size="small" v-for="tag in row.LabelKeyWord.split(',')" :key="tag">{{ tag }}</el-tag></div>
+              <div v-else>
+                <template v-if="row.LabelKeyWord">
+                  <el-tag style="margin: 5px" type="info" size="small" v-for="tag in row.LabelKeyWord.split(',')" :key="tag">{{ tag }}</el-tag>
+                </template>
+              </div>
             </template>
           </el-table-column>
           <div slot="empty" style="padding: 20px 0">

src/views/custom_manage/contacts/organizationList.vue

@@ -56,7 +56,11 @@
           <el-table-column v-for="item in tableColumsList" :key="item.label" :label="item.label" :width="item.widthsty" :min-width="item.minwidthsty" align="center">
             <template slot-scope="{ row }">
               <span v-if="item.key !== 'LabelKeyWord'" @click="handleRowClick(row, item.key)" :style="handleRowStyle(item.key)">{{ handleRowContent(row, item.key) }}</span>
-              <div v-else>  <el-tag style="margin: 5px" type="info" size="small" v-for="tag in row.LabelKeyWord.split(',')" :key="tag">{{ tag }}</el-tag></div>
+              <div v-else>
+                <template v-if="row.LabelKeyWord">
+                  <el-tag style="margin: 5px" type="info" size="small" v-for="tag in row.LabelKeyWord.split(',')" :key="tag">{{ tag }}</el-tag>
+                </template>
+              </div>
             </template>
           </el-table-column>
           <div slot="empty" style="padding: 20px 0">

src/views/custom_manage/contacts/wholeOrganization.vue

@@ -62,7 +62,11 @@
           <el-table-column v-for="item in tableColumsList" :key="item.label" :label="item.label" :width="item.widthsty" :min-width="item.minwidthsty" align="center">
             <template slot-scope="{ row }">
               <span v-if="item.key !== 'LabelKeyWord'" @click="handleRowClick(row, item.key)" :style="handleRowStyle(item.key)">{{ handleRowContent(row, item.key) }}</span>
-              <div v-else>  <el-tag style="margin: 5px" type="info" size="small" v-for="tag in row.LabelKeyWord.split(',')" :key="tag">{{ tag }}</el-tag></div>
+              <div v-else>
+                <template v-if="row.LabelKeyWord">
+                  <el-tag style="margin: 5px" type="info" size="small" v-for="tag in row.LabelKeyWord.split(',')" :key="tag">{{ tag }}</el-tag>
+                </template>
+              </div>
             </template>
           </el-table-column>
           <div slot="empty" style="padding: 20px 0">

src/views/dataReport_manage/components/ServiceDetailsDlg.vue

@@ -4,7 +4,7 @@
       <el-table-column align="center" prop="Content" label="服务内容"> </el-table-column>
       <el-table-column align="center" prop="ServeTypeName" label="服务类型" width="120"> </el-table-column>
       <el-table-column align="center" prop="address" label="主题标签">
-        <template slot-scope="{ row }">
+        <template slot-scope="{ row }" v-if="row.Tag">
           <el-tag style="margin: 5px" type="info" size="small" v-for="item in row.Tag.split(',')" :key="item">{{ item }}</el-tag>
         </template>
       </el-table-column>
@@ -88,7 +88,9 @@ export default {
     },
     // 关闭弹框
     handleClose() {
+      this.page_no = 1;
       this.$emit("update:isServiceDetailsShow", false);
+      this.$emit("update:dlgForm", {});
     },
     // 时间的计算
     getWeekRange(offset) {