wyling 4 年之前
父節點
當前提交
13899450af
共有 3 個文件被更改,包括 155 次插入69 次删除
  1. 11 3
      src/App.vue
  2. 16 16
      src/views/customer/customer/index.vue
  3. 128 50
      src/views/product/info/index.vue

+ 11 - 3
src/App.vue

@@ -5,7 +5,15 @@
 </template>
 
 <script>
-export default  {
-  name:  'App'
-}
+export default {
+  name: "App"
+};
 </script>
+
+<style>
+.dialogFrom {
+  max-height: calc(100vh - 300px);
+  overflow: auto;
+  padding: 0 20px;
+}
+</style>

+ 16 - 16
src/views/customer/customer/index.vue

@@ -65,6 +65,8 @@
       <el-table-column fixed='left' width="150" label="公司名称" align="center" prop="corporateName" />
       <el-table-column label="业务类型" align="center" prop="businessType" />
       <el-table-column label="公司LOGO图片" align="center" prop="corporateLogo" />
+      <el-table-column label="小程序地址" width="160" align="center" prop="appletAddress" />
+      <el-table-column label="小程序介绍" width="350" align="center" prop="appletIntroduce" />
       <el-table-column label="客户来源" align="center" prop="customerSource" />
       <el-table-column label="所在城市编码" align="center" prop="cityCode" />
       <el-table-column label="归属人员" align="center" prop="attributedPersonnel" />
@@ -80,10 +82,8 @@
       <el-table-column label="银行帐户" align="center" prop="bankAccount" />
       <el-table-column label="财务电话号码" align="center" prop="financePhone" />
       <el-table-column label="传真号码" align="center" prop="faxNumber" />
-      <el-table-column label="小程序地址" align="center" prop="appletAddress" />
       <el-table-column label="小程序图标" align="center" prop="appletLogo" />
       <el-table-column label="小程序二维码" align="center" prop="appletQrCode" />
-      <el-table-column label="小程序介绍" align="center" prop="appletIntroduce" />
       <el-table-column label="上架状态" align="center" prop="shelfStatus" />
       <el-table-column label="状态" align="center" prop="status" />
       <el-table-column fixed='right' width="150" label="操作" align="center" class-name="small-padding fixed-width">
@@ -115,22 +115,22 @@
     />
 
     <!-- 添加或修改客户信息对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules"  label-width="80px" class="dialogFrom">
         <el-form-item label="公司名称" prop="corporateName">
           <el-input v-model="form.corporateName" placeholder="请输入公司名称" />
         </el-form-item>
-        <el-form-item label="公司LOGO图片--" prop="corporateLogo">
-          <el-input v-model="form.corporateLogo" placeholder="请输入公司LOGO图片--" />
+        <el-form-item label="公司LOGO图片" prop="corporateLogo">
+          <el-input v-model="form.corporateLogo" placeholder="请输入公司LOGO图片" />
         </el-form-item>
-        <el-form-item label="客户来源  0:电话营销、1:主动来电、2:客户介绍、3:朋友介绍、4:销售推广、5:网络搜索、6:广告杂志、7:展会促销、8:其他" prop="customerSource">
-          <el-input v-model="form.customerSource" placeholder="请输入客户来源  0:电话营销、1:主动来电、2:客户介绍、3:朋友介绍、4:销售推广、5:网络搜索、6:广告杂志、7:展会促销、8:其他" />
+        <el-form-item label="客户来源" prop="customerSource">
+          <el-input v-model="form.customerSource" placeholder="请输入客户来源" />
         </el-form-item>
         <el-form-item label="所在城市编码" prop="cityCode">
           <el-input v-model="form.cityCode" placeholder="请输入所在城市编码" />
         </el-form-item>
-        <el-form-item label="归属人员--关联用户表" prop="attributedPersonnel">
-          <el-input v-model="form.attributedPersonnel" placeholder="请输入归属人员--关联用户表" />
+        <el-form-item label="归属人员" prop="attributedPersonnel">
+          <el-input v-model="form.attributedPersonnel" placeholder="请输入归属人员" />
         </el-form-item>
         <el-form-item label="详细地址" prop="detailedAddress">
           <el-input v-model="form.detailedAddress" placeholder="请输入详细地址" />
@@ -144,8 +144,8 @@
         <el-form-item label="手机号码" prop="phone">
           <el-input v-model="form.phone" placeholder="请输入手机号码" />
         </el-form-item>
-        <el-form-item label="客户星级  1:一星、2:二星、3:三星、4:四星、5:五星" prop="customerStar">
-          <el-input v-model="form.customerStar" placeholder="请输入客户星级  1:一星、2:二星、3:三星、4:四星、5:五星" />
+        <el-form-item label="客户星级" prop="customerStar">
+          <el-input v-model="form.customerStar" placeholder="请输入客户星级" />
         </el-form-item>
         <el-form-item label="企业税号" prop="enterpriseTaxNumber">
           <el-input v-model="form.enterpriseTaxNumber" placeholder="请输入企业税号" />
@@ -168,11 +168,11 @@
         <el-form-item label="小程序地址" prop="appletAddress">
           <el-input v-model="form.appletAddress" placeholder="请输入小程序地址" />
         </el-form-item>
-        <el-form-item label="小程序图标---" prop="appletLogo">
-          <el-input v-model="form.appletLogo" placeholder="请输入小程序图标---" />
+        <el-form-item label="小程序图标" prop="appletLogo">
+          <el-input v-model="form.appletLogo" placeholder="请输入小程序图标" />
         </el-form-item>
-        <el-form-item label="小程序二维码---" prop="appletQrCode">
-          <el-input v-model="form.appletQrCode" placeholder="请输入小程序二维码---" />
+        <el-form-item label="小程序二维码" prop="appletQrCode">
+          <el-input v-model="form.appletQrCode" placeholder="请输入小程序二维码" />
         </el-form-item>
         <el-form-item label="小程序介绍" prop="appletIntroduce">
           <el-input v-model="form.appletIntroduce" placeholder="请输入小程序介绍" />

+ 128 - 50
src/views/product/info/index.vue

@@ -1,6 +1,12 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
       <el-form-item label="分类名称" prop="productName">
         <el-input
           v-model="queryParams.productName"
@@ -10,15 +16,24 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="父节点" prop="pid">
-        <el-input
-          v-model="queryParams.pid"
-          placeholder="请输入父节点"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+        <el-form-item label="父节点" prop="pid">
+          <el-select
+            v-model="queryParams.pid"
+            placeholder="请输入父节点"
+            clearable
+          >
+            <el-option
+              label="无"
+              value="0"
+            ></el-option>
+            <el-option
+              v-for="(item, index) in infoListFa"
+              :key="index"
+              :label="item.productName"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
       <el-form-item label="分类描述" prop="describe">
         <el-input
           v-model="queryParams.describe"
@@ -29,8 +44,16 @@
         />
       </el-form-item>
       <el-form-item>
-        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button
+          type="cyan"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
       </el-form-item>
     </el-form>
 
@@ -42,7 +65,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['product:info:add']"
-        >新增</el-button>
+          >新增</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -52,7 +76,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['product:info:edit']"
-        >修改</el-button>
+          >修改</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -62,7 +87,8 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['product:info:remove']"
-        >删除</el-button>
+          >删除</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -71,19 +97,33 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['product:info:export']"
-        >导出</el-button>
+          >导出</el-button
+        >
       </el-col>
-	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="infoList" @selection-change="handleSelectionChange">
+    <el-table
+      v-loading="loading"
+      :data="infoList"
+      @selection-change="handleSelectionChange"
+    >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="主键" align="center" prop="id" />
       <el-table-column label="分类名称" align="center" prop="productName" />
       <el-table-column label="父节点" align="center" prop="pid" />
       <el-table-column label="分类描述" align="center" prop="describe" />
       <el-table-column label="状态" align="center" prop="status" />
-      <el-table-column fixed='right' width="150" label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column
+        fixed="right"
+        width="150"
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -91,20 +131,22 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['product:info:edit']"
-          >修改</el-button>
+            >修改</el-button
+          >
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['product:info:remove']"
-          >删除</el-button>
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
 
     <pagination
-      v-show="total>0"
+      v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
@@ -118,10 +160,28 @@
           <el-input v-model="form.productName" placeholder="请输入分类名称" />
         </el-form-item>
         <el-form-item label="父节点" prop="pid">
-          <el-input v-model="form.pid" placeholder="请输入父节点" />
+          <el-select
+            v-model="form.pid"
+            placeholder="请输入父节点"
+            clearable
+          >
+            <el-option
+              label="无"
+              value="0"
+            ></el-option>
+            <el-option
+              v-for="(item, index) in infoListFa"
+              :key="index"
+              :label="item.productName"
+              :value="item.id"
+            ></el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item label="分类描述,该分类名称的描述" prop="describe">
-          <el-input v-model="form.describe" placeholder="请输入分类描述,该分类名称的描述" />
+        <el-form-item label="分类描述" prop="describe">
+          <el-input
+            v-model="form.describe"
+            placeholder="请输入分类描述,该分类名称的描述"
+          />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -133,7 +193,14 @@
 </template>
 
 <script>
-import { listInfo, getInfo, delInfo, addInfo, updateInfo, exportInfo } from "@/api/product/info";
+import {
+  listInfo,
+  getInfo,
+  delInfo,
+  addInfo,
+  updateInfo,
+  exportInfo
+} from "@/api/product/info";
 
 export default {
   name: "Info",
@@ -153,6 +220,7 @@ export default {
       total: 0,
       // 品类表格数据
       infoList: [],
+      infoListFa: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -167,8 +235,7 @@ export default {
 
         describe: null,
 
-        status: null,
-
+        status: null
       },
       // 表单参数
       form: {},
@@ -179,9 +246,12 @@ export default {
         ],
 
         status: [
-          { required: true, message: "状态  0:有效(默认)、1:失效 不能为空", trigger: "blur" }
-        ],
-
+          {
+            required: true,
+            message: "状态  0:有效(默认)、1:失效 不能为空",
+            trigger: "blur"
+          }
+        ]
       }
     };
   },
@@ -197,6 +267,11 @@ export default {
         this.total = response.total;
         this.loading = false;
       });
+      listInfo({
+        pid: 0
+      }).then(response => {
+        this.infoListFa = response.rows;
+      });
     },
     // 取消按钮
     cancel() {
@@ -218,8 +293,7 @@ export default {
 
         updateTime: null,
 
-        status: 0,
-
+        status: 0
       };
       this.resetForm("form");
     },
@@ -235,9 +309,9 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
+      this.ids = selection.map(item => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
     },
     /** 新增按钮操作 */
     handleAdd() {
@@ -248,7 +322,7 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const id = row.id || this.ids
+      const id = row.id || this.ids;
       getInfo(id).then(response => {
         this.form = response.data;
         this.open = true;
@@ -279,28 +353,32 @@ export default {
     handleDelete(row) {
       const ids = row.id || this.ids;
       this.$confirm('是否确认删除品类编号为"' + ids + '"的数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(function() {
           return delInfo(ids);
-        }).then(() => {
+        })
+        .then(() => {
           this.getList();
           this.msgSuccess("删除成功");
-        })
+        });
     },
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams;
-      this.$confirm('是否确认导出所有品类数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
+      this.$confirm("是否确认导出所有品类数据项?", "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(function() {
           return exportInfo(queryParams);
-        }).then(response => {
-          this.download(response.data);
         })
+        .then(response => {
+          this.download(response.data);
+        });
     }
   }
 };