提交测试 商品 课程团合班缴费

1

src/views/businessManager/shopManager/shopList.vue

@@ -627,10 +627,7 @@
               ></el-option>
             </el-select>
           </el-form-item>
-          <div
-            v-if="!addDisabled"
-            style="display: inline-block"
-          >
+          <div v-if="!addDisabled" style="display: inline-block">
             <el-button
               icon="el-icon-minus"
               v-if="form.goodsList.length > 1"
@@ -1445,10 +1442,10 @@ export default {
         this.getAllGoodsList(val.join(","));
       }
     },
-   async onValidGoodsStatus() {
+    async onValidGoodsStatus() {
       // 更新商品选择状态
-     await this.getAllGoodsList();
-     console.log(this.form.goodsList)
+      await this.getAllGoodsList();
+      console.log(this.form.goodsList);
       let goodsList = this.form.goodsList;
       let tempIds = [];
       goodsList.forEach((item) => {
@@ -1497,6 +1494,26 @@ export default {
           form.courseViewType = row.courseViewType.split(",");
         }
 
+        if (row.studentShowOrganId) {
+          form.studentShowOrganId = row.studentShowOrganId.split(",");
+        }
+
+        if (row.educationShowOrganId) {
+          form.educationShowOrganId = row.educationShowOrganId.split(",");
+        }
+
+        if (row.courseFeeShowOrganId) {
+          form.courseFeeShowOrganId = row.courseFeeShowOrganId.split(",");
+        }
+
+        if (row.memberFeeShowOrganId) {
+          form.memberFeeShowOrganId = row.memberFeeShowOrganId.split(",");
+        }
+
+        if (row.replacementShowOrganId) {
+          form.replacementShowOrganId = row.replacementShowOrganId.split(",");
+        }
+
         // if (row.organIdList) {
         //   form.organIdList = row.organIdList.split(",");
 
@@ -1631,25 +1648,21 @@ export default {
           form.complementGoodsIdList = tempIds.join(",");
           // form.courseViewType = form.courseViewType.join(",");
           // form.organIdList = form.courseViewType.join(",");
-           if (form.studentShowOrganId) {
+          if (form.studentShowOrganId) {
             form.studentShowOrganId = form.studentShowOrganId.join(",");
           }
           if (form.educationShowOrganId) {
-            form.educationShowOrganId =
-              form.educationShowOrganId.join(",");
+            form.educationShowOrganId = form.educationShowOrganId.join(",");
           }
 
           if (form.courseFeeShowOrganId) {
-            form.courseFeeShowOrganId =
-              form.courseFeeShowOrganId.join(",");
+            form.courseFeeShowOrganId = form.courseFeeShowOrganId.join(",");
           }
           if (form.memberFeeShowOrganId) {
-            form.memberFeeShowOrganId =
-              form.memberFeeShowOrganId.join(",");
+            form.memberFeeShowOrganId = form.memberFeeShowOrganId.join(",");
           }
           if (form.replacementShowOrganId) {
-            form.replacementShowOrganId =
-              form.replacementShowOrganId.join(",");
+            form.replacementShowOrganId = form.replacementShowOrganId.join(",");
           }
           form.goodsList = null;
           if (this.addType == "create" || this.addType == "copy") {

src/views/businessManager/shopManager/shopOperation.vue

@@ -181,7 +181,7 @@
             placeholder="请选择所属分部"
             style="width: 400px !important"
             multiple
-            :disabled="pageDisabled || pageType == 'update'"
+            :disabled="pageDisabled"
             clearable
           >
             <el-option
@@ -199,7 +199,7 @@
             placeholder="请选择所属分部"
             style="width: 400px !important"
             multiple
-            :disabled="pageDisabled || pageType == 'update'"
+            :disabled="pageDisabled "
             clearable
           >
             <el-option
@@ -217,7 +217,7 @@
             placeholder="请选择所属分部"
             style="width: 400px !important"
             multiple
-            :disabled="pageDisabled || pageType == 'update'"
+            :disabled="pageDisabled"
             clearable
           >
             <el-option
@@ -235,7 +235,7 @@
             placeholder="请选择所属分部"
             style="width: 400px !important"
             multiple
-            :disabled="pageDisabled || pageType == 'update'"
+            :disabled="pageDisabled"
             clearable
           >
             <el-option
@@ -253,7 +253,7 @@
             placeholder="请选择所属分部"
             style="width: 400px !important"
             multiple
-            :disabled="pageDisabled || pageType == 'update'"
+            :disabled="pageDisabled"
             clearable
           >
             <el-option

src/views/resetTeaming/components/strudentPayInfo.vue

@@ -390,7 +390,7 @@
                     value="张三"></el-input>
         </el-form-item> -->
         <el-form-item
-          v-if="msgList.length > 0"
+          v-if="msgList.length > 0 || titleForm.paymentType == 'SPAN_GROUP_CLASS_ADJUST'"
           label="预计课程金额"
           :rules="[
             { required: true, message: '请输入预计缴费金额', trigger: 'blur' },