Merge branch 'master' of http://132.232.92.186:3000/XinXiBu/oa-system

src/components/MCR/MarketCustomerResourcesHome.vue

@@ -140,12 +140,24 @@
                     <el-table-column prop="client" label="单位" width="230">
                     </el-table-column>
                     <el-table-column prop="contact" label="联系人" width="90">
+                        <template slot-scope="scope">
+                            <span>{{scope.row.contact==0?'-':scope.row.contact}}</span>
+                        </template>
                     </el-table-column>
                     <el-table-column prop="job" label="职位" width="110">
+                        <template slot-scope="scope">
+                            <span>{{scope.row.job==0?'-':scope.row.job}}</span>
+                        </template>
                     </el-table-column>
                     <el-table-column prop="telephone" label="手机号" width="120">
+                        <template slot-scope="scope">
+                            <span>{{scope.row.telephone==0?'-':scope.row.telephone}}</span>
+                        </template>
                     </el-table-column>
                     <el-table-column prop="phone" label="座机号" width="120">
+                        <template slot-scope="scope">
+                            <span>{{scope.row.phone==0?'-':scope.row.phone}}</span>
+                        </template>
                     </el-table-column>
                     <el-table-column prop="location" label="所在区域" width="130">
                     </el-table-column>
@@ -522,7 +534,7 @@ export default {
         },
         pageload() {
             var that = this;
-            if (this.userId == 21 || this.userId == 95) {
+            if (this.userId == 21 || this.userId == 95|| this.userId == 380) {
                 this.isSelect = false;
             }
             that.pageloadData.operationUserId = that.userId

src/components/OP/EntryDetails.vue

@@ -20,7 +20,7 @@
                         </el-option>
                     </el-select>
                 </div>
-                <div v-if="isSave" class="Entry-head-li">
+     3            <div v-if="isSave" class="Entry-head-li">
                     <!-- <el-button type="primary">计算费用</el-button> -->
                     <el-button @click="NationalTravelFeeImportReceivables" type="primary">导出到收款账单</el-button>
                     <el-button @click="cleanout" type="primary">全部清空</el-button>