mo 4 gadi atpakaļ
vecāks
revīzija
894cef77ce

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 0
dist/index.html


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 0
dist/static/css/chunk-0257a33c.d9f212cb.css


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
dist/static/css/chunk-06d9395d.16f0c399.css


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
dist/static/css/chunk-69265236.40a686f6.css


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
dist/static/css/chunk-6a2bae14.d66c8065.css


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
dist/static/css/chunk-cda3f540.26794985.css


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 0
dist/static/js/app.afdda786.js


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
dist/static/js/chunk-0257a33c.7a1f7d67.js


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
dist/static/js/chunk-06d9395d.46d89a41.js


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
dist/static/js/chunk-4bd4f6c0.3f7aa572.js


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
dist/static/js/chunk-69265236.02c0af66.js


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
dist/static/js/chunk-6a2bae14.6d200768.js


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
dist/static/js/chunk-6b46d296.c018d59d.js


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
dist/static/js/chunk-6e170a3a.013557a5.js


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
dist/static/js/chunk-7021c1f6.195c4bdc.js


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
dist/static/js/chunk-75bd98d9.48cbed5c.js


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
dist/static/js/chunk-cda3f540.08ccaa0a.js


+ 214 - 86
src/views/businessManager/shopManager/shopOperation.vue

@@ -8,13 +8,25 @@
     </h2>
 
     <div class="m-core">
-      <el-form :model="form" :rules="rules" ref="form" label-width="120px">
+      <el-form
+        :model="form"
+        :rules="rules"
+        ref="form"
+        label-width="160px"
+        :inline="true"
+      >
+        <el-alert
+          title="基础信息"
+          :closable="false"
+          class="alert"
+          type="info"
+        />
         <el-form-item label="货号" prop="sn">
           <el-input
             v-model.trim="form.sn"
             :disabled="pageDisabled"
             placeholder="请输入货号"
-            style="width: 400px"
+            style="width: 220px !important"
           ></el-input>
         </el-form-item>
         <el-form-item label="品牌" prop="brand">
@@ -22,7 +34,7 @@
             v-model.trim="form.brand"
             :disabled="pageDisabled"
             placeholder="请输入品牌"
-            style="width: 400px"
+            style="width: 220px !important"
           ></el-input>
         </el-form-item>
         <!-- <el-form-item label="备查货号" prop="supplyChannel" v-if="pageType == 'create'">
@@ -33,7 +45,7 @@
             v-model.trim="form.name"
             placeholder="请输入商品名称"
             :disabled="pageDisabled"
-            style="width: 400px"
+            style="width: 220px !important"
           ></el-input>
         </el-form-item>
         <el-form-item label="商品类型" prop="type">
@@ -41,7 +53,7 @@
             v-model.trim="form.type"
             placeholder="请选择商品类型"
             :disabled="pageDisabled"
-            style="width: 400px !important"
+            style="width: 220px !important"
           >
             <el-option
               v-for="(item, index) in goodsType"
@@ -56,7 +68,7 @@
             v-model.trim="form.goodsCategoryId"
             placeholder="请选择商品分类"
             :disabled="pageDisabled"
-            style="width: 400px !important"
+            style="width: 220px !important"
             filterable
           >
             <el-option
@@ -68,40 +80,38 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="所属分部" prop="organIdList">
-          <select-all v-model.trim="form.organIdList"
-                     filterable
-                     placeholder="请选择所属分部"
-                     style="width: 400px !important"
-                     multiple
-                     :disabled="pageDisabled || pageType == 'update'"
-                     clearable>
-            <el-option v-for="item in selects.branchs"
+        <!-- <el-form-item label="所属分部" prop="organIdList">
+          <select-all
+            v-model.trim="form.organIdList"
+            filterable
+            placeholder="请选择所属分部"
+            style="width: 400px !important"
+            multiple
+            :disabled="pageDisabled || pageType == 'update'"
+            clearable
+          >
+            <el-option
+              v-for="item in selects.branchs"
               :key="item.id"
               :label="item.name"
-              :value="item.id.toString()"></el-option>
+              :value="item.id.toString()"
+            ></el-option>
           </select-all>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="商品型号" prop="specification">
           <el-input
             v-model.trim="form.specification"
             placeholder="请输入商品型号"
             :disabled="pageDisabled"
-            style="width: 400px"
+            style="width: 220px"
           ></el-input>
         </el-form-item>
-        <!-- <el-form-item label="内部库存" prop="stockCount">
-          <el-input type="number" :disabled="pageType != 'create'" v-model.trim="form.stockCount" placeholder="请输入内部库存" style="width: 400px"></el-input>
-        </el-form-item>
-        <el-form-item label="税务库存" prop="taxStockCount">
-          <el-input type="number" :disabled="pageType != 'create'" v-model.trim="form.taxStockCount" placeholder="请输入税务库存" style="width: 400px"></el-input>
-        </el-form-item> -->
         <el-form-item label="库存类型" prop="stockType">
           <el-select
             v-model="form.stockType"
             placeholder="请选择库存类型"
             :disabled="pageDisabled"
-            style="width: 400px !important"
+            style="width: 220px !important"
           >
             <el-option
               v-for="(item, index) in stockType"
@@ -111,6 +121,23 @@
             ></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="是否库存预警" prop="stockWarning">
+          <el-select
+            v-model="form.stockWarning"
+            placeholder="请选择库存预警"
+            :disabled="pageDisabled"
+            style="width: 220px !important"
+          >
+            <el-option label="是" :value="1"></el-option>
+            <el-option label="否" :value="0"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-alert
+          title="价格信息"
+          :closable="false"
+          class="alert"
+          type="info"
+        />
         <el-form-item label="市场价" prop="marketPrice">
           <el-input
             type="number"
@@ -118,7 +145,7 @@
             :disabled="pageDisabled"
             @mousewheel.native.prevent
             v-model.trim="form.marketPrice"
-            style="width: 400px"
+            style="width: 220px"
           ></el-input>
         </el-form-item>
         <el-form-item label="零售价" prop="discountPrice">
@@ -128,7 +155,7 @@
             @mousewheel.native.prevent
             :disabled="pageDisabled"
             v-model.trim="form.discountPrice"
-            style="width: 400px"
+            style="width: 220px"
           ></el-input>
         </el-form-item>
         <el-form-item label="商品团购价" prop="groupPurchasePrice">
@@ -138,76 +165,174 @@
             @mousewheel.native.prevent
             :disabled="pageDisabled"
             v-model.trim="form.groupPurchasePrice"
-            style="width: 400px"
+            style="width: 220px"
           ></el-input>
         </el-form-item>
-        <el-form-item label="学员是否展示" prop="clientShow">
+        <el-alert
+          title="销售渠道"
+          :closable="false"
+          class="alert"
+          type="info"
+        />
+        <el-form-item label="学员可见分部" prop="organIdList">
+          <select-all
+            v-model.trim="form.organIdList"
+            filterable
+            placeholder="请选择所属分部"
+            style="width: 400px !important"
+            multiple
+            :disabled="pageDisabled || pageType == 'update'"
+            clearable
+          >
+            <el-option
+              v-for="item in selects.branchs"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id.toString()"
+            ></el-option>
+          </select-all>
+        </el-form-item>
+        <el-form-item label="管理端可见分部" prop="organIdList">
+          <select-all
+            v-model.trim="form.organIdList"
+            filterable
+            placeholder="请选择所属分部"
+            style="width: 400px !important"
+            multiple
+            :disabled="pageDisabled || pageType == 'update'"
+            clearable
+          >
+            <el-option
+              v-for="item in selects.branchs"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id.toString()"
+            ></el-option>
+          </select-all>
+        </el-form-item>
+        <el-form-item label="课程收费团可见分部" prop="organIdList">
+          <select-all
+            v-model.trim="form.organIdList"
+            filterable
+            placeholder="请选择所属分部"
+            style="width: 400px !important"
+            multiple
+            :disabled="pageDisabled || pageType == 'update'"
+            clearable
+          >
+            <el-option
+              v-for="item in selects.branchs"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id.toString()"
+            ></el-option>
+          </select-all>
+        </el-form-item>
+        <el-form-item label="系统收费团可见分部" prop="organIdList">
+          <select-all
+            v-model.trim="form.organIdList"
+            filterable
+            placeholder="请选择所属分部"
+            style="width: 400px !important"
+            multiple
+            :disabled="pageDisabled || pageType == 'update'"
+            clearable
+          >
+            <el-option
+              v-for="item in selects.branchs"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id.toString()"
+            ></el-option>
+          </select-all>
+        </el-form-item>
+        <el-form-item label="参与置换可见分部" prop="organIdList">
+          <select-all
+            v-model.trim="form.organIdList"
+            filterable
+            placeholder="请选择所属分部"
+            style="width: 400px !important"
+            multiple
+            :disabled="pageDisabled || pageType == 'update'"
+            clearable
+          >
+            <el-option
+              v-for="item in selects.branchs"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id.toString()"
+            ></el-option>
+          </select-all>
+        </el-form-item>
+        <!-- <el-form-item label="学员是否展示" prop="clientShow">
           <el-select
             v-model="form.clientShow"
             :disabled="pageDisabled"
             placeholder="请选择学员是否展示"
-            style="width: 400px !important"
+            style="width: 220px !important"
           >
             <el-option label="是" :value="1"></el-option>
             <el-option label="否" :value="0"></el-option>
           </el-select>
-        </el-form-item>
-        <el-form-item label="管理端是否展示" prop="educationalShow">
+        </el-form-item> -->
+        <!-- <el-form-item label="管理端是否展示" prop="educationalShow">
           <el-select
             v-model="form.educationalShow"
             placeholder="请选择教务端是否展示"
             :disabled="pageDisabled"
-            style="width: 400px !important"
+            style="width: 220px !important"
           >
             <el-option label="是" :value="1"></el-option>
             <el-option label="否" :value="0"></el-option>
           </el-select>
-        </el-form-item>
-        <el-form-item label="乐团是否展示" prop="musicGroupShow">
+        </el-form-item> -->
+        <!-- <el-form-item label="乐团是否展示" prop="musicGroupShow">
           <el-select
             v-model="form.musicGroupShow"
             :disabled="pageDisabled"
             placeholder="请选择乐团是否展示"
-            style="width: 400px !important"
+            style="width: 220px !important"
           >
             <el-option label="是" :value="1"></el-option>
             <el-option label="否" :value="0"></el-option>
           </el-select>
-        </el-form-item>
-        <el-form-item label="乐团收费模式" prop="courseViewType">
-          <select-all v-model.trim="form.courseViewType"
-                     filterable
-                     placeholder="请选择乐团收费模式"
-                     style="width: 400px !important"
-                     multiple
-                     :disabled="pageDisabled || (form.musicGroupShow != 0 && form.musicGroupShow != 1)"
-                     clearable>
-          <el-option label="课程收费" value="0"></el-option>
-            <el-option label="会员收费" value="1"></el-option>
-          </select-all>
-        </el-form-item>
-        <el-form-item label="是否库存预警" prop="stockWarning">
-          <el-select
-            v-model="form.stockWarning"
-            placeholder="请选择库存预警"
-            :disabled="pageDisabled"
-            style="width: 400px !important"
+        </el-form-item> -->
+        <!-- <el-form-item label="乐团收费模式" prop="courseViewType">
+          <select-all
+            v-model.trim="form.courseViewType"
+            filterable
+            placeholder="请选择乐团收费模式"
+            style="width: 220px !important"
+            multiple
+            :disabled="
+              pageDisabled ||
+              (form.musicGroupShow != 0 && form.musicGroupShow != 1)
+            "
+            clearable
           >
-            <el-option label="是" :value="1"></el-option>
-            <el-option label="否" :value="0"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="是否参与置换" prop="replacementShow">
+            <el-option label="课程收费" value="0"></el-option>
+            <el-option label="系统收费" value="1"></el-option>
+            <el-option label="云教练收费" value="2"></el-option>
+          </select-all>
+        </el-form-item> -->
+
+        <!-- <el-form-item label="是否参与置换" prop="replacementShow">
           <el-select
             v-model="form.replacementShow"
             placeholder="请选择库存预警"
             :disabled="pageDisabled"
-            style="width: 400px !important"
+            style="width: 220px !important"
           >
             <el-option label="是" :value="1"></el-option>
             <el-option label="否" :value="0"></el-option>
           </el-select>
-        </el-form-item>
+        </el-form-item> -->
+        <el-alert
+          title="商品信息"
+          :closable="false"
+          class="alert"
+          type="info"
+        />
         <el-form-item label="商品图片" prop="image">
           <el-upload
             class="avatar-uploader"
@@ -223,6 +348,7 @@
             <i v-else class="el-icon-plus avatar-uploader-icon"></i>
           </el-upload>
         </el-form-item>
+        <br />
         <el-form-item label="商品描述" prop="brief">
           <el-input
             type="textarea"
@@ -231,6 +357,7 @@
             style="width: 400px"
           ></el-input>
         </el-form-item>
+        <br />
         <el-form-item label="商品详情" prop="desc">
           <el-input
             type="textarea"
@@ -239,10 +366,9 @@
             style="width: 400px"
           ></el-input>
         </el-form-item>
+        <br />
         <el-form-item v-if="!pageDisabled">
-          <el-button @click="onSubmit('form')" type="primary"
-            >保存</el-button
-          >
+          <el-button @click="onSubmit('form')" type="primary">保存</el-button>
           <el-button @click="onReSet('form')">重置</el-button>
         </el-form-item>
       </el-form>
@@ -290,7 +416,7 @@ export default {
         create: "添加",
         update: "修改",
         look: "查看",
-        copy: "复制"
+        copy: "复制",
       },
       pageDisabled: false,
       headers: {
@@ -319,8 +445,7 @@ export default {
         image: null,
         brief: null,
         desc: null,
-        replacementShow:null
-
+        replacementShow: null,
       },
       rules: {
         sn: [{ required: true, message: "请输入商品货号", trigger: "blur" }],
@@ -370,9 +495,9 @@ export default {
         organIdList: [
           {
             required: true,
-            message: '请选择所属分部',
-            trigger: "change"
-          }
+            message: "请选择所属分部",
+            trigger: "change",
+          },
         ],
         specification: [
           {
@@ -420,7 +545,7 @@ export default {
         clientShow: [
           { required: true, message: "请选择学员是否展示", trigger: "change" },
         ],
-        replacementShow:[
+        replacementShow: [
           { required: true, message: "是否参与乐器置换", trigger: "change" },
         ],
         educationalShow: [
@@ -434,7 +559,7 @@ export default {
           { required: true, message: "请选择乐团是否展示", trigger: "change" },
         ],
         courseViewType: [
-          { required: true, message: "请选乐团收费模式", trigger: 'change' },
+          { required: true, message: "请选乐团收费模式", trigger: "change" },
         ],
         stockWarning: [
           { required: true, message: "请选择是否库存预警", trigger: "change" },
@@ -487,14 +612,14 @@ export default {
     onSubmit(formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
-          let tempForm = JSON.parse(JSON.stringify(this.form))
-          if(tempForm.courseViewType) {
-            tempForm.courseViewType = tempForm.courseViewType.join(',')
+          let tempForm = JSON.parse(JSON.stringify(this.form));
+          if (tempForm.courseViewType) {
+            tempForm.courseViewType = tempForm.courseViewType.join(",");
           }
-          if(tempForm.organIdList) {
-            tempForm.organIdList = tempForm.organIdList.join(',')
+          if (tempForm.organIdList) {
+            tempForm.organIdList = tempForm.organIdList.join(",");
           }
-          if (this.pageType == "create" || this.pageType == 'copy') {
+          if (this.pageType == "create" || this.pageType == "copy") {
             if (tempForm.id) {
               // 判断有没有Id,如果有则删除
               delete tempForm.id;
@@ -577,13 +702,13 @@ export default {
         goodsSingleQuery(this.id).then((res) => {
           if (res.code == 200) {
             let result = res.data;
-            let courseViewType = null
-            if(result.courseViewType) {
-              courseViewType = result.courseViewType.split(',')
+            let courseViewType = null;
+            if (result.courseViewType) {
+              courseViewType = result.courseViewType.split(",");
             }
-            let organIdList = []
-            if(result.organIdList) {
-              organIdList = result.organIdList.split(',')
+            let organIdList = [];
+            if (result.organIdList) {
+              organIdList = result.organIdList.split(",");
             }
             this.form = {
               id: result.id,
@@ -609,7 +734,7 @@ export default {
               image: result.image,
               brief: result.brief,
               desc: result.desc,
-              replacementShow:result.replacementShow
+              replacementShow: result.replacementShow,
             };
           }
         });
@@ -688,6 +813,9 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+.alert {
+  margin-bottom: 22px;
+}
 .el-button--primary {
   background: #14928a;
   border-color: #14928a;

Daži faili netika attēloti, jo izmaiņu fails ir pārāk liels