提交测试

1

src/views/businessManager/shopManager/shopOperation.vue

@@ -106,7 +106,7 @@
             style="width: 220px"
           ></el-input>
         </el-form-item>
-        <el-form-item label="库存类型" prop="stockType" v-if="tenantId==1">
+        <el-form-item label="库存类型" prop="stockType" v-if="tenantId == 1">
           <el-select
             v-model="form.stockType"
             placeholder="请选择库存类型"
@@ -121,7 +121,11 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="是否库存预警" prop="stockWarning" v-if="tenantId==1">
+        <el-form-item
+          label="是否库存预警"
+          prop="stockWarning"
+          v-if="tenantId == 1"
+        >
           <el-select
             v-model="form.stockWarning"
             placeholder="请选择库存预警"
@@ -199,7 +203,11 @@
             style="width: 220px"
           ></el-input>
         </el-form-item>
-        <el-form-item label="商品团购价" prop="groupPurchasePrice" class="hiddenStart">
+        <el-form-item
+          label="商品团购价"
+          prop="groupPurchasePrice"
+          class="hiddenStart"
+        >
           <template slot="label">
             <p style="position: relative">
               <span style="color: #f56c6c; margin-right: 4px">*</span>
@@ -233,7 +241,7 @@
           class="alert"
           type="info"
         />
-        <el-form-item label="学生端APP销售分部" prop="studentShowOrganId">
+        <!-- <el-form-item label="学生端APP可售分部" prop="studentShowOrganId">
           <select-all
             v-model.trim="form.studentShowOrganId"
             filterable
@@ -250,8 +258,8 @@
               :value="item.id.toString()"
             ></el-option>
           </select-all>
-        </el-form-item>
-        <el-form-item label="管理端APP销售分部" prop="educationShowOrganId">
+        </el-form-item> -->
+        <el-form-item label="管理端APP可售分部" prop="educationShowOrganId">
           <select-all
             v-model.trim="form.educationShowOrganId"
             filterable
@@ -269,7 +277,7 @@
             ></el-option>
           </select-all>
         </el-form-item>
-        <el-form-item label="课程收费乐团销售分部" prop="courseFeeShowOrganId">
+        <el-form-item label="课程收费乐团可售分部" prop="courseFeeShowOrganId">
           <select-all
             v-model.trim="form.courseFeeShowOrganId"
             filterable
@@ -287,7 +295,7 @@
             ></el-option>
           </select-all>
         </el-form-item>
-        <el-form-item label="会乐收费乐团销售分部" prop="memberFeeShowOrganId">
+        <el-form-item label="会员收费乐团可售分部" prop="memberFeeShowOrganId">
           <select-all
             v-model.trim="form.memberFeeShowOrganId"
             filterable
@@ -305,7 +313,11 @@
             ></el-option>
           </select-all>
         </el-form-item>
-        <el-form-item label="乐器置换销售分部" prop="replacementShowOrganId" v-if="tenantId==1">
+        <el-form-item
+          label="乐器置换可售分部"
+          prop="replacementShowOrganId"
+          v-if="tenantId == 1"
+        >
           <select-all
             v-model.trim="form.replacementShowOrganId"
             filterable
@@ -406,6 +418,9 @@
             <img v-if="form.image" :src="form.image" class="avatar" />
             <i v-else class="el-icon-plus avatar-uploader-icon"></i>
           </el-upload>
+          <p class="imageSize">
+            仅支持上传尺寸为：{{ imageWidthM }}x{{ imageHeightM }}的图片
+          </p>
         </el-form-item>
         <br />
         <el-form-item label="商品描述" prop="brief">
@@ -654,12 +669,12 @@ export default {
       Frules: null,
       imageWidthM: 400,
       imageHeightM: 400,
-      tenantId:''
+      tenantId: "",
     };
   },
   mounted() {
     // 获取分部
-      this.tenantId = this.$helpers.tenantId
+    this.tenantId = this.$helpers.tenantId;
     this.$store.dispatch("setBranchs");
     this.init();
   },
@@ -1002,4 +1017,8 @@ replacementShowOrganId: 6,7 */
 .el-select__tags .el-tag.el-tag--info.el-tag--small.el-tag--light {
   max-width: 95px;
 }
+.imageSize {
+  color: red;
+  line-height: 1.5;
+}
 </style>

src/views/categroyManager/specialSetup/musicCourseFee.vue

@@ -450,8 +450,8 @@ export default {
               const res = await querySingle(this.createForm.organId, val);
              console.log(this.createForm.unitPriceJson)
 
-              // data.
-              res.forEach((item) => {
+              //
+              res.data.forEach((item) => {
                 if (
                   this.createForm.unitPriceJson.hasOwnProperty(
                     item.chargeTypeId

src/views/teamBuild/components/soundSetComponents/chioseMusic.vue

@@ -102,8 +102,7 @@
               class="el-icon-remove-outline marginLeft10 iconStyle"
               v-if="
                 item.chioseMusic.length > 1 &&
-                !basdisabled &&
-                (music.type.includes('LEASE') || music.type.includes('GROUP'))
+                !basdisabled
               "
               @click="deleteMusic(music)"
               style="font-size: 20px; cursor: pointer"