2023-3-10

src/HDrpManagement/recvoucher/details/index.vue

@@ -103,17 +103,25 @@ export default {
       this.changeDataStructure()
     },
     duichong (data) {
-      // if (this.$route.path !== '/workorderDetail') {
-      //   this.oldRoute = {path:this.$route.path,query:this.$route.query}
-      //   this.$store.dispatch('setHistoryRouter',this.oldRoute)
-      // }
-      // this.$router.push({
-      //   path:'/writeoffbillDetail',
-      //   query:{
-      //     id:res.data.sa_writeoffbillid,
-      //   }
-      // })
-      this.queryMainData($route.query.id)
+      this.$store.dispatch('changeDetailDrawer',false)
+      this.$router.push('/recvoucher')
+      this.$router.replace({
+        path:'/recvoucherDetails',
+        query:{
+          id:data.sa_cashbillid, 
+        }
+      })
+      setTimeout(() => {
+        this.$router.replace({
+          path:'/recvoucherDetails',
+          query:{
+            id:data.sa_cashbillid,
+          }
+        })
+        this.$store.dispatch('changeDetailDrawer',true)
+        this.queryMainData(this.$route.query.id)
+      })
+
     },
     changeDataStructure(){
       let that = this

src/HManagement/EnterpriseArchives/modules/details.vue

@@ -59,8 +59,8 @@ export default {
           value: this.mainData.erpagentnum
         },
         {
-          label:'免运费额度',
-          value: this.mainData.freefreightamount
+          label:'免运费金额',
+          value: this.mainData.freefreightamount == -1 ? '不免运费' : this.mainData.freefreightamount == 0 ? '免运费' : this.mainData.freefreightamount
         },
         {
           label:'订单可退货天数',

src/HManagement/marketing2/agent/details/index.vue

@@ -249,7 +249,7 @@ export default {
         },
         {
           label:'免运费金额',
-          value: this.mainData.freefreightamount
+          value: this.mainData.freefreightamount == -1 ? '不免运费' : this.mainData.freefreightamount == 0 ? '免运费' : this.mainData.freefreightamount
         },
         {
           label:'订单可退货天数',

src/SDrpManagement/ProductGroup/index.vue

@@ -108,15 +108,19 @@ export default {
       this.enterprisename = data.enterprisename
       this.sys_enterpriseid = data.sys_enterpriseid
 
-      this.$refs.class.queryAgentiInfo()
-      this.$refs.class.queryBrands().then(() => {
+      this.$refs.class.queryBrands(() => {
         this.$refs.class.queryClass()
         this.brandId = [this.$refs.class.brand_act]
+      })
+      this.$refs.class.queryAgentiInfo(() => {
         this.params.content.where.tradefield = this.$refs.class.tradefield
+        
         this.params.content.where.itemclassid = ''
         this.$refs.class.class_act = ''
+        this.$refs.class.activeClass = {}
         this.getProductGroup()
       })
+      
     },
     /* 获取品牌数据 */
     async getbrandList() {

src/SDrpManagement/ProductGroup/modules/Select.vue

@@ -50,13 +50,13 @@ export default {
     classTree
   },
   methods:{
-    async queryAgentiInfo () {
+    async queryAgentiInfo (callback) {
       let param = {
         "id": 20221223141802,
         "content": {
             "pageNumber": 1,
             "pageSize": 20,
-            // "sys_enterpriseid":this.sys_enterpriseid(),
+            "sys_enterpriseid":this.sys_enterpriseid(),
             "where": {
               "condition": ""
             }
@@ -74,8 +74,9 @@ export default {
         this.tradefield = ''
         // this.clickField(false)
       }
+      callback && callback()
     },
-    async queryBrands () {
+    async queryBrands (callback) {
       let param = {
         "id": "20220924163702",
         "content": {
@@ -87,18 +88,16 @@ export default {
         }
       }
       if (!this.sys_enterpriseid()) delete param.content.sys_enterpriseid
-      return new Promise(async (re,rej) => {
-        const res = await this.$api.requested(param)
-        this.brands = res.data
-        if (this.brands.length) {
-          this.brand_act = res.data[0].sa_brandid
-          // this.clickBrand(res.data[0].sa_brandid)
-        } else {
-          this.brand_act = 0
-          // this.clickBrand(this.brand_act)
-        }
-        re()
-      })
+      const res = await this.$api.requested(param)
+      this.brands = res.data
+      if (this.brands.length) {
+        this.brand_act = res.data[0].sa_brandid
+        // this.clickBrand(res.data[0].sa_brandid)
+      } else {
+        this.brand_act = 0
+        // this.clickBrand(this.brand_act)
+      }
+      callback && callback()
       
     },