fix:bug

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

@@ -47,7 +47,9 @@
                 }}</span
                 >{{ scope.row[item.prop3] }}
                 <el-button
-                  v-if="toData.templateStatus == 1 && scope.row['goodsType'] == 1"
+                  v-if="
+                    toData.templateStatus == 1 && scope.row['goodsType'] == 1
+                  "
                   type="text"
                   :style="
                     scope.row[item.prop4] === -1 ? 'color:red!important;' : ''
@@ -556,7 +558,10 @@ export default {
               for (let i = 0; i < item.subjectIds.length; i++) {
                 for (let j = 0; j < res.rows.length; j++) {
                   if (res.rows[j].subjectId == item.subjectIds[i]) {
-                    var ary = JSON.parse(JSON.stringify(res.rows[j].goodsList));
+                    var arys = JSON.parse(JSON.stringify(res.rows[j].goodsList));
+                    let ary = arys.sort((a, b) => {
+                      return a.goodsType - b.goodsType;
+                    });
                     var datas = ary.map((items) => {
                       if (obj.topData.type.indexOf(items.goodsType) !== -1) {
                         items.checked = true;
@@ -812,7 +817,7 @@ export default {
       var errorList = this.tableData.filter((item) => {
         return item.checked && item.errmsg;
       });
-      this.$parent.changePage2("third", successList, errorList,this.toData);
+      this.$parent.changePage2("third", successList, errorList, this.toData);
       this.disabledBtn = false;
       this.loading = false;
       return;

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

@@ -149,7 +149,7 @@ export default {
         },
         {
           label: "已退总金额",
-          prop: "standPrice",
+          prop: "goodsRefund",
           hidden: true,
           scope: "leftCh",
           ch: "￥",

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

@@ -116,63 +116,25 @@
                 disabled
                 v-else-if="item.scope === 'startEndTime'"
                 v-model="goodsData[item.prop]"
-                type="daterange"
+                type="datetimerange"
+                value-format="timestamp"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+              >
+              </el-date-picker>
+              <el-date-picker
+                :size="size"
+                disabled
+                v-else-if="item.scope === 'studentTime'"
+                v-model="listData['studyTimeArrays']"
+                type="datetimerange"
                 value-format="timestamp"
                 range-separator="至"
                 start-placeholder="开始日期"
                 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
@@ -271,24 +233,6 @@ export default {
   props: ["goodsId", "orderSn"],
   data() {
     return {
-      styleType: [
-        {
-          label: "按年限",
-          value: 1,
-        },
-        {
-          label: "按月限",
-          value: 2,
-        },
-        {
-          label: "按天限",
-          value: 3,
-        },
-        {
-          label: "按具体时间区间",
-          value: 4,
-        },
-      ],
       size: "",
       tableSet: [
         {
@@ -475,12 +419,6 @@ 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;
       });
@@ -490,6 +428,10 @@ export default {
           goodsId: this.goodsId,
         })
         .then((res) => {
+          res.data.studyTimeArrays = [
+            this.$methodsTools.time10to13(res.data.serviceStartTime, 2),
+            this.$methodsTools.time10to13(res.data.serviceEndTime, 2),
+          ];
           this.listData = res.data;
           this.$refs["listData"].resetFields();
         });
@@ -503,7 +445,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/orderChargeInfo/topBox.vue

@@ -97,7 +97,7 @@ export default {
         },
         {
           label: "已退金额：",
-          prop: "aaa",
+          prop: "goodsRefund",
         },
         {
           label: "录单人：",

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

@@ -153,15 +153,7 @@ export default {
             {
               label: "退款中",
               value: 1,
-            },
-            {
-              label: "已退款",
-              value: 2,
-            },
-            {
-              label: "拒绝退款",
-              value: 3,
-            },
+            }
           ],
         },
         {

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

@@ -108,63 +108,24 @@
                   disabled
                   v-else-if="item.scope === 'startEndTime'"
                   v-model="goodsData[item.prop]"
-                  type="daterange"
+                  type="datetimerange"
+                  value-format="timestamp"
+                  range-separator="至"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                >
+                </el-date-picker>
+                <el-date-picker
+                  disabled
+                  v-else-if="item.scope === 'studentTime'"
+                  v-model="listData['studyTimeArrays']"
+                  type="datetimerange"
                   value-format="timestamp"
                   range-separator="至"
                   start-placeholder="开始日期"
                   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
                   disabled
                   v-else-if="item.scope === 'yecj'"
@@ -258,24 +219,6 @@ import { mapGetters } from "vuex";
 export default {
   data() {
     return {
-      styleType: [
-        {
-          label: "按年限",
-          value: 1,
-        },
-        {
-          label: "按月限",
-          value: 2,
-        },
-        {
-          label: "按天限",
-          value: 3,
-        },
-        {
-          label: "按具体时间区间",
-          value: 4,
-        },
-      ],
       ISADMIN: true,
       tableSet: [
         {
@@ -474,12 +417,6 @@ 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;
       });
@@ -489,6 +426,10 @@ export default {
           goodsId: this.$route.query.goodsId,
         })
         .then((res) => {
+          res.data.studyTimeArrays = [
+            this.$methodsTools.time10to13(res.data.serviceStartTime, 2),
+            this.$methodsTools.time10to13(res.data.serviceEndTime, 2),
+          ];
           this.listData = res.data;
           this.$refs["listData"].resetFields();
         });

src/views/education/classManageMent/learningHoursRecordList/index.vue

@@ -240,7 +240,7 @@ export default {
         },
         {
           prop: "searchKey",
-          placeholder: "班级姓名/商品名称/学员姓名/身份证",
+          placeholder: "班级名称/商品名称/学员姓名/身份证",
         },
       ],
       formData: {

src/views/education/studentManageMent/studentXQ/BankQuestionPassRecord.vue

@@ -576,7 +576,7 @@ export default {
           width: "140px",
         },
         {
-          label: "学习有效期",
+          label: "学习服务期",
           prop1: "serviceStartTime",
           prop2: "serviceEndTime",
           scope: "moreTime",