lilei 3 anni fa
parent
commit
81ce4be7d3

+ 1 - 1
src/components/MultiTab/MultiTab.vue

@@ -163,7 +163,7 @@ export default {
         >
           <span slot="tab">
             {this.renderTabPane(page.meta.customTitle || page.meta.title, page.name)}
-            {this.activeKey == page.name ? (<a-icon
+            {this.activeKey == 'page.name' ? (<a-icon
               {...{ on: { click: refashThat } }}
               style={{ marginLeft: '8px', fontSize: '12px' }}
               type="reload" />) : ''}

+ 2 - 1
src/views/dealerManagement/dealerAccountManagement/editModal.vue

@@ -51,9 +51,10 @@
             <a-input
               id="dealerAccountEdit-password"
               :maxLength="50"
+              :minLength="6"
               type="password"
               v-model.trim="form.password"
-              placeholder="请输入管理员密码,字母/数字(最多50个字符)"
+              placeholder="请输入管理员密码,字母/数字(最少6个字符,最多50个字符)"
               allowClear />
           </a-form-model-item>
           <a-form-model-item label="最大可开通用户数" prop="org.childUserMaxNum" extra="(含管理员账号)">

+ 9 - 8
src/views/salesManagement/waitDispatch/edit.vue

@@ -14,7 +14,7 @@
           <a-button key="1" type="primary" id="waitDispatch-print-btn">快速打印</a-button>
         </template> -->
       </a-page-header>
-      <a-card size="small" :bordered="false" class="waitDispatch-cont" v-if="salesBillSn">
+      <a-card size="small" :bordered="false" class="waitDispatch-cont">
         <!-- 查询配件列表 -->
         <queryPart
           ref="partQuery"
@@ -387,19 +387,20 @@ export default {
     },
     pageInit () {
       this.getOrderDetail()
-      this.$refs.partQuery.resetSearchForm()
-      this.$refs.table.refresh(true)
+      this.salesBillSn = this.$route.params.salesBillSn
+      console.log(this.salesBillSn)
+      // this.$refs.partQuery.resetSearchForm()
+      if (!this.disabled) {
+        this.$refs.table.refresh(true)
+      }
     }
   },
   mounted () {
-    this.getOrderDetail()
+    this.pageInit()
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {
-      vm.salesBillSn = vm.$route.params.salesBillSn
-      if (!vm.disabled) {
-        vm.pageInit()
-      }
+      vm.pageInit()
     })
   }
 }

+ 9 - 6
src/views/salesManagement/waitDispatch/queryPart.vue

@@ -142,6 +142,12 @@ export default {
     newLoading: Boolean,
     detailData: Object
   },
+  watch: {
+    data (newValue, oldValue) {
+      console.log(newValue)
+      this.resetSearchForm()
+    }
+  },
   data () {
     return {
       advanced: true, // 高级搜索 展开/关闭
@@ -155,7 +161,8 @@ export default {
         brandSn: undefined, //  产品品牌
         productTypeSn1: '', //  产品一级分类
         productTypeSn2: '', //  产品二级分类
-        productTypeSn3: '' //  产品三级分类
+        productTypeSn3: '', //  产品三级分类
+        salesBillSn: ''
       },
       disabled: false, //  查询、重置按钮是否可操作
       selectedRowKeys: [], // Check here to configure the default column
@@ -164,6 +171,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         this.queryParam.salesBillSn = this.salesBillSn
+        console.log(this.salesBillSn, 'this.salesBillSn')
         return salesDetailAllList(Object.assign(parameter, this.queryParam)).then(res => {
           let data = res.data
           if (data) {
@@ -342,11 +350,6 @@ export default {
       this.queryParam.productTypeSn2 = val[1] ? val[1] : ''
       this.queryParam.productTypeSn3 = val[2] ? val[2] : ''
     }
-  },
-  beforeRouteEnter (to, from, next) {
-    next(vm => {
-      vm.$refs.table.refresh()
-    })
   }
 }
 </script>