wxy 4 年之前
父節點
當前提交
96ddf1d1e0
共有 4 個文件被更改,包括 106 次插入74 次删除
  1. 3 1
      src/views/company/index.vue
  2. 65 44
      src/views/company/indexDetail.vue
  3. 35 21
      src/views/product/productDetail.vue
  4. 3 8
      src/views/product/productIndex.vue

+ 3 - 1
src/views/company/index.vue

@@ -13,7 +13,7 @@
               <el-table-column prop="engCompany" label="英文名称" width="120" show-overflow-tooltip> </el-table-column>
               <el-table-column prop="brief" label="简介" width="150" show-overflow-tooltip> </el-table-column>
               <el-table-column prop="mobile" label="统一热线" width="120" show-overflow-tooltip> </el-table-column>
-              <el-table-column prop="aaddress" label="地址" width="150" show-overflow-tooltip> </el-table-column>
+              <el-table-column prop="address" label="地址" width="150" show-overflow-tooltip> </el-table-column>
               <el-table-column prop="weixin" label="微信" width="120" show-overflow-tooltip> </el-table-column>
               <el-table-column prop="gzh" label="公众号" width="120" show-overflow-tooltip> </el-table-column>
               <el-table-column prop="weibo" label="微博" width="120" show-overflow-tooltip> </el-table-column>
@@ -74,6 +74,7 @@ export default {
     async search({ skip = 0, limit = 10, ...info } = {}) {
       skip = this.skip;
       let res = await this.query({ skip, limit, ...info });
+      console.log(res);
       if (this.$checkRes(res)) {
         this.$set(this, `list`, res.data);
         this.$set(this, `total`, res.total);
@@ -93,6 +94,7 @@ export default {
       this.$router.push({ path: '/indexDetail' });
     },
     handleEdit(data) {
+      console.log(data);
       this.$router.push({ path: '/indexDetail', query: { id: data.id } });
     },
     handleCurrentChange(currentPage) {

+ 65 - 44
src/views/company/indexDetail.vue

@@ -7,49 +7,51 @@
           <el-col :span="24" style="margin:0 0 15px 0;text-align:right;">
             <el-button type="primary" size="mini" @click="back()">返回</el-button>
           </el-col>
-          <el-form :model="form" :rules="rules" ref="form" label-width="100px" class="demo-ruleForm">
-            <el-form-item label="企业名称" prop="company">
-              <el-input v-model="form.company"></el-input>
-            </el-form-item>
-            <el-form-item label="英文名称" prop="engCompany">
-              <el-input v-model="form.engCompany"></el-input>
-            </el-form-item>
-            <el-form-item label="简介" prop="brief">
-              <el-input type="textarea" v-model="form.brief"></el-input>
-            </el-form-item>
-            <el-form-item label="图片">
-              <upload
-                :limit="6"
-                :data="form.image"
-                :uploadBtn="true"
-                type="image"
-                :url="`/files/image/upload`"
-                @upload="uploadSuccess"
-                @delete="uploadDelete"
-              ></upload>
-            </el-form-item>
-            <el-form-item label="统一热线" prop="mobile">
-              <el-input v-model="form.mobile"></el-input>
-            </el-form-item>
-            <el-form-item label="地址" prop="aaddress">
-              <el-input v-model="form.aaddress"></el-input>
-            </el-form-item>
-            <el-form-item label="微信" prop="wexin">
-              <el-input v-model="form.weixin"></el-input>
-            </el-form-item>
-            <el-form-item label="公众号" prop="gzh">
-              <el-input v-model="form.gzh"></el-input>
-            </el-form-item>
-            <el-form-item label="微博" prop="weibo">
-              <el-input v-model="form.weibo"></el-input>
-            </el-form-item>
-            <el-form-item label="备案" prop="beian">
-              <el-input v-model="form.beian"></el-input>
-            </el-form-item>
-            <el-form-item>
-              <el-button type="primary" @click="submitForm('form')">确定</el-button>
-            </el-form-item>
-          </el-form>
+          <el-col :span="24">
+            <el-form :model="form" :rules="rules" ref="form" label-width="100px" class="demo-ruleForm">
+              <el-form-item label="企业名称" prop="company">
+                <el-input v-model="form.company"></el-input>
+              </el-form-item>
+              <el-form-item label="英文名称" prop="engCompany">
+                <el-input v-model="form.engCompany"></el-input>
+              </el-form-item>
+              <el-form-item label="简介" prop="brief">
+                <el-input type="textarea" v-model="form.brief"></el-input>
+              </el-form-item>
+              <el-form-item label="图片">
+                <upload
+                  :limit="6"
+                  :data="form.image"
+                  :uploadBtn="true"
+                  type="image"
+                  :url="`/files/image/upload`"
+                  @upload="uploadSuccess"
+                  @delete="uploadDelete"
+                ></upload>
+              </el-form-item>
+              <el-form-item label="统一热线" prop="mobile">
+                <el-input v-model="form.mobile"></el-input>
+              </el-form-item>
+              <el-form-item label="地址" prop="address">
+                <el-input v-model="form.address"></el-input>
+              </el-form-item>
+              <el-form-item label="微信" prop="wexin">
+                <el-input v-model="form.weixin"></el-input>
+              </el-form-item>
+              <el-form-item label="公众号" prop="gzh">
+                <el-input v-model="form.gzh"></el-input>
+              </el-form-item>
+              <el-form-item label="微博" prop="weibo">
+                <el-input v-model="form.weibo"></el-input>
+              </el-form-item>
+              <el-form-item label="备案" prop="beian">
+                <el-input v-model="form.beian"></el-input>
+              </el-form-item>
+              <el-form-item>
+                <el-button type="primary" @click="submitForm('form')">确定</el-button>
+              </el-form-item>
+            </el-form>
+          </el-col>
         </el-col>
       </el-col>
     </el-row>
@@ -104,7 +106,7 @@ export default {
       this.$refs[formName].validate(async valid => {
         if (valid) {
           let data = this.form;
-          console.log(data);
+          // console.log(data);
           if (data.id) {
             let res = await this.update(data);
             if (this.$checkRes(res)) {
@@ -135,9 +137,16 @@ export default {
       this.$router.push({ path: '/index' });
     },
     uploadSuccess({ type, data }) {
+      console.log(data);
       let arr = _.get(this.form, type);
+      // let arr = this.$get(this.form, type);
+      console.log(this.form);
+      console.log(type);
+      console.log(arr);
       if (_.isArray(arr)) {
         let datas = { name: data.name, url: data.uri };
+        // console.log('hhh');
+        // console.log(datas);
         this.form[type].push({ name: data.name, url: data.uri });
       } else {
         let newArr = [{ name: data.name, url: data.uri }];
@@ -151,6 +160,18 @@ export default {
   },
   computed: {
     ...mapState(['user']),
+    id() {
+      return this.$route.query.id;
+    },
+  },
+  watch: {
+    id: {
+      deep: true,
+      immediate: true,
+      handler(val) {
+        this.search();
+      },
+    },
   },
 };
 </script>

+ 35 - 21
src/views/product/productDetail.vue

@@ -2,32 +2,34 @@
   <div id="productDetail">
     <el-row>
       <el-col :span="24">
-        <breadcrumb :breadcrumb="this.$route.meta.title"></breadcrumb>
+        <breadcrumb :breadcrumbTitle="this.$route.meta.title"></breadcrumb>
       </el-col>
       <el-col :span="24" class="container">
         <el-col :span="24" style="margin:15px 0;text-align:right">
           <el-button type="primary" size="mini" @click="back()">返回</el-button>
         </el-col>
-        <el-form :model="form" :rules="rules" ref="form" label-width="100px">
-          <el-form-item label="名称" prop="name">
-            <el-input v-model="form.name"></el-input>
-          </el-form-item>
-          <el-form-item label="简介" prop="brief">
-            <el-input type="textarea" v-model="form.brief"></el-input>
-          </el-form-item>
-          <el-form-item label="内容" prop="content">
-            <el-input type="textarea" v-model="form.content"></el-input>
-          </el-form-item>
-          <el-form-item label="图片">
-            <upload :limit="1" :data="form.filepath" type="filepath" :url="'/files/filepath/upload'" @upload="uploadSuccess"></upload>
-          </el-form-item>
-          <el-form-item label="发布时间" prop="create_time">
-            <el-date-picker type="date" placeholder="选择日期" v-model="form.create_time" value-format="yyyy-MM-dd" format="yyyy-MM-dd"></el-date-picker>
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" @click="submitForm('form')">保存</el-button>
-          </el-form-item>
-        </el-form>
+        <el-col :span="24">
+          <el-form :model="form" :rules="rules" ref="form" label-width="100px">
+            <el-form-item label="名称" prop="name">
+              <el-input v-model="form.name"></el-input>
+            </el-form-item>
+            <el-form-item label="简介" prop="brief">
+              <el-input type="textarea" v-model="form.brief"></el-input>
+            </el-form-item>
+            <el-form-item label="内容" prop="content">
+              <el-input type="textarea" v-model="form.content"></el-input>
+            </el-form-item>
+            <el-form-item label="图片">
+              <upload :limit="1" :data="form.filepath" type="filepath" :url="'/files/filepath/upload'" @upload="uploadSuccess"></upload>
+            </el-form-item>
+            <el-form-item label="发布时间" prop="create_time">
+              <el-date-picker type="date" placeholder="选择日期" v-model="form.create_time" value-format="yyyy-MM-dd" format="yyyy-MM-dd"></el-date-picker>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" @click="submitForm('form')">保存</el-button>
+            </el-form-item>
+          </el-form>
+        </el-col>
       </el-col>
     </el-row>
   </div>
@@ -115,6 +117,18 @@ export default {
   },
   computed: {
     ...mapState(['user']),
+    id() {
+      return this.$route.query.id;
+    },
+  },
+  watch: {
+    id: {
+      deep: true,
+      immediate: true,
+      handler(val) {
+        this.search();
+      },
+    },
   },
 };
 </script>

+ 3 - 8
src/views/product/productIndex.vue

@@ -3,7 +3,7 @@
     <el-row>
       <el-col :span="24">
         <el-col :span="24">
-          <breadcrumb :breadcrumb="this.$route.meta.title"></breadcrumb>
+          <breadcrumb :breadcrumbTitle="this.$route.meta.title"></breadcrumb>
         </el-col>
         <el-col :span="24" class="container">
           <el-col :span="24" style="margin:15px 0;text-align:right">
@@ -82,13 +82,8 @@ export default {
       this.$router.push({ path: '/productDetail' });
     },
     //编辑
-    handleEdit() {
-      this.$router.push({
-        path: '/productDetail',
-        query: {
-          id: data.id,
-        },
-      });
+    handleEdit(data) {
+      this.$router.push({ path: '/productDetail', query: { id: data.id } });
     },
     //删除数据
     async handleDelete(data) {