1004749546@qq.com 4 年 前
コミット
2a9c63e81d

+ 5 - 4
src/views/equipmentManage/boxSetting/AddBoxModal.vue

@@ -19,7 +19,7 @@
             placeholder="请输入箱体类型名称(最多30个字符)"
             allowClear
             :maxLength="30"
-            id="roleModal-name"
+            id="addBoxModal-name"
             v-model="formData.name"
           />
         </a-form-model-item>
@@ -60,6 +60,7 @@
               }"
             >
               <a-input-number
+                id="addBoxModal-maxWeight"
                 :min="1"
                 :max="1000"
                 :precision="0"
@@ -84,8 +85,8 @@
               }"
             >
               <v-select
-                ref="orderStatus"
                 id="addBoxModal-status"
+                ref="orderStatus"
                 code="RUBBISH_TYPE"
                 placeholder="请选择分类"
                 allowClear
@@ -96,10 +97,10 @@
           </a-col>
         </a-row>
         <a-form-model-item :wrapper-col="{ span: 24, offset: 10 }">
-          <a-button type="primary" @click="handleSubmit()" id="roleModal-handleSubmit" :style="{ marginRight: '15px' }">
+          <a-button type="primary" @click="handleSubmit()" id="addBoxModal-handleSubmit" :style="{ marginRight: '15px' }">
             保存
           </a-button>
-          <a-button :style="{ marginLeft: '15px' }" @click="handleCancel()" id="roleModal-handleCancel">
+          <a-button :style="{ marginLeft: '15px' }" @click="handleCancel()" id="addBoxModal-handleCancel">
             取消
           </a-button>
         </a-form-model-item>

+ 15 - 3
src/views/equipmentManage/boxSetting/boxSetting.vue

@@ -16,7 +16,7 @@
       </a-form>
     </div>
     <div class="table-operator">
-      <a-button type="primary" icon="plus" @click="openModal" id="roleList-openModal" v-hasPermission="'B_boxSetting_add'">新增</a-button>
+      <a-button type="primary" icon="plus" @click="openModal" id="boxSetting-add" v-hasPermission="'B_boxSetting_add'">新增</a-button>
     </div>
     <s-table
       ref="table"
@@ -27,8 +27,20 @@
       bordered>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
-        <a-icon type="edit" title="编辑" class="actionBtn icon-blues" @click="handleEdit(record)" v-hasPermission="'B_boxSetting_edit'" />
-        <a-icon type="delete" title="删除" class="actionBtn icon-red" @click="delect(record)" v-if="$hasPermissions('B_boxSetting_del') && !record.isEnable"/>
+        <a-icon
+          type="edit"
+          id="boxSetting-edit"
+          title="编辑"
+          class="actionBtn icon-blues"
+          @click="handleEdit(record)"
+          v-hasPermission="'B_boxSetting_edit'" />
+        <a-icon
+          type="delete"
+          id="boxSetting-del"
+          title="删除"
+          class="actionBtn icon-red"
+          @click="delect(record)"
+          v-if="$hasPermissions('B_boxSetting_del') && !record.isEnable"/>
         <span v-if="!$hasPermissions('B_boxSetting_edit') && (!$hasPermissions('B_boxSetting_del') && !record.isEnable)">--</span>
       </template>
     </s-table>

+ 5 - 3
src/views/equipmentManage/exchangeSetting/AddSetModal.vue

@@ -39,6 +39,7 @@
             <!-- 请输入投放重量 -->
             <a-form-item :label="item.dispName" :required="true" :label-col=" { span: 11 }" :wrapper-col=" { span: 13 }">
               <a-input-number
+                id="addSetModal-rubbishWeight"
                 :min="0"
                 :max="999999"
                 :precision="0"
@@ -65,6 +66,7 @@
             <!-- 请输入可兑乐豆数 -->
             <a-form-item :label="''" :required="false" :wrapper-col="{ span: 20 }">
               <a-input-number
+                id="addSetModal-goleNum"
                 :min="0"
                 :max="999999"
                 :precision="0"
@@ -88,17 +90,17 @@
           </a-col>
           <a-col span="3">
             <a-form-item :label="''" :required="false" :wrapper-col="{ span: 24 }">
-              <a-checkbox :checked="item.state==0" @change="handleStatusChange(item,index)">
+              <a-checkbox id="addSetModal-state" :checked="item.state==0" @change="handleStatusChange(item,index)">
                 不兑换
               </a-checkbox>
             </a-form-item>
           </a-col>
         </a-row>
         <a-form-item :wrapper-col="{ span: 24, offset: 10 }">
-          <a-button type="primary" @click="handleSubmit()" id="roleModal-handleSubmit" :style="{ marginRight: '15px' }">
+          <a-button type="primary" @click="handleSubmit()" id="addSetModal-handleSubmit" :style="{ marginRight: '15px' }">
             保存
           </a-button>
-          <a-button :style="{ marginLeft: '15px' }" @click="cancel()" id="roleModal-handleCancel">
+          <a-button :style="{ marginLeft: '15px' }" @click="cancel()" id="addSetModal-handleCancel">
             取消
           </a-button>
         </a-form-item>

+ 15 - 3
src/views/equipmentManage/exchangeSetting/ExchangeSetting.vue

@@ -16,7 +16,7 @@
       </a-form>
     </div>
     <div class="table-operator">
-      <a-button type="primary" icon="plus" @click="openModal" id="roleList-openModal" v-hasPermission="'B_exchangeSetting_add'">新增</a-button>
+      <a-button type="primary" icon="plus" @click="openModal" id="boxSetting-add" v-hasPermission="'B_exchangeSetting_add'">新增</a-button>
     </div>
     <s-table
       ref="table"
@@ -27,8 +27,20 @@
       bordered>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
-        <a-icon type="edit" title="编辑" class="actionBtn icon-blues" @click="handleEdit(record)" v-hasPermission="'B_exchangeSetting_edit'"/>
-        <a-icon type="delete" title="删除" class="actionBtn icon-red" v-if="$hasPermissions('B_exchangeSetting_del') && !record.isEnable" @click="delect(record)" />
+        <a-icon
+          id="boxSetting-edit"
+          type="edit"
+          title="编辑"
+          class="actionBtn icon-blues"
+          @click="handleEdit(record)"
+          v-hasPermission="'B_exchangeSetting_edit'"/>
+        <a-icon
+          id="boxSetting-del"
+          type="delete"
+          title="删除"
+          class="actionBtn icon-red"
+          v-if="$hasPermissions('B_exchangeSetting_del') && !record.isEnable"
+          @click="delect(record)" />
         <span v-if="!$hasPermissions('B_exchangeSetting_edit') && (!$hasPermissions('B_exchangeSetting_del') && !record.isEnable)">--</span>
       </template>
     </s-table>

+ 12 - 4
src/views/equipmentManage/openTimeSetting/AddTimeModal.vue

@@ -21,7 +21,7 @@
               placeholder="请输入投放时间段名称(最多30个字符)"
               allowClear
               :maxLength="30"
-              id="tftime-name"
+              id="addTimeModal-name"
               v-model="formData.name"
             />
           </a-form-model-item>
@@ -41,6 +41,7 @@
                 }"
               >
                 <a-time-picker
+                  id="addTimeModal-openTime"
                   placeholder="开始时间"
                   v-model="item.openTime"
                   format="HH:mm"
@@ -62,6 +63,7 @@
                 }"
               >
                 <a-time-picker
+                  id="addTimeModal-closeTime"
                   placeholder="结束时间"
                   v-model="item.closeTime"
                   format="HH:mm"
@@ -74,16 +76,22 @@
                 v-if="index > 0"
                 class="dynamic-delete-button"
                 type="minus-circle-o"
+                id="addTimeModal-del"
                 :disabled="formData.deliveryTimeRuleItemList.length === 1"
                 @click="() => remove(index)"
               />
-              <a-icon v-if="index === formData.deliveryTimeRuleItemList.length - 1" :style="{ fontSize: '18px' }" type="plus-circle" @click="add" />
+              <a-icon
+                id="addTimeModal-add"
+                v-if="index === formData.deliveryTimeRuleItemList.length - 1"
+                :style="{ fontSize: '18px' }"
+                type="plus-circle"
+                @click="add" />
             </a-form-model-item>
           </a-row>
         </div>
         <a-form-model-item :wrapper-col="{ span: 24, offset: 10 }">
-          <a-button type="primary" @click="handleSubmit()" id="roleModal-handleSubmit" :style="{ marginRight: '15px' }">保存</a-button>
-          <a-button :style="{ marginLeft: '15px' }" @click="handleCancel()" id="roleModal-handleCancel">取消</a-button>
+          <a-button id="addTimeModal-handleSubmit" type="primary" @click="handleSubmit()" :style="{ marginRight: '15px' }">保存</a-button>
+          <a-button :style="{ marginLeft: '15px' }" @click="handleCancel()" id="addTimeModal-handleCancel">取消</a-button>
         </a-form-model-item>
       </a-form-model>
     </a-modal>

+ 9 - 2
src/views/equipmentManage/openTimeSetting/OpenTimeSetting.vue

@@ -1,7 +1,7 @@
 <template>
   <a-card :bordered="false">
     <div class="table-operator">
-      <a-button type="primary" icon="plus" @click="openModal" id="roleList-openModal">新增</a-button>
+      <a-button v-hasPermission="'B_openTimeSetting_add'" type="primary" icon="plus" @click="openModal" id="openTimeSetting-add">新增</a-button>
     </div>
     <s-table
       ref="table"
@@ -16,10 +16,17 @@
       </template>
       <!-- 操作 -->
       <span slot="action" slot-scope="text, record">
-        <a-icon type="edit" title="编辑" class="actionBtn icon-blues" @click="handleEdit(record)" v-hasPermission="'B_openTimeSetting_edit'"/>
+        <a-icon
+          id="openTimeSetting-edit"
+          type="edit"
+          title="编辑"
+          class="actionBtn icon-blues"
+          @click="handleEdit(record)"
+          v-hasPermission="'B_openTimeSetting_edit'"/>
         <a-icon
           type="delete"
           title="删除"
+          id="openTimeSetting-del"
           class="actionBtn icon-red"
           v-if="$hasPermissions('B_openTimeSetting_del') && !record.isEnable"
           @click="delect(record)" />