mo 3 年之前
父節點
當前提交
f3f376cfbe

File diff suppressed because it is too large
+ 0 - 0
dist/index.html


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.286b1c4a.css


File diff suppressed because it is too large
+ 1 - 0
dist/static/css/app.3519cc03.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/chunk-18976d90.9648c3a3.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/chunk-4fb1129b.a0f5fbec.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/chunk-5eb75ec9.aca1c1db.css


+ 1 - 0
dist/static/css/chunk-5f1e1e79.1716a137.css

@@ -0,0 +1 @@
+.alert[data-v-6bae6dfd]{margin-bottom:22px}.el-button--primary[data-v-6bae6dfd],.el-button--primary[data-v-6bae6dfd]:active,.el-button--primary[data-v-6bae6dfd]:focus,.el-button--primary[data-v-6bae6dfd]:hover{background:#14928a;border-color:#14928a;color:#fff}.el-row[data-v-6bae6dfd]{margin-top:40px}.el-col[data-v-6bae6dfd]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;margin-bottom:20px;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end;margin-right:50%}.el-input-group[data-v-6bae6dfd]{width:200px;margin:0 20px}[data-v-6bae6dfd] .el-tree-node__content{height:40px!important}[data-v-6bae6dfd] .avatar-uploader .el-upload{border:1px dashed #d9d9d9;border-radius:6px;cursor:pointer;position:relative;overflow:hidden}.avatar-uploader .el-upload[data-v-6bae6dfd]:hover{border-color:#409eff}.avatar-uploader-icon[data-v-6bae6dfd]{font-size:28px;color:#8c939d;width:120px;height:120px;line-height:120px;text-align:center}.avatar[data-v-6bae6dfd]{width:120px;height:120px;display:block}.el-select__tags .el-tag.el-tag--info.el-tag--small.el-tag--light[data-v-6bae6dfd]{max-width:95px}

File diff suppressed because it is too large
+ 0 - 0
dist/static/css/chunk-62f4aaf4.456a9507.css


File diff suppressed because it is too large
+ 1 - 0
dist/static/css/chunk-68051099.a591cf9c.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/chunk-70724a2b.a68703c4.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/chunk-f34ed4b0.a926943f.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.312426d9.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-18976d90.408fba35.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-4fb1129b.afe00306.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-5eb75ec9.03a8d21a.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-5f1e1e79.89cf33bb.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-68051099.af885b48.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-70724a2b.cc0d5403.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-f34ed4b0.c08c028d.js


+ 1 - 1
src/views/businessManager/orderManager/orderAudit-taoqi/index.vue

@@ -236,7 +236,7 @@ export default {
     // });
     // });
     // 获取分部
     // 获取分部
      this.$store.dispatch("setBranchs");
      this.$store.dispatch("setBranchs");
-    goodsQuery({ rows: 99999 }).then((res) => {
+    goodsQuery({ rows: 99999,noOrganSearch:1 }).then((res) => {
       if (res.code === 200) {
       if (res.code === 200) {
         this.shopList = res.data.rows;
         this.shopList = res.data.rows;
       }
       }

+ 1 - 1
src/views/businessManager/orderManager/orderAudit/index.vue

@@ -265,7 +265,7 @@ export default {
     // });
     // });
     // 获取分部
     // 获取分部
      this.$store.dispatch("setBranchs");
      this.$store.dispatch("setBranchs");
-    goodsQuery({ rows: 99999 }).then((res) => {
+    goodsQuery({ rows: 99999 ,noOrganSearch:1}).then((res) => {
       if (res.code === 200) {
       if (res.code === 200) {
         this.shopList = res.data.rows;
         this.shopList = res.data.rows;
       }
       }

+ 5 - 0
src/views/businessManager/shopManager/shopList.vue

@@ -800,6 +800,7 @@
             style="width: 400px !important"
             style="width: 400px !important"
             multiple
             multiple
             clearable
             clearable
+             :disabled="addDisabled"
           >
           >
             <el-option
             <el-option
               v-for="item in selects.branchs"
               v-for="item in selects.branchs"
@@ -822,6 +823,7 @@
             style="width: 400px !important"
             style="width: 400px !important"
             multiple
             multiple
             clearable
             clearable
+             :disabled="addDisabled"
           >
           >
             <el-option
             <el-option
               v-for="item in selects.branchs"
               v-for="item in selects.branchs"
@@ -844,6 +846,7 @@
             style="width: 400px !important"
             style="width: 400px !important"
             multiple
             multiple
             clearable
             clearable
+             :disabled="addDisabled"
           >
           >
             <el-option
             <el-option
               v-for="item in selects.branchs"
               v-for="item in selects.branchs"
@@ -866,6 +869,7 @@
             style="width: 400px !important"
             style="width: 400px !important"
             multiple
             multiple
             clearable
             clearable
+             :disabled="addDisabled"
           >
           >
             <el-option
             <el-option
               v-for="item in selects.branchs"
               v-for="item in selects.branchs"
@@ -888,6 +892,7 @@
             style="width: 400px !important"
             style="width: 400px !important"
             multiple
             multiple
             clearable
             clearable
+             :disabled="addDisabled"
           >
           >
             <el-option
             <el-option
               v-for="item in selects.branchs"
               v-for="item in selects.branchs"

+ 1 - 1
src/views/resetTeaming/modals/user-pay-form.vue

@@ -809,7 +809,7 @@ export default {
           this.type === "user"
           this.type === "user"
         ) {
         ) {
           this.$message.error(
           this.$message.error(
-            "报名缴费云教练收费模式课程费用不得大于0且不可选"
+            "会员收费模式报名缴费项目课程费用不得大于0且不可选"
           );
           );
           return;
           return;
         }
         }

+ 0 - 1
src/views/teamBuild/components/teamBaseInfo.vue

@@ -1198,7 +1198,6 @@ export default {
       }
       }
     },
     },
       checkCourseView(val){
       checkCourseView(val){
-           console.log(this.teamStatus)
       if(this.teamStatus == "newTeam" || this.teamStatus == "teamDraft"){
       if(this.teamStatus == "newTeam" || this.teamStatus == "teamDraft"){
 
 
         return false
         return false

Some files were not shown because too many files changed in this diff