jz.kai 2 lat temu
rodzic
commit
2cfe7cb979

+ 5 - 0
src/views/base/staff-list.vue

@@ -43,6 +43,11 @@
       <el-table-column type="selection" width="55"></el-table-column>
       <el-table-column prop="userName" label="用户名" width="180"></el-table-column>
       <el-table-column prop="realName" label="真实名称" width="180"></el-table-column>
+      <el-table-column label="所属角色" width="180">
+        <template slot-scope="{row}">
+          <label v-for="item in row.roles" :key="item">{{item}}</label>
+        </template>
+      </el-table-column>
       <el-table-column prop="phone" label="手机号码" width="180"></el-table-column>
       <el-table-column prop="areaName" label="区域" width="180"></el-table-column>
       <el-table-column prop="createTime" label="创建时间" width="180"></el-table-column>

+ 16 - 0
src/views/base/supplier-detail.vue

@@ -38,6 +38,11 @@
         <el-form-item label="主营业务" prop="mainBusiness">
           <el-input v-model="formModel.mainBusiness" placeholder="请输入主营业务" style="width: 300px"></el-input>
         </el-form-item>
+        <el-form-item label="采购渠道" prop="placeId">
+          <el-select v-model="formModel.placeId" filterable placeholder="请选择类型" style="width: 300px">
+            <el-option v-for="placeClass in placeClassResult" :key="placeClass.value" :label="placeClass.name" :value="placeClass.id"></el-option>
+          </el-select>
+        </el-form-item>
       </el-form>
     </div>
     <span slot="footer" class="dialog-footer">
@@ -51,6 +56,7 @@ import Constant from "@/constant";
 import supplierApi from "@/api/base/supplier";
 import areaApi from "@/api/base/area";
 import SelectTree from "@/components/SelectTree";
+import dataDictionaryApi from "@/api/sys/dataDictionary";
 
 export default {
   props: ["businessKey", "title"],
@@ -64,6 +70,7 @@ export default {
         linkman: [{required: true, message: "联系人不能为空", trigger: "blur"}],
         phone: [{required: true, message: "电话不能为空", trigger: "blur"}],
         mainBusiness: [{required: true, message: "主营业务不能为空", trigger: "blur"}],
+        placeId: [{required: true, message: "采购渠道不能为空", trigger: "blur"}],
       },
       showDialog: true,
       loading: false,
@@ -74,6 +81,7 @@ export default {
         children: "children"
       },
       queryAreaResult: [],
+      placeClassResult: [],
     };
   },
   methods: {
@@ -125,6 +133,14 @@ export default {
       this.queryAreaResult = jsonData;
     });
 
+    dataDictionaryApi.findByCatalogName({
+      catalogName: "采购渠道",
+    })
+    .then((response) => {
+      var jsonData = response.data;
+      this.placeClassResult = jsonData.data;
+    });
+
     (function () {
       if (self.businessKey.length == 0) {
         return supplierApi.create();

+ 2 - 1
src/views/base/supplier-list.vue

@@ -41,6 +41,7 @@
     </el-row>
     <el-table :data="tableData" style="min-height: 400px" v-loading="loading" stripe @sort-change="sortChange" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55"></el-table-column>
+      <el-table-column prop="placeName" label="采购渠道" width="180"></el-table-column>
       <el-table-column prop="name" label="供应商名称" width="180"></el-table-column>
       <el-table-column prop="areaName" label="所属区域" width="180"></el-table-column>
       <el-table-column prop="address" label="供应商地址" width="180"></el-table-column>
@@ -48,7 +49,7 @@
       <el-table-column prop="phone" label="电话" width="180"></el-table-column>
       <el-table-column prop="mainBusiness" label="主营业务" width="180"></el-table-column>
       <el-table-column label="操作">
-        <template slot-scope="{ row }">
+        <template slot-scope="{row}">
           <el-button size="mini" type="warning" @click="handleEdit(row)">编辑</el-button>
           <el-button size="mini" type="danger" @click="handleDelete(row)">删除</el-button>
         </template>