add:8/2日新需求

.env.development

@@ -5,8 +5,8 @@ VUE_APP_TITLE =中正云教育管理后台
 ENV = 'development'
 
 # 中正云教育管理后台/开发环境
-# VUE_APP_BASE_API = 'http://192.168.1.222:5030/'
-VUE_APP_BASE_API = 'http://localhost:5030/'
+VUE_APP_BASE_API = 'http://192.168.1.222:5030/'
+# VUE_APP_BASE_API = 'http://localhost:5030/'
 VUE_APP_IMG_API = 'https://file-dev.xyyxt.net'
 
 # 路由懒加载

src/views/Marketing/order/offlineOrder/batchRecord/secondStep/setGoodsList.vue

@@ -227,7 +227,7 @@ export default {
         goodsType: type,
         goodsName: this.goodsName || "",
         standPrice: this.goodsPrice || "",
-        goodsStatus: 1,
+        // goodsStatus: 1,//可售状态
         status: 1,
         businessIds: this.oldObj.businessId,
         subjectId : subjectId

src/views/Marketing/order/offlineOrder/index.vue

@@ -25,7 +25,7 @@
           >订单详情</el-button
         >
         <el-button type="text" @click="theOrderJump(props.scope.row, 2)"
-        :disabled="props.scope.row.orderFrom == 5"
+        :disabled="props.scope.row.orderFrom == 5 || props.scope.row.orderFrom == 6"
           >计费单收费</el-button
         >
         <el-button type="text" @click="theOrderJump(props.scope.row, 3)"
@@ -189,6 +189,10 @@ export default {
               label: "业务员录单",
               value: "5",
             },
+            {
+              label: "业务系统",
+              value: "6",
+            },
           ],
         },
         {
@@ -314,6 +318,7 @@ export default {
             path: "orderDetailsT",
             query: {
               inputOrderSn: row.inputOrderSn,
+              orderFrom:row.orderFrom,
             },
           });
         };

src/views/Marketing/order/offlineOrder/orderDetailsT/index.vue

@@ -18,7 +18,7 @@
       @backFunc="jumpRefund"
     >
       <template slot="customize">
-        <el-button size="medium" type="warning" @click="setGoodsOptions(1)"
+        <el-button size="medium" type="warning" @click="setGoodsOptions(1)" :disabled="$route.query.orderFrom == 6"
           >计费单收费</el-button
         ><el-button size="medium" type="success" @click="setGoodsOptions(2)"
           >退款申请</el-button