소스 검색

feat:线下订单

Moss 1 년 전
부모
커밋
b0ab5ef6dc
2개의 변경된 파일11개의 추가작업 그리고 2개의 파일을 삭제
  1. 5 1
      src/views/mallManagement/order/offline_order_list/index.vue
  2. 6 1
      src/views/mallManagement/order/order_list/index.vue

+ 5 - 1
src/views/mallManagement/order/offline_order_list/index.vue

@@ -617,7 +617,7 @@ export default {
       this.$refs.formRef.validate((valid, invalidFields, errLabels) => {
         if (valid) {
           offlineOrderSave({...this.formData, orderDetails: this.goodsList}).then(res => {
-            if(this.formData.payType == 'WECHAT') {
+            if(this.formData.payType == 'WECHAT' && this.formDialogType == 0) {
               offlineOrderExamine({
                 orderId: res.data,
                 examineStatus: 'OK',
@@ -631,6 +631,10 @@ export default {
                   this.$refs.pageRef.refreshList()
                 }
               })
+            }else {
+              this.$message({ type: 'success', message: `${this.formDialogTitles[this.formDialogType]}成功!` })
+              cancel('list')
+              this.$refs.pageRef.refreshList()
             }
           })
         }

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

@@ -1479,6 +1479,11 @@ export default {
 			let loadingLen = len
 			// 使用 i-- 提升for效率
 			this.$startLoading()
+      let unitMap = {
+        C: '整套',
+        I: '单个'
+      }
+
 			for (let i = 0; i < len; i++) {
 				try {
 					let html = ''
@@ -1491,7 +1496,7 @@ export default {
               <tr align="center">
               <td>${item.goodsName || ''}</td>
               <td>${item.goodsSpecName || ''}</td>
-              <td>${item.goodsMaterialUnit || ''}</td>
+              <td>${item.goodsMaterialUnit ? unitMap[item.goodsMaterialUnit] : ''}</td>
               <td>${item.num}</td>
               <td>${item.price}</td>
               <td>${item.payAmount}</td>