暂存画像样式调整

.idea/stylesheetLinters/stylelint.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="StylelintConfiguration" allowJS="true" />
+</project>

src/HDrpManagement/projectData/index.vue

@@ -2952,7 +2952,7 @@ export default {
           interactions: [{ type: 'element-selected' },{ type: 'element-active' }],
         });
         this.projectFllowMap.on('element:click',(v) => {
-          if (v.data.data.value != this.fllowTableParam.content.where.isfollowup) {
+          if (v.data.data.key != this.fllowTableParam.content.where.isfollowup) {
             this.fllowTableParam.content.where.isfollowup = v.data.data.key
             this.fllowTableParam.content.pageNumber = 1
             this.$refs.projectFllowTable.listData()

src/HDrpManagement/salerPortrait/modules/detail.vue

@@ -47,30 +47,30 @@
           <div class="Mcontainer-header__right">
             <el-descriptions class="margin-top">
               <el-descriptions-item :label="$t('编号')">{{
-                baseInfo.hrcode
+                baseInfo.hrcode?baseInfo.hrcode:'--'
               }}</el-descriptions-item>
               <el-descriptions-item :label="$t('部门')">{{
-                baseInfo.depname
+                baseInfo.depname?baseInfo.depname:'--'
               }}</el-descriptions-item>
               <el-descriptions-item :label="$t('手机号')">{{
-                baseInfo.phonenumber
+                baseInfo.phonenumber?baseInfo.phonenumber:'--'
               }}</el-descriptions-item>
               <el-descriptions-item :label="$t('营销区域')">
-                {{ baseInfo.areaname }}</el-descriptions-item
+                {{ baseInfo.areaname?baseInfo.areaname:'--' }}</el-descriptions-item
               >
               <el-descriptions-item :label="$t(`登录账号`)">{{
-                baseInfo.accountno
+                baseInfo.accountno?baseInfo.accountno:'--'
               }}</el-descriptions-item>
               <el-descriptions-item :label="$t('职位')">{{
-                baseInfo.position
+                baseInfo.position?baseInfo.position:'--'
               }}</el-descriptions-item>
               <el-descriptions-item :label="$t(`邮箱`)">
-                {{ baseInfo.email }}</el-descriptions-item
+                {{ baseInfo.email?baseInfo.email:'--' }}</el-descriptions-item
               >
               <el-descriptions-item :label="$t(`最低授权折扣`)"
                 ><span
                   style="color: #e85b5b; font-size: 16px; font-weight: bold"
-                  >{{ baseInfo.discountrate * 100 + "%" }}</span
+                  >{{ baseInfo.discountrate?baseInfo.discountrate * 100 + "%":'--' }}</span
                 ></el-descriptions-item
               >
               <el-descriptions-item :label="$t('状态')">
@@ -421,7 +421,7 @@
                               "￥"
                             )
                           : $t(scope.data.data[scope.data.columnname]) == 0
-                          ? "￥ 0.00"
+                          ? "￥0.00"
                           : "--"
                       }}</span
                     >
@@ -442,7 +442,7 @@
                               "￥"
                             )
                           : $t(scope.data.data[scope.data.columnname]) == 0
-                          ? "￥ 0.00"
+                          ? "￥0.00"
                           : "--"
                       }}</span
                     >
@@ -463,7 +463,7 @@
                               "￥"
                             )
                           : $t(scope.data.data[scope.data.columnname]) == 0
-                          ? "￥ 0.00"
+                          ? "￥0.00"
                           : "--"
                       }}</span
                     >
@@ -484,7 +484,7 @@
                               "￥"
                             )
                           : $t(scope.data.data[scope.data.columnname]) == 0
-                          ? "￥ 0.00"
+                          ? "￥0.00"
                           : "--"
                       }}</span
                     >
@@ -498,12 +498,15 @@
                             "￥"
                           )
                         : $t(scope.data.data[scope.data.columnname]) == 0
-                        ? "￥ 0.00"
+                        ? "￥0.00"
                         : "--"
                     }}
                   </div>
+                  <div v-else-if="scope.data.columnname == 'status'" :style="tool.getStatusColor(scope.data.data[scope.data.columnname])">
+                    {{$t(scope.data.data[scope.data.columnname])}}
+                  </div>
                   <div v-else>
-                    {{ $t(scope.data.data[scope.data.columnname]) }}
+                    {{ scope.data.data[scope.data.columnname]?$t(scope.data.data[scope.data.columnname]):'--' }}
                   </div>
                 </template>
               </pageTable>
@@ -585,27 +588,16 @@
               >
                 <template v-slot:custom="scope">
                   <div v-if="scope.data.columnname == 'costofconstruction'">
-                    {{
-                      scope.data.data.costofconstruction &&
-                      tool.formatAmount(
-                        scope.data.data.costofconstruction || 0,
-                        2,
-                        "￥"
-                      )
-                    }}
+                    {{scope.data.data.costofconstruction?tool.formatAmount(scope.data.data.costofconstruction,2,'￥'):'￥0.00'}}
                   </div>
                   <div v-else-if="scope.data.columnname == 'totalinvestment'">
-                    {{
-                      scope.data.data.totalinvestment &&
-                      tool.formatAmount(
-                        scope.data.data.totalinvestment || 0,
-                        2,
-                        "￥"
-                      )
-                    }}
+                    {{scope.data.data.totalinvestment?tool.formatAmount(scope.data.data.totalinvestment,2,'￥'):'￥0.00'}}
+                  </div>
+                  <div v-else-if="scope.data.columnname == 'status'" :style="tool.getStatusColor(scope.data.data[scope.data.columnname])">
+                    {{scope.data.data[scope.data.columnname]}}
                   </div>
                   <div v-else>
-                    {{ $t(scope.data.data[scope.data.columnname]) }}
+                    {{ scope.data.data[scope.data.columnname]?$t(scope.data.data[scope.data.columnname]):'--' }}
                   </div>
                 </template>
               </pageTable>
@@ -626,7 +618,7 @@
                       white-space: normal;
                     "
                   >
-                    {{ $t(scope.data.data[scope.data.columnname]) }}
+                    {{ scope.data.data[scope.data.columnname]?$t(scope.data.data[scope.data.columnname]):'--' }}
                   </div>
                 </template>
               </pageTable>
@@ -702,23 +694,35 @@
               >
                 <template v-slot:custom="scope">
                   <div v-if="scope.data.columnname == 'sys_tag'">
-                    <el-tag
-                      size="mini"
-                      v-for="(item, index) in scope.data.data.sys_tag"
-                      :key="index"
+                    <div v-if="scope.data.data.sys_tag.length > 0">
+                      <el-tag
+                          size="mini"
+                          v-for="(item, index) in scope.data.data.sys_tag"
+                          :key="index"
                       >{{ $t(item) }}</el-tag
-                    >
+                      >
+                    </div>
+                    <div v-else>--</div>
                   </div>
                   <div v-else-if="scope.data.columnname == 'industry'">
-                    <el-tag
-                      size="mini"
-                      v-for="(item, index) in scope.data.data.industry"
-                      :key="index"
+                    <div v-if="scope.data.data.industry.length > 0">
+                      <el-tag
+                          size="mini"
+                          v-for="(item, index) in scope.data.data.industry"
+                          :key="index"
                       >{{ $t(item) }}</el-tag
-                    >
+                      >
+                    </div>
+                    <div v-else>--</div>
+                  </div>
+                  <div v-else-if="scope.data.columnname == 'tradingstatus'" :style="tool.getStatusColor(scope.data.data[scope.data.columnname])">
+                    {{scope.data.data[scope.data.columnname]}}
+                  </div>
+                  <div v-else-if="scope.data.columnname == 'status'" :style="tool.getStatusColor(scope.data.data[scope.data.columnname])">
+                    {{scope.data.data[scope.data.columnname]}}
                   </div>
                   <div v-else>
-                    {{ $t(scope.data.data[scope.data.columnname]) }}
+                    {{ scope.data.data[scope.data.columnname]?$t(scope.data.data[scope.data.columnname]):'--' }}
                   </div>
                 </template>
               </pageTable>
@@ -851,24 +855,20 @@
                     >
                   </div>
                   <div v-else-if="scope.data.columnname == 'signamount_due'">
-                    {{
-                      scope.data.data.signamount_due &&
-                      tool.formatAmount(
-                        scope.data.data.signamount_due || 0,
-                        2,
-                        "￥"
-                      )
-                    }}
+                    {{scope.data.data.signamount_due?tool.formatAmount(scope.data.data.signamount_due,2,"￥"):'￥0.00'}}
                   </div>
                   <div v-else-if="scope.data.columnname == 'scale'">
                     {{
                       scope.data.data.scalc
                         ? $t(scope.data.data.scale) + $t(scope.data.data.unitname)
-                        : ""
+                        : "--"
                     }}
                   </div>
+                  <div v-else-if="scope.data.columnname == 'status'" :style="tool.getStatusColor(scope.data.data[scope.data.columnname])">
+                    {{scope.data.data[scope.data.columnname]}}
+                  </div>
                   <div v-else>
-                    {{ $t(scope.data.data[scope.data.columnname]) }}
+                    {{ scope.data.data[scope.data.columnname]?$t(scope.data.data[scope.data.columnname]):'--' }}
                   </div>
                 </template>
               </pageTable>
@@ -950,20 +950,17 @@
                 :custom="true"
               >
                 <template v-slot:custom="scope">
-                  <div v-if="scope.data.columnname == 'specialoffer'">
+                  <div v-if="scope.data.columnname == 'specialoffer'" :style="{color:scope.data.data.specialoffer?tool.getStatusColor('是',true):tool.getStatusColor('否',true)}">
                     {{ scope.data.data.specialoffer ? $t("是") :  $t("否") }}
                   </div>
-                  <div v-else-if="scope.data.columnname == 'sumamount'">
-                    {{
-                      scope.data.data.sumamount &&
-                      tool.formatAmount(scope.data.data.sumamount || 0, 2, "￥")
-                    }}
+                  <div v-else-if="scope.data.columnname == 'quotedpriceamount'">
+                    {{scope.data.data[scope.data.columnname]?tool.formatAmount(scope.data.data[scope.data.columnname],2,'￥'):'￥0.00'}}
                   </div>
                   <div v-else-if="scope.data.columnname == 'begdate'">
-                    {{ scope.data.data.begdate }}-{{ scope.data.data.enddate }}
+                    {{ tool.getDataChange(scope.data.data.begdate) }}至{{ scope.data.data.enddate }}
                   </div>
                   <div v-else>
-                    {{ $t(scope.data.data[scope.data.columnname]) }}
+                    {{ scope.data.data[scope.data.columnname]?$t(scope.data.data[scope.data.columnname]):'--' }}
                   </div>
                 </template>
               </pageTable>

src/utils/tool.js

@@ -10,13 +10,13 @@ export default {
   checkAuth (appname,auth) {
     // await this.sleep(3000)
     let _haveAuth = false
-    
+
     let app = JSON.parse(sessionStorage.getItem('activeApp'))
     // 获取当前应用权限
     let auth_list = app.meta.auth
     // 判断是否拥有权限
     _haveAuth = auth_list.some(item=>item.option === auth)
-    
+
     return _haveAuth
   },
 
@@ -25,7 +25,7 @@ export default {
     try {
       // 获取应用数据
       let apps = JSON.parse(sessionStorage.getItem('active_modules'))
-      
+
       let module_list =  apps.apps
       // 获取当前应用数据
       let active_modules = module_list.filter(item => {
@@ -45,7 +45,7 @@ export default {
     try {
       message = res.msg || '操作成功'
     } catch (error) {
-      
+
     }
 
     try {
@@ -79,7 +79,7 @@ export default {
       index = href.indexOf('/',index+1)
       if (num++ == 3) {
         return href.slice(0,index)
-      } 
+      }
     }
   },
   // 处理省市县数据结构
@@ -225,21 +225,21 @@ export default {
         result.push(data[index]) // 依次把index对应的元素data[index]添加进去即可
       })
     })
-    
+
     return result
   },
   calculatedColumnWidth(dom, layout) {
     if (!dom || _uids.includes(dom._uid)) return;
     _uids.push(dom._uid)
     let lang = localStorage.getItem('lang') || 'ZH';
-    if (lang!='ZH') setTimeout(() => {     
+    if (lang!='ZH') setTimeout(() => {
       try {
         const ths = dom.$el.querySelector('.el-table__header-wrapper').querySelectorAll('table thead tr:first-child th'),
           nodes = [];
         for (var key of ths.keys()) {
             const node = ths[key].querySelector('.cell')
             if (node && layout.some(v => v.title == node.innerText)) nodes.push(node);
-          } 
+          }
         layout.forEach((v,i) => {
           v.width = v.width > nodes[i].offsetWidth ? v.width : nodes[i].offsetWidth
         })
@@ -257,4 +257,9 @@ export default {
       return colors[status] ? `color:${colors[status]}` : "#999";
     }
   },
+  /*日期转化*/
+  getDataChange(data){
+    const newData = new Date(data)
+    return newData.getFullYear() + '-' + (newData.getMonth() + 1) +'-' + newData.getDate()
+  }
 }