瀏覽代碼

输入框,下拉菜单,按钮等元素 + id

chenrui 4 年之前
父節點
當前提交
3168fcc980

+ 19 - 6
src/views/BasicSettings/Organization.vue

@@ -1,7 +1,7 @@
 <template>
 <template>
   <a-card class="organization-wrap" :bordered="false">
   <a-card class="organization-wrap" :bordered="false">
     <!-- 新建 -->
     <!-- 新建 -->
-    <div class="table-operator"><a-button type="primary" icon="plus" @click="addOrg()">添加最高级</a-button></div>
+    <div class="table-operator"><a-button id="organization-add" type="primary" icon="plus" @click="addOrg()">添加最高级</a-button></div>
     <!-- 表格列表 -->
     <!-- 表格列表 -->
     <s-table
     <s-table
       class="s-table"
       class="s-table"
@@ -19,9 +19,22 @@
           size="small"
           size="small"
           icon="plus"
           icon="plus"
           class="btn-add-s"
           class="btn-add-s"
+          id="organization-addSubItem"
           @click="addOrg(text)">添加子级</a-button>
           @click="addOrg(text)">添加子级</a-button>
-        <a-button type="link" size="small" icon="edit" class="btn-edit-s" @click="editOrg(text)">编辑</a-button>
-        <a-button type="link" size="small" icon="delete" class="btn-del-s" @click="delOrg(text)">删除</a-button>
+        <a-button
+          type="link"
+          size="small"
+          icon="edit"
+          class="btn-edit-s"
+          id="organization-edit"
+          @click="editOrg(text)">编辑</a-button>
+        <a-button
+          type="link"
+          size="small"
+          icon="delete"
+          class="btn-del-s"
+          id="organization-del"
+          @click="delOrg(text)">删除</a-button>
       </template>
       </template>
     </s-table>
     </s-table>
     <!-- 添加子级 -->
     <!-- 添加子级 -->
@@ -36,11 +49,11 @@
       <!-- 表单 -->
       <!-- 表单 -->
       <a-form-model ref="ruleForm" :model="form" :rules="rules">
       <a-form-model ref="ruleForm" :model="form" :rules="rules">
         <a-form-model-item label="网点名称" prop="name">
         <a-form-model-item label="网点名称" prop="name">
-          <a-input v-model.trim="form.name" :maxLength="30" placeholder="请输入组织机构名称,30个字以内" />
+          <a-input v-model.trim="form.name" id="organization-itemName" :maxLength="30" placeholder="请输入组织机构名称,30个字以内" />
         </a-form-model-item>
         </a-form-model-item>
         <a-form-model-item class="btn-cont">
         <a-form-model-item class="btn-cont">
-          <a-button type="primary" @click="onSubmit">保存</a-button>
-          <a-button class="cancel" @click="onCancel">取消</a-button>
+          <a-button type="primary" id="organization-save" @click="onSubmit">保存</a-button>
+          <a-button class="cancel" id="organization-cancel" @click="onCancel">取消</a-button>
         </a-form-model-item>
         </a-form-model-item>
       </a-form-model>
       </a-form-model>
     </a-modal>
     </a-modal>

+ 18 - 6
src/views/BasicSettings/StoreAssociatedEquipmentModal.vue

@@ -10,6 +10,7 @@
     <!-- 搜索设备 -->
     <!-- 搜索设备 -->
     <div class="search-con" @blur="isFocus=false">
     <div class="search-con" @blur="isFocus=false">
       <a-input-search
       <a-input-search
+        id="equipment-search"
         class="search-s"
         class="search-s"
         allow-clear
         allow-clear
         placeholder="请通过设备ID搜索"
         placeholder="请通过设备ID搜索"
@@ -21,7 +22,13 @@
       <a-card class="search-sub" :bordered="false" v-show="resultData.length != 0 && isFocus">
       <a-card class="search-sub" :bordered="false" v-show="resultData.length != 0 && isFocus">
         <div class="search-sub-item" v-for="(item, index) in resultData" :key="index">
         <div class="search-sub-item" v-for="(item, index) in resultData" :key="index">
           <p>{{ item.des }}-{{ item.isBind ? '已绑定' : '未绑定' }}</p>
           <p>{{ item.des }}-{{ item.isBind ? '已绑定' : '未绑定' }}</p>
-          <a-button v-if="!item.isBind" type="primary" ghost size="small" @click="onBundling(item)">立即绑定</a-button>
+          <a-button
+            id="equipment-bind"
+            v-if="!item.isBind"
+            type="primary"
+            ghost
+            size="small"
+            @click="onBundling(item)">立即绑定</a-button>
         </div>
         </div>
       </a-card>
       </a-card>
     </div>
     </div>
@@ -32,10 +39,12 @@
       ref="table"
       ref="table"
       bordered
       bordered
       size="small"
       size="small"
+      :row-key="id"
       :columns="columns"
       :columns="columns"
       :data-source="equipmentData"
       :data-source="equipmentData"
       :pagination="false">
       :pagination="false">
       <div slot="expandedRowRender" slot-scope="record" style="margin: 30px 30px;">
       <div slot="expandedRowRender" slot-scope="record" style="margin: 30px 30px;">
+        <div class="eq-subTit">设备通道(机位):</div>
         <a-table
         <a-table
           ref="tables"
           ref="tables"
           bordered
           bordered
@@ -44,12 +53,12 @@
           :data-source="record.passageway"
           :data-source="record.passageway"
           :pagination="false">
           :pagination="false">
           <template slot="action" slot-scope="record">
           <template slot="action" slot-scope="record">
-            <a-button type="link" @click="onEdit(record)">编辑</a-button>
+            <a-button type="link" id="equipment-edit" @click="onEdit(record)">编辑</a-button>
           </template>
           </template>
         </a-table>
         </a-table>
       </div>
       </div>
       <template slot="action" slot-scope="record">
       <template slot="action" slot-scope="record">
-        <a-button type="primary" ghost size="small" @click="onUnbundling(record)">解绑</a-button>
+        <a-button type="primary" ghost size="small" id="equipment-unBind" @click="onUnbundling(record)">解绑</a-button>
       </template>
       </template>
     </a-table>
     </a-table>
     <!-- 编辑  通道/机位名称 -->
     <!-- 编辑  通道/机位名称 -->
@@ -64,11 +73,11 @@
       <!-- 表单 -->
       <!-- 表单 -->
       <a-form-model ref="ruleForm" :model="form" :rules="rules">
       <a-form-model ref="ruleForm" :model="form" :rules="rules">
         <a-form-model-item label="名称" prop="name">
         <a-form-model-item label="名称" prop="name">
-          <a-input v-model.trim="form.name" :maxLength="30" placeholder="请输入名称,30个字以内" />
+          <a-input v-model.trim="form.name" id="equipment-name" :maxLength="30" placeholder="请输入名称,30个字以内" />
         </a-form-model-item>
         </a-form-model-item>
         <a-form-model-item class="btn-cont">
         <a-form-model-item class="btn-cont">
-          <a-button type="primary" @click="onSubmit">保存</a-button>
-          <a-button class="cancel" @click="visible=false">取消</a-button>
+          <a-button type="primary" id="equipment-save" @click="onSubmit">保存</a-button>
+          <a-button class="cancel" id="equipment-cancel" @click="visible=false">取消</a-button>
         </a-form-model-item>
         </a-form-model-item>
       </a-form-model>
       </a-form-model>
     </a-modal>
     </a-modal>
@@ -266,6 +275,9 @@ export default {
       font-size: 16px;
       font-size: 16px;
       margin: 75px 0 5px;
       margin: 75px 0 5px;
     }
     }
+    .eq-subTit{
+      margin: 0 0 10px;
+    }
     .table{
     .table{
       padding-bottom: 50px;
       padding-bottom: 50px;
     }
     }

+ 9 - 9
src/views/BasicSettings/StoreManagement.vue

@@ -6,32 +6,32 @@
         <a-row :gutter="48">
         <a-row :gutter="48">
           <a-col :span="6">
           <a-col :span="6">
             <a-form-item class="search-item" label="门店名称">
             <a-form-item class="search-item" label="门店名称">
-              <a-input v-model.trim="queryParam.name" placeholder="请输入门店名称" @pressEnter="$refs.table.refresh(true)" allowClear />
+              <a-input id="store-name" v-model.trim="queryParam.name" placeholder="请输入门店名称" @pressEnter="$refs.table.refresh(true)" allowClear />
             </a-form-item>
             </a-form-item>
           </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 v-model.trim="queryParam.managerMobile" placeholder="请输入负责人手机" @pressEnter="$refs.table.refresh(true)" allowClear />
+              <a-input id="store-managerMobile" v-model.trim="queryParam.managerMobile" placeholder="请输入负责人手机" @pressEnter="$refs.table.refresh(true)" allowClear />
             </a-form-item>
             </a-form-item>
           </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 v-model.trim="queryParam.orgCode" placeholder="请选择组织机构" @pressEnter="$refs.table.refresh(true)" allowClear />
+              <a-input id="store-orgCode" v-model.trim="queryParam.orgCode" placeholder="请选择组织机构" @pressEnter="$refs.table.refresh(true)" allowClear />
             </a-form-item>
             </a-form-item>
           </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="门店类型">
-              <!-- <v-select ref="businessStatus" allowClear placeholder="请选择门店类型" v-model="queryParam.type" code="STORE_BUSINESS_STATUS"></v-select> -->
+              <!-- <v-select id="store-type" ref="businessStatus" allowClear placeholder="请选择门店类型" v-model="queryParam.type" code="STORE_BUSINESS_STATUS"></v-select> -->
             </a-form-item>
             </a-form-item>
           </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="启用状态">
-              <!-- <v-select ref="deviceStatus" allowClear placeholder="请选择启用状态" v-model="queryParam.enableFlag" code="DEVICE_STATUS"></v-select> -->
+              <!-- <v-select id="store-status" ref="deviceStatus" allowClear placeholder="请选择启用状态" v-model="queryParam.enableFlag" code="DEVICE_STATUS"></v-select> -->
             </a-form-item>
             </a-form-item>
           </a-col>
           </a-col>
           <a-col :span="6">
           <a-col :span="6">
-            <a-button type="primary" class="search-btn" @click="$refs.table.refresh(true)">查询</a-button>
-            <a-button type="" @click="reset">重置</a-button>
+            <a-button type="primary" id="store-search" class="search-btn" @click="$refs.table.refresh(true)">查询</a-button>
+            <a-button id="store-reset" @click="reset">重置</a-button>
           </a-col>
           </a-col>
         </a-row>
         </a-row>
       </a-form>
       </a-form>
@@ -46,8 +46,8 @@
       bordered>
       bordered>
       <!-- 操作 -->
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
       <template slot="action" slot-scope="text, record">
-        <a-icon type="edit" title="编辑" @click="edit(record)" :style="{ fontSize: '20px', color: '#1890FF', padding: '0 10px' }" />
-        <a-icon type="link" title="设置" @click="setEquipment(record)" :style="{ fontSize: '20px', color: '#e29e14', padding: '0 10px' }" />
+        <a-icon type="edit" title="编辑" id="store-edit" @click="edit(record)" :style="{ fontSize: '20px', color: '#1890FF', padding: '0 10px' }" />
+        <a-icon type="link" title="设置" id="store-set" @click="setEquipment(record)" :style="{ fontSize: '20px', color: '#e29e14', padding: '0 10px' }" />
       </template>
       </template>
     </s-table>
     </s-table>
 
 

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

@@ -56,6 +56,7 @@
           <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 }">
             <a-tree-select
             <a-tree-select
               showSearch
               showSearch
+              id="store-editOrg"
               v-model="form.orgCode"
               v-model="form.orgCode"
               allowClear
               allowClear
               style="width: 100%"
               style="width: 100%"
@@ -68,8 +69,8 @@
         </a-col>
         </a-col>
         <a-col :span="24">
         <a-col :span="24">
           <a-form-model-item class="btn-cont" :label-col="{ span: 0 }" :wrapper-col="{ span: 24 }">
           <a-form-model-item class="btn-cont" :label-col="{ span: 0 }" :wrapper-col="{ span: 24 }">
-            <a-button type="primary" @click="onSubmit">保存</a-button>
-            <a-button class="cancel" @click="isShow = false">取消</a-button>
+            <a-button id="store-saveOrg" type="primary" @click="onSubmit">保存</a-button>
+            <a-button id="store-cancelOrg" class="cancel" @click="isShow = false">取消</a-button>
           </a-form-model-item>
           </a-form-model-item>
         </a-col>
         </a-col>
       </a-row>
       </a-row>