fix:bug

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

@@ -65,10 +65,10 @@ export default {
         this.$refs.secondStep.getInitData(obj);
       });
     },
-    changePage2(name, successobj, errorobj) {
+    changePage2(name, successobj, errorobj,toData) {
       this.activeName = name;
       this.$nextTick(() => {
-        this.$refs.thirdStep.getInitData(successobj, errorobj);
+        this.$refs.thirdStep.getInitData(successobj, errorobj,toData);
       });
     },
   },

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

@@ -812,7 +812,7 @@ export default {
       var errorList = this.tableData.filter((item) => {
         return item.checked && item.errmsg;
       });
-      this.$parent.changePage2("third", successList, errorList);
+      this.$parent.changePage2("third", successList, errorList,this.toData);
       this.disabledBtn = false;
       this.loading = false;
       return;

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

@@ -232,15 +232,13 @@ export default {
         goodsType: type,
         goodsName: this.goodsName || "",
         standPrice: this.goodsPrice || "",
+        goodsStatus: 1,
+        status: 1,
+        businessIds: this.oldObj.businessId,
       };
       if (type == 1 || type == 2) {
         data.subjectId = subjectId;
       }
-      if (type == 3 || type == 4) {
-        data.businessIds = this.oldObj.businessId;
-        data.status = 1;
-      }
-      data.goodsStatus = 1;
       this.$api.inquiregoodslistToInputList(data).then((res) => {
         res.rows.forEach((item) => {
           item.subjectId = subjectId;
@@ -301,7 +299,10 @@ export default {
       this.goodsPrice = "";
       this.goodsList = [];
       this.$api
-        .inquireCourseSubject({ businessId: Number(oldObj.businessId),status:1 })
+        .inquireCourseSubject({
+          businessId: Number(oldObj.businessId),
+          status: 1,
+        })
         .then((res) => {
           let options = [];
           if (oldObj.type.indexOf(1) !== -1) {

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

@@ -69,9 +69,14 @@
                   typeChange(scope.row[item.prop2])
                 }}</span
                 >{{ scope.row[item.prop3] }}
-                <el-button type="text" style="color: green">{{
-                  scope.row[item.prop4] ? scope.row[item.prop5] : "自动分班"
-                }}</el-button>
+                <el-button
+                  type="text"
+                  style="color: green"
+                  v-if="toData.templateStatus == 1"
+                  >{{
+                    scope.row[item.prop4] ? scope.row[item.prop5] : "自动分班"
+                  }}</el-button
+                >
               </div>
             </div>
             <div v-else-if="item.scope === 'priceInput'">
@@ -79,7 +84,10 @@
               <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)" v-if="scope.row.sheetId"
+              ><el-button
+                type="text"
+                @click="setOptionsFun(2, scope.row)"
+                v-if="scope.row.sheetId"
                 >补充信息</el-button
               ></span
             >
@@ -187,6 +195,7 @@ export default {
       sujectList: [],
       successobj: [], //成功数据
       errorobj: [], //失败数据
+      toData: {},
     };
   },
   mounted() {
@@ -526,7 +535,8 @@ export default {
         };
       }
     },
-    getInitData(successobj, errorobj) {
+    getInitData(successobj, errorobj, toData) {
+      this.toData = toData;
       this.successobj = JSON.parse(JSON.stringify(successobj));
       this.errorobj = JSON.parse(JSON.stringify(errorobj));
       this.tableData = JSON.parse(JSON.stringify(successobj));

src/views/Marketing/order/offlineOrder/goodsMatch/matchInfoData.vue

@@ -243,13 +243,13 @@ export default {
         goodsType: type,
         goodsName: this.goodsName || "",
         standPrice: this.goodsPrice || "",
+        goodsStatus: 1,
+        businessIds: this.businessData.id,
+        status: 1,
       };
       if (type == 1 || type == 2) {
         data.subjectId = this.newData.subjectId;
       }
-      if (type == 3 || type == 4) {
-        data.businessIds = this.businessData.id;
-      }
       this.$api.inquireGoods(data).then((res) => {
         this.goodsList = res.rows;
       });
@@ -327,7 +327,10 @@ export default {
           });
       }
       this.$api
-        .inquireCourseSubject({ businessId: Number(this.queryData.businessId),status:1 })
+        .inquireCourseSubject({
+          businessId: Number(this.queryData.businessId),
+          status: 1,
+        })
         .then((res) => {
           this.$api
             .inquireorderconfiggoodsList({

src/views/Marketing/order/offlineOrder/orderChargeInfo/goodsDocument/goodsInfos.vue

@@ -123,6 +123,56 @@
                 end-placeholder="结束日期"
               >
               </el-date-picker>
+              <div v-else-if="item.scope === 'studentTime'">
+                <el-select
+                  disabled
+                  style="width: 150px"
+                  v-model="goodsData.serviceTimeType"
+                  placeholder="请选择学习服务器类型"
+                >
+                  <el-option
+                    v-for="(item, index) in styleType"
+                    :key="index"
+                    :label="item.label"
+                    :value="item.value"
+                  >
+                  </el-option>
+                </el-select>
+                <span
+                  v-if="
+                    goodsData.serviceTimeType === 1 ||
+                    goodsData.serviceTimeType === 2 ||
+                    goodsData.serviceTimeType === 3
+                  "
+                  ><span style="margin: 0px 6px">购买那刻开始计算</span
+                  ><el-input
+                    disabled
+                    style="width: 60px"
+                    v-model="goodsData.serviceTimeNum"
+                  ></el-input
+                  ><span style="margin-left: 6px">{{
+                    goodsData.serviceTimeType === 1
+                      ? "年"
+                      : goodsData.serviceTimeType === 2
+                      ? "月"
+                      : goodsData.serviceTimeType === 3
+                      ? "天"
+                      : ""
+                  }}</span></span
+                >
+
+                <el-date-picker
+                  disabled
+                  v-if="goodsData.serviceTimeType === 4"
+                  v-model="goodsData.studyTimeArrays"
+                  type="datetimerange"
+                  value-format="timestamp"
+                  range-separator="至"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                >
+                </el-date-picker>
+              </div>
               <el-input
                 :size="size"
                 disabled
@@ -221,6 +271,24 @@ export default {
   props: ["goodsId", "orderSn"],
   data() {
     return {
+      styleType: [
+        {
+          label: "按年限",
+          value: 1,
+        },
+        {
+          label: "按月限",
+          value: 2,
+        },
+        {
+          label: "按天限",
+          value: 3,
+        },
+        {
+          label: "按具体时间区间",
+          value: 4,
+        },
+      ],
       size: "",
       tableSet: [
         {
@@ -336,7 +404,7 @@ export default {
         {
           label: "学习服务期",
           prop: "studentTime",
-          scope: "startEndTime",
+          scope: "studentTime",
         },
         {
           label: "学时",
@@ -407,6 +475,12 @@ export default {
           this.$methodsTools.time10to13(res.data.validityStartTime, 2),
           this.$methodsTools.time10to13(res.data.validityEndTime, 2),
         ];
+        if (res.data.serviceTimeType === 4) {
+          res.data.studyTimeArrays = [
+            this.$methodsTools.time10to13(res.data.studyStartTime, 2),
+            this.$methodsTools.time10to13(res.data.studyEndTime, 2),
+          ];
+        }
         res.data.standPriceJson = JSON.parse(res.data.standPriceJson);
         this.goodsData = res.data;
       });
@@ -429,7 +503,7 @@ export default {
   border-bottom: 1px dotted #9a9a9a;
   margin-bottom: 12px;
 }
-/deep/ .el-input__inner {
-  width: 350px;
-}
+// /deep/ .el-input__inner {
+//   width: 350px;
+// }
 </style>

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

@@ -405,7 +405,7 @@ export default {
         });
         if (!status) {
           this.$message.error(
-            "请勿选择(完全收费、免费)或退款状态为(退款中、已退款)或订单状态为关闭的订单"
+            "请勿选择（完全收费、免费）或退款状态为（退款中、已退费）或订单状态为已取消的订单。"
           );
           return;
         }

src/views/Marketing/order/orderList/details/goodsManage.vue

@@ -231,7 +231,7 @@
         <div class="fgx"></div>
         <el-form-item label="订单状态" prop="orderGoodsStatus" v-if="ISADMIN">
           <el-radio-group v-model="listData.orderGoodsStatus" disabled>
-            <el-radio :label="-1">关闭</el-radio>
+            <el-radio :label="-1">已取消</el-radio>
             <el-radio :label="0">待支付</el-radio>
             <el-radio :label="1">已支付</el-radio>
             <el-radio :label="2">已退款</el-radio>

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

@@ -79,8 +79,8 @@ export default {
           edu: "educationTypeId",
         },
         {
-          prop1: "startTime",
-          prop2: "endTime",
+          prop1: "searchStartTime",
+          prop2: "searchEndTime",
           placeholder1: "订单开始时间",
           placeholder2: "订单结束时间",
           scope: "moreDataPicker",
@@ -257,11 +257,11 @@ export default {
       }
       var data = JSON.parse(JSON.stringify(this.formData));
       data.inputOrderSn = this.$route.query.inputOrderSn;
-      if (this.formData.startTime) {
-        data.startTime = data.startTime / 1000;
+      if (this.formData.searchStartTime) {
+        data.searchStartTime = data.searchStartTime / 1000;
       }
-      if (this.formData.endTime) {
-        data.endTime = data.endTime / 1000;
+      if (this.formData.searchEndTime) {
+        data.searchEndTime = data.searchEndTime / 1000;
       }
       this.$api
         .inquireorderrefundlist(data)

src/views/Marketing/order/pendingRefundOrder/refundDia.vue

@@ -48,6 +48,7 @@
             </li>
           </ul>
           <ul v-if="int === 1" class="ul_sty">
+            <li><strong>初审时间：</strong>{{$methodsTools.onlyForma(item.periodTime)}}</li>
             <strong>初审结果</strong>
             <li>审核人：{{ item.periodUsername }}</li>
             <li>