feat: 数据调整

src/components/global-picker/dictData.js

+/**
+ * 下拉框字典项
+ */
 export const opinionType = [
     { label: 'N/A', value: 0 },
     { label: '不同意', value: 1 },
     { label: '同意', value: 2 }
 ]
-
 export const appealInfo = [
     { label: '无', value: 0 },
     { label: '申诉跟踪', value: 1 },
     { label: '申诉关闭', value: 2 }
 ]
-
 export const eventType = [
     { label: '扣分', value: 0 },
     { label: '加分', value: 1 }

src/pages/panel/appraisal-record/components/card-details.vue

@@ -21,11 +21,11 @@
             <view class="card-footer">
                 <view class="label">
                     <global-icon icon="idcard" color="#1D2129"></global-icon>
-                    <text>{{ showData(idcard, '-') }}</text>
+                    <text>{{ idcard || '-' }}</text>
                 </view>
                 <view class="label">
                     <global-icon icon="calendar" color="#1D2129"></global-icon>
-                    <text>{{ showData(calendar) ? timeStampFormat(calendar) : '-' }}</text>
+                    <text>{{ calendar != -1 ? timeStampFormat(calendar) : '-' }}</text>
                 </view>
             </view>
         </slot>
@@ -33,7 +33,7 @@
 </template>
 
 <script setup>
-import { showData, timeStampFormat } from '@/utils/tool'
+import { timeStampFormat } from '@/utils/tool'
 const es = defineEmits(['handleAdd'])
 const ps = defineProps({
     // company,quality,appeal

src/pages/panel/appraisal-record/details.vue

 <template>
     <global-page :showNavbar="false">
         <template #top>
-            <global-navbar :title="showData(details?.appraisee, '暂无标题~')">
+            <global-navbar :title="details?.appraiseeshowData || '暂无标题~'">
                 <template #left>
                     <uni-icons type="left" size="16" @tap="goBack"></uni-icons>
                 </template>
@@ -33,53 +33,53 @@
                     <view class="details-body-top">
                         <view class="left">
                             <global-icon icon="mind-mapping"></global-icon>
-                            <text>来源编号:{{ showData(details.acOwn, '暂无~') }}</text>
+                            <text>来源编号:{{ details.acOwn || '暂无~' }}</text>
                         </view>
                         <view class="right">
-                            {{ showData(details.department) }}
-                            <text>{{ showData(details.appraisee) }}</text>
+                            {{ details.department != '-1' ? details.department : '' }}
+                            <text>{{ details.appraisee != '-1' ? details.appraisee : '' }}</text>
                         </view>
                     </view>
                     <view class="details-body-bottom">
-                        {{ showData(details.eventMsg, '暂无内容~') }}
+                        {{ details.eventMsg || '暂无内容~' }}
                     </view>
                 </view>
                 <view class="details-footer">
                     <view class="details-footer-top">
                         <global-icon icon="subscribed" color="#1D2129"></global-icon>
-                        <text>{{ showData(details.examineType, '暂无内容~') }}</text>
+                        <text>{{ details.examineType != -1 ? details.examineType : '暂无内容~' }}</text>
                     </view>
                     <view class="details-footer-center">{{ details.examineBasis }}</view>
                     <view class="details-footer-bottom">
                         <view class="person-info">
                             <global-icon icon="idcard"></global-icon>
-                            <text>当班人员：{{ details.onDutyUser }}</text>
+                            <text>当班人员：{{ details.onDutyUser || '-' }}</text>
                         </view>
                         <view class="person-info">
                             <global-icon icon="idcard"></global-icon>
-                            <text>值班人员：{{ details.dmName }}</text>
+                            <text>值班人员：{{ details.dmName || '-' }}</text>
                         </view>
                     </view>
                 </view>
             </view>
             <card-details type="company" title="公司值班信息" showfooter :idcard="details.dmName" :calendar="details.optionSaveTime">
-                <card-details-item label="公司值班经理" :value="showData(details.dmName, '-')"></card-details-item>
+                <card-details-item label="公司值班经理" :value="details.dmName || '-'"></card-details-item>
                 <card-details-item
                     label="公司值班经理意见"
                     :value="details.opinionType != -1 ? useGetDictByValue('opinionType', details.opinionType) : '-'"
                 ></card-details-item>
-                <card-details-item label="公司值班经理意见描述" :value="showData(details.dmMsg, '-')"></card-details-item>
+                <card-details-item label="公司值班经理意见描述" :value="details.dmMsg || '-'"></card-details-item>
             </card-details>
             <card-details type="quality" title="品质中心信息" showfooter :idcard="details.qmName" :calendar="details.qualitySaveTime">
-                <card-details-item label="品质中心经理" :value="showData(details.qmName, '-')"></card-details-item>
+                <card-details-item label="品质中心经理" :value="details.qmName || '-'"></card-details-item>
                 <card-details-item
                     label="品质中心经理意见"
                     :value="details.qualityOpinionType != -1 ? useGetDictByValue('opinionType', details.qualityOpinionType) : '-'"
                 ></card-details-item>
-                <card-details-item label="品质中心经理意见描述" :value="showData(details.qmMsg, '-')"></card-details-item>
+                <card-details-item label="品质中心经理意见描述" :value="details.qmMsg || '-'"></card-details-item>
             </card-details>
             <card-details type="appeal" title="申诉状态" titleIcon="email">
-                <template v-if="showData(details.appealInfo)">
+                <template v-if="details.appealInfo != -1">
                     <view class="appeal-status">{{ useGetDictByValue('appealInfo', details.appealInfo) }}</view>
                     <image :src="item.fileUrl" v-for="(item, index) in getFileList" :key="item.id" @tap="previewImage(index)" />
                 </template>
@@ -92,7 +92,7 @@
 <script setup>
 import CardDetails from './components/card-details.vue'
 import CardDetailsItem from './components/card-details-item.vue'
-import { showData, timeStampFormat } from '@/utils/tool'
+import { timeStampFormat } from '@/utils/tool'
 import { useGetDictByValue } from '@/components/global-picker/useDict'
 import useAppraisalRecordStore from '@/store/appraisal-record'
 import { storeToRefs } from 'pinia'

src/pages/panel/appraisal-record/edit.vue

@@ -68,12 +68,12 @@
                 @handleAdd="handleAdd(0)"
                 v-if="details"
             >
-                <card-details-item label="公司值班经理" :value="showData(details.dmName, '-')"></card-details-item>
+                <card-details-item label="公司值班经理" :value="details.dmName || '-'"></card-details-item>
                 <card-details-item
                     label="公司值班经理意见"
                     :value="details.opinionType != -1 ? useGetDictByValue('opinionType', details.opinionType) : '-'"
                 ></card-details-item>
-                <card-details-item label="公司值班经理意见描述" :value="showData(details.dmMsg, '-')"></card-details-item>
+                <card-details-item label="公司值班经理意见描述" :value="details.dmMsg || '-'"></card-details-item>
             </card-details>
             <card-details
                 type="quality"
@@ -85,12 +85,12 @@
                 @handleAdd="handleAdd(1)"
                 v-if="details"
             >
-                <card-details-item label="品质中心经理" :value="showData(details.qmName, '-')"></card-details-item>
+                <card-details-item label="品质中心经理" :value="details.qmName || '-'"></card-details-item>
                 <card-details-item
                     label="品质中心经理意见"
                     :value="details.qualityOpinionType != -1 ? useGetDictByValue('opinionType', details.qualityOpinionType) : '-'"
                 ></card-details-item>
-                <card-details-item label="品质中心经理意见描述" :value="showData(details.qmMsg, '-')"></card-details-item>
+                <card-details-item label="品质中心经理意见描述" :value="details.qmMsg || '-'"></card-details-item>
             </card-details>
             <view class="appeal">
                 <view class="appeal-title">
@@ -115,7 +115,6 @@ import { reactive, ref } from 'vue'
 import CardDetails from './components/card-details.vue'
 import CardDetailsItem from './components/card-details-item.vue'
 import { onShow } from '@dcloudio/uni-app'
-import { showData } from '@/utils/tool'
 import useBaseStore from '@/store/base'
 import { useGetDictByValue } from '@/components/global-picker/useDict'
 import useAppraisalRecordStore from '@/store/appraisal-record'

src/pages/panel/appraisal-record/list.vue

@@ -6,8 +6,8 @@
                     <view class="item-title">
                         <view class="desc">
                             <view class="type">{{ item.status == 1 ? 'OPEN' : 'ClOSE' }}</view>
-                            <view class="txt">{{ showData(item.appraisee) }}</view>
-                            <view class="place">{{ showData(item.department) }}</view>
+                            <view class="txt">{{ item.appraisee != '-1' ? item.appraisee : '' }}</view>
+                            <view class="place">{{ item.department != '-1' ? item.department : '' }}</view>
                         </view>
                         <global-score v-if="item.score != -1" :type="item.eventType == 1 ? 'success' : 'warning'" :count="item.score"></global-score>
                     </view>
@@ -24,7 +24,6 @@
 import { ref } from 'vue'
 import { getRqmListApi } from '@/api/appraisal-record'
 import { onLoad } from '@dcloudio/uni-app'
-import { showData } from '@/utils/tool'
 import useAppraisalRecordStore from '@/store/appraisal-record'
 
 const tabList = ref([

src/utils/tool.js

@@ -2,29 +2,6 @@
 import Day from './dayjs'
 
 /**
- * 数据展示
- * null => ''
- */
-export const showData = (data, result = '') => {
-    if (typeof data === 'undefined' || data === null) {
-        return result
-    }
-    if (typeof data === 'string' && data.trim() === '') {
-        return result
-    }
-    if (data === '-1' || data === -1) {
-        return result
-    }
-    if (Array.isArray(data) && data.length === 0) {
-        return result
-    }
-    if (typeof data === 'object' && Object.keys(data).length === 0) {
-        return result
-    }
-    return data
-}
-
-/**
  * 时间戳格式化
  * 1715072168340 => 2024-05-07 16:56:08
  */