fix:bug

src/views/Marketing/goods/commodityManageMent/add/index.vue

@@ -2,7 +2,7 @@
   <div id="commodityManageMentAdd">
     <el-form
       label-position="right"
-      label-width="120px"
+      label-width="135px"
       :model="listData"
       :rules="rules"
       ref="listData"

src/views/Marketing/goods/commodityManageMent/add/pricePeriod.vue

@@ -2,18 +2,18 @@
   <div id="pricePeriod">
     <el-row :gutter="20">
       <el-col :span="12">
-        <el-form-item label="商品标准价格" prop="standPrice">
+        <el-form-item label="商品标准价格(元)" prop="standPrice">
           <el-input
             :style="`max-width:${inputWidth}px;`"
             v-model="listData.standPrice"
-            ><template slot="prepend">￥</template></el-input
+            ></el-input
           >
         </el-form-item>
-        <el-form-item label="商品最低价格" prop="lowestPrice">
+        <el-form-item label="商品最低价格(元)" prop="lowestPrice">
           <el-input
             :style="`max-width:${inputWidth}px;`"
             v-model="listData.lowestPrice"
-            ><template slot="prepend">￥</template></el-input
+            ></el-input
           >
         </el-form-item>
         <el-form-item label="状态" prop="status">

src/views/Marketing/goods/commodityManageMent/edit/index.vue

@@ -2,7 +2,7 @@
   <div id="commodityManageMentEdit">
     <el-form
       label-position="right"
-      label-width="120px"
+      label-width="135px"
       :model="listData"
       :rules="rules"
       ref="listData"

src/views/Marketing/goods/commodityManageMent/edit/pricePeriod.vue

@@ -2,18 +2,22 @@
   <div id="pricePeriod">
     <el-row :gutter="20">
       <el-col :span="12">
-        <el-form-item label="商品标准价格" prop="standPrice">
-          <el-input
+        <el-form-item label="商品标准价格(元)" prop="standPrice">
+          <el-input-number
+            :controls="false"
+            :min="0"
             :style="`max-width:${inputWidth}px;`"
             v-model="listData.standPrice"
-            ><template slot="prepend">￥</template></el-input
+            ></el-input-number
           >
         </el-form-item>
-        <el-form-item label="商品最低价格" prop="lowestPrice">
-          <el-input
+        <el-form-item label="商品最低价格(元)" prop="lowestPrice">
+          <el-input-number
+            :controls="false"
+            :min="0"
             :style="`max-width:${inputWidth}px;`"
             v-model="listData.lowestPrice"
-            ><template slot="prepend">￥</template></el-input
+            ></el-input-number
           >
         </el-form-item>
         <el-form-item label="状态" prop="status">
@@ -48,59 +52,64 @@
       </el-col>
       <el-col :span="12">
         <el-form-item label=" " prop="standPriceJson" label-width="0px">
-        <h5 style="margin: 0px">
-          商品标准价格明细表：
-          <el-button type="text" @click="addPriceInfo">添加</el-button>
-        </h5>
-        <el-table
-          :data="listData.standPriceJson"
-          show-summary
-          :summary-method="totalPrice"
-          border
-          :header-cell-style="{
-            'background-color': '#eee',
-            padding: '8px',
-            color: '#333',
-          }"
-        >
-          <el-table-column type="index" label="序号" width="80" align="center">
-          </el-table-column>
-          <el-table-column
-            v-for="(item, index) in tableSet"
-            :width="item.width"
-            :key="index"
-            :label="item.label"
-            align="center"
-            :show-overflow-tooltip="true"
-            header-align="center"
-            :prop="item.prop"
+          <h5 style="margin: 0px">
+            商品标准价格明细表：
+            <el-button type="text" @click="addPriceInfo">添加</el-button>
+          </h5>
+          <el-table
+            :data="listData.standPriceJson"
+            show-summary
+            :summary-method="totalPrice"
+            border
+            :header-cell-style="{
+              'background-color': '#eee',
+              padding: '8px',
+              color: '#333',
+            }"
           >
-            <template slot-scope="scope">
-              <span
-                v-if="item.scope === 'editInfo'"
-                @click="editPriceInfo(scope.row)"
-                class="clickSpan"
-                >{{ scope.row[item.prop] }}</span
-              >
-              <span v-else-if="item.scope === 'leftCh'"
-                >{{ item.ch }}{{ scope.row[item.prop] }}</span
-              >
-              <span v-else>{{ scope.row[item.prop] }}</span></template
+            <el-table-column
+              type="index"
+              label="序号"
+              width="80"
+              align="center"
             >
-          </el-table-column>
-          <el-table-column
-            label="操作"
-            align="center"
-            fixed="right"
-            width="100px"
-          >
-            <template slot-scope="scope">
-              <el-button type="text" @click="delPriceInfo(scope.row)"
-                >删除</el-button
+            </el-table-column>
+            <el-table-column
+              v-for="(item, index) in tableSet"
+              :width="item.width"
+              :key="index"
+              :label="item.label"
+              align="center"
+              :show-overflow-tooltip="true"
+              header-align="center"
+              :prop="item.prop"
+            >
+              <template slot-scope="scope">
+                <span
+                  v-if="item.scope === 'editInfo'"
+                  @click="editPriceInfo(scope.row)"
+                  class="clickSpan"
+                  >{{ scope.row[item.prop] }}</span
+                >
+                <span v-else-if="item.scope === 'leftCh'"
+                  >{{ item.ch }}{{ scope.row[item.prop] }}</span
+                >
+                <span v-else>{{ scope.row[item.prop] }}</span></template
               >
-            </template>
-          </el-table-column>
-        </el-table>
+            </el-table-column>
+            <el-table-column
+              label="操作"
+              align="center"
+              fixed="right"
+              width="100px"
+            >
+              <template slot-scope="scope">
+                <el-button type="text" @click="delPriceInfo(scope.row)"
+                  >删除</el-button
+                >
+              </template>
+            </el-table-column>
+          </el-table>
         </el-form-item>
       </el-col>
     </el-row>
@@ -228,8 +237,11 @@ export default {
   computed: { ...mapGetters(["paysupply", "educationType", "paycost"]) },
   methods: {
     changeDataTime() {
-      if(this.listData.studyTimeArrays && this.listData.studyTimeArrays.length){
-        this.$bus.$emit("againValidate")
+      if (
+        this.listData.studyTimeArrays &&
+        this.listData.studyTimeArrays.length
+      ) {
+        this.$bus.$emit("againValidate");
       }
     },
     openFunc() {

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

@@ -78,13 +78,13 @@
       <div>
         <el-button
           size="small"
-          v-if="statusShow.indexOf(2) !== -1"
+          v-if="statusShow.includes(2)"
           @click="uploadXS"
           >官方学时推送</el-button
         >
         <span
           style="font-size: 14px; margin: 0px 6px"
-          v-if="statusShow.indexOf(2) !== -1"
+          v-if="statusShow.includes(2)"
           >已推送：{{ gfNum }}/{{ total }}</span
         >
       </div>
@@ -170,7 +170,7 @@ export default {
     return {
       reviewListNums: 0,
       underReiviewNums: 0,
-      statusShow: "", //1无官方接口按钮 2只有官方推送 3都有
+      statusShow: "", //2学时
       size: "medium",
       active: 2,
       activeBtn: 4,
@@ -384,7 +384,7 @@ export default {
           })
           .then((res) => {
             this.statusShow = res.data;
-            if (res.data.indexOf(2) !== -1) {
+            if (res.data.includes(2)) {
               this.navText.gfxsStatus = true;
             } else {
               this.navText.gfxsStatus = false;

src/views/education/classManageMent/classList/addClass/index.vue

@@ -216,6 +216,7 @@
                 v-model="listData.interfaceAccountId"
                 placeholder="请选择官方账号标记(有接口+标记功能)"
                 clearable
+                :disabled="listData.noInterfaceAccountId?true:false"
               >
                 <el-option
                   v-for="(item, index) in type2List"
@@ -231,6 +232,7 @@
                 v-model="listData.noInterfaceAccountId"
                 placeholder="请选择官方账号标记(无接口+标记功能)"
                 clearable
+                :disabled="listData.interfaceAccountId?true:false"
               >
                 <el-option
                   v-for="(item, index) in type4List"
@@ -680,7 +682,6 @@ export default {
     //提交
     submit() {
       var data = JSON.parse(JSON.stringify(this.listData));
-      return
       // if(!data.interfaceAccountId){
       //   delete data.officialLearningUrl
       // }

src/views/education/classManageMent/classList/manageClass/baseInfo.vue

@@ -277,7 +277,11 @@
                 <el-select
                   v-model="listData.interfaceAccountId"
                   placeholder="请选择官方学习账号开通"
-                  :disabled="copyData.interfaceAccountId ? true : false"
+                  :disabled="
+                    copyData.noInterfaceAccountId || copyData.interfaceAccountId
+                      ? true : listData.noInterfaceAccountId ? true
+                      : false
+                  "
                   clearable
                 >
                   <el-option
@@ -293,7 +297,11 @@
                 <el-select
                   v-model="listData.noInterfaceAccountId"
                   placeholder="请选择官方账号标记(无接口+标记功能)"
-                  :disabled="copyData.noInterfaceAccountId ? true : false"
+                  :disabled="
+                    copyData.noInterfaceAccountId || copyData.interfaceAccountId
+                      ? true : listData.interfaceAccountId ? true
+                      : false
+                  "
                   clearable
                 >
                   <el-option
@@ -564,9 +572,9 @@ export default {
       this.listData.officialName = "";
       this.listData.classStartTime = "";
       this.listData.classEndTime = "";
-      this.$nextTick(()=>{
-        this.$refs.listData.clearValidate()
-      })
+      this.$nextTick(() => {
+        this.$refs.listData.clearValidate();
+      });
     },
     //返回
     backPage() {
@@ -684,7 +692,7 @@ export default {
     font-weight: bold;
   }
 }
-.dis_style{
+.dis_style {
   display: flex;
   align-items: center;
 }

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

@@ -18,32 +18,38 @@
       <div>
         <el-button
           size="small"
-          v-if="statusShow.indexOf(1) !== -1"
+          v-if="statusShow.includes(1)"
           @click="uploadGF"
           >官方信息推送</el-button
         >
         <span
           style="font-size: 14px; margin: 0px 6px"
-          v-if="statusShow.indexOf(1) !== -1"
+          v-if="statusShow.includes(1)"
           >已推送：{{ gfNum }}/{{ total }}</span
         >
         <el-button
           type="primary"
           size="small"
-          v-if="statusShow.indexOf(3) !== -1"
+          v-if="statusShow.includes(3)"
           @click="moreActive(5)"
           >【数据同步到官方系统】开通账号</el-button
         >
         <el-button
           size="small"
           type="warning"
-          v-if="statusShow.indexOf(3) !== -1 || statusShow.indexOf(4) !== -1"
+          v-if="
+            statusShow.includes(3) ||
+            statusShow.includes(4)
+          "
           @click="moreActive(4)"
           >账号状态标记</el-button
         >
         <span
           style="font-size: 14px; margin: 0px 6px"
-          v-if="statusShow.indexOf(3) !== -1"
+          v-if="
+            statusShow.includes(3) ||
+            statusShow.includes(4)
+          "
           >已开通：{{ zhNum }}/{{ total }}</span
         >
       </div>
@@ -580,7 +586,7 @@ export default {
           value: 0,
         },
       ],
-      statusShow: [], //1无官方接口按钮 2只有官方推送 3都有
+      statusShow: [], //1官方推送 2标记 3都有 4无接口+有标记
       size: "medium",
       active: 1,
       loading: false, //当前表单加载是否加载动画
@@ -799,12 +805,15 @@ export default {
           })
           .then((res) => {
             this.statusShow = res.data;
-            if (res.data.indexOf(1) !== -1) {
+            if (res.data.includes(1)) {
               this.navText.gftsStatus = true;
             } else {
               this.navText.gftsStatus = false;
             }
-            if (res.data.indexOf(3) !== -1) {
+            if (
+              res.data.includes(3) ||
+              res.data.includes(4)
+            ) {
               this.navText.gfUserStatus = true;
             } else {
               this.navText.gfUserStatus = false;
@@ -1069,7 +1078,6 @@ export default {
           this.tableData = res.rows;
           this.total = res.total;
           this.navText.index = res.total;
-          if (this.navText.gftsStatus) {
             this.$api
               .inquireGradegradeofficialInfoCount({
                 gradeId: this.$route.query.id,
@@ -1078,7 +1086,6 @@ export default {
                 this.gfNum = res.data.officialInfoCount;
                 this.zhNum = res.data.learnStatus;
               });
-          }
         })
         .finally(() => {
           this.loading = false;

src/views/education/mockTestManagement/mockExamArrangement/editMockExam/index.vue

@@ -346,11 +346,11 @@ export default {
           array.sort((a, b) => {
             return a - b;
           });
-          if (data.timeArray[1] >= array[0]) {
-            this.$message.error("预约时间需要不得超过考试时间，请重新设置");
-            this.disabledBtn = false;
-            return;
-          }
+          // if (data.timeArray[1] >= array[0]) {
+          //   this.$message.error("预约时间需要不得超过考试时间，请重新设置");
+          //   this.disabledBtn = false;
+          //   return;
+          // }
           for (let i = 0; i < this.newCourTypeOptions.length; i++) {
             if (data.businessId === this.newCourTypeOptions[i].id) {
               data.projectId = this.newCourTypeOptions[i].projectId;