lex 1 vuosi sitten
vanhempi
commit
f7f0bce5d9

+ 13 - 2
src/components/singe-file-upload/index.vue

@@ -10,8 +10,11 @@
     :file-list="filelist"
     :before-upload="beforeUpload"
     :accept="accept"
+    :disabled="disabled"
   >
-    <el-button type="primary" plain>{{ buttonText }}</el-button>
+    <el-button type="primary" plain :disabled="disabled">{{
+      buttonText
+    }}</el-button>
     <div slot="tip" v-if="tips" class="el-upload__tip">{{ tips }}</div>
     <div slot="file" slot-scope="{ file }">
       <div
@@ -32,7 +35,11 @@
           ></i>
           <span class="upload-text" :title="file.url">{{ file.url }}</span>
         </div>
-        <i v-if="!!file.url" class="el-icon-delete" @click="remove"></i>
+        <i
+          v-if="!!file.url && !disabled"
+          class="el-icon-delete"
+          @click="remove"
+        ></i>
       </div>
     </div>
   </el-upload>
@@ -66,6 +73,10 @@ export default {
     bucket_name: {
       type: String,
       default: "daya"
+    },
+    disabled: {
+      type: Boolean,
+      default: false
     }
   },
   watch: {

+ 49 - 16
src/views/branchPayManager/payschoolList.vue

@@ -14,7 +14,7 @@
             v-model.trim="searchForm.search"
             clearable
             @keyup.enter.native="
-              (e) => {
+              e => {
                 e.target.blur();
                 $refs.saveForm.save();
                 search();
@@ -43,7 +43,7 @@
             end-placeholder="缴费结束日期"
             value-format="yyyy-MM-dd"
             :picker-options="{
-              firstDayOfWeek: 1,
+              firstDayOfWeek: 1
             }"
           ></el-date-picker>
         </el-form-item>
@@ -129,6 +129,13 @@
               </div>
             </template>
           </el-table-column>
+          <el-table-column align="center" prop="memo" label="备注内容">
+            <template slot-scope="scope">
+              <div>
+                <tooltip :content="scope.row.memo" />
+              </div>
+            </template>
+          </el-table-column>
           <el-table-column align="center" prop="studentId" label="操作">
             <template slot-scope="scope">
               <div>
@@ -144,6 +151,15 @@
                   @click="downLoad(scope.row)"
                   >下载合同</el-button
                 >
+
+                <auth
+                  auths="musicGroupCalenderRefundPeriod/batchUpdate"
+                  v-if="scope.row.paymentType === 'GOODS_PURCHASE'"
+                >
+                  <el-button type="text" @click="onChangeTime(scope.row)"
+                    >修改账期</el-button
+                  >
+                </auth>
               </div>
             </template>
           </el-table-column>
@@ -197,7 +213,7 @@ export default {
     return {
       searchForm: {
         cooperationId: this.$route.query.id,
-        refundStatus:''
+        refundStatus: ""
       },
       name: this.$route.query.name,
       backTypeList,
@@ -209,13 +225,13 @@ export default {
         limit: 10, // 限制显示条数
         page: 1, // 当前页
         total: 0, // 总条数
-        page_size: [10, 20, 40, 50], // 选择限制显示条数
+        page_size: [10, 20, 40, 50] // 选择限制显示条数
       },
       form: {
-        id: null,
+        id: null
       },
       reviewVisible: false,
-      viewDetail: null,
+      viewDetail: null
     };
   },
   //生命周期 - 创建完成(可以访问当前this实例)
@@ -236,7 +252,7 @@ export default {
         ...rest,
         ...getTimes(payTime, ["refundStartDate", "refundEndDate"]),
         page: this.rules.page,
-        rows: this.rules.limit,
+        rows: this.rules.limit
       };
       try {
         const res = await getCoopCalenderList(params);
@@ -256,18 +272,35 @@ export default {
       this.search();
     },
     goBack() {
-      this.$store.dispatch('delVisitedViews', this.$route)
-      this.$router.push('/branchPayManager')
+      this.$store.dispatch("delVisitedViews", this.$route);
+      this.$router.push("/branchPayManager");
     },
     lookList(row) {
       this.viewDetail = row;
       this.viewDetail.id = row.calenderId;
       this.reviewVisible = true;
     },
+    onChangeTime(row) {
+      let query = this.$route.query;
+      this.$router.push(
+        {
+          path: "/business/goodsPaySet",
+          query: {
+            calenderId: row.calenderId,
+            musicGroupId: row.musicGroupId,
+            type: "payschoolList",
+            ...query
+          }
+        },
+        route => {
+          route.meta.title = "商品采购设置";
+        }
+      );
+    },
     async downLoad(row) {
       try {
         await this.$confirm(`是否下载批次号为${row.batchNo}合同`, "提示", {
-          type: "warning",
+          type: "warning"
         });
         window.open(row.contractUrl);
       } catch (e) {
@@ -280,7 +313,7 @@ export default {
       this.resetVisible = true;
     },
     resetRorm() {
-      this.$refs.form.validate(async (flag) => {
+      this.$refs.form.validate(async flag => {
         if (flag) {
           try {
             if (!this.form.transNo) {
@@ -304,7 +337,7 @@ export default {
         rows: this.rules.limit,
         organId: organId.join(","),
         ...getTimes(backTime, ["createStartTime", "createEndTime"]),
-        ...getTimes(payTime, ["payStartTime", "payEndTime"]),
+        ...getTimes(payTime, ["payStartTime", "payEndTime"])
       };
       Export(
         this,
@@ -312,14 +345,14 @@ export default {
           url: "/api-web/export/userCashAccountLog",
           fileName: "退费列表.xls",
           method: "post",
-          params: qs.stringify(params),
+          params: qs.stringify(params)
         },
         "您确定导出退费列表?"
       );
     },
     changeOrgan(val) {
       this.searchForm.cooperationId = null;
-    },
+    }
   },
   watch: {
     // "searchForm.organId"(val) {
@@ -338,10 +371,10 @@ export default {
     //     });
     //   }
     // },
-  },
+  }
 };
 </script>
-<style lang='scss' scoped>
+<style lang="scss" scoped>
 .search {
   ::v-deep .el-input__inner {
     width: 260px !important;

+ 33 - 11
src/views/businessManager/shopManager/model/combinationProducts.vue

@@ -131,21 +131,15 @@
         prop="goodsCategoryId"
         :label-width="formLabelWidth"
       >
-        <el-select
+        <el-cascader
           v-model.trim="form.goodsCategoryId"
           style="width: 220px !important"
           placeholder="请选择商品分类"
           :disabled="addDisabled"
+          :options="categoryList"
           filterable
-        >
-          <el-option
-            v-for="item in categoryList"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          >
-          </el-option>
-        </el-select>
+          :props="{ expandTrigger: 'hover' }"
+        ></el-cascader>
       </el-form-item>
       <el-form-item
         label="商品型号"
@@ -735,6 +729,12 @@ export default {
             form[i] = row[i];
           }
         }
+        if (row.goodsCategoryId) {
+          form.goodsCategoryId = this.formatParentId(
+            row.goodsCategoryId,
+            this.categoryList
+          );
+        }
         let ids = row.goodsSubList;
         let goodsList = [];
         ids.forEach(item => {
@@ -781,12 +781,30 @@ export default {
         if (row.organIdList) {
           form.organIdList = row.organIdList.split(",");
         }
-      } catch {
+      } catch (e) {
         //
+        console.log(e, "1212");
       }
     }
   },
   methods: {
+    formatParentId(id, list, ids = []) {
+      for (const item of list) {
+        if (item.children) {
+          const cIds = this.formatParentId(id, item.children, [
+            ...ids,
+            item.value
+          ]);
+          if (cIds.includes(id)) {
+            return cIds;
+          }
+        }
+        if (item.value === id) {
+          return [...ids, id];
+        }
+      }
+      return ids;
+    },
     onShopSubmit(formName) {
       if (this.form.goodsList.length <= 0) {
         this.$message.error("请至少添加一个子商品");
@@ -807,6 +825,10 @@ export default {
             }
           });
           form.goodsSubList = temps;
+          form.goodsCategoryId =
+            form.goodsCategoryId && form.goodsCategoryId.length > 0
+              ? form.goodsCategoryId[form.goodsCategoryId.length - 1]
+              : null;
           if (form.studentShowOrganId) {
             form.studentShowOrganId = form.studentShowOrganId.join(",");
           }

+ 8 - 2
src/views/businessManager/shopManager/model/subShopGoods.vue

@@ -25,7 +25,7 @@
         ></el-input>
       </el-form-item>
       <el-form-item prop="productCategoryId">
-        <el-select
+        <!-- <el-select
           v-model.trim="searchForm.productCategoryId"
           clearable
           placeholder="商品分类"
@@ -37,7 +37,13 @@
             :value="item.value"
           >
           </el-option>
-        </el-select>
+        </el-select> -->
+        <el-cascader
+          v-model.trim="searchForm.productCategoryId"
+          :options="categoryList"
+          placeholder="商品分类"
+          :props="{ checkStrictly: true, expandTrigger: 'hover' }"
+        ></el-cascader>
       </el-form-item>
       <el-form-item prop="brandId">
         <el-select

+ 32 - 31
src/views/businessManager/shopManager/shopCategory.vue

@@ -1,4 +1,3 @@
-
 <template>
   <div class="m-container">
     <h2>
@@ -6,14 +5,14 @@
       商品分类管理
     </h2>
     <div class="m-core">
-      <el-button
+      <!-- <el-button
         v-permission="'category/upset'"
         @click="openTypes('create')"
         type="primary"
         style="margin-bottom:20px"
       >
         添加
-      </el-button>
+      </el-button> -->
       <!-- 列表 -->
       <div class="tableWrap">
         <el-table
@@ -38,12 +37,12 @@
                 type="text"
                 >修改</el-button
               >
-              <el-button
+              <!-- <el-button
                 @click="onTypesDelOpeation(scope.row)"
                 v-permission="'category/del'"
                 type="text"
                 >删除</el-button
-              >
+              > -->
             </template>
           </el-table-column>
         </el-table>
@@ -117,7 +116,7 @@ import { subjectListTree } from "@/api/specialSetting";
 import {
   categoryListTree,
   categoryUpSet,
-  categoryUpSetDel,
+  categoryUpSetDel
 } from "@/api/businessManager";
 export default {
   components: { pagination },
@@ -129,27 +128,27 @@ export default {
       formActionTitle: "create",
       formTitle: {
         create: "添加商品分类",
-        update: "修改商品分类",
+        update: "修改商品分类"
       },
       typeStatus: false, // 添加教学点
       formLabelWidth: "120px",
       form: {
         name: null, // 训练模块名称
-        subjectIds: [],
+        subjectIds: []
       },
       rules: {
         name: [{ required: true, message: "请输入类型名称", trigger: "blur" }],
         subjectIds: [
-          { required: true, message: "请选择声部组合", trigger: "change" },
-        ],
+          { required: true, message: "请选择声部组合", trigger: "change" }
+        ]
       },
       pageInfo: {
         // 分页规则
         limit: 10, // 限制显示条数
         page: 1, // 当前页
         total: 0, // 总条数
-        page_size: [10, 20, 40, 50], // 选择限制显示条数
-      },
+        page_size: [10, 20, 40, 50] // 选择限制显示条数
+      }
     };
   },
   mounted() {
@@ -161,27 +160,27 @@ export default {
       this.$confirm("您确定删除该分类?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
-        type: "warning",
+        type: "warning"
       }).then(() => {
-        categoryUpSetDel({ id: row.id }).then((res) => {
+        categoryUpSetDel({ id: row.id }).then(res => {
           this.messageTips("删除", res);
         });
       });
     },
     onTypesSubmit(formName) {
       // 添加数据
-      this.$refs[formName].validate((valid) => {
+      this.$refs[formName].validate(valid => {
         if (valid) {
           if (this.formActionTitle == "create") {
             if (this.form.id) {
               // 判断有没有Id,如果有则删除
               delete this.form.id;
             }
-            categoryUpSet(this.form).then((res) => {
+            categoryUpSet(this.form).then(res => {
               this.messageTips("添加", res);
             });
           } else if (this.formActionTitle == "update") {
-            categoryUpSet(this.form).then((res) => {
+            categoryUpSet(this.form).then(res => {
               this.messageTips("修改", res);
             });
           }
@@ -204,14 +203,14 @@ export default {
       categoryListTree({
         delFlag: 0,
         rows: this.pageInfo.limit,
-        page: this.pageInfo.page,
-      }).then((res) => {
+        page: this.pageInfo.page
+      }).then(res => {
         let result = res.data;
         if (res.code == 200) {
-          result.rows.forEach((row) => {
+          result.rows.forEach(row => {
             let subjectname = [],
               subjectIds = [];
-            row.subjects.forEach((item) => {
+            row.subjects.forEach(item => {
               subjectname.push(item.name);
               subjectIds.push(item.id);
             });
@@ -231,7 +230,7 @@ export default {
         this.form = {
           id: row.id,
           name: row.name,
-          subjectIds: row.subjectIds,
+          subjectIds: row.subjectIds
         };
       }
     },
@@ -239,7 +238,7 @@ export default {
       // 关闭弹窗重置验证
       this.form = {
         name: null, // 训练模块名称
-        subjectIds: [],
+        subjectIds: []
       };
       this.$refs[formName].resetFields();
     },
@@ -247,30 +246,32 @@ export default {
       // 获取声部列表
       subjectListTree({
         delFlag: 0,
-        rows: 9999,
-      }).then((res) => {
+        rows: 9999
+      }).then(res => {
         let result = res.data;
         if (res.code == 200) {
           let tempArray = [];
-          result.rows.forEach((item, index) => {
+
+          (result.rows || []).forEach((item, index) => {
             let subject = [];
-            item.subjects.forEach((s) => {
+            (item.subjects || []).forEach(s => {
               subject.push({
                 value: s.id,
-                label: s.name,
+                label: s.name
               });
             });
 
             tempArray[index] = {
               label: item.name,
-              options: subject,
+              options: subject
             };
           });
           this.subjectList = tempArray;
+          console.log(this.subjectList, "12");
         }
       });
-    },
-  },
+    }
+  }
 };
 </script>
 <style lang="scss" scoped>

+ 26 - 4
src/views/businessManager/shopManager/shopList.vue

@@ -170,7 +170,13 @@
           </el-select>
         </el-form-item>
         <el-form-item prop="goodsCategoryId">
-          <el-select
+          <el-cascader
+            v-model.trim="searchForm.goodsCategoryId"
+            :options="categoryList"
+            placeholder="商品分类"
+            :props="{ checkStrictly: true, expandTrigger: 'hover' }"
+          ></el-cascader>
+          <!-- <el-select
             v-model.trim="searchForm.goodsCategoryId"
             clearable
             placeholder="商品分类"
@@ -181,7 +187,7 @@
               :label="item.label"
               :value="item.value"
             ></el-option>
-          </el-select>
+          </el-select> -->
         </el-form-item>
         <el-form-item prop="brandId">
           <el-select
@@ -604,13 +610,22 @@ export default {
       };
       try {
         const { data } = await api_queryGoodsCategoryList(params);
-        console.log(data, "data");
         const result = data || [];
         let tempArray = [];
         result.forEach(row => {
+          let children = [];
+          if (row.children && row.children.length > 0) {
+            row.children.forEach(child => {
+              children.push({
+                label: child.name,
+                value: child.id
+              });
+            });
+          }
           tempArray.push({
             label: row.name,
-            value: row.id
+            value: row.id,
+            children
           });
         });
         this.categoryList = tempArray;
@@ -710,6 +725,13 @@ export default {
       params.organId = this.organId;
       params.rows = this.pageInfo.limit;
       params.page = this.pageInfo.page;
+      params.goodsCategoryId =
+        this.searchForm.goodsCategoryId &&
+        this.searchForm.goodsCategoryId.length > 0
+          ? this.searchForm.goodsCategoryId[
+              this.searchForm.goodsCategoryId.length - 1
+            ]
+          : null;
       goodsQuery(params).then(res => {
         if (res.code == 200 && res.data) {
           this.tableList = res.data.rows;

+ 8 - 0
src/views/resetTeaming/api.js

@@ -21,6 +21,14 @@ export const musicGroupcreateCalender = data =>
     data,
     method: "post"
   });
+
+// musicGroupCalenderRefundPeriod/batchUpdate
+export const musicGroupbatchUpdate = data =>
+  request2({
+    url: "/api-web/musicGroupCalenderRefundPeriod/batchUpdate",
+    data,
+    method: "post"
+  });
 export const musicGroupresetCalender = data =>
   request2({
     url: "/api-web/musicGroupPaymentCalender/updateCalender",

+ 95 - 24
src/views/resetTeaming/components/goodsPayInfo.vue

@@ -11,10 +11,22 @@
                 :form="form"
                 :courseViewType="courseViewType"
                 :organId="organId"
+                :payschoolListStatus="payschoolListStatus"
+              />
+              <payFeeInfo
+                :form="form"
+                @setAllTotal="setAllTotal"
+                :payschoolListStatus="payschoolListStatus"
+              />
+              <payAddressInfo
+                :form="form"
+                :payschoolListStatus="payschoolListStatus"
+              />
+              <payBackMoney
+                :form="form"
+                :educationList="educationList"
+                :payschoolListStatus="payschoolListStatus"
               />
-              <payFeeInfo :form="form" @setAllTotal="setAllTotal" />
-              <payAddressInfo :form="form" />
-              <payBackMoney :form="form" :educationList="educationList" />
             </div>
           </el-form>
 
@@ -29,7 +41,11 @@
 <script>
 import { getMusicGroupPaymentCalenderDetail } from "@/api/buildTeam";
 import { queryEmployByOrganId } from "@/api/systemManage";
-import { musicGroupcreateCalender } from "../api";
+import {
+  musicGroupcreateCalender,
+  musicGroupresetCalender,
+  musicGroupbatchUpdate
+} from "../api";
 import payGoodsInfo from "../goodsModal/payGoodsInfo";
 import payFeeInfo from "../goodsModal/payFeeInfo";
 import payAddressInfo from "../goodsModal/payAddressInfo";
@@ -64,6 +80,7 @@ export default {
           region: null
         },
         responsiblePerson: null, // 责任人
+        responsibleMemo: null, // 备注
         musicGroupCalenderRefundPeriods: [{ refundDate: "", refundAmount: "" }] // 回款周期
       }
     };
@@ -157,6 +174,15 @@ export default {
           path: "/business/resetTeaming",
           query
         });
+      } else if (query.type == "payschoolList") {
+        this.$store.dispatch("delVisitedViews", this.$route);
+        this.$router.push({
+          path: "/financialManager/payschoolList",
+          query: {
+            id: query.id,
+            name: query.name
+          }
+        });
       } else if (
         query.type == "teamDraft" ||
         query.type == "feeAudit" ||
@@ -187,41 +213,83 @@ export default {
           return;
         }
 
-        try {
-          const res = await musicGroupcreateCalender(obj);
-          if (res.code == 200) {
-            this.$message.success("创建缴费成功");
-            this.goback();
-          }
-          if (res.code == 207) {
-            await this.$confirm(
-              res.msg || `当前乐团存在未排课的缴费项目,请再次确认操作`,
-              "提示",
-              {
-                type: "warning"
+        if (this.$route.query.calenderId) {
+          obj.calenderId = this.$route.query.calenderId;
+          try {
+            // 账期修改
+            if (this.$route.query.type == "payschoolList") {
+              const res = await musicGroupbatchUpdate(
+                obj.musicGroupCalenderRefundPeriods
+              );
+              if (res.code == 200) {
+                this.$message.success("修改账期成功");
+                this.goback();
               }
-            );
-            obj.confirmCreate = true;
-            await musicGroupcreateCalender(obj);
-            this.$message.success("创建缴费成功");
-            this.goback();
+              return;
+            }
+            // 其它修改
+            const res = await musicGroupresetCalender(obj);
+            if (res.code == 200) {
+              this.$message.success("修改缴费成功");
+              this.goback();
+            }
+            if (res.code == 207) {
+              await this.$confirm(
+                res.msg || `当前乐团存在未排课的缴费项目,请再次确认操作`,
+                "提示",
+                {
+                  type: "warning"
+                }
+              );
+              obj.confirmCreate = true;
+              await musicGroupresetCalender(obj);
+              this.$message.success("修改缴费成功");
+              this.goback();
+            }
+          } catch (e) {
+            console.log(e);
+          }
+        } else {
+          try {
+            const res = await musicGroupcreateCalender(obj);
+            if (res.code == 200) {
+              this.$message.success("创建缴费成功");
+              this.goback();
+            }
+            if (res.code == 207) {
+              await this.$confirm(
+                res.msg || `当前乐团存在未排课的缴费项目,请再次确认操作`,
+                "提示",
+                {
+                  type: "warning"
+                }
+              );
+              obj.confirmCreate = true;
+              await musicGroupcreateCalender(obj);
+              this.$message.success("创建缴费成功");
+              this.goback();
+            }
+          } catch (e) {
+            console.log(e);
           }
-        } catch (e) {
-          console.log(e);
         }
       });
     },
     formatData() {
+      const query = this.$route.query;
       let calenderFeeJson = this.form.calenderFeeJson;
       const musicGroupCalenderRefundPeriods =
         this.form.musicGroupCalenderRefundPeriods || [];
       musicGroupCalenderRefundPeriods.forEach(period => {
         period.responsiblePerson = this.form.responsiblePerson;
+        period.memo = this.form.responsibleMemo;
       });
+
       return {
         payUserType: "SCHOOL",
         memo: this.form.memo,
-        musicGroupId: this.$route.query.id,
+        musicGroupId:
+          query.type == "payschoolList" ? query.musicGroupId : query.id,
         calenderFeeJson: JSON.stringify(calenderFeeJson),
         musicGroupCalenderRefundPeriods,
         currentTotalAmount: this.form.currentTotalAmount,
@@ -256,6 +324,9 @@ export default {
   computed: {
     musicGroup() {
       return this.baseInfo?.musicGroup;
+    },
+    payschoolListStatus() {
+      return this.$route.query.type === "payschoolList" ? true : false;
     }
   }
 };

+ 9 - 3
src/views/resetTeaming/goodsModal/payAddressInfo.vue

@@ -28,6 +28,7 @@
             placeholder="请输入收货人姓名"
             v-model="form.calenderAddress.name"
             :maxlength="12"
+            :disabled="payschoolListStatus"
           ></el-input>
         </el-form-item>
         <el-form-item
@@ -54,6 +55,7 @@
             placeholder="请输入收货人手机号"
             v-model="form.calenderAddress.phone"
             :maxlength="11"
+            :disabled="payschoolListStatus"
           ></el-input>
         </el-form-item>
       </div>
@@ -81,6 +83,7 @@
                   clearable
                   style="width: 148px !important; margin-right: 5px"
                   @change="onChangeProvince"
+                  :disabled="payschoolListStatus"
                 >
                   <el-option
                     v-for="item in provinceList"
@@ -100,7 +103,9 @@
                 <el-select
                   v-model.trim="form.calenderAddress.city"
                   filterable
-                  :disabled="!form.calenderAddress.province"
+                  :disabled="
+                    !form.calenderAddress.province || payschoolListStatus
+                  "
                   style="width: 148px !important; margin-right: 5px"
                   placeholder="请选择市"
                   @change="onChangeCity"
@@ -124,7 +129,7 @@
                 <el-select
                   v-model.trim="form.calenderAddress.region"
                   filterable
-                  :disabled="!form.calenderAddress.city"
+                  :disabled="!form.calenderAddress.city || payschoolListStatus"
                   style="width: 148px !important"
                   placeholder="请选择地区"
                   clearable
@@ -169,6 +174,7 @@
               type="textarea"
               maxlength="50"
               show-word-limit
+              :disabled="payschoolListStatus"
             ></el-input>
           </el-form-item>
         </el-col>
@@ -180,7 +186,7 @@
 import { areaQueryChild, getParentArea } from "@/api/specialSetting";
 // import { courseType, boolOptions } from "@/constant";
 export default {
-  props: ["form"],
+  props: ["form", "payschoolListStatus"],
   data() {
     return {
       charges: [],

+ 29 - 2
src/views/resetTeaming/goodsModal/payBackMoney.vue

@@ -94,10 +94,37 @@
             @click="deteleRow(item, index)"
           ></i>
         </div>
-        <el-row>
+        <el-row v-if="!payschoolListStatus">
           <el-button class="addBackBtn" @click="addBack">+添加</el-button>
         </el-row>
       </div>
+      <el-row v-if="payschoolListStatus">
+        <el-col class="memoWrap">
+          <el-form-item
+            label="备注"
+            prop="responsibleMemo"
+            :rules="[
+              { required: true, message: '请输入备注', trigger: 'change' }
+            ]"
+          >
+            <template slot="label">
+              <p style="position: relative">
+                <span style="color: #f56c6c; margin-right: 4px">*</span>
+                备注
+              </p>
+            </template>
+            <el-input
+              style="width: 423px;"
+              placeholder="请输入备注"
+              :rows="3"
+              v-model="form.responsibleMemo"
+              type="textarea"
+              maxlength="500"
+              show-word-limit
+            ></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
     </div>
   </div>
 </template>
@@ -105,7 +132,7 @@
 // import { getToken, getTenantId } from "@/utils/auth";
 // import { courseType, boolOptions } from "@/constant";
 export default {
-  props: ["form", "educationList"],
+  props: ["form", "educationList", "payschoolListStatus"],
   data() {
     return {
       charges: [],

+ 4 - 1
src/views/resetTeaming/goodsModal/payFeeInfo.vue

@@ -32,6 +32,7 @@
             :max="allTotal"
             :precision="2"
             type="number"
+            :disabled="payschoolListStatus"
           >
           </el-input-number>
         </el-form-item>
@@ -72,6 +73,7 @@
             tips="仅支持上传pdf格式文件"
             buttonText="上传合同"
             accept=".pdf"
+            :disabled="payschoolListStatus"
             v-model="form.contractUrl"
             bucket_name="contracts"
             @success="checkType"
@@ -118,6 +120,7 @@
               type="textarea"
               maxlength="50"
               show-word-limit
+              :disabled="payschoolListStatus"
             ></el-input>
           </el-form-item>
         </el-col>
@@ -128,7 +131,7 @@
 <script>
 import { courseType, boolOptions } from "@/constant";
 export default {
-  props: ["form"],
+  props: ["form", "payschoolListStatus"],
   data() {
     return {
       charges: [],

+ 7 - 2
src/views/resetTeaming/goodsModal/payGoodsInfo.vue

@@ -40,6 +40,7 @@
                 :min="0"
                 placeholder="请输入采购数量"
                 @change="onChangeNum(scope.$index)"
+                :disabled="payschoolListStatus"
               />
             </el-form-item>
           </template>
@@ -51,7 +52,10 @@
         </el-table-column>
         <el-table-column width="170px" label="操作">
           <template slot-scope="scope">
-            <el-button type="text" @click.prevent="removeGoodsList(scope.row)"
+            <el-button
+              type="text"
+              @click.prevent="removeGoodsList(scope.row)"
+              :disabled="payschoolListStatus"
               >删除</el-button
             >
           </template>
@@ -63,6 +67,7 @@
         type="info"
         style="width: 100%;margin: 10px 0 10px;"
         @click="addGoodsList"
+        :disabled="payschoolListStatus"
         >添加商品</el-button
       >
     </div>
@@ -98,7 +103,7 @@ export default {
   components: {
     addShopGoods
   },
-  props: ["form", "courseViewType", "organId"],
+  props: ["form", "courseViewType", "organId", "payschoolListStatus"],
   data() {
     return {
       disabledIds: [],