chenrui 4 rokov pred
rodič
commit
b60096fc7a

+ 1 - 1
src/views/BasicSettings/StoreAssociatedEquipmentModal.vue

@@ -21,7 +21,7 @@
       />
       />
       <a-card class="search-sub" :bordered="false" v-if="resultData && isFocus">
       <a-card class="search-sub" :bordered="false" v-if="resultData && isFocus">
         <div class="search-sub-item">
         <div class="search-sub-item">
-          <p>{{ resultData.name }}-{{ resultData.params ? '已绑定' : '未绑定' }}</p>
+          <p>{{ resultData.name }}</p>
           <a-button
           <a-button
             id="equipment-bind"
             id="equipment-bind"
             v-if="!resultData.params"
             v-if="!resultData.params"

+ 7 - 4
src/views/BasicSettings/StoreManagement.vue

@@ -16,7 +16,6 @@
           </a-col>
           </a-col>
           <a-col :span="6">
           <a-col :span="6">
             <a-form-item class="search-item" label="组织机构">
             <a-form-item class="search-item" label="组织机构">
-              <!-- <a-input id="store-orgCode" v-model.trim="queryParam.orgCode" placeholder="请选择组织机构" @pressEnter="$refs.table.refresh(true)" allowClear /> -->
               <a-tree-select
               <a-tree-select
                 showSearch
                 showSearch
                 id="store-orgCode"
                 id="store-orgCode"
@@ -66,6 +65,11 @@
       :columns="columns"
       :columns="columns"
       :data="loadData"
       :data="loadData"
       bordered>
       bordered>
+      <!-- 启用状态 -->
+      <template slot="isEnable" slot-scope="text, record">
+        <div v-if="record.isEnable == 0" style="color: #ff4d4f">{{ record.isEnableDictValue }}</div>
+        <div v-if="record.isEnable == 1" style="color: #1890FF">{{ record.isEnableDictValue }}</div>
+      </template>
       <!-- 操作 -->
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
       <template slot="action" slot-scope="text, record">
         <a-icon type="edit" title="编辑" id="store-edit" @click="edit(record)" :style="{ fontSize: '20px', color: '#1890FF', padding: '0 10px' }" />
         <a-icon type="edit" title="编辑" id="store-edit" @click="edit(record)" :style="{ fontSize: '20px', color: '#1890FF', padding: '0 10px' }" />
@@ -84,7 +88,6 @@
 import { STable, VSelect } from '@/components'
 import { STable, VSelect } from '@/components'
 import StoreModal from './StoreModal.vue'
 import StoreModal from './StoreModal.vue'
 import StoreAssociatedEquipmentModal from './StoreAssociatedEquipmentModal.vue'
 import StoreAssociatedEquipmentModal from './StoreAssociatedEquipmentModal.vue'
-// import { getProvince, getCityByPro } from '@/api/lookup'
 import { findStoreList } from '@/api/store.js'
 import { findStoreList } from '@/api/store.js'
 import { findOrgTree } from '@/api/atorg.js'
 import { findOrgTree } from '@/api/atorg.js'
 export default {
 export default {
@@ -104,10 +107,10 @@ export default {
         { title: '创建时间', dataIndex: 'createDate', width: '100', align: 'center' },
         { title: '创建时间', dataIndex: 'createDate', width: '100', align: 'center' },
         { title: '组织机构', dataIndex: 'orgCodeName', width: '100', align: 'center' },
         { title: '组织机构', dataIndex: 'orgCodeName', width: '100', align: 'center' },
         { title: '门店名称', dataIndex: 'name', width: '100', align: 'center' },
         { title: '门店名称', dataIndex: 'name', width: '100', align: 'center' },
-        { title: '门店类型', dataIndex: 'selfFlag', width: '100', align: 'center' },
+        { title: '门店类型', dataIndex: 'selfFlagDictValue', width: '100', align: 'center' },
         { title: '负责人名称', dataIndex: 'managerName', width: '100', align: 'center' },
         { title: '负责人名称', dataIndex: 'managerName', width: '100', align: 'center' },
         { title: '负责人手机', dataIndex: 'managerMobile', width: '100', align: 'center' },
         { title: '负责人手机', dataIndex: 'managerMobile', width: '100', align: 'center' },
-        { title: '启用状态', dataIndex: 'isEnable', width: '100', align: 'center' },
+        { title: '启用状态', scopedSlots: { customRender: 'isEnable' }, width: '100', align: 'center' },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '265', align: 'center' }
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '265', align: 'center' }
       ],
       ],
       // 加载数据方法 必须为 Promise 对象
       // 加载数据方法 必须为 Promise 对象

+ 3 - 3
src/views/BasicSettings/StoreModal.vue

@@ -46,11 +46,11 @@
         </a-col>
         </a-col>
         <a-col :span="8" class="item-w">
         <a-col :span="8" class="item-w">
           <div class="item-label">是否自营:</div>
           <div class="item-label">是否自营:</div>
-          <div class="item-cont">{{ storeInfo.selfFlag }}</div>
+          <div class="item-cont">{{ storeInfo.selfFlagDictValue }}</div>
         </a-col>
         </a-col>
         <a-col :span="8" class="item-w">
         <a-col :span="8" class="item-w">
           <div class="item-label">启用状态:</div>
           <div class="item-label">启用状态:</div>
-          <div class="item-cont">{{ storeInfo.isEnable }}</div>
+          <div class="item-cont">{{ storeInfo.isEnableDictValue }}</div>
         </a-col>
         </a-col>
         <a-col :span="8">
         <a-col :span="8">
           <a-form-model-item class="form-label" label="组织归属" prop="orgCode" :label-col="{ span: 7 }" :wrapper-col="{ span: 17 }">
           <a-form-model-item class="form-label" label="组织归属" prop="orgCode" :label-col="{ span: 7 }" :wrapper-col="{ span: 17 }">
@@ -211,7 +211,7 @@ export default {
         .item-label{
         .item-label{
           flex-shrink: 0;
           flex-shrink: 0;
           width: 90px;
           width: 90px;
-          text-align: right;
+          text-align: left;
           font-weight: bold;
           font-weight: bold;
         }
         }
         .item-cont{
         .item-cont{