暂存

src/apis/components/search-good-modal.js

@@ -2,7 +2,7 @@ import http from "@/apis/axios";
 const api = "admin/";
 export default {
   // 列表
-  list: (data, params) => http(api + "goodlist", data, "post", params),
+  list: (data, params) => http(api + "gooduplist", data, "post", params),
   // 供应商列表
   supplierList: (data, params) => http(api + "supplierlist", data, "post", params),
 

src/apis/service/goodStore/goodsCost/index.js

@@ -7,7 +7,7 @@ export default {
   // 删除
   delete: (data, params) => http(api + "gooddel", data, "post", params),
   // 分页查询
-  list: (data, params) => http(api + "goodlist", data, "post", params),
+  list: (data, params) => http(api + "gooduplist", data, "post", params),
   // 详情
   detail: (data, params) => http(api + "goodinfo", data, "post", params),
   // 更改

src/views/goodStore/active/add.vue

@@ -3,13 +3,94 @@
     <div
       v-if="powers && powers.length > 0 && powers.some((item) => item == '007')"
     >
-      <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
-        <el-tab-pane label="基础/规格" name="1"> <base-form /></el-tab-pane>
-        <el-tab-pane label="包装/发货/图片" name="2">
-          <pack-form
-        /></el-tab-pane>
-        <el-tab-pane label="固定/阶梯成本" name="3"> <cost-form /></el-tab-pane>
-      </el-tabs>
+      活动新建
+      <el-form
+        :model="ruleForm"
+        status-icon
+        :rules="rulesThis"
+        ref="ruleForm"
+        :size="'mini'"
+        label-width="110px"
+        class="demo-ruleForm"
+      >
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="活动标题" prop="activity_name">
+              <el-input
+                placeholder="活动标题"
+                v-model="ruleForm.activity_name"
+                maxlength="100"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="所属平台" prop="platform_code">
+              <search-brand
+                :value="ruleForm.platform_code"
+                :disabled="false"
+                :size="'mini'"
+                :isDetail="false"
+                :placeholder="'所属平台'"
+                @searchChange="platform_codesearchChange"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="商品库存类型" prop="is_stock">
+              <el-input
+                placeholder="商品库存类型"
+                v-model="ruleForm.is_stock"
+                maxlength="100"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="活动时间" required>
+              <el-row>
+                <el-col :span="11">
+                  <el-form-item prop="datactivity_name">
+                    <el-date-picker
+                      type="datetime"
+                      placeholder="开始时间"
+                      v-model="ruleForm.activity_start"
+                      style="width: 100%"
+                    ></el-date-picker>
+                  </el-form-item>
+                </el-col>
+                <el-col class="tc" :span="2">-</el-col>
+                <el-col :span="11">
+                  <el-form-item prop="activity_end">
+                    <el-date-picker
+                      type="datetime"
+                      placeholder="结束时间"
+                      v-model="ruleForm.activity_end"
+                      style="width: 100%"
+                    ></el-date-picker>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="活动描述" prop="activity_desc">
+              <el-input
+                placeholder="活动描述"
+                v-model="ruleForm.activity_desc"
+                maxlength="100"
+              />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="24">
+            <el-form-item label="活动商品" prop="good_list">
+
+
+
+              
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
     </div>
     <div v-else>
       <no-auth></no-auth>
@@ -27,9 +108,9 @@ export default {
   name: "activeAdd",
   mixins: [resToken],
   components: {
-    baseForm,
-    costForm,
-    packForm,
+    // baseForm,
+    // costForm,
+    // packForm,
   },
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
@@ -50,12 +131,13 @@ export default {
       size: "small",
       activeName: "3",
       loading: false,
-   
-     
-
-    
-
-   
+      ruleForm: {
+        activity_name: "",
+        platform_code: "",
+        a3: "",
+        activity_desc: "",
+        a5: "",
+      },
     };
   },
   mounted() {
@@ -64,7 +146,7 @@ export default {
   methods: {
     async initForm() {
       this.loading = true;
-    
+
       this.loading = false;
     },
     handleClick(row) {
@@ -78,10 +160,6 @@ export default {
         await this.resetForm(res.data);
       }
     },
-  
-
-  
-   
   },
 };
 </script>
@@ -101,19 +179,18 @@ export default {
   }
   /deep/ .ddiv {
     border-top: 1px solid #dcdfe6;
-   
   }
   /deep/ .dtitle {
     width: 40px;
     text-align: center;
     height: 100%;
     min-height: 100%;
-    ul{
-      padding:20px 0 0 0;
+    ul {
+      padding: 20px 0 0 0;
     }
   }
   /deep/ .dmain {
-     padding: 20px 0 0 0;
+    padding: 20px 0 0 0;
     width: calc(100% - 40px);
     border-left: 1px solid #dcdfe6;
   }

src/views/goodStore/sort/addEdit.vue

@@ -4,7 +4,7 @@
     :title="title"
     :center="true"
     align="left"
-    top="18vh"
+    top="12vh"
     width="600px"
     :close-on-click-modal="false"
     :visible.sync="showModelThis"
@@ -24,6 +24,14 @@
             label-width="80px"
             class="demo-ruleForm"
           >
+            <el-form-item label="上级分类" prop="pid">
+              <el-input
+                v-model="ruleForm.pid"
+                placeholder="上级分类"
+                minlength="20"
+                disabled
+              />
+            </el-form-item>
             <el-form-item label="分类名称" prop="cat_name">
               <el-input
                 v-model="ruleForm.cat_name"
@@ -48,7 +56,14 @@
                 </el-option>
               </el-select>
             </el-form-item>
-
+            <el-form-item label="科目代码" prop="科目代码">
+              <el-input
+                v-model="ruleForm.fund_code"
+                :disabled="id == '007'"
+                placeholder="科目代码"
+                minlength="50"
+              />
+            </el-form-item>
             <el-form-item label="售后说明" prop="cat_desc">
               <el-input
                 v-model="ruleForm.cat_desc"

src/views/goodStore/sort/index.vue

@@ -125,12 +125,6 @@
       </template>
 
       <template #operation="{ scope }">
-        <el-tooltip effect="dark" content="下级分类" placement="top">
-          <i
-            class="el-icon-arrow-right tb-icon"
-            @click="openChildren(scope.row)"
-          ></i>
-        </el-tooltip>
         <el-tooltip
           v-if="powers.some((item) => item == '007')"
           effect="dark"
@@ -190,6 +184,18 @@
             @click="deleteItem(scope.row.id)"
           ></i>
         </el-tooltip>
+
+        <el-tooltip
+          v-if="parseInt(scope.row.level) < 3"
+          effect="dark"
+          content="下级分类"
+          placement="top"
+        >
+          <i
+            class="el-icon-arrow-right tb-icon"
+            @click="openChildren(scope.row)"
+          ></i>
+        </el-tooltip>
       </template>
     </ex-table>
     <no-auth v-else></no-auth>