zh пре 2 година
родитељ
комит
3cf85bb299
29 измењених фајлова са 86 додато и 67 уклоњено
  1. 10 3
      src/views/supply/displace/components/displace_detail.vue
  2. 11 4
      src/views/supply/displace/components/displace_examine.vue
  3. 12 5
      src/views/supply/displace/components/displace_form.vue
  4. 12 4
      src/views/supply/displace/components/displace_return.vue
  5. 1 1
      src/views/supply/engin/components/commerce_examine.vue
  6. 3 3
      src/views/supply/engin/components/commerce_form.vue
  7. 1 1
      src/views/supply/engin/components/commerce_return.vue
  8. 1 1
      src/views/supply/engin/components/engin_detail.vue
  9. 2 2
      src/views/supply/engin/components/engin_examine.vue
  10. 3 3
      src/views/supply/engin/components/engin_form.vue
  11. 2 2
      src/views/supply/engin/components/home_examine.vue
  12. 3 3
      src/views/supply/engin/components/home_form.vue
  13. 1 1
      src/views/supply/engin/components/home_return.vue
  14. 1 1
      src/views/supply/implement/components/sales_examine.vue
  15. 2 2
      src/views/supply/implement/components/sales_return_form.vue
  16. 2 2
      src/views/supply/pickup/components/pickup_form.vue
  17. 1 1
      src/views/supply/policy/components/retail_examine.vue
  18. 2 2
      src/views/supply/policy/components/retail_form.vue
  19. 2 2
      src/views/supply/policy/components/retail_form2.vue
  20. 1 1
      src/views/supply/policy/components/retail_return.vue
  21. 4 10
      src/views/supply/price/components/modify_list-apply.vue
  22. 2 4
      src/views/supply/price/components/modify_list-approval.vue
  23. 1 2
      src/views/supply/price/components/modify_list-detail.vue
  24. 2 2
      src/views/supply/reserve/components/reserve_form.vue
  25. 0 1
      src/views/supply/retail/components/retail_examine.vue
  26. 2 2
      src/views/supply/retail/components/retail_form.vue
  27. 1 1
      src/views/supply/retail/components/retail_return.vue
  28. 0 1
      src/views/supply/return/components/return_form.vue
  29. 1 0
      src/views/supply/return/return_list.vue

+ 10 - 3
src/views/supply/displace/components/displace_detail.vue

@@ -18,7 +18,7 @@
           </el-col>
           <el-col :span="8" class="item">
             <div class="label">单据状态</div>
-            <div class="value">{{ $parent.findExamineStatus(detailData.examineStatus) }}</div>
+            <div class="value">{{ findExamineStatus(detailData.examineStatus) }}</div>
           </el-col>
           <el-col :span="8" class="item">
             <div class="label">原订单号</div>
@@ -26,7 +26,7 @@
           </el-col>
           <el-col :span="8" class="item">
             <div class="label">订单类型</div>
-            <div class="value">{{ $parent.findOrderType(detailData.orderType) }}</div>
+            <div class="value">{{ findOrderType(detailData.orderType) }}</div>
           </el-col>
           <el-col :span="8" class="item">
             <div class="label">销售政策编号</div>
@@ -389,7 +389,14 @@ export default {
     goBack() {
       this.$emit('backListFormDetail')
     },
-
+    findOrderType(val) {
+      const obj = this.orderType.find(value => value.val === val)
+      return obj ? obj.label : ''
+    },
+    findExamineStatus(val) {
+      const obj = this.examineStatus.find(value => value.val === val)
+      return obj ? obj.label : ''
+    },
     // 获取详情
     getDetail() {
       getDetail({ id: this.listItem.displaceOrderId }).then(res => {

+ 11 - 4
src/views/supply/displace/components/displace_examine.vue

@@ -18,7 +18,7 @@
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">单据状态</div>
-          <div class="value">{{ $parent.findExamineStatus(detailData.examineStatus) }}</div>
+          <div class="value">{{ findExamineStatus(detailData.examineStatus) }}</div>
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">原订单号</div>
@@ -26,7 +26,7 @@
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">订单类型</div>
-          <div class="value">{{ $parent.findOrderType(detailData.orderType) }}</div>
+          <div class="value">{{ findOrderType(detailData.orderType) }}</div>
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">销售政策编号</div>
@@ -406,7 +406,14 @@ export default {
         this.originGoodsList = res.data.originItems
       })
     },
-
+    findOrderType(val) {
+      const obj = this.orderType.find(value => value.val === val)
+      return obj ? obj.label : ''
+    },
+    findExamineStatus(val) {
+      const obj = this.examineStatus.find(value => value.val === val)
+      return obj ? obj.label : ''
+    },
     clickSubmitForm() {
       if (this.formLoading) {
         return
@@ -423,7 +430,7 @@ export default {
           this.$successMsg('审批成功')
           this.$nextTick(() => {
             this.goBack()
-            this.$parent.getList()
+            
           })
         })
         .finally(res => {

+ 12 - 5
src/views/supply/displace/components/displace_form.vue

@@ -66,7 +66,7 @@
         </template>
         <el-col :xs="24" :sm="12" :lg="8">
           <el-form-item label="订单类型" prop="orderType">
-            <el-input :value="$parent.findOrderType(mainForm.orderType)" placeholder="订单类型" disabled></el-input>
+            <el-input :value="findOrderType(mainForm.orderType)" placeholder="订单类型" disabled></el-input>
           </el-form-item>
         </el-col>
         <el-col :xs="24" :sm="12" :lg="8">
@@ -439,7 +439,7 @@
           <el-table-column type="selection" width="55"></el-table-column>
           <el-table-column align="center" prop="orderType" label="订单类型" show-overflow-tooltip>
             <template slot-scope="scope">
-              {{ $parent.findOrderType(dialogTable_data.orderType) }}
+              {{ findOrderType(dialogTable_data.orderType) }}
             </template>
           </el-table-column>
           <el-table-column align="center" prop="saleTypeName" label="销售类型" show-overflow-tooltip></el-table-column>
@@ -755,7 +755,14 @@ export default {
     goBack() {
       this.$emit('backListFormDetail')
     },
-
+    findOrderType(val) {
+      const obj = this.orderType.find(value => value.val === val)
+      return obj ? obj.label : ''
+    },
+    findExamineStatus(val) {
+      const obj = this.examineStatus.find(value => value.val === val)
+      return obj ? obj.label : ''
+    },
     // 获取详情
     getDetail() {
       getDetail({ id: this.editId }).then(res => {
@@ -888,13 +895,13 @@ export default {
             editData(params).then(res => {
               this.$successMsg('编辑成功')
               this.goBack()
-              this.$parent.getList()
+              
             })
           } else {
             addData(params).then(res => {
               this.$successMsg('添加成功')
               this.goBack()
-              this.$parent.getList()
+              
             })
           }
         }

+ 12 - 4
src/views/supply/displace/components/displace_return.vue

@@ -18,7 +18,7 @@
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">单据状态</div>
-          <div class="value">{{ $parent.findExamineStatus(detailData.examineStatus) }}</div>
+          <div class="value">{{ findExamineStatus(detailData.examineStatus) }}</div>
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">原订单号</div>
@@ -26,7 +26,7 @@
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">订单类型</div>
-          <div class="value">{{ $parent.findOrderType(detailData.orderType) }}</div>
+          <div class="value">{{ findOrderType(detailData.orderType) }}</div>
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">销售政策编号</div>
@@ -350,7 +350,7 @@ import { getDetail, returnOrder } from '@/api/supply/displace'
 export default {
   name: 'CommerceReturn',
   componentName: 'CommerceReturn',
-  props: ['listItem'],
+  props: ['listItem','orderType','examineStatus'],
   filters: {
     statusFilter(val) {
       const statusList = [
@@ -440,10 +440,18 @@ export default {
           returnOrder(params).then(res => {
             this.$successMsg()
             this.goBack()
-            this.$parent.getList()
+            
           })
         })
         .catch(() => {})
+    },
+    findOrderType(val) {
+      const obj = this.orderType.find(value => value.val === val)
+      return obj ? obj.label : ''
+    },
+    findExamineStatus(val) {
+      const obj = this.examineStatus.find(value => value.val === val)
+      return obj ? obj.label : ''
     }
   }
 }

+ 1 - 1
src/views/supply/engin/components/commerce_examine.vue

@@ -361,7 +361,7 @@ export default {
           examineCom(params).then(res => {
             this.$successMsg()
             this.goBack()
-            this.$parent.getList()
+            
           })
         })
         .catch(() => {})

+ 3 - 3
src/views/supply/engin/components/commerce_form.vue

@@ -1105,7 +1105,7 @@ export default {
               editCom(params).then(res => {
                 this.$successMsg('编辑成功')
                 this.goBack()
-                // this.$parent.getList()
+                
               })
             } else {
               params.customerNumber = this.mainForm.jxsNum
@@ -1114,7 +1114,7 @@ export default {
               addCom(params).then(res => {
                 this.$successMsg('新增成功')
                 this.goBack()
-                // this.$parent.getList()
+                
               })
             }
           } else if (type === 2) {
@@ -1124,7 +1124,7 @@ export default {
             submitCom(params).then(res => {
               this.$successMsg('提交审核成功')
               this.goBack()
-              // this.$parent.getList()
+              
             })
           }
         }

+ 1 - 1
src/views/supply/engin/components/commerce_return.vue

@@ -353,7 +353,7 @@ export default {
           returnCom(params).then(res => {
             this.$successMsg()
             this.goBack()
-            this.$parent.getList()
+           
           })
         })
         .catch(() => {})

+ 1 - 1
src/views/supply/engin/components/engin_detail.vue

@@ -328,7 +328,7 @@ export default {
       }).then(res => {
         this.$successMsg(status ? '关闭' : '启用')
         this.goBack()
-        this.$parent.getList()
+        
       })
     },
     // 直调完结

+ 2 - 2
src/views/supply/engin/components/engin_examine.vue

@@ -767,7 +767,7 @@ export default {
             .then(res => {
               this.$successMsg('审批成功')
               this.goBack()
-              this.$parent.getList()
+              
             })
             .finally(res => {
               this.formLoading = false
@@ -811,7 +811,7 @@ export default {
       //           .then(res => {
       //             this.$successMsg('审批成功')
       //             this.goBack()
-      //             this.$parent.getList()
+      //          
       //           })
       //           .finally(res => {
       //             this.formLoading = false

+ 3 - 3
src/views/supply/engin/components/engin_form.vue

@@ -964,7 +964,7 @@ export default {
               editEngin(params).then(res => {
                 this.$successMsg('编辑成功')
                 this.goBack()
-                // this.$parent.getList()
+                
               })
             } else {
               params.customerNumber = this.mainForm.jxsNum
@@ -973,7 +973,7 @@ export default {
               addEngin(params).then(res => {
                 this.$successMsg('保存成功')
                 this.goBack()
-                // this.$parent.getList()
+                
               })
             }
           } else {
@@ -987,7 +987,7 @@ export default {
             submitEngin(params).then(res => {
               this.$successMsg('提交审核成功')
               this.goBack()
-              // this.$parent.getList()
+              
             })
           }
         }

+ 2 - 2
src/views/supply/engin/components/home_examine.vue

@@ -625,7 +625,7 @@ export default {
               if (!res.data) {
                 this.$successMsg()
                 this.goBack()
-                this.$parent.getList()
+                
               } else {
                 this.$confirm('审批成功!是否跳转下一张待审批订单?', '提示', {
                   confirmButtonText: '跳转',
@@ -640,7 +640,7 @@ export default {
                   })
                   .catch(() => {
                     this.goBack()
-                    this.$parent.getList()
+                    
                   })
               }
             })

+ 3 - 3
src/views/supply/engin/components/home_form.vue

@@ -1577,7 +1577,7 @@ export default {
                 .then(res => {
                   this.$successMsg('编辑成功')
                   this.goBack()
-                  // this.$parent.getList()
+                  
                 })
                 .finally(res => {
                   this.formLoading = false
@@ -1587,7 +1587,7 @@ export default {
                 .then(res => {
                   this.$successMsg('新增成功')
                   this.goBack()
-                  // this.$parent.getList()
+                  
                 })
                 .finally(res => {
                   this.formLoading = false
@@ -1598,7 +1598,7 @@ export default {
               .then(res => {
                 this.$successMsg('提交审核成功')
                 this.goBack()
-                // this.$parent.getList()
+                
               })
               .finally(res => {
                 this.formLoading = false

+ 1 - 1
src/views/supply/engin/components/home_return.vue

@@ -464,7 +464,7 @@ export default {
           returnHome(params).then(res => {
             this.$successMsg()
             this.goBack()
-            this.$parent.getList()
+            
           })
         })
         .catch(() => {})

+ 1 - 1
src/views/supply/implement/components/sales_examine.vue

@@ -230,7 +230,7 @@ export default {
             .then(res => {
               this.$successMsg()
               this.goBack()
-              this.$parent.getList()
+              
             })
             .finally(res => {
               this.formLoading = false

+ 2 - 2
src/views/supply/implement/components/sales_return_form.vue

@@ -653,13 +653,13 @@ export default {
             editApply(params).then(res => {
               this.$successMsg('编辑成功')
               this.goBack()
-              this.$parent.getList()
+              
             })
           } else {
             addReturn(params).then(res => {
               this.$successMsg('添加成功')
               this.goBack()
-              this.$parent.getList()
+              
             })
           }
         }

+ 2 - 2
src/views/supply/pickup/components/pickup_form.vue

@@ -933,7 +933,7 @@ export default {
           .then(res => {
             this.$successMsg('提交成功')
             this.goBack()
-            // this.$parent.getList()
+           
           })
           .finally(res => {
             this.formLoading = false
@@ -943,7 +943,7 @@ export default {
           .then(res => {
             this.$successMsg('提交成功')
             this.goBack()
-            // this.$parent.getList()
+           
           })
           .finally(res => {
             this.formLoading = false

+ 1 - 1
src/views/supply/policy/components/retail_examine.vue

@@ -373,7 +373,7 @@ export default {
         .then(res => {
           this.$successMsg('审批成功')
           this.goBack()
-          this.$parent.getList()
+         
         })
         .finally(res => {
           this.formLoading = false

+ 2 - 2
src/views/supply/policy/components/retail_form.vue

@@ -1905,7 +1905,7 @@ export default {
             editData(params).then(res => {
               this.$successMsg('编辑成功')
               this.goBack()
-              this.$parent.getList()
+             
             })
           } else {
             params.retailOrderItemList.forEach(k => {
@@ -1915,7 +1915,7 @@ export default {
             addData(params).then(res => {
               this.$successMsg('添加成功')
               this.goBack()
-              this.$parent.getList()
+             
             })
           }
         }

+ 2 - 2
src/views/supply/policy/components/retail_form2.vue

@@ -1209,13 +1209,13 @@ export default {
             editData(params).then(res => {
               this.$successMsg('编辑成功')
               this.goBack()
-              this.$parent.getList()
+              
             })
           } else {
             addData(params).then(res => {
               this.$successMsg('添加成功')
               this.goBack()
-              this.$parent.getList()
+              
             })
           }
         }

+ 1 - 1
src/views/supply/policy/components/retail_return.vue

@@ -349,7 +349,7 @@ export default {
         .then(res => {
           this.$successMsg('退订成功')
           this.goBack()
-          this.$parent.getList()
+      
         })
         .finally(res => {
           this.formLoading = false

+ 4 - 10
src/views/supply/price/components/modify_list-apply.vue

@@ -796,10 +796,7 @@ export default {
       this.serviceId = adminCompany.roleId
     },
     goBack() {
-      // this.$parent.cid = ''
-      // this.show = 1
-      // 更新父组件数据
-      // this.getList()
+      
       this.$emit('back')
     },
     indexMethod(index) {
@@ -1095,10 +1092,9 @@ export default {
       }
       getProductRriceAdd(params)
         .then(res => {
-          // console.log(res.code, 'klkk')
+          
           this.$successMsg('成功')
-          // this.$parent.show = 1
-          // this.$parent.getList()
+          
           this.goBack()
         })
         .catch(err => {
@@ -1122,9 +1118,7 @@ export default {
       })
         .then(res => {
           this.$successMsg('成功')
-          // this.$parent.cid = ''
-          // this.$parent.show = 1
-          // this.$parent.getList()
+          
           this.goBack()
         })
         .catch(err => {

+ 2 - 4
src/views/supply/price/components/modify_list-approval.vue

@@ -230,8 +230,7 @@ export default {
       })[0]?.saleName
     },
     goBack() {
-      // console.log(this.$parent)
-      // this.$parent.show = 1
+      
       this.$emit('back')
     },
     onSubmit() {
@@ -245,8 +244,7 @@ export default {
 
       getProductRriceConfirm(params).then(res => {
         this.$successMsg('已提交审核')
-        // this.$parent.show = 1
-        // this.$parent.getList()
+     
         this.goBack()
       })
     },

+ 1 - 2
src/views/supply/price/components/modify_list-detail.vue

@@ -235,8 +235,7 @@ export default {
       })[0]?.saleName
     },
     goBack() {
-      // console.log(this.$parent)
-      // this.$parent.show = 1
+
       this.$emit('back')
     }
   }

+ 2 - 2
src/views/supply/reserve/components/reserve_form.vue

@@ -892,13 +892,13 @@ export default {
             editData(params).then(res => {
               this.$successMsg('编辑成功')
               this.goBack()
-              // this.$parent.getList()
+              
             })
           } else {
             addData(params).then(res => {
               this.$successMsg('添加成功')
               this.goBack()
-              // this.$parent.getList()
+              
             })
           }
         }

+ 0 - 1
src/views/supply/retail/components/retail_examine.vue

@@ -293,7 +293,6 @@ export default {
         .then(res => {
           this.$successMsg('审批成功')
           this.goBack()
-          this.$parent.getList()
         })
         .finally(res => {
           this.formLoading = false

+ 2 - 2
src/views/supply/retail/components/retail_form.vue

@@ -1117,13 +1117,13 @@ export default {
             editData(params).then(res => {
               this.$successMsg('编辑成功')
               this.goBack()
-              this.$parent.getList()
+              
             })
           } else {
             addData(params).then(res => {
               this.$successMsg('添加成功')
               this.goBack()
-              this.$parent.getList()
+              
             })
           }
         }

+ 1 - 1
src/views/supply/retail/components/retail_return.vue

@@ -320,7 +320,7 @@ export default {
         .then(res => {
           this.$successMsg('退订成功')
           this.goBack()
-          this.$parent.getList()
+     
         })
         .finally(res => {
           this.formLoading = false

+ 0 - 1
src/views/supply/return/components/return_form.vue

@@ -560,7 +560,6 @@ export default {
           addData(params).then(res => {
             this.$successMsg('添加成功')
             this.goBack()
-            this.$parent.getList()
           })
         }
       })

+ 1 - 0
src/views/supply/return/return_list.vue

@@ -320,6 +320,7 @@ export default {
       this.queryItem = {}
       this.isShowForm = false
       this.isShowDetail = false
+      this.getList()
     }
   }
 }