hfxc226 преди 1 година
родител
ревизия
9ec6e2709c
променени са 3 файла, в които са добавени 8 реда и са изтрити 14 реда
  1. 4 5
      src/views/remote/position/RemotePosition.vue
  2. 3 5
      src/views/remote/position/modules/BaseForm.vue
  3. 1 4
      src/views/remote/position/modules/Detail.vue

+ 4 - 5
src/views/remote/position/RemotePosition.vue

@@ -74,7 +74,7 @@
       </span>
       <span slot="delFlag" slot-scope="text">
         <badge
-          :status="DictCache.COLOR.DELFLAG[text]"
+          :status="DictCache.COLOR.YES_NO[text]"
           :text="delFlagMap[text]" />
       </span>
     </s-table>
@@ -156,8 +156,8 @@ export default {
           dataIndex: 'createdTime'
         },
         {
-          title: '是否删除',
-          dataIndex: 'delFlag',
+          title: '是否展示',
+          dataIndex: 'opcFlag',
           scopedSlots: { customRender: 'delFlag' }
         },
         {
@@ -198,8 +198,7 @@ export default {
   },
   created () {
     this.tableOption()
-    this.delFlagMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.DELFLAG)
-    this.yesNoMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.YES_NO)
+    this.delFlagMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.YES_NO)
     this.positionTypeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REMOTE_POSITION_TYPE)
   },
   methods: {

+ 3 - 5
src/views/remote/position/modules/BaseForm.vue

@@ -87,11 +87,11 @@
         ></upload-position-img>
       </a-form-item>
       <a-form-item
-        label="是否删除"
+        label="是否展示"
         :labelCol="BaseTool.Constant.labelCol"
         :wrapperCol="BaseTool.Constant.wrapperCol"
       >
-        <a-select v-decorator="['delFlag', {initialValue:DictCache.VALUE.DELFLAG.NORMAL, rules: [{required: true, message: '是否删除不能为空'}]}]" placeholder="请选择">
+        <a-select v-decorator="['opcFlag', {initialValue:DictCache.VALUE.DELFLAG.NORMAL, rules: [{required: true, message: '是否删除不能为空'}]}]" placeholder="请选择">
           <a-select-option
             v-for="(label,value) in delFlagMap"
             :key="value"
@@ -142,8 +142,7 @@ export default {
   props: {
   },
   created () {
-    this.delFlagMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.DELFLAG)
-    this.yesNoMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.YES_NO)
+    this.delFlagMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.YES_NO)
     this.positionTypeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REMOTE_POSITION_TYPE)
     const params = { roleType: 3, deptId: null, queryType: 1 }
     queryRepairUser(params).then(res => {
@@ -174,7 +173,6 @@ export default {
           'sort',
           'opcFlag',
           'lightFlag',
-          'delFlag',
           'parentId',
           'userId',
           'remark'

+ 1 - 4
src/views/remote/position/modules/Detail.vue

@@ -17,7 +17,6 @@
       <detail-list-item term="图片"><img :src="BaseTool.Constant.FILE_URL + model.opcImg" width="200px" height="200px"/></detail-list-item>
       <detail-list-item term="创建人">{{ model.createdUserName }}</detail-list-item>
       <detail-list-item term="是否OPC展示"><badge :status="DictCache.COLOR.DELFLAG[model.opcFlag]" :text="yesNoMap[model.opcFlag]"></badge></detail-list-item>
-      <detail-list-item term="是否删除"><badge :status="DictCache.COLOR.DELFLAG[model.delFlag]" :text="delFlagMap[model.delFlag]"></badge></detail-list-item>
       <detail-list-item term="更新日期">{{ model.updateTime }}</detail-list-item>
     </detail-list>
 
@@ -60,13 +59,11 @@ export default {
         'createdUserName': null
       },
       positionTypeMap: {},
-      yesNoMap: {},
       delFlagMap: {}
     }
   },
   created () {
-    this.delFlagMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.DELFLAG)
-    this.yesNoMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.YES_NO)
+    this.delFlagMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.YES_NO)
     this.positionTypeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REMOTE_POSITION_TYPE)
   },
   methods: {