add

src/views/crm/customer/line.vue

@@ -108,7 +108,7 @@
           icon="el-icon-upload2"
           size="mini"
           @click="handleImport"
-          v-hasPermi="['crm:customer:import']"
+          v-hasPermi="['crm:customer:importLine']"
         >导入线索客户</el-button>
       </el-col>
       <el-col :span="1.5">

src/views/oms/store/index.vue

@@ -60,24 +60,6 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item  label="省市区" prop="cityIds">
-        <el-input
-          v-model="queryParams.cityIds"
-          placeholder="请输入所属省市区"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="详情地址" prop="address">
-        <el-input
-          v-model="queryParams.address"
-          placeholder="请输入详情地址"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="联系人" prop="linkUsername">
         <el-input
           v-model="queryParams.linkUsername"
@@ -146,43 +128,48 @@
 
     <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 width="55" label="ID" align="center" prop="storeId" />
 
-      <el-table-column label="网店名称" align="center" prop="storeName" />
+      <el-table-column width="105" 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>
+            <el-tag prop="storeType" v-for="(item, index) in storeTypeOptions"    v-if="scope.row.storeType==item.dictValue">{{item.dictLabel}}</el-tag>
         </template>
       </el-table-column>
 
      
-      <el-table-column label="网店编码" align="center" prop="storeCode" />
-
-      <el-table-column  label="状态" align="center" prop="status">
-        <template slot-scope="scope">
-            <el-tag prop="status" v-for="(item, index) in statusOptions"    v-if="scope.row.status==item.dictValue">{{item.dictLabel}}</el-tag>
-        </template>
-      </el-table-column>
+      <el-table-column width="140" label="网店编码" align="center" prop="storeCode" />
 
+     
       <el-table-column label="到期时间" align="center" prop="limitTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.limitTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
     
-      <el-table-column  label="渠道类型" align="center" prop="channelType">
+      <el-table-column width="145" 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>
+            <el-tag prop="channelType" v-for="(item, index) in channelTypeOptions" :key="'channelType'+index"   v-if="scope.row.channelType==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 width="140" label="渠道仓名称" align="center" prop="channelWarehouseName" />
+      
+
+       <el-table-column  label="状态" align="center" prop="status">
+        <template slot-scope="scope">
+            <el-tag prop="status"  v-for="(item, index) in statusOptions"   v-if="scope.row.status==item.dictValue">{{item.dictLabel}}</el-tag>
+        </template>
+      </el-table-column>
+
+      <el-table-column width="105" label="所属省市区" align="center" prop="cityIds" />
       <el-table-column label="详情地址" align="center" prop="address" />
       <el-table-column label="联系人" align="center" prop="linkUsername" />
       <el-table-column label="联系电话" align="center" prop="linkPhone" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="备注" align="center" prop="remark" />
+
+      <el-table-column fixed="right" width="120px" align="center"   label="操作"  class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -211,18 +198,17 @@
     />
 
     <!-- 添加或修改网店对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
 
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-      
-        <el-form-item label="网店名称" prop="storeName">
+        <el-form-item label-width="95px" label="网店名称" prop="storeName">
           <el-input v-model="form.storeName" placeholder="请输入店铺名称" />
         </el-form-item>
-        <el-form-item label="网店编码" prop="storeCode">
+        <el-form-item label-width="95px" label="网店编码" prop="storeCode">
           <el-input v-model="form.storeCode" placeholder="请输入店铺编码" />
         </el-form-item>
 
-        <el-form-item label="渠道类型" prop="channelType">
+        <el-form-item label-width="95px" label="渠道类型" prop="channelType">
           <el-select v-model="form.channelType" placeholder="请选择状态" clearable size="small">
             <el-option
                   v-for="item in channelTypeOptions"
@@ -233,7 +219,7 @@
           </el-select>
         </el-form-item>
 
-       <el-form-item label="网店类型" prop="storeType">
+       <el-form-item label-width="95px" label="网店类型" prop="storeType">
           <el-select v-model="form.storeType" placeholder="请选择网店类型" clearable size="small">
             <el-option
                   v-for="item in storeTypeOptions"
@@ -244,14 +230,15 @@
           </el-select>
       </el-form-item>
 
-       <el-form-item label="联系人" prop="linkUsername">
+       <el-form-item label-width="95px" label="联系人" prop="linkUsername">
           <el-input v-model="form.linkUsername" placeholder="请输入联系人" />
         </el-form-item>
-        <el-form-item label="联系电话" prop="linkPhone">
+
+        <el-form-item label-width="95px" label="联系电话" prop="linkPhone">
           <el-input v-model="form.linkPhone" placeholder="请输入联系电话" />
         </el-form-item>
         
-       <el-form-item label="状态" prop="status">
+       <el-form-item label-width="95px" label="状态" prop="status">
           <el-select v-model="form.status" placeholder="请选择状态" clearable size="small">
             <el-option
                   v-for="item in statusOptions"
@@ -262,7 +249,22 @@
           </el-select>
         </el-form-item>
 
-        <el-form-item label="到期时间" prop="limitTime">
+        <el-form-item  label-width="95px" label="渠道仓名称" prop="channelWarehouseName">
+            <el-input v-model="form.channelWarehouseName" placeholder="请输入渠道仓名称" />
+        </el-form-item>  
+        <el-form-item  label-width="95px" label="所属省市区" prop="cityIds">
+              <el-cascader
+              ref="citySelect"
+              v-model="cityIds"
+              :options="citys"
+              @change="handleCityChange"></el-cascader>
+        </el-form-item>
+
+        <el-form-item label-width="95px" label="详情地址" prop="address">
+          <el-input v-model="form.address" placeholder="请输入详情地址" />
+        </el-form-item>
+
+        <el-form-item label-width="95px" label="到期时间" prop="limitTime">
           <el-date-picker clearable size="small" style="width: 200px"
             v-model="form.limitTime"
             type="date"
@@ -274,13 +276,6 @@
           <el-input v-model="form.remark" placeholder="请输入备注" />
         </el-form-item>
       
-        <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>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -292,7 +287,7 @@
 
 <script>
 import { listStore, getStore, delStore, addStore, updateStore, exportStore } from "@/api/oms/store";
-
+import {getCitys} from "@/api/store/city";
 export default {
   name: "Store",
   data() {
@@ -313,6 +308,8 @@ export default {
       storeList: [],
       // 弹出层标题
       title: "",
+      cityIds:[],
+        citys:[],
       // 是否显示弹出层
       open: false,
       storeTypeOptions:[],
@@ -352,8 +349,9 @@ export default {
             status: [
               { required: true, message: "请选择店铺状态", trigger: "blur" }
             ],
-
-            
+            channelWarehouseName: [
+              { required: true, message: "渠道仓名称不能为空", trigger: "blur" }
+            ],
       }
     };
   },
@@ -368,7 +366,9 @@ export default {
     this.getDicts("oms_store_status").then((response) => {
         this.statusOptions = response.data;
     });
+    this.getCitys();
     this.getList();
+   
   },
   methods: {
     /** 查询网店列表 */
@@ -389,20 +389,25 @@ export default {
     reset() {
       this.form = {
         storeId: null,
-        storeType: null,
+       
         storeName: null,
         storeCode: null,
         status: '0',
+        storeType: "1",
+        channelType: "1",
         createTime: null,
         updateTime: null,
         limitTime: null,
         remark: null,
-        channelType: null,
-        cityIds: null,
+        
+        cityIds:[],
+          citys:[],
         address: null,
         linkUsername: null,
-        linkPhone: null
+        linkPhone: null,
+        
       };
+      this.cityIds=[];
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
@@ -433,10 +438,32 @@ export default {
       const storeId = row.storeId || this.ids
       getStore(storeId).then(response => {
         this.form = response.data;
+        if(this.form.channelType!=null){
+              this.form.channelType = this.form.channelType.toString();
+        }
+        if(this.form.storeType!=null){
+              this.form.storeType = this.form.storeType.toString();
+        }
+        if(this.form.status!=null){
+              this.form.status = this.form.status.toString();
+        }
         this.open = true;
         this.title = "修改网店";
       });
     },
+    handleCityChange(value) {
+          console.log(value);
+          var nodes=this.$refs.citySelect.getCheckedNodes();
+          this.form.cityIds=nodes[0].pathLabels[0]+"-"+nodes[0].pathLabels[1]+"-"+nodes[0].pathLabels[2];
+          this.form.cityIdsStr=value.toString();
+          console.log(this.form.cityIdsStr);
+    },
+    getCitys(){
+          getCitys().then(res => {
+             this.loading = false;
+             this.citys=res.data;
+          });
+    },
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(valid => {