Merge branch 'master' of http://42.192.7.176:3000/suojin/smartpark_durable_front

src/api/system/dict.js

@@ -2,7 +2,7 @@ import request from '@/router/axios';
 
 export const getList = (current, size, params) => {
   return request({
-    url: '/api/blade-system/dict/list',
+    url: '/smartpark/dict/list',
     method: 'get',
     params: {
       ...params,
@@ -14,7 +14,7 @@ export const getList = (current, size, params) => {
 
 export const getParentList = (current, size, params) => {
   return request({
-    url: '/api/blade-system/dict/parent-list',
+    url: '/smartpark/dict/parent-list',
     method: 'get',
     params: {
       ...params,
@@ -26,7 +26,7 @@ export const getParentList = (current, size, params) => {
 
 export const getChildList = (current, size, parentId, params) => {
   return request({
-    url: '/api/blade-system/dict/child-list',
+    url: '/smartpark/dict/child-list',
     method: 'get',
     params: {
       ...params,
@@ -39,7 +39,7 @@ export const getChildList = (current, size, parentId, params) => {
 
 export const remove = (ids) => {
   return request({
-    url: '/api/blade-system/dict/remove',
+    url: '/smartpark/dict/remove',
     method: 'post',
     params: {
       ids,
@@ -49,7 +49,7 @@ export const remove = (ids) => {
 
 export const add = (row) => {
   return request({
-    url: '/api/blade-system/dict/submit',
+    url: '/smartpark/dict/submit',
     method: 'post',
     data: row
   })
@@ -57,7 +57,7 @@ export const add = (row) => {
 
 export const update = (row) => {
   return request({
-    url: '/api/blade-system/dict/submit',
+    url: '/smartpark/dict/submit',
     method: 'post',
     data: row
   })
@@ -66,7 +66,7 @@ export const update = (row) => {
 
 export const getDict = (id) => {
   return request({
-    url: '/api/blade-system/dict/detail',
+    url: '/smartpark/dict/detail',
     method: 'get',
     params: {
       id,
@@ -75,14 +75,14 @@ export const getDict = (id) => {
 }
 export const getDictTree = () => {
   return request({
-    url: '/api/blade-system/dict/tree?code=DICT',
+    url: '/smartpark/dict/tree?code=DICT',
     method: 'get'
   })
 }
 
 export const getDictionary = (params) => {
   return request({
-    url: '/api/blade-system/dict/dictionary',
+    url: '/smartpark/dict/dictionary',
     method: 'get',
     params,
   })

src/api/system/menu.js

@@ -2,7 +2,7 @@ import request from '@/router/axios';
 
 export const getList = (current, size, params) => {
   return request({
-    url: '/api/blade-system/menu/list',
+    url: '/smartpark/menu/list',
     method: 'get',
     params: {
       ...params,
@@ -14,7 +14,7 @@ export const getList = (current, size, params) => {
 
 export const getLazyList = (parentId, params) => {
   return request({
-    url: '/api/blade-system/menu/lazy-list',
+    url: '/smartpark/menu/lazy-list',
     method: 'get',
     params: {
       ...params,
@@ -25,7 +25,7 @@ export const getLazyList = (parentId, params) => {
 
 export const getLazyMenuList = (parentId, params) => {
   return request({
-    url: '/api/blade-system/menu/lazy-menu-list',
+    url: '/smartpark/menu/lazy-menu-list',
     method: 'get',
     params: {
       ...params,
@@ -36,7 +36,7 @@ export const getLazyMenuList = (parentId, params) => {
 
 export const getMenuList = (current, size, params) => {
   return request({
-    url: '/api/blade-system/menu/menu-list',
+    url: '/smartpark/menu/menu-list',
     method: 'get',
     params: {
       ...params,
@@ -48,7 +48,7 @@ export const getMenuList = (current, size, params) => {
 
 export const getMenuTree = (tenantId) => {
   return request({
-    url: '/api/blade-system/menu/tree',
+    url: '/smartpark/menu/tree',
     method: 'get',
     params: {
       tenantId,
@@ -58,7 +58,7 @@ export const getMenuTree = (tenantId) => {
 
 export const remove = (ids) => {
   return request({
-    url: '/api/blade-system/menu/remove',
+    url: '/smartpark/menu/remove',
     method: 'post',
     params: {
       ids,
@@ -68,7 +68,7 @@ export const remove = (ids) => {
 
 export const add = (row) => {
   return request({
-    url: '/api/blade-system/menu/submit',
+    url: '/smartpark/menu/submit',
     method: 'post',
     data: row
   })
@@ -76,7 +76,7 @@ export const add = (row) => {
 
 export const update = (row) => {
   return request({
-    url: '/api/blade-system/menu/submit',
+    url: '/smartpark/menu/submit',
     method: 'post',
     data: row
   })
@@ -84,7 +84,7 @@ export const update = (row) => {
 
 export const getMenu = (id) => {
   return request({
-    url: '/api/blade-system/menu/detail',
+    url: '/smartpark/menu/detail',
     method: 'get',
     params: {
       id,

src/api/system/role.js

@@ -2,7 +2,7 @@ import request from '@/router/axios';
 
 export const getList = (current, size, params) => {
   return request({
-    url: '/api/blade-system/role/list',
+    url: '/smartpark/role/list',
     method: 'get',
     params: {
       ...params,
@@ -33,7 +33,7 @@ export const grant = (roleIds, menuIds, dataScopeIds, apiScopeIds) => {
 
 export const remove = (ids) => {
   return request({
-    url: '/api/blade-system/role/remove',
+    url: '/smartpark/role/remove',
     method: 'post',
     params: {
       ids,
@@ -43,7 +43,7 @@ export const remove = (ids) => {
 
 export const add = (row) => {
   return request({
-    url: '/api/blade-system/role/submit',
+    url: '/smartpark/role/submit',
     method: 'post',
     data: row
   })
@@ -51,7 +51,7 @@ export const add = (row) => {
 
 export const update = (row) => {
   return request({
-    url: '/api/blade-system/role/submit',
+    url: '/smartpark/role/submit',
     method: 'post',
     data: row
   })
@@ -80,7 +80,7 @@ export const getRoleTree = (tenantId) => {
 
 export const getRoleTreeById = (roleId) => {
   return request({
-    url: '/api/blade-system/role/tree-by-id',
+    url: '/smartpark/role/tree-by-id',
     method: 'get',
     params: {
       roleId,
@@ -90,7 +90,7 @@ export const getRoleTreeById = (roleId) => {
 
 export const getRoleAlias = () => {
   return request({
-    url: '/api/blade-system/role/alias',
+    url: '/smartpark/role/alias',
     method: 'get',
     params: {},
   });

src/views/authority/role.vue

@@ -69,7 +69,7 @@
           >
           </el-tree>
         </el-tab-pane>
-        <el-tab-pane label="数据权限">
+        <!-- <el-tab-pane label="数据权限">
           <el-tree
             :data="dataScopeGrantList"
             show-checkbox
@@ -90,7 +90,7 @@
             :props="props"
           >
           </el-tree>
-        </el-tab-pane>
+        </el-tab-pane> -->
       </el-tabs>
 
       <span slot="footer" class="dialog-footer">
@@ -308,7 +308,7 @@ export default {
     initData(roleId) {
       getRoleTreeById(roleId).then((res) => {
         const column = this.findObject(this.option.column, "parentId");
-        column.dicData = res.data.data;
+        column.dicData = res.data.result;
       });
     },
     submit() {
@@ -398,7 +398,7 @@ export default {
       }
       getRoleAlias().then((res) => {
         const column = this.findObject(this.option.column, "currentAlias");
-        column.dicData = res.data.data;
+        column.dicData = res.data.result;
       });
       done();
     },
@@ -477,7 +477,7 @@ export default {
         page.pageSize,
         Object.assign(params, this.query)
       ).then((res) => {
-        this.data = res.data.data;
+        this.data = res.data.result;
         this.loading = false;
         this.selectionClear();
       });

src/views/firstOrder/inbound.vue

@@ -136,13 +136,21 @@ export default {
             headerAlign: "center",
             align: "center",
             slot: "purchaseEndInfo"
+            width: 150,
+            align: "center",
+            formatter: (row, column) => {
+              const value = row.purchaseEndInfo;
+              if (value === null || value === undefined || value === "") {
+                return "无"; // 空值时显示“无”
+              }
+              return value; // 有值时显示原内容
+            }
           },
           {
             label: "入库单号",
             prop: "orderNo",
-            width: 110,
+            width: 160,
-            headerAlign: "center",
+            align: "center"
-            align: "center",
           },
           {
             label: "入库日期",
@@ -152,19 +160,19 @@ export default {
             searchRange: true,
             startPlaceholder: "开始时间",
             endPlaceholder: "结束时间",
-            format: "yyyy-MM-dd HH:mm:ss",
+            format: 'yyyy-MM-dd HH:mm:ss',
-            valueFormat: "yyyy-MM-dd HH:mm:ss",
+            valueFormat: 'yyyy-MM-dd HH:mm:ss',
-            width: 140,
+            width: 160,
-            headerAlign: "center",
+            align: "center"
-            align: "center",
+            // searchParam: 'startTime',
+            // searchEndParam: 'endTime'
           },
           {
             label: "入库人",
             prop: "inOperatorName",
             search: true,
-            searchParam: "inOperator",
+            searchParam: 'inOperator',
-            headerAlign: "center",
+            align: "center"
-            align: "center",
           },
           {
             label: "来源",

src/views/materials/components/returnDialog.vue

@@ -60,6 +60,20 @@ export default {
               },
             ],
           },
+          {
+            label: "归还时间",
+            prop: "sex",
+            span: 24,
+            type:'textarea',
+            rows:5,
+            rules: [
+              {
+                required: true,
+                message: "请选择",
+                trigger: "blur",
+              },
+            ],
+          },
         ],
       },
     };

src/views/materials/components/scrapDialog.vue

@@ -61,6 +61,20 @@ export default {
               },
             ],
           },
+          {
+            label: "报废时间",
+            prop: "sex",
+            span: 24,
+            type:'textarea',
+            rows:5,
+            rules: [
+              {
+                required: true,
+                message: "请选择",
+                trigger: "blur",
+              },
+            ],
+          },
         ],
       },
     };

src/views/system/dict.vue

@@ -420,7 +420,8 @@ export default {
         page.pageSize,
         Object.assign(params, this.query)
       ).then(res => {
-        const data = res.data.data;
+        const data = res.data.result;
+        // console.log("data", data)
         this.pageParent.total = data.total;
         this.dataParent = data.records;
         this.loading = false;
@@ -435,7 +436,7 @@ export default {
         this.parentId,
         Object.assign(params, this.query)
       ).then(res => {
-        this.dataChild = res.data.data;
+        this.dataChild = res.data.result;
         this.loadingChild = false;
         this.selectionClear();
       });

src/views/system/menu.vue

@@ -271,7 +271,7 @@
       initData() {
         getMenuTree().then(res => {
           const column = this.findObject(this.option.column, "parentId");
-          column.dicData = res.data.data;
+          column.dicData = res.data.result;
         });
       },
       handleAdd(row) {
@@ -284,7 +284,7 @@
       rowSave(row, done, loading) {
         add(row).then((res) => {
           // 获取新增数据的相关字段
-          const data = res.data.data;
+          const data = res.data.result;
           row.id = data.id;
           this.$message({
             type: "success",
@@ -404,7 +404,7 @@
       onLoad(page, params = {}) {
         this.loading = true;
         getLazyList(this.parentId, Object.assign(params, this.query)).then(res => {
-          this.data = res.data.data;
+          this.data = res.data.result;
           this.loading = false;
           this.selectionClear();
         });
@@ -412,7 +412,8 @@
       treeLoad(tree, treeNode, resolve) {
         const parentId = tree.id;
         getLazyList(parentId).then(res => {
-          resolve(res.data.data);
+
+          resolve(res.data.result);
         });
       }
     }