chenrui 4 vuotta sitten
vanhempi
commit
e557f41f5b

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

@@ -179,7 +179,9 @@ export default {
         this.form.loginName = ''
         this.form.password = ''
         this.form.org.childUserMaxNum = ''
-        this.$refs.custList.resetForm()
+        if (this.itemId == '') {
+          this.$refs.custList.resetForm()
+        }
       }
     },
     itemId (newValue, oldValue) {

+ 1 - 0
src/views/dealerManagement/merchantInfoManagement/detailModal.vue

@@ -76,6 +76,7 @@
           size="large"
           v-if="isAudit"
           type="primary"
+          class="button-primary"
           style="margin-right: 50px;"
           @click="handleAudit">审核</a-button>
         <a-button id="merchantInfoManagement-back" size="large" @click="isShow = false" style="font-size: 12px;">返回列表</a-button>

+ 1 - 2
src/views/productManagement/productBrand/list.vue

@@ -70,8 +70,7 @@
       :maskClosable="false"
       title="品牌图片"
       v-model="openPicModal"
-      @cancle="nowPic=''"
-      :width="800">
+      @cancle="nowPic=''">
       <img :src="nowPic" width="100%" />
     </a-modal>
   </a-card>

+ 4 - 1
src/views/purchasingManagement/bulkWarehousingOrder/detailModal.vue

@@ -125,7 +125,10 @@ export default {
     },
     itemSn (newValue, oldValue) {
       if (this.isShow && newValue) {
-        this.$refs.table.refresh(true)
+        const _this = this
+        setTimeout(() => {
+          _this.$refs.table.refresh(true)
+        }, 200)
       }
     }
   }

+ 1 - 1
src/views/supplierManagement/associatedProduct/add.vue

@@ -9,7 +9,7 @@
       <!-- 操作区,位于 title 行的行尾 -->
       <template slot="extra">
         <a-button key="2" type="primary" @click="choosePModal" class="button-error" id="associatedProduct-addProduct-btn">增加产品</a-button>
-        <a-button key="1" type="primary" class="button-success" id="associatedProduct-import-btn">批量导入</a-button>
+        <!-- <a-button key="1" type="primary" class="button-success" id="associatedProduct-import-btn">批量导入</a-button> -->
       </template>
     </a-page-header>
     <!-- 列表 -->

+ 1 - 1
src/views/supplierManagement/associatedProductDetails/list.vue

@@ -100,7 +100,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 380
+          this.tableHeight = window.innerHeight - 320
         }
         return supplierProductList(Object.assign(parameter, this.queryParam)).then(res => {
           const data = res.data