1004749546@qq.com 4 年之前
父节点
当前提交
ad44563207

+ 5 - 5
src/views/Home.vue

@@ -42,11 +42,11 @@ export default {
   beforeRouteEnter (to, from, next) {
     next(vm => {
       //  判断登录用户是否重置过密码(首次登陆需强制重置密码)
-      if (vm.mustChangePwd == 0) {
-        vm.openResetPwd = false
-      } else {
-        vm.openResetPwd = true
-      }
+      // if (vm.mustChangePwd == 0) {
+      //   vm.openResetPwd = false
+      // } else {
+      //   vm.openResetPwd = true
+      // }
       console.log(vm.mustChangePwd, '-------是否需要重置密码')
     })
   }

+ 3 - 3
src/views/storehouseManagement/customerInfo/CustomerList.vue

@@ -6,12 +6,12 @@
         <a-row :gutter="48">
           <a-col :lg="8" :sm="12">
             <a-form-model-item prop="storeName" label="客户名称" :label-col="{ span:4 }" :wrapper-col="{ span:12}">
-              <a-input class="full-width" v-model="queryParam.storeName" placeholder="请输入客户名称" allowClear id="PaySettlementRecords-queryOrderDate"/>
+              <a-input class="full-width" v-model="queryParam.storeName" placeholder="请输入客户名称" allowClear id="customerList-name"/>
             </a-form-model-item>
           </a-col>
           <a-col :lg="6" :sm="12">
-            <a-button type="primary" @click="handleSearch" id="PaySettlementRecords-refresh">查询</a-button>
-            <a-button style="margin-left: 8px" @click="resetSearchForm" id="PaySettlementRecords-resetSearchForm">重置</a-button>
+            <a-button type="primary" @click="handleSearch" id="customerList-search">查询</a-button>
+            <a-button style="margin-left: 8px" @click="resetSearchForm" id="customerList-resetSearchForm">重置</a-button>
           </a-col>
         </a-row>
         </a-form>

+ 5 - 4
src/views/storehouseManagement/productInfo/ProductList.vue

@@ -6,7 +6,7 @@
         <a-row :gutter="48">
           <a-col :lg="6" :sm="12">
             <a-form-model-item prop="partName" label="配件名称" :label-col="{ span:4 }" :wrapper-col="{ span:12}">
-              <a-input class="full-width" v-model="queryParam.partName" placeholder="请输入配件名称" allowClear id="PaySettlementRecords-queryOrderDate"/>
+              <a-input class="full-width" v-model="queryParam.partName" placeholder="请输入配件名称" allowClear id="productList-partName"/>
             </a-form-model-item>
           </a-col>
           <a-col :lg="6" :sm="12">
@@ -14,6 +14,7 @@
               <a-select
                 show-search
                 allowClear
+                id="productList-brand"
                 placeholder="请选择配件品牌"
                 option-filter-prop="children"
                 v-model="queryParam.storeName"
@@ -26,12 +27,12 @@
           </a-col>
           <a-col :lg="6" :sm="12">
             <a-form-model-item prop="settleNo" label="配件编码/OE码" :label-col="{ span:4 }" :wrapper-col="{ span:12}">
-              <a-input class="full-width" v-model="queryParam.settleNo" placeholder="配件编码/OE码" allowClear id="PaySettlementRecords-queryOrderDate"/>
+              <a-input class="full-width" v-model="queryParam.settleNo" placeholder="配件编码/OE码" allowClear id="productList-code"/>
             </a-form-model-item>
           </a-col>
           <a-col :lg="6" :sm="12">
-            <a-button type="primary" @click="handleSearch" id="PaySettlementRecords-refresh">查询</a-button>
-            <a-button style="margin-left: 8px" @click="resetSearchForm" id="PaySettlementRecords-resetSearchForm">重置</a-button>
+            <a-button type="primary" @click="handleSearch" id="productList-search">查询</a-button>
+            <a-button style="margin-left: 8px" @click="resetSearchForm" id="productList-resetSearchForm">重置</a-button>
           </a-col>
         </a-row>
         </a-form>

+ 6 - 4
src/views/storehouseManagement/storeBind/StoreBindList.vue

@@ -7,7 +7,7 @@
           <a-col :lg="8" :sm="12">
             <a-form-model-item label="绑定时间" :label-col="{ span:4 }" :wrapper-col="{ span:16}">
               <a-range-picker
-                id="PaySettlementRecords-queryOrderDate"
+                id="storeBindList-queryOrderDate"
                 :disabledDate="disabledDate"
                 style="width: 100%;"
                 v-model="queryOrderDate"
@@ -19,6 +19,7 @@
           <a-col :lg="6" :sm="12">
             <a-form-model-item prop="channeName" label="供应商名称" :label-col="{ span:4 }" :wrapper-col="{ span:12}">
               <a-select
+                id="storeBindList-channeName"
                 show-search
                 allowClear
                 placeholder="请输入供应商名称"
@@ -34,6 +35,7 @@
           <a-col :lg="6" :sm="12">
             <a-form-model-item prop="channeName" label="门店名称" :label-col="{ span:4 }" :wrapper-col="{ span:12}">
               <a-select
+                id="storeBindList-storeName"
                 show-search
                 allowClear
                 placeholder="请输入门店名称"
@@ -47,15 +49,15 @@
             </a-form-model-item>
           </a-col>
           <a-col :lg="4" :sm="12">
-            <a-button style="margin:0 4px 3px 4px" type="primary" @click="refresh" id="PaySettlementRecords-refresh">查询</a-button>
-            <a-button style="margin: 0 4px 3px 4px" @click="resetSearchForm" id="PaySettlementRecords-resetSearchForm">重置</a-button>
+            <a-button style="margin:0 4px 3px 4px" type="primary" @click="refresh" id="storeBindList-search">查询</a-button>
+            <a-button style="margin: 0 4px 3px 4px" @click="resetSearchForm" id="storeBindList-resetSearchForm">重置</a-button>
           </a-col>
         </a-row>
       </a-form-model>
     </div>
     <!-- 合计 -->
     <div class="ftext" >
-      <a-button class="btn-cont" type="primary" @click="openModal" id="PaySettlementRecords-refresh">新增绑定</a-button>
+      <a-button class="btn-cont" type="primary" @click="openModal" id="storeBindList-add">新增绑定</a-button>
     </div>
     <!-- 列表 -->
     <div>

+ 4 - 2
src/views/storehouseManagement/storeBind/StoreBindModal.vue

@@ -11,6 +11,7 @@
       <a-form-model ref="ruleForm" :model="form" :rules="rules" :labelCol="{span:5}" :wrapperCol="{span:15}">
         <a-form-model-item required label="选择供应商" prop="channeName">
           <a-select
+            id="storeBindModal-channeName"
             show-search
             allowClear
             placeholder="请选择供应商"
@@ -24,6 +25,7 @@
         </a-form-model-item>
         <a-form-model-item label="选择关联客户" prop="storeName">
           <a-select
+            id="storeBindModal-storeName"
             show-search
             allowClear
             placeholder="请选择关联客户"
@@ -39,10 +41,10 @@
           <span>{{ form.storeAddress }}</span>
         </a-form-model-item>
         <a-form-model-item class="submit-cont" :wrapper-col="{ span: 14, offset: 9 }">
-          <a-button type="primary" @click="submitForm('ruleForm')">
+          <a-button type="primary" id="storeBindModal-submit" @click="submitForm('ruleForm')">
             提交
           </a-button>
-          <a-button style="margin-left: 10px" @click="cancel">
+          <a-button id="storeBindModal-cancle" style="margin-left: 10px" @click="cancel">
             取消
           </a-button>
         </a-form-model-item>