add

src/api/system/user.js

@@ -164,3 +164,12 @@ export function getSelectUserList(query) {
     params: query
   })
 }
+
+
+export function isAdmin() {
+  return request({
+    url: '/system/user/isAdmin',
+    method: 'get'
+  })
+}
+

src/views/crm/customer/line.vue

@@ -130,7 +130,7 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="ID" align="center" prop="customerId" />
       <el-table-column label="所属公司" align="center" prop="companyName" />
-      <el-table-column width="120"  label="客户编号" align="center" prop="customerCode" />
+      <el-table-column label="客户编号" width="120"  align="center" prop="customerCode" />
       <el-table-column label="客户名称" align="center" prop="customerName" />
       <el-table-column label="手机" align="center" prop="mobile" />
       <el-table-column  label="性别" align="center" prop="sex">
@@ -143,9 +143,10 @@
       <el-table-column width="105" label="创建时间" align="center" prop="createTime" />
       <el-table-column  label="客户来源" align="center" prop="source">
         <template slot-scope="scope">
-            <el-tag prop="status" v-for="(item, index) in sourceOptions"    v-if="scope.row.source==item.dictValue">{{item.dictLabel}}</el-tag>
+            <el-tag prop="source" v-for="(item, index) in sourceOptions"    v-if="scope.row.source==item.dictValue">{{item.dictLabel}}</el-tag>
         </template>
       </el-table-column>
+      <el-table-column label="流量来源" align="center" prop="trafficSource" />
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作"   align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -318,6 +319,7 @@
 import { assignCustomer,importLineTemplate,listLineCustomer, getLineCustomer, delLineCustomer, addLineCustomer, updateLineCustomer, exportLineCustomer } from "@/api/crm/customer";
 import {getCitys} from "@/api/store/city";
 import { getToken } from "@/utils/auth";
+import { isAdmin } from "@/api/system/user";
 
 import customerAssignList from '../components/customerAssignList.vue';
 import assignCompany from '../components/assignCompany.vue';
@@ -395,6 +397,7 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      isAdmin:false,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -453,6 +456,11 @@ export default {
       this.tagsOptions = response.data;
     });
 
+    isAdmin().then(res => {
+         this.isAdmin=res.data;
+         this.isAdmin=false;
+     });
+
     this.getCitys();
     this.getList();
   },
@@ -461,7 +469,7 @@ export default {
       this.assignList.open=true;
       var that=this;
       setTimeout(() => {
-        that.$refs.assignList.getData();
+            that.$refs.assignList.getData();
       }, 200);
     },
     closeAssign(){
@@ -585,15 +593,17 @@ export default {
       this.multiple = !selection.length
     },
     handleAssign(){
-      var that=this
-      this.assign.open = true;
-      this.assign.title = "分配线索客户";
-
-       setTimeout(() => {
-          that.$refs.assignCompany.init(this.ids);
-      }, 200);
-
-
+    //if(this.isAdmin){
+           var that=this
+           this.assign.open = true;
+           this.assign.title = "分配线索客户";
+           setTimeout(() => {
+            that.$refs.assignCompany.init(this.ids);
+           }, 200);
+      // }else{
+      //      this.msgError("无权限操作!");
+      // }
+      
       // //获取所有CUSTOMER列表
       // var cutsomers=[];
       // this.customerList.forEach(function(value,index,array){

src/views/oms/store/list.vue

@@ -60,7 +60,7 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="所属省市区" prop="cityIds">
+      <el-form-item  label="省市区" prop="cityIds">
         <el-input
           v-model="queryParams.cityIds"
           placeholder="请输入所属省市区"
@@ -147,14 +147,17 @@
     <el-table v-loading="loading" :data="storeList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="ID" align="center" prop="storeId" />
+
+      <el-table-column label="网店名称" align="center" prop="storeName" />
+
       <el-table-column  label="网店类型" align="center" prop="storeType">
         <template slot-scope="scope">
             <el-tag prop="storeType" v-for="(item, index) in storeTypeOptions"    v-if="scope.row.status==item.dictValue">{{item.dictLabel}}</el-tag>
         </template>
       </el-table-column>
 
-      <el-table-column label="店铺名称" align="center" prop="storeName" />
-      <el-table-column label="店铺编码" align="center" prop="storeCode" />
+     
+      <el-table-column label="网店编码" align="center" prop="storeCode" />
 
       <el-table-column  label="状态" align="center" prop="status">
         <template slot-scope="scope">
@@ -167,14 +170,14 @@
           <span>{{ parseTime(scope.row.limitTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark" />
-
+    
       <el-table-column  label="渠道类型" align="center" prop="channelType">
         <template slot-scope="scope">
             <el-tag prop="channelType" v-for="(item, index) in channelTypeOptions"    v-if="scope.row.status==item.dictValue">{{item.dictLabel}}</el-tag>
         </template>
       </el-table-column>
 
+      <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="所属省市区" align="center" prop="cityIds" />
       <el-table-column label="详情地址" align="center" prop="address" />
       <el-table-column label="联系人" align="center" prop="linkUsername" />
@@ -211,7 +214,27 @@
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
 
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-       <el-form-item label="客户类型" prop="storeType">
+      
+
+        <el-form-item label="网店名称" prop="storeName">
+          <el-input v-model="form.storeName" placeholder="请输入店铺名称" />
+        </el-form-item>
+        <el-form-item label="网店编码" prop="storeCode">
+          <el-input v-model="form.storeCode" placeholder="请输入店铺编码" />
+        </el-form-item>
+
+        <el-form-item label="渠道类型" prop="channelType">
+          <el-select v-model="form.channelType" placeholder="请选择状态" clearable size="small">
+            <el-option
+                  v-for="item in channelTypeOptions"
+                  :key="item.dictValue"
+                  :label="item.dictLabel"
+                  :value="item.dictValue"
+                />
+          </el-select>
+        </el-form-item>
+
+       <el-form-item label="网店类型" prop="storeType">
           <el-select v-model="form.storeType" placeholder="请选择网店类型" clearable size="small">
             <el-option
                   v-for="item in storeTypeOptions"
@@ -222,11 +245,11 @@
           </el-select>
       </el-form-item>
 
-        <el-form-item label="店铺名称" prop="storeName">
-          <el-input v-model="form.storeName" placeholder="请输入店铺名称" />
+       <el-form-item label="联系人" prop="linkUsername">
+          <el-input v-model="form.linkUsername" placeholder="请输入联系人" />
         </el-form-item>
-        <el-form-item label="店铺编码" prop="storeCode">
-          <el-input v-model="form.storeCode" placeholder="请输入店铺编码" />
+        <el-form-item label="联系电话" prop="linkPhone">
+          <el-input v-model="form.linkPhone" placeholder="请输入联系电话" />
         </el-form-item>
         
        <el-form-item label="状态" prop="status">
@@ -251,28 +274,14 @@
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" placeholder="请输入备注" />
         </el-form-item>
-        <el-form-item label="渠道类型" prop="channelType">
-          <el-select v-model="form.channelType" placeholder="请选择状态" clearable size="small">
-            <el-option
-                  v-for="item in channelTypeOptions"
-                  :key="item.dictValue"
-                  :label="item.dictLabel"
-                  :value="item.dictValue"
-                />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="所属省市区" prop="cityIds">
+      
+        <el-form-item label-width="82px" label="所属省市区" prop="cityIds">
           <el-input v-model="form.cityIds" placeholder="请输入所属省市区" />
         </el-form-item>
         <el-form-item label="详情地址" prop="address">
           <el-input v-model="form.address" placeholder="请输入详情地址" />
         </el-form-item>
-        <el-form-item label="联系人" prop="linkUsername">
-          <el-input v-model="form.linkUsername" placeholder="请输入联系人" />
-        </el-form-item>
-        <el-form-item label="联系电话" prop="linkPhone">
-          <el-input v-model="form.linkPhone" placeholder="请输入联系电话" />
-        </el-form-item>
+       
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -326,9 +335,26 @@ export default {
         linkPhone: null
       },
       // 表单参数
-      form: {},
+      form: {  },
       // 表单校验
       rules: {
+            storeName: [
+              { required: true, message: "网店名称不能为空", trigger: "blur" }
+            ],
+            storeType: [
+               { required: true, message: "网店类型不能为空", trigger: "blur" }
+            ],
+            channelType: [
+              { required: true, message: "请选择渠道类型", trigger: "blur" }
+            ],
+            linkUsername: [
+              { required: true, message: "联系人状态不能为空", trigger: "blur" }
+            ],
+            status: [
+              { required: true, message: "请选择店铺状态", trigger: "blur" }
+            ],
+
+            
       }
     };
   },
@@ -343,7 +369,6 @@ export default {
     this.getDicts("oms_store_status").then((response) => {
         this.statusOptions = response.data;
     });
-
     this.getList();
   },
   methods: {
@@ -368,7 +393,7 @@ export default {
         storeType: null,
         storeName: null,
         storeCode: null,
-        status: 0,
+        status: '0',
         createTime: null,
         updateTime: null,
         limitTime: null,
@@ -428,9 +453,9 @@ export default {
           } else {
             addStore(this.form).then(response => {
               if (response.code === 200) {
-                this.msgSuccess("新增成功");
-                this.open = false;
-                this.getList();
+                  this.msgSuccess("新增成功");
+                  this.open = false;
+                  this.getList();
               }
             });
           }