add

src/views/oms/store/index.vue

@@ -141,13 +141,7 @@
      
       <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 width="145" label="渠道类型" align="center" prop="channelType">
         <template slot-scope="scope">
             <el-tag prop="channelType" v-for="(item, index) in channelTypeOptions" :key="'channelType'+index"   v-if="scope.row.channelType==item.dictValue">{{item.dictLabel}}</el-tag>
@@ -163,6 +157,12 @@
         </template>
       </el-table-column>
 
+      <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 width="105" label="所属省市区" align="center" prop="cityIds" />
       <el-table-column label="详情地址" align="center" prop="address" />
       <el-table-column label="联系人" align="center" prop="linkUsername" />
@@ -389,7 +389,6 @@ export default {
     reset() {
       this.form = {
         storeId: null,
-       
         storeName: null,
         storeCode: null,
         status: '0',
@@ -399,7 +398,6 @@ export default {
         updateTime: null,
         limitTime: null,
         remark: null,
-        
         cityIds:[],
           citys:[],
         address: null,
@@ -439,13 +437,13 @@ export default {
       getStore(storeId).then(response => {
         this.form = response.data;
         if(this.form.channelType!=null){
-              this.form.channelType = this.form.channelType.toString();
+            this.form.channelType = this.form.channelType.toString();
         }
         if(this.form.storeType!=null){
-              this.form.storeType = this.form.storeType.toString();
+            this.form.storeType = this.form.storeType.toString();
         }
         if(this.form.status!=null){
-              this.form.status = this.form.status.toString();
+            this.form.status = this.form.status.toString();
         }
         this.open = true;
         this.title = "修改网店";

src/views/oms/warehouse/index.vue

@@ -46,25 +46,7 @@
           @keyup.enter.native="handleQuery"
         />
       </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="status">
         <el-select v-model="queryParams.status" placeholder="请选择状态" clearable size="small">
            <el-option
@@ -75,7 +57,7 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="创建人ID" prop="createUserId">
+      <!-- <el-form-item label="创建人ID"  prop="createUserId">
         <el-input
           v-model="queryParams.createUserId"
           placeholder="请输入创建人ID"
@@ -83,7 +65,7 @@
           size="small"
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </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>
@@ -134,9 +116,9 @@
 
     <el-table v-loading="loading" :data="warehouseList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="ID" align="center" prop="warehouseId" />
-      <el-table-column label="仓库名" align="center" prop="warehouseName" />
-      <el-table-column label="仓库编码" align="center" prop="warehouseCode" />
+      <el-table-column width="55" label="ID" align="center" prop="warehouseId" />
+      <el-table-column width="100" label="仓库名" align="center" prop="warehouseName" />
+      <el-table-column width="100" label="仓库编码" align="center" prop="warehouseCode" />
       <el-table-column  label="仓库类型" align="center" prop="warehouseType">
         <template slot-scope="scope">
             <el-tag prop="warehouseType" v-for="(item, index) in wareHouseTypeOptions"    v-if="scope.row.warehouseType==item.dictValue">{{item.dictLabel}}</el-tag>
@@ -145,7 +127,7 @@
 
       <el-table-column label="联系人" align="center" prop="linkUsername" />
       <el-table-column label="联系电话" align="center" prop="linkPhone" />
-      <el-table-column label="所属省市区" align="center" prop="cityIds" />
+      <el-table-column width="100" label="所属省市区" align="center" prop="cityIds" />
       <el-table-column label="地址" align="center" prop="address" />
       <el-table-column label="备注" align="center" prop="remark" />
 
@@ -154,9 +136,10 @@
             <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 label="创建人ID" align="center" prop="createUserId" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+       <el-table-column label="创建人" align="center" prop="createUserName" />
+       <el-table-column width="100" label="创建时间" align="center" prop="createTime" />
+    
+      <el-table-column width="120" label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -187,7 +170,7 @@
     <!-- 添加或修改仓库对话框 -->
     <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="warehouseName">
+        <el-form-item label="仓库名称" prop="warehouseName">
           <el-input v-model="form.warehouseName" placeholder="请输入仓库名" />
         </el-form-item>
         <el-form-item label="仓库编码" prop="warehouseCode">
@@ -211,9 +194,16 @@
         <el-form-item label="联系电话" prop="linkPhone">
           <el-input v-model="form.linkPhone" placeholder="请输入联系电话" />
         </el-form-item>
-        <el-form-item label="所属省市区" prop="cityIds">
-          <el-input v-model="form.cityIds" 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="地址" prop="address">
           <el-input v-model="form.address" placeholder="请输入地址" />
         </el-form-item>
@@ -232,9 +222,6 @@
           </el-select>
         </el-form-item>
 
-        <el-form-item label="创建人ID" prop="createUserId">
-          <el-input v-model="form.createUserId" placeholder="请输入创建人ID" />
-        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -246,7 +233,7 @@
 
 <script>
 import { listWarehouse, getWarehouse, delWarehouse, addWarehouse, updateWarehouse, exportWarehouse } from "@/api/oms/warehouse";
-
+import {getCitys} from "@/api/store/city";
 export default {
   name: "Warehouse",
   data() {
@@ -271,6 +258,8 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+       cityIds:[],
+        citys:[],
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -289,6 +278,19 @@ export default {
       form: {},
       // 表单校验
       rules: {
+            warehouseName: [
+              { required: true, message: "仓库名称不能为空", trigger: "blur" }
+            ],
+            warehouseCode: [
+               { required: true, message: "仓库编码不能为空", trigger: "blur" }
+            ],
+            linkUsername: [
+              { required: true, message: "联系人不能为空", trigger: "blur" }
+            ],
+            // cityIds: [
+            //   { required: true, message: "所在城市不能为空", trigger: "blur" }
+            // ],
+           
       }
     };
   },
@@ -299,6 +301,7 @@ export default {
     this.getDicts("oms_warehouse_status").then((response) => {
         this.statusOptions = response.data;
     });
+    this.getCitys();
     this.getList();
   },
   methods: {
@@ -363,10 +366,19 @@ export default {
       const warehouseId = row.warehouseId || this.ids
       getWarehouse(warehouseId).then(response => {
         this.form = response.data;
+        if(this.form.warehouseType!=null){
+            this.form.warehouseType = this.form.warehouseType.toString();
+        }
         this.open = true;
         this.title = "修改仓库";
       });
     },
+    getCitys(){
+        getCitys().then(res => {
+            this.loading = false;
+            this.citys=res.data;
+        });
+    },
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(valid => {
@@ -417,7 +429,20 @@ export default {
         }).then(response => {
           this.download(response.msg);
         }).catch(function() {});
-    }
+    },
+    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;
+          });
+    },
   }
 };
 </script>