diff --git a/lms/nladmin-system/src/main/resources/config/application-dev.yml b/lms/nladmin-system/src/main/resources/config/application-dev.yml
index d3cd31b..7334816 100644
--- a/lms/nladmin-system/src/main/resources/config/application-dev.yml
+++ b/lms/nladmin-system/src/main/resources/config/application-dev.yml
@@ -6,8 +6,8 @@ spring:
druid:
db-type: com.alibaba.druid.pool.DruidDataSource
driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
-# url: jdbc:log4jdbc:mysql://${DB_HOST:47.111.78.178}:${DB_PORT:3306}/${DB_NAME:yongyu_lms2}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
- url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:yongyu_lms2}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
+ url: jdbc:log4jdbc:mysql://${DB_HOST:47.111.78.178}:${DB_PORT:3306}/${DB_NAME:yongyu_lms2}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
+# url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:yongyu_lms2}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
username: ${DB_USER:root}
password: ${DB_PWD:P@ssw0rd}
# password: ${DB_PWD:12356}
diff --git a/lms/nladmin-ui/src/views/wms/sch/point/ViewDialog.vue b/lms/nladmin-ui/src/views/wms/sch/point/ViewDialog.vue
new file mode 100644
index 0000000..50889d1
--- /dev/null
+++ b/lms/nladmin-ui/src/views/wms/sch/point/ViewDialog.vue
@@ -0,0 +1,223 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 卡片名称
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 更新记录
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/lms/nladmin-ui/src/views/wms/sch/point/index.vue b/lms/nladmin-ui/src/views/wms/sch/point/index.vue
index 4faca3d..12eca28 100644
--- a/lms/nladmin-ui/src/views/wms/sch/point/index.vue
+++ b/lms/nladmin-ui/src/views/wms/sch/point/index.vue
@@ -69,7 +69,10 @@
/>
-
+
-
+
-
+
-
+
-
+
+
+ {{ scope.row.point_code }}
+
+
@@ -298,7 +314,7 @@
- {{ scope.row.is_used=='1' ? '是' : '否' }}
+ {{ scope.row.is_used == '1' ? '是' : '否' }}
@@ -321,6 +337,8 @@
+
+
@@ -332,12 +350,31 @@ import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
+import ViewDialog from '@/views/wms/sch/point/ViewDialog'
-const defaultForm = { point_id: null, point_code: null, point_name: null, point_type: null, point_status: null, lock_type: '1', vehicle_code: null, source_id: null, remark: null, is_used: null, is_delete: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null }
+const defaultForm = {
+ point_id: null,
+ point_code: null,
+ point_name: null,
+ point_type: null,
+ point_status: null,
+ lock_type: '1',
+ vehicle_code: null,
+ source_id: null,
+ remark: null,
+ is_used: null,
+ is_delete: null,
+ create_id: null,
+ create_name: null,
+ create_time: null,
+ update_optid: null,
+ update_optname: null,
+ update_time: null
+}
export default {
name: 'Point',
dicts: ['vehicle_type', 'd_lock_type', 'SCH_TASK_TYPE_DTL', 'vehicle_type'],
- components: { pagination, crudOperation, rrOperation, udOperation },
+ components: { pagination, crudOperation, rrOperation, udOperation , ViewDialog},
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({
@@ -431,7 +468,9 @@ export default {
this.getPointStatusList(id, flag)
this.getPointTypeList(id, flag)
}
- if (flag === 1) { this.crud.toQuery() }
+ if (flag === 1) {
+ this.crud.toQuery()
+ }
},
getPointStatusList(id, flag) {
crudRegion.getPointStatusSelectById(id).then(res => {
@@ -444,7 +483,11 @@ export default {
},
getPointTypeList(id, flag) {
crudRegion.getPointTypeSelectById(id).then(res => {
- if (flag === 1) { this.pointTypesList = res } else { this.pointTypesDialogList = res }
+ if (flag === 1) {
+ this.pointTypesList = res
+ } else {
+ this.pointTypesDialogList = res
+ }
})
},
changeUsed(data, flag) { // 更改启用状态
@@ -464,6 +507,12 @@ export default {
this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.toQuery()
})
+ },
+ toView(row) {
+ debugger
+ if (row) {
+ this.$refs.viewDialog.setParentData(row)
+ }
}
}