linwenxin 1 rok pred
rodič
commit
2a7cd68990

+ 1 - 1
src/views/mallManagement/order/order_detail/index.vue

@@ -716,7 +716,7 @@ export default {
 	  },
 	  isEdit1: 0,
 	  isEdit2: 0,
-	  joinCode: JSON.parse(localStorage.getItem('greemall_user')).joinCode,
+	  joinCode: JSON.parse(localStorage.getItem('greemall_user')).joinCode === "CODE",
 	  orderDetailId: '',
 
     printList: [],

+ 1 - 1
src/views/mallManagement/order/order_list/index.vue

@@ -761,7 +761,7 @@ export default {
 		},
 		isEdit1: 0,
 		isEdit2: 0,
-		joinCode: JSON.parse(localStorage.getItem('greemall_user')).joinCode,
+		joinCode: JSON.parse(localStorage.getItem('greemall_user')).joinCode === "CODE",
 		orderDetailId: '',
 
     printOrderId: '',

+ 1 - 1
src/views/mallManagement/order/order_refund/index.vue

@@ -519,7 +519,7 @@ export default {
       },
       isEdit1: 0,
       isEdit2: 0,
-      joinCode: JSON.parse(localStorage.getItem('greemall_user')).joinCode,
+      joinCode: JSON.parse(localStorage.getItem('greemall_user')).joinCode === "CODE",
       orderDetailId: '',
       returnGoodsFormRules: {
         // refundMessage: [{ required: true, message: '请填写卖家留言', trigger: 'blur' }],

+ 1 - 1
src/views/mallManagement/order/order_refund_detail/index.vue

@@ -388,7 +388,7 @@ export default {
 	  },
 	  isEdit1: 0,
 	  isEdit2: 0,
-	  joinCode: JSON.parse(localStorage.getItem('greemall_user')).joinCode,
+	  joinCode: JSON.parse(localStorage.getItem('greemall_user')).joinCode === "CODE",
 	  orderDetailId: '',
 	  returnGoodsFormRules: {
 	  	// refundMessage: [{ required: true, message: '请填写卖家留言', trigger: 'blur' }],

+ 1 - 1
src/views/mallManagement/order/sales_return_order_list/index.vue

@@ -627,7 +627,7 @@ export default {
       orderList: [],
       waitChooseOrder: [],
 
-      joinCode: JSON.parse(localStorage.getItem('greemall_user')).joinCode,
+      joinCode: JSON.parse(localStorage.getItem('greemall_user')).joinCode === "CODE",
     }
   },
   computed: {

+ 1 - 1
src/views/salesPurchasing/goodsInventory/index.vue

@@ -83,7 +83,7 @@ export default {
 			return this.operationBtn({
 				detail: {
 					conditions: ({ row, index, column }) => {
-						return JSON.parse(localStorage.getItem('greemall_user')).joinCode
+						return JSON.parse(localStorage.getItem('greemall_user')).joinCode === "CODE"
 					},
 					click: ({ row, index, column }) => {
 						this.$router.push({

+ 2 - 2
src/views/salesPurchasing/goodsPurchasedStored/index.vue

@@ -123,7 +123,7 @@ export default {
                 click: () => {
                   this.openForm()
                   this.formDialog = true
-                  this.joinCode = JSON.parse(localStorage.getItem('greemall_user')).joinCode
+                  this.joinCode = JSON.parse(localStorage.getItem('greemall_user')).joinCode === "CODE"
                 }
               })
             ]
@@ -215,7 +215,7 @@ export default {
           fileUrl: res.data.fileUrl ? [{ url: res.data.fileUrl }] : [],
           items: res.data.items.map(item => ({ ...item, details: {} }))
         })
-        this.joinCode = res.data.joinCode
+        this.joinCode = res.data.joinCode === "CODE"
         this.formDialogType = type
         this.openForm()
         this.formDialog = true

+ 2 - 2
src/views/salesPurchasing/mixins/common_form.js

@@ -112,7 +112,7 @@ export default {
                               this.formData.items = []
                               if (val) {
                                 goodsPurchaseDetail({ id: val, isQuery: true }).then(res => {
-                                  this.joinCode = res.data.joinCode
+                                  this.joinCode = res.data.joinCode === "CODE"
                                   this.formData.items = res.data.items.map(item => ({
                                     brandId: item.brandId,
                                     brandName: item.brandName,
@@ -261,7 +261,7 @@ export default {
           this.cgrkOrder = res.data.records
           if (this.formData.goodsPurchaseId) {
             goodsPurchaseDetail({ id: this.formData.goodsPurchaseId, isQuery: true }).then(res => {
-              this.joinCode = res.data.joinCode
+              this.joinCode = res.data.joinCode === "CODE"
             })
           }
         })

+ 1 - 1
src/views/setting/departmentManage/index.vue

@@ -158,7 +158,7 @@ export default {
         address: '',
         status: true,
         isIncre: true,
-        joinCode: true,
+        joinCode: "",
         type: ""
       },
       mainFormRules: {