合并代码

dist/static/css/chunk-158ebecc.2fa061f7.css

@@ -0,0 +1 @@
+.newBand[data-v-b50d09aa]{display:inline-block}[data-v-b50d09aa] .el-input-number.is-controls-right .el-input__inner{text-align:left}.setWidth[data-v-b50d09aa]{display:inline-block}.lookTitle[data-v-b50d09aa]{height:40px;line-height:40px;font-weight:700;background-color:#edeef0;padding:0 20px;margin-bottom:20px}.showShop[data-v-b50d09aa]{height:40px;line-height:40px;width:150px;background-color:#f5f7fa;border-color:#e4e7ed;color:#c0c4cc;cursor:not-allowed;color:#333;opacity:1;border-radius:4px;border:1px solid #dcdfe6;padding:0 15px;margin-right:10px}.shopListWrap[data-v-b50d09aa]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}

src/views/adapayAccount/index.vue

@@ -144,14 +144,14 @@
                label-width="160px"
                label-position="right"
                ref="moneyForm">
-        <el-form-item label="每月最大收款金额"
+        <el-form-item label="每日最大收款金额"
                       prop="monthMaxReceipt">
           <template #label>
-            每月最大收款金额
+            每日最大收款金额
             <el-tooltip placement="top"
                     popper-class="mTooltip">
             <div slot="content">
-              每月最大收款金额，0不限制
+              每日最大收款金额，0不限制
             </div>
             <i class="el-icon-question micon el-tooltip"
               style="font-size: 18px; color: #F56C6C"
@@ -159,7 +159,7 @@
           </el-tooltip>
           </template>
           <el-input v-model="moneyForm.monthMaxReceipt" type="number"
-                    placeholder="请输入每月最大收款金额">
+                    placeholder="请输入每日最大收款金额">
             <template slot="append">元</template>
           </el-input>
         </el-form-item>
@@ -234,7 +234,7 @@ export default {
         routeMemberId: null
       },
       moneyRules: {
-        monthMaxReceipt: [{ required: true, message: '请输入每月最大收款金额', trigger: 'blur' }],
+        monthMaxReceipt: [{ required: true, message: '请输入每日最大收款金额', trigger: 'blur' }],
         organId: [{ required: true, message: '请选择满额转分部', trigger: 'change' }]
       },
       calcBranchList: []

src/views/businessManager/orderManager/financeManager.vue

@@ -734,7 +734,7 @@ export default {
     //     this.organList = res.data;
     //   }
     // });
-       this.$store.dispatch("setBranchs");
+    this.$store.dispatch("setBranchs");
     goodsQuery({ status: 1, rows: 99999 }).then((res) => {
       if (res.code === 200) {
         this.shopList = res.data.rows;

src/views/sporadicManager/sporadicList.vue

@@ -528,6 +528,7 @@ export default {
         { label: "上门费", value: 7 },
         { label: "账户充值", value: 9 },
         { label: "乐保服务", value: 10 },
+        { label: "网基课活动", value: 13 },
         { label: "其它", value: 11 },
       ],
       orderType1: [
@@ -539,6 +540,7 @@ export default {
         { label: "上门费", value: 7 },
         { label: "账户充值", value: 9 },
         { label: "乐保服务", value: 10 },
+        { label: "网基课活动", value: 13 }
       ],
       maskForm: {
         organId: "",
@@ -994,6 +996,7 @@ export default {
         10: "乐保服务",
         11: "其它",
         12: "双十一活动",
+        13: '网基课活动'
       };
       return template[val];
     },

src/views/vipClass/vipList.vue

@@ -197,7 +197,11 @@
             align="center"
             prop="vipGroupActivityName"
             label="活动方案"
-          ></el-table-column>
+          >
+            <template slot-scope="scope">
+               <overflow-text :text="scope.row.vipGroupActivityName" width="100%" />
+            </template>
+          </el-table-column>
           <el-table-column align="center" label="当前课次">
             <template slot-scope="scope">
               <div>