Skip to content

M
mocp-uniapp
Commit bc7675ae by pangchong
Options

feat: 字典项名字优化

parent 85ab23a6
Showing with 36 additions and 33 deletions
src/mocp/hooks/use-dict/dict-data/appraisal-record.js
export const opinionType = [
// 建议以文件名首字母作为前缀ar_
export const ar_opinionType = [
{ label: 'N/A', value: 0 },
{ label: '不同意', value: 1 },
{ label: '同意', value: 2 }
]
export const appealInfo = [
export const ar_appealInfo = [
{ label: '无', value: 0 },
{ label: '申诉跟踪', value: 1 },
{ label: '申诉关闭', value: 2 }
]
export const eventType = [
export const ar_eventType = [
{ label: '扣分', value: 0 },
{ label: '加分', value: 1 }
]
src/mocp/hooks/use-dict/dict-data/assign-work.js
export const feedbackOpts = [
// 建议以文件名首字母作为前缀aw_
export const aw_feedbackOpts = [
{ label: '是', value: '1' },
{ label: '落实执行', value: '0' }
]
export const feedbackState = [
export const aw_feedbackState = [
{ label: 'OPEN', value: '1' },
{ label: 'CLOSE', value: '2' }
]
export const leaderState = [
export const aw_leaderState = [
{ label: '同意', value: '1' },
{ label: '不同意', value: '0' },
{ label: '部分同意', value: '2' }
]
export const validateType = [
export const aw_validateType = [
{ label: '重复事件', value: '1' },
{ label: '同类事件', value: '2' }
]
src/mocp/hooks/use-dict/dict-data/move-decision.js
export const moveDecisionStatus = [
// 建议以文件名首字母作为前缀md_
export const md_state = [
{ label: 'OPEN', value: 1 },
{ label: '跟踪', value: 2 },
{ label: 'CLOSE', value: 3 }
]
export const decisionState = [
export const md_decisionState = [
{ label: '同意', value: '1' },
{ label: '不同意', value: '0' }
]
src/pages/modules/mocp/panel/appraisal-record/add.vue
......@@ -13,7 +13,7 @@
<global-picker pickAlign="right" clearable v-model="formData.mid" :options="selectList" emptyValue="-1"></global-picker>
</up-form-item>
<up-form-item :label="formData.isDuty == 0 ? '公司值班经理意见' : '品质中心经理意见'" :borderBottom="true">
<global-picker pickAlign="right" clearable v-model="formData.opinionType" dictkey="opinionType" :emptyValue="-1"></global-picker>
<global-picker pickAlign="right" clearable v-model="formData.opinionType" dictkey="ar_opinionType" :emptyValue="-1"></global-picker>
</up-form-item>
<up-form-item
:label="formData.isDuty == 0 ? '公司值班经理意见描述' : '品质中心经理意见描述'"
......
src/pages/modules/mocp/panel/appraisal-record/details.vue
......@@ -56,7 +56,7 @@
<card-details-item label="公司值班经理" :value="details.dmName || '-'"></card-details-item>
<card-details-item
label="公司值班经理意见"
:value="details.opinionType != -1 ? useGetDictByValue('opinionType', details.opinionType) : '-'"
:value="details.opinionType != -1 ? useGetDictByValue('ar_opinionType', details.opinionType) : '-'"
></card-details-item>
<card-details-item label="公司值班经理意见描述" :value="details.dmMsg || '-'"></card-details-item>
</card-details>
......@@ -64,12 +64,12 @@
<card-details-item label="品质中心经理" :value="details.qmName || '-'"></card-details-item>
<card-details-item
label="品质中心经理意见"
:value="details.qualityOpinionType != -1 ? useGetDictByValue('opinionType', details.qualityOpinionType) : '-'"
:value="details.qualityOpinionType != -1 ? useGetDictByValue('ar_opinionType', details.qualityOpinionType) : '-'"
></card-details-item>
<card-details-item label="品质中心经理意见描述" :value="details.qmMsg || '-'"></card-details-item>
</card-details>
<card-details type="appeal" title="申诉状态" titleIcon="email">
<view class="appeal-status">{{ useGetDictByValue('appealInfo', details.appealInfo) }}</view>
<view class="appeal-status">{{ useGetDictByValue('ar_appealInfo', details.appealInfo) }}</view>
<global-upload :fileList="getFileList" :showUpload="false"></global-upload>
</card-details>
</template>
......
src/pages/modules/mocp/panel/appraisal-record/edit.vue
......@@ -39,7 +39,7 @@
></up-textarea>
</up-form-item>
<up-form-item label="事件类别" :borderBottom="true">
<global-picker pickAlign="right" clearable v-model="formData.eventType" dictkey="eventType" :emptyValue="-1"></global-picker>
<global-picker pickAlign="right" clearable v-model="formData.eventType" dictkey="ar_eventType" :emptyValue="-1"></global-picker>
</up-form-item>
<up-form-item label="考核类型" :borderBottom="true">
<global-picker
......@@ -86,7 +86,7 @@
<card-details-item label="公司值班经理" :value="details.dmName || '-'"></card-details-item>
<card-details-item
label="公司值班经理意见"
:value="details.opinionType != -1 ? useGetDictByValue('opinionType', details.opinionType) : '-'"
:value="details.opinionType != -1 ? useGetDictByValue('ar_opinionType', details.opinionType) : '-'"
></card-details-item>
<card-details-item label="公司值班经理意见描述" :value="details.dmMsg || '-'"></card-details-item>
</card-details>
......@@ -103,14 +103,14 @@
<card-details-item label="品质中心经理" :value="details.qmName || '-'"></card-details-item>
<card-details-item
label="品质中心经理意见"
:value="details.qualityOpinionType != -1 ? useGetDictByValue('opinionType', details.qualityOpinionType) : '-'"
:value="details.qualityOpinionType != -1 ? useGetDictByValue('ar_opinionType', details.qualityOpinionType) : '-'"
></card-details-item>
<card-details-item label="品质中心经理意见描述" :value="details.qmMsg || '-'"></card-details-item>
</card-details>
<view class="appeal">
<view class="appeal-title">
<text>申诉情况</text>
<global-picker pickAlign="right" dictkey="appealInfo" v-model="formData.appealInfo" clearable></global-picker>
<global-picker pickAlign="right" dictkey="ar_appealInfo" v-model="formData.appealInfo" clearable></global-picker>
</view>
<view class="appeal-content">
<global-upload :fileList="getFileList" v-model="formData.file"></global-upload>
......
src/pages/modules/mocp/panel/assign-work/details.vue
......@@ -33,7 +33,7 @@
<global-icon icon="safe"></global-icon>
<text class="txt">反馈情况</text>
</view>
<view class="right">{{ useGetDictByValue('feedbackOpts', details.feedback) }}</view>
<view class="right">{{ useGetDictByValue('aw_feedbackOpts', details.feedback) }}</view>
</view>
</view>
<view class="details-body">
......@@ -80,7 +80,7 @@
></card-details-footer>
<card-details-footer
leftLabel="工作反馈状态:"
:leftValue="useGetDictByValue('feedbackState', arrangeWorkExtend.feedbackState)"
:leftValue="useGetDictByValue('aw_feedbackState', arrangeWorkExtend.feedbackState)"
rightLabel="反馈人:"
:rightValue="arrangeWorkExtend.feedbackUser || '-'"
></card-details-footer>
......@@ -93,7 +93,7 @@
<card-details title="领导批示" :showEmpty="arrangeWorkExtend.approvalTime == '0'" v-if="arrangeWorkExtend.approvalTime != '0'">
<card-details-item
title="领导批示意见"
:content="useGetDictByValue('leaderState', arrangeWorkExtend.leaderApprovalComments)"
:content="useGetDictByValue('aw_leaderState', arrangeWorkExtend.leaderApprovalComments)"
></card-details-item>
<card-details-item title="批示要点" :content="arrangeWorkExtend.approvalContent"></card-details-item>
<card-details-footer
......@@ -131,7 +131,7 @@
>
<card-details-item
title="领导批示意见"
:content="useGetDictByValue('leaderState', arrangeWorkExtend.gzApprovalComments)"
:content="useGetDictByValue('aw_leaderState', arrangeWorkExtend.gzApprovalComments)"
></card-details-item>
<card-details-item title="批示要点" :content="arrangeWorkExtend.gzApprovalContent"></card-details-item>
<card-details-footer
......@@ -170,12 +170,12 @@
leftLabel="事件类型:"
:leftValue="baseStore.getParamNameByValue('LayoutEventType', arrangeWorkExtend.eventType)"
rightLabel="重复/同类事件:"
:rightValue="useGetDictByValue('validateType', arrangeWorkExtend.validateType)"
:rightValue="useGetDictByValue('aw_validateType', arrangeWorkExtend.validateType)"
></card-details-footer>
</card-details-item>
<card-details-item :borderBottom="false">
<view class="mocp-color-danger-6" style="font-size: 30rpx">
{{ useGetDictByValue('feedbackState', arrangeWorkExtend.validateState) }}
{{ useGetDictByValue('aw_feedbackState', arrangeWorkExtend.validateState) }}
</view>
<card-details-footer
v-if="arrangeWorkExtend.validateState == '2'"
......
src/pages/modules/mocp/panel/assign-work/edit-approval.vue
......@@ -10,7 +10,7 @@
<view class="mocp-form">
<up-form labelPosition="left" labelWidth="auto" :model="formData" :rules="rules" ref="formRef">
<up-form-item label="领导批示意见" :borderBottom="true" prop="leaderApprovalComments" required>
<global-picker pickAlign="right" v-model="formData.leaderApprovalComments" clearable dictkey="leaderState"></global-picker>
<global-picker pickAlign="right" v-model="formData.leaderApprovalComments" clearable dictkey="aw_leaderState"></global-picker>
</up-form-item>
<up-form-item label="批示要点" :borderBottom="true" labelPosition="top" prop="approvalContent" required>
<up-textarea
......
src/pages/modules/mocp/panel/assign-work/edit-gzApproval.vue
......@@ -3,7 +3,7 @@
<view class="mocp-form">
<up-form labelPosition="left" labelWidth="auto" :model="formData" :rules="rules" ref="formRef">
<up-form-item label="领导批示意见" :borderBottom="true" prop="gzApprovalComments" required>
<global-picker pickAlign="right" v-model="formData.gzApprovalComments" clearable dictkey="leaderState"></global-picker>
<global-picker pickAlign="right" v-model="formData.gzApprovalComments" clearable dictkey="aw_leaderState"></global-picker>
</up-form-item>
<up-form-item label="批示要点" :borderBottom="true" labelPosition="top" prop="gzApprovalContent" required>
<up-textarea
......
src/pages/modules/mocp/panel/assign-work/edit-validate.vue
......@@ -19,7 +19,7 @@
></global-picker>
</up-form-item>
<up-form-item label="重复/同类事件" :borderBottom="true" prop="validateType" required>
<global-checkbox checkboxAlign="right" v-model="formData.validateType" dictkey="validateType"></global-checkbox>
<global-checkbox checkboxAlign="right" v-model="formData.validateType" dictkey="aw_validateType"></global-checkbox>
</up-form-item>
<up-form-item label="验证附件" labelPosition="top" :borderBottom="true">
<view style="margin-top: 24rpx">
......@@ -31,7 +31,7 @@
</view>
</up-form-item>
<up-form-item label="工作验证状态" :borderBottom="true" prop="validateState" required>
<global-picker pickAlign="right" clearable v-model="formData.validateState" dictkey="feedbackState"></global-picker>
<global-picker pickAlign="right" clearable v-model="formData.validateState" dictkey="aw_feedbackState"></global-picker>
</up-form-item>
</up-form>
</view>
......
src/pages/modules/mocp/panel/assign-work/edit-work.vue
......@@ -12,7 +12,7 @@
<view class="form">
<view class="form-item">
<up-form-item label="工作反馈状态" :borderBottom="true" prop="feedbackState" required>
<global-picker v-model="formData.feedbackState" pickAlign="right" clearable dictkey="feedbackState"></global-picker>
<global-picker v-model="formData.feedbackState" pickAlign="right" clearable dictkey="aw_feedbackState"></global-picker>
</up-form-item>
<up-form-item label="问题分析" :borderBottom="true" labelPosition="top" prop="problem" required>
<up-textarea
......
src/pages/modules/mocp/panel/move-decision/details.vue
......@@ -4,7 +4,7 @@
<view class="details">
<view class="details-header">
<view class="details-header-left">
<custom-state :value="useGetDictByValue('moveDecisionStatus', details.state)" :size="48"></custom-state>
<custom-state :value="useGetDictByValue('md_state', details.state)" :size="48"></custom-state>
</view>
<view class="details-header-right">
<global-icon icon="mind-mapping"></global-icon>
......@@ -65,7 +65,7 @@
<view class="details-footer-item">
<global-field
label="决策结果:"
:value="useGetDictByValue('decisionState', details.decisionState) || '-'"
:value="useGetDictByValue('md_decisionState', details.decisionState) || '-'"
></global-field>
</view>
<view class="details-footer-item" v-if="details.decisionState == '0' && details.remark">
......
src/pages/modules/mocp/panel/move-decision/edit.vue
......@@ -10,7 +10,7 @@
<view class="mocp-form">
<up-form labelPosition="left" labelWidth="auto" :model="formData">
<up-form-item label="状态" :borderBottom="true">
<global-picker pickAlign="right" v-model="formData.state" clearable dictkey="moveDecisionStatus"></global-picker>
<global-picker pickAlign="right" v-model="formData.state" clearable dictkey="md_state"></global-picker>
</up-form-item>
<up-form-item label="机号" :borderBottom="true">
<global-picker
......@@ -112,7 +112,7 @@
v-model="formData.decisionState"
clearable
style="margin-top: 24rpx"
dictkey="decisionState"
dictkey="md_decisionState"
></global-picker>
</up-form-item>
<up-form-item label="详情" :borderBottom="true" labelPosition="top" v-if="formData.decisionState == '0'">
......
src/pages/modules/mocp/panel/move-decision/list.vue
......@@ -12,7 +12,7 @@
<view class="item" v-for="item in dataList" :key="item.id" @tap="goDetails(item)">
<view class="item-title">
<view class="left">
<custom-state :value="useGetDictByValue('moveDecisionStatus', item.state)"></custom-state>
<custom-state :value="useGetDictByValue('md_state', item.state)"></custom-state>
<text class="txt u-line-1">{{ item.decisionNumber }}</text>
</view>
</view>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment