Tang 3 years ago
parent
commit
6b0f5468d4

+ 8 - 0
src/newApi/newOrder.js

@@ -24,6 +24,14 @@ export default {
             params: data
         })
     },
+    //查询商品列表To录单
+    inquiregoodslistToInputList(data) {
+        return request({
+            url: '/goods/listToInput',
+            method: 'get',
+            params: data
+        })
+    },
     //修改订单计费单-单个
     editordersheetedit(data) {
         return request({

+ 1 - 1
src/views/Marketing/order/offlineOrder/batchRecord/secondStep/index.vue

@@ -749,7 +749,6 @@ export default {
       var self = this;
       return new Promise((resolve, reject) => {
         self.$api.apporderinputOrder(item).then((res) => {
-          resolve(res);
           if (res.code === 510 || res.code === 511) {
             self.tableData.forEach((items, indexs) => {
               if (items.userId === item.userId) {
@@ -770,6 +769,7 @@ export default {
               }
             });
           }
+          resolve(res);
         });
       });
     },

+ 3 - 2
src/views/Marketing/order/offlineOrder/batchRecord/secondStep/setGoodsList.vue

@@ -150,7 +150,8 @@ export default {
           copyData.subjectId = this.active.split("-").map(Number)[0];
           copyData.checked = true;
           if (row.gradeNum) {
-            copyData.gradeId = -1;
+            copyData.gradeId = row.gradeId;
+            copyData.gradeName = row.gradeName;
           } else {
             copyData.gradeId = 0;
           }
@@ -238,7 +239,7 @@ export default {
         data.status = 1
       }
       data.goodsStatus = 1
-      this.$api.inquireGoods(data).then((res) => {
+      this.$api.inquiregoodslistToInputList(data).then((res) => {
         res.rows.forEach((item) => {
           item.subjectId = subjectId;
           item.checked = false;

+ 1 - 1
src/views/Marketing/order/offlineOrder/batchRecord/thirdStep/index.vue

@@ -79,7 +79,7 @@
               <div v-else>¥{{ scope.row[item.prop] }}</div>
             </div>
             <span v-else-if="item.scope === 'success'"
-              ><el-button type="text" @click="setOptionsFun(2, scope.row)"
+              ><el-button type="text" @click="setOptionsFun(2, scope.row)" v-if="scope.row.sheetId"
                 >补充信息</el-button
               ></span
             >