合并

src/api/base/base.js

@@ -160,7 +160,7 @@ export function delUnitPerson(unitId) {
 // 单位类型-列表
 export function unitTypeList(query) {
   return request({
-    url: '/material/bm_unit_type/list',
+    url: '/system/dict/data/type/bm_unit_type',
     method: 'get',
     params: query
   })
@@ -168,7 +168,7 @@ export function unitTypeList(query) {
 // 单位类型-列表-下拉
 export function unitTypeListAll(query) {
   return request({
-    url: '/material/bm_unit_type/list',
+    url: '/system/dict/data/type/bm_unit_type',
     method: 'get',
     params: query
   })

src/views/base/comeAndGo/index.vue

@@ -252,8 +252,8 @@
 </template>
 
 <script>
-import { addUnit, delUnit, unitInfoAll, updateUnit } from '@/api/base/base'
+import { addUnit, delUnit, unitInfoAll, updateUnit,getTypeList } from '@/api/base/base'
-// import { unitTypeListAll } from '@/api/base/base'
+import { unitTypeListAll } from '@/api/base/base'
 import { deptTreeSelect } from '@/api/system/user'
 import Treeselect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
@@ -332,7 +332,7 @@ export default {
     created() {
         // this.getType()
         // this.getDeptTree()
-        // this.getList()
+        this.getList()
     },
     methods: {
         //获取单位类型
@@ -374,7 +374,7 @@ export default {
         /** 查询列表 */
         getList() {
             this.loading = true
-            unitInfoAll(this.queryParams).then((response) => {
+            getTypeList(this.queryParams).then((response) => {
                 this.unitList = response.rows
                 this.total = response.total
                 this.loading = false

src/views/base/comeAndGo/people.vue

@@ -500,8 +500,8 @@ export default {
     }
   },
   created() {
-    // this.getList();
+    this.getList();
-    // this.getUserList()
+    this.getUserList()
 
   },
   methods: {

src/views/base/project/index.vue

@@ -375,6 +375,7 @@ export default {
             //字典数据
             typeList: [],
             unitList:[],
+            projectStatuses:[],
             // 部门树选项
             deptOptions: undefined,
             // 弹出层标题
@@ -383,6 +384,7 @@ export default {
             open: false,
             // 日期范围
             dateRange: [],
+            projectNatures:[],
             // 查询参数
             queryParams: {
                 pageNum: 1,

src/views/materialsManage/manufacturer/index.vue

@@ -501,6 +501,7 @@
                   .then((res) => {
                       if (res.code == 200) {
                           this.imageUrl = res.data.fileUrl
+                          console.log('imageUrl',this.imageUrl)
                           this.businessLicenseFileList.push(this.imageUrl);
                       } else {
                           // this.$msgError(res.msg)

src/views/materialsManage/type/index.vue

@@ -77,7 +77,7 @@
                             icon="el-icon-plus"
                             size="mini"
                             @click="handleAdd"
-                            v-hasPermi="['machinery:type:add']"
+                            v-hasPermi="['ma:type:add']"
                             >新增</el-button
                         >
                     </el-col> 
@@ -118,8 +118,8 @@
                     <el-table-column
                         label="仓库信息"
                         align="center"
-                        key="parentOneLevelName"
+                        key="houseName"
-                        prop="parentOneLevelName"
+                        prop="houseName"
                         show-overflow-tooltip
                     />
                     <el-table-column
@@ -176,7 +176,7 @@
                                 type="text"
                                 icon="el-icon-edit"
                                 @click="handleUpdate(scope.row)"
-                                v-hasPermi="['machinery:type:edit']"
+                                v-hasPermi="['ma:type:edit']"
                             >
                                 编辑
                             </el-button>
@@ -185,7 +185,7 @@
                                 type="text"
                                 icon="el-icon-delete"
                                 @click="handleDelete(scope.row)"
-                                v-hasPermi="['machinery:type:del']"
+                                v-hasPermi="['ma:type:remove']"
                             >
                                 删除
                             </el-button>