Merge branch 'mergeBranch' into greenUrgent

src/HDrpManagement/ProductMag/modules/components/editField.vue

@@ -14,7 +14,7 @@
             <el-col :span="12">
               <el-form-item label="领域" prop="value">
                 <el-select v-model="form.value" style="width:100%">
-                  <el-option v-for="item in categoriesList" :key="item.index" :value="item.tag" :label="item.tag"></el-option>
+                  <el-option v-for="item in fieldList" :key="item.index" :value="item.value" :label="item.remarks"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -87,7 +87,7 @@ export default {
           { required: true, message: '未设置产品售价折扣区间及其提成类型', trigger: 'change'},
         ],
       },
-      categoriesList:[],
+      fieldList:[],
       rewardList:[],
       tablecols:[],
       list:[],

src/HDrpManagement/orderManage/details/index.vue

@@ -222,6 +222,7 @@ export default {
           this.rebateamount = this.mainData.rebateamount
         }
         console.log(this.mainData);
+        this.$refs.prod.listData(this.$refs.prod.param.content.pageNumber = 1)
         this.queryUsedrebate()
         this.changeDataStructure()
         this.orderreviewtype()

src/HDrpManagement/orderManage/details/tabs/productlist.vue

@@ -13,7 +13,7 @@
          v-if="type !== 'confirmdate' && data.status === '新建' "
           style="margin:0 0 10px 10px"
           :total="total"
-          @onSuccess="listData();$emit('onSuccess')"
+          @onSuccess="listData(this.param.content.pageNumber = 1);$emit('onSuccess')"
           @handlePullApi="handlePullApi"
           @handleDelApi="handleDelApi"
           idName="sa_orderitemsid"
@@ -698,7 +698,7 @@ export default {
         },
       })
       this.tool.showMessage(res,()=>{
-        this.listData()
+        this.listData(this.param.content.pageNumber = 1)
         this.$emit('onSuccess')
         this.deleteIds = []
       })
@@ -775,7 +775,7 @@ export default {
           "needdate": this.value1
         },
       })
-      this.listData()
+      this.listData(this.param.content.pageNumber = 1)
     },
     setPickerOptions (val) {
       // /* 如果设置需求日 交期不能大于需求日 */
@@ -851,7 +851,7 @@ export default {
           "deliverydate": this.value2
         },
       })
-      this.listData()
+      this.listData(this.param.content.pageNumber = 1)
     },
     selectionChange (selection) {
       this.$emit('select',selection)
@@ -876,7 +876,7 @@ export default {
           },
         })
       }
-      this.listData()
+      this.listData(this.param.content.pageNumber = 1)
       this.$emit('onSuccess')
     },
     async queryStock (val) {
@@ -919,7 +919,7 @@ export default {
         },
       })
       this.tool.showMessage(res,()=>{
-        this.listData()
+        this.listData(this.param.content.pageNumber = 1)
         this.$refs.addProduct.listData()
         this.$emit('onSuccess')
       })
@@ -943,7 +943,7 @@ export default {
         },
       })
       this.tool.showMessage(res,() => {
-        this.listData()
+        this.listData(this.param.content.pageNumber = 1)
         this.$refs.addProduct.listData()
         this.$emit('onSuccess')
       })
@@ -964,7 +964,7 @@ export default {
           }
         })
       }
-      this.listData()
+      this.listData(this.param.content.pageNumber = 1)
       this.$refs.addProduct.list = []
       this.$emit('onSuccess')
     },
@@ -973,7 +973,7 @@ export default {
   mounted () {
     this.flag = 0
     this.siteid = JSON.parse(sessionStorage.getItem('active_account')).siteid
-    this.listData()
+    this.listData(this.param.content.pageNumber = 1)
     // this.queryStock()
     // this.columnTitle  = []
     setTimeout(() => {

src/components/dynamic-table/index3.vue

@@ -41,6 +41,11 @@ export default {
       list:[],
     }
   },
+  watch:{
+    data(val){
+      this.doLayout()
+    }
+  },
   computed:{
     ...mapGetters({
       loading:'loading'
@@ -55,6 +60,13 @@ export default {
     },
     selectionChange(row){
       this.$emit('selectionChange',row)
+    },
+    doLayout(){
+      if (this.$refs.table){
+        this.$nextTick(()=>{
+          this.$refs.table.doLayout()
+        })
+      }
     }
   },
   mounted () {

src/template/addProduct/index.vue

@@ -130,12 +130,10 @@ export default {
       this.querySa_brandid !== '' ?this.sa_brandid = this.querySa_brandid : this.sa_brandid = ''
       this.queryBrands()
       this.queryClass()
-      this.listData()
+      this.listData(this.params.content.pageNumber = 1)
     },
     /*可添加商品*/
     async listData(){
-      this.params.content.pageNumber = 1
-      console.log(this.tradefield,'领域')
       if (this.data){
         switch (this.data.type) {
           case '标准订单':
@@ -182,7 +180,7 @@ export default {
     },
     brandChange(){
       this.params.content.where.sa_brandid = this.sa_brandid
-      this.listData()
+      this.listData(this.params.content.pageNumber = 1)
       this.queryClass()
     },
     /*获取分类*/
@@ -242,12 +240,12 @@ export default {
     },
     classChange(){
       this.params.content.where.itemclassid = this.itemclassid[this.itemclassid.length -1]
-      this.listData()
+      this.listData(this.params.content.pageNumber = 1)
     },
     queryChange(){
       this.params.content.where.standards = this.itemstandard
       this.params.content.where.material = this.itemmaterial
-      this.listData()
+      this.listData(this.params.content.pageNumber = 1)
     },
     /*拉取数据*/
     handlePullApi (pullApi) {
@@ -276,7 +274,7 @@ export default {
     },
     onSuccess () {
       console.log('成功')
-      this.listData()
+      this.listData(this.params.content.pageNumber = 1)
     },
     onClose(){
       this.dialogFormVisible = false