diff --git a/src/application/mk/components/dialog/dialog.vue b/src/application/mk/components/dialog/dialog.vue index 0a300fd..49737e8 100644 --- a/src/application/mk/components/dialog/dialog.vue +++ b/src/application/mk/components/dialog/dialog.vue @@ -49,8 +49,8 @@ export default { // 解构赋值 page 页面组件 title 标题 callback 回调函数 pageMode 模式 add edit select dataId 数据id width 宽度 height 高度 pageOptions 页面参数 // pageOptions 用于传递给页面的参数 例如:{id:1,name:'张三'} 页面通过 this.$options.pageOptions 获取 // showFooter 是否显示底部按钮 - const { page, title, callback, pageMode, dataId,width = 800,height = 600 , pageOptions = {} ,showFooter } = options || {}; - + const { page, title, callback, pageMode, dataId,width = 800,height = 600 , pageOptions = {} ,showFooter } = options || {}; + this.width = width; this.height = height; this.dataId = dataId; @@ -68,7 +68,7 @@ export default { // 处理回调 handleCallback(e) { - + console.log(e); const { callback } = this; // 判断是否有回调函数 diff --git a/src/application/zk/components/dialog/dialog.vue b/src/application/zk/components/dialog/dialog.vue new file mode 100644 index 0000000..0a300fd --- /dev/null +++ b/src/application/zk/components/dialog/dialog.vue @@ -0,0 +1,100 @@ + + + \ No newline at end of file diff --git a/src/application/zk/components/dialog/index.js b/src/application/zk/components/dialog/index.js new file mode 100644 index 0000000..33abda5 --- /dev/null +++ b/src/application/zk/components/dialog/index.js @@ -0,0 +1,15 @@ +import Vue from 'vue' // 加载vue模块 +import promptComponent from './dialog.vue' // 加载dialog组件 + + + +export default { + // 打开对话框 + open: function (args) { // 打开对话框 + const promptConstructor = Vue.extend(promptComponent); // 创建一个子类 + let instance = new promptConstructor().$mount(''); // 创建一个实例 + document.body.appendChild(instance.$el); // 将实例挂载到body上 + instance.open(args); // 打开对话框 + } + +}; \ No newline at end of file diff --git a/src/application/zk/func/request.js b/src/application/zk/func/request.js index 1dd76a6..f93313b 100644 --- a/src/application/zk/func/request.js +++ b/src/application/zk/func/request.js @@ -1,12 +1,11 @@ -import { request } from '@/utils/request' // 加载request +import {request} from '@/utils/request' // 加载request import modal from './modal' // 加载modal - import JSONbig from 'json-bigint' export default { // 提交post请求 ,获取数据 - post: function ({ url, data, loading, config, useBigInt }) { // post请求 + post: function ({url, data, loading, config, useBigInt}) { // post请求 if (useBigInt) { config = config || {}; @@ -52,7 +51,7 @@ export default { }, - get: function ({ url, loading, config, useBigInt }) { // post请求 + get: function ({url, loading, config, useBigInt}) { // post请求 if (useBigInt) { config = config || {}; @@ -90,7 +89,7 @@ export default { }, // 获取分页数据 - getPagedData: function ({ url, method = 'post', data, callback, config,useBigInt,rowFilters,listFieldName }) { // 获取分页数据 默认post请求 + getPagedData: function ({url, method = 'post', data, callback, config, useBigInt, rowFilters, listFieldName}) { // 获取分页数据 默认post请求 if (useBigInt) { config = config || {}; @@ -108,6 +107,10 @@ export default { if (data.end_time && typeof (data.end_time) == "string") { // 如果结束时间是字符串 data.end_time = parseInt(new Date(data.end_time).getTime() / 1000); // 转换为时间戳 } + if (data.start_time === data.end_time) { // 如果开始时间和结束时间相等 说明是同一天 + data.end_time = data.end_time + 24 * 60 * 60 - 1; + } + request(url, method, data, config).then(response => { // 发送请求 if (!response) { // 如果没有返回 reject && reject(response); // 返回错误 @@ -128,25 +131,25 @@ export default { return; } - if( + if ( rowFilters && // 如果有行过滤器 rowFilters.length && // 如果行过滤器有数据 listFieldName && // 如果列表字段名有数据 result.data && // 如果返回的数据有数据 result.data[listFieldName] && // 如果返回的数据中有列表字段名 result.data[listFieldName].length // 如果返回的数据中的列表字段名有数据 - ){ - console.log( JSON.stringify(result.data[listFieldName])) - result.data[listFieldName] = result.data[listFieldName].filter((row)=>{ - for(let i =0;i { + for (let i = 0; i < rowFilters.length; i++) { let f = rowFilters[i]; - if(!f(row)){ + if (!f(row)) { return false; } } return true; }); - console.log( JSON.stringify(result.data[listFieldName])) + console.log(JSON.stringify(result.data[listFieldName])) } // console.log(result.data) resolve(result.data); // 返回成功 diff --git a/src/application/zk/index.js b/src/application/zk/index.js index 4756390..5f922bc 100644 --- a/src/application/zk/index.js +++ b/src/application/zk/index.js @@ -1,4 +1,4 @@ -import dialog from "@/application/mk/components/dialog"; +import dialog from "@/application/zk/components/dialog"; import request from "@/application/zk/func/request"; import zkToolbar from "./components/zkToolbar.vue"; import zkTableView from "./components/zkTableView.vue"; diff --git a/src/application/zk/mixins/DeleteComponents.js b/src/application/zk/mixins/DeleteComponents.js new file mode 100644 index 0000000..bd3d670 --- /dev/null +++ b/src/application/zk/mixins/DeleteComponents.js @@ -0,0 +1,34 @@ +export default { + data() { + return { + DeleteUrlData: {ids: []}, + }; + }, + props: { + DeleteUrl: { + type: String + }, + }, + created() { + this.initListData(); + }, + methods: { + Delete() { + this.$zk.post({ + url: this.DeleteUrl, + data: this.DeleteUrlData, + loading: "加载中...", + config: { + headers: { + 'Content-Type': 'application/json' + } + } + }).then(a => { + this.initListData(); + console.log(a) + }).catch((a) => { + this.$mk.error(a.msg); + }); + }, + }, +} \ No newline at end of file diff --git a/src/application/zk/mixins/DetailComponents.js b/src/application/zk/mixins/DetailComponents.js new file mode 100644 index 0000000..24921ed --- /dev/null +++ b/src/application/zk/mixins/DetailComponents.js @@ -0,0 +1,14 @@ +export default { + data() { + return {}; + }, + props: { + DetailUrl: { + type: String + }, + DetailUrlData: { + type: Object + }, + }, + methods: {}, +} \ No newline at end of file diff --git a/src/application/zk/mixins/ListComponents.js b/src/application/zk/mixins/ListComponents.js new file mode 100644 index 0000000..90013a6 --- /dev/null +++ b/src/application/zk/mixins/ListComponents.js @@ -0,0 +1,78 @@ +export default { + data() { + return { + data: [], + }; + }, + props: { + CreateRouter: { + type: String + }, + UpdateRouter: { + type: String + }, + DetailVueComponent: { + type: String, + default: "./Detail.vue" + }, + IsListShowCode: { + type: Boolean, + default: false + }, + ListTitle: { + type: String + }, + ListUrl: { + type: String + }, + ListUrlData: { + type: Object + }, + ListFieldName: { + type: String + }, + BackFieldNames: { + type: Array, + default: () => { + return ["id", "name", "code"]; + } + } + }, + created() { + this.initListData(); + }, + methods: { + initListData() { + this.$zk.getPagedData({ + url: this.ListUrl, + listFieldName: this.ListFieldName, + data: this.ListUrlData, + loading: "加载中...", + config: { + headers: { + 'Content-Type': 'application/json' + } + } + }).then(a => { + if (a.total === 0) { + return + } + + if (a[this.ListFieldName].length > 0) { + this.data = a[this.ListFieldName]; + // this.list中的id字段转换为字符串 + this.data.forEach(item => { + item.id = item.id.toString(); + }); + } + + }).catch((a) => { + console.log("====error", a) + if (a.code !== 200) { + this.$mk.error(a.msg); + } + + }); + }, + }, +} \ No newline at end of file diff --git a/src/application/zk/mixins/TebleComponents.js b/src/application/zk/mixins/TebleComponents.js new file mode 100644 index 0000000..e69de29 diff --git a/src/application/zk/mixins/UpdateComponents.js b/src/application/zk/mixins/UpdateComponents.js new file mode 100644 index 0000000..c816f5b --- /dev/null +++ b/src/application/zk/mixins/UpdateComponents.js @@ -0,0 +1,14 @@ +export default { + data() { + return {}; + }, + props: { + UpdateUrl: { + type: String + }, + UpdateUrlData: { + type: Object + }, + }, + methods: {}, +} \ No newline at end of file diff --git a/src/components/zk/zkSelect.md b/src/components/zk/zkSelect.md new file mode 100644 index 0000000..4fc4bf3 --- /dev/null +++ b/src/components/zk/zkSelect.md @@ -0,0 +1,57 @@ + + +```json + zkSelectData: { +page: 1, +limit: 50, +order_bys: [ +{ +column: "create_time", +order: "desc" +}, +], +}, +zkSelectDataFieldName: 'Truck', +zkBackFieldNames: ['id', 'name', 'code', 'create_time'], +``` + +```html + + +``` + +### 引用 + +```js + +import ZkSelect from '@/components/zk/zkSelect.vue'; + +``` + +```js + +// 动作 +methods: { + // 选择器改变 + zkSelecthandleChange(value) + { + console.log("value:", value); + } +} +``` \ No newline at end of file diff --git a/src/components/zk/zkSelect.vue b/src/components/zk/zkSelect.vue new file mode 100644 index 0000000..73304de --- /dev/null +++ b/src/components/zk/zkSelect.vue @@ -0,0 +1,42 @@ + + \ No newline at end of file diff --git a/src/components/zk/zkSelectAddItem.md b/src/components/zk/zkSelectAddItem.md new file mode 100644 index 0000000..6e7b265 --- /dev/null +++ b/src/components/zk/zkSelectAddItem.md @@ -0,0 +1,54 @@ + :ListTitle="'请选择车辆'" // 空选择 + :IsListShowCode="false" // 是否显示code字段 + :ListUrl="this.$data.actions.TruckSearch" // 请求地址 + :ListUrlData="this.$data.zkSelectData" // 请求参数 + :ListFieldName="this.$data.zkSelectDataFieldName" // 请求字段 + :BackFieldNames="[ 'id', 'name', 'code','create_time']" // 返回字段 + @zkSelectAddItem="zkSelecthandleChange" // 选择后的回调 + +```json + zkSelectData: { +page: 1, +limit: 50, +order_bys: [ +{ +column: "create_time", +order: "desc" +}, +], +}, +zkSelectDataFieldName: 'Truck', +zkBackFieldNames: ['id', 'name', 'code', 'create_time'], +``` + +```html + + +``` + +### 引用 + +```js + +import ZkSelectAddItem from '@/components/zk/zkSelectAddItem.vue'; + +``` + +```js + // 动作 +methods: { + // 选择器改变 + zkSelecthandleChange(value) + { + console.log("value:", value); + } +} +``` \ No newline at end of file diff --git a/src/components/zk/zkSelectAddItem.vue b/src/components/zk/zkSelectAddItem.vue new file mode 100644 index 0000000..2208788 --- /dev/null +++ b/src/components/zk/zkSelectAddItem.vue @@ -0,0 +1,59 @@ + + \ No newline at end of file diff --git a/src/components/zk/zkSelectSearch.md b/src/components/zk/zkSelectSearch.md new file mode 100644 index 0000000..2fc498b --- /dev/null +++ b/src/components/zk/zkSelectSearch.md @@ -0,0 +1,55 @@ + :ListTitle="'请选择车辆'" // 空选择 + :IsListShowCode="false" // 是否显示code字段 + :ListUrl="this.$data.actions.TruckSearch" // 请求地址 + :ListUrlData="this.$data.zkSelectData" // 请求参数 + :ListFieldName="this.$data.zkSelectDataFieldName" // 请求字段 + :BackFieldNames="this.$data.zkBackFieldNames" // 返回字段 + @zkSelectSearch="zkSelecthandleChange" // 选择后的回调 + +```json + zkSelectData: { +page: 1, +limit: 50, +order_bys: [ +{ +column: "create_time", +order: "desc" +}, +], +}, +zkSelectDataFieldName: 'Truck', +zkBackFieldNames: ['id', 'name', 'code', 'create_time'], +``` + +```html + + +``` + +### 引用 + +```js +import ZkSelectSearch from '@/components/zk/zkSelectSearch.vue'; + +``` + +```js + // 动作 +methods: { + // 选择器改变 + zkSelecthandleChange(value) + { + console.log("value:", value); + } +} +``` + + diff --git a/src/components/zk/zkSelectSearch.vue b/src/components/zk/zkSelectSearch.vue new file mode 100644 index 0000000..188b3f2 --- /dev/null +++ b/src/components/zk/zkSelectSearch.vue @@ -0,0 +1,93 @@ + + \ No newline at end of file diff --git a/src/components/zk/zkSelectSearch1.md b/src/components/zk/zkSelectSearch1.md new file mode 100644 index 0000000..c65f6da --- /dev/null +++ b/src/components/zk/zkSelectSearch1.md @@ -0,0 +1,54 @@ + :ListTitle="'请选择车辆'" // 空选择 + :IsListShowCode="false" // 是否显示code字段 + :ListUrl="this.$data.actions.TruckSearch" // 请求地址 + :ListUrlData="this.$data.zkSelectData" // 请求参数 + :ListFieldName="this.$data.zkSelectDataFieldName" // 请求字段 + :BackFieldNames="this.$data.zkBackFieldNames" // 返回字段 + @zkSelectSearch="zkSelecthandleChange" // 选择后的回调 + +```json + zkSelectData: { +page: 1, +limit: 50, +order_bys: [ +{ +column: "create_time", +order: "desc" +}, +], +}, +zkSelectDataFieldName: 'Truck', +zkBackFieldNames: ['id', 'name', 'code', 'create_time'], +``` + +```html + + +``` + +### 引用 + +```js + +import ZkSelectSearch1 from '@/components/zk/zkSelectSearch1.vue'; + +``` + +```js + // 动作 +methods: { + // 选择器改变 + zkSelecthandleChange(value) + { + console.log("value:", value); + } +} +``` \ No newline at end of file diff --git a/src/components/zk/zkSelectSearch1.vue b/src/components/zk/zkSelectSearch1.vue new file mode 100644 index 0000000..435cbf8 --- /dev/null +++ b/src/components/zk/zkSelectSearch1.vue @@ -0,0 +1,99 @@ + + \ No newline at end of file diff --git a/src/components/zk/zkSelectSearchMultiple.md b/src/components/zk/zkSelectSearchMultiple.md new file mode 100644 index 0000000..4ae3e35 --- /dev/null +++ b/src/components/zk/zkSelectSearchMultiple.md @@ -0,0 +1,56 @@ + + +```json + zkSelectData: { +page: 1, +limit: 50, +order_bys: [ +{ +column: "create_time", +order: "desc" +}, +], +}, +zkSelectDataFieldName: 'Truck', +zkBackFieldNames: ['id', 'name', 'code', 'create_time'], +``` + +```html + + +``` + +### 引用 + +```js + +import ZkSelectSearchMultiple from "@/components/zk/zkSelectSearchMultiple.vue"; + +``` + +```js + // 动作 +methods: { + // 选择器改变 + zkSelecthandleChange(value) + { + console.log("value:", value); + } +} +``` \ No newline at end of file diff --git a/src/components/zk/zkSelectSearchMultiple.vue b/src/components/zk/zkSelectSearchMultiple.vue new file mode 100644 index 0000000..f438598 --- /dev/null +++ b/src/components/zk/zkSelectSearchMultiple.vue @@ -0,0 +1,99 @@ + + \ No newline at end of file diff --git a/src/components/zk/zkTableList.md b/src/components/zk/zkTableList.md new file mode 100644 index 0000000..0529b27 --- /dev/null +++ b/src/components/zk/zkTableList.md @@ -0,0 +1,128 @@ + + + + +### 引用 + +```js + +import ZkTableList from "@/components/zk/zkTableList.vue"; + +``` + +```json + zkSelectFormConfig: { +data: { +name: '', +code: '', +plate_number: '', +create_time: 0 +}, +items: [ +{ +field: 'name', +title: '名称', +slots: { +default: 'name_item' +} // 自定义插槽 +}, +{ +field: 'code', +title: '编码', +slots: {default: 'code_item' +} // 自定义插槽 +}, +{ +field: 'plate_number', +title: '车牌号', +slots: { +default: 'plate_number_item'} // 自定义插槽 +}, +{ +field: 'create_time', +title: '时间', +slots: { +default: 'create_time_item' +} // 自定义插槽 +}, +{slots: {default: 'operate_item'}} +] +}, +// 表格列配置 +columns: [ +{type: 'seq', width: 60}, +{type: 'checkbox', width: 42}, + + +// =============================== 表格列 自动生成 Start =============================== + + +{field: 'code', sortable: true, title: '编码', width: 120 +}, // 编码 +{ +field: 'name', sortable: true, title: '名称', width: 120 +}, // 名称 +{ +field: 'plate_number', sortable: true, title: '车牌号', width: 120 +}, // 车牌号 +{ +field: 'type', sortable: true, title: '车辆类型', width: 120}, // 车辆类型 +{ +field: 'manager_name', sortable: true, title: '负责人姓名', width: 120}, // 负责人姓名 +{field: 'manager_phone', sortable: true, title: '负责人电话', width: 150 +}, // 负责人电话 +{ +field: 'out_count', sortable: true, title: '出车次数', width: 120 +}, // 出车次数 +{ +field: 'out_distance', sortable: true, title: '出车总公里数', width: 150 +}, // 出车总公里数 +{ +field: 'repair_count', sortable: true, title: '维修次数', width: 100}, // 维修次数 +{ +field: 'change_tyre_count', sortable: true, title: '更换轮胎次数', width: 130}, // 更换轮胎次数 +{field: 'add_oil_count', sortable: true, title: '加油次数', width: 100 +}, // 加油次数 +{ +field: 'add_oil_litre', sortable: true, title: '加油总升数', width: 120 +}, // 加油总升数 +{ +field: 'remark', sortable: true, title: '车辆备注', width: 250 +}, // 车辆备注 + + +// =============================== 表格列 自动生成 Start =============================== + + +{ +title: '操作', fixed: 'right', slots: {default: 'op'}, width: 140} +], + +``` + +```html + + + + +``` \ No newline at end of file diff --git a/src/components/zk/zkTableList.vue b/src/components/zk/zkTableList.vue new file mode 100644 index 0000000..e114ce7 --- /dev/null +++ b/src/components/zk/zkTableList.vue @@ -0,0 +1,288 @@ + + + \ No newline at end of file diff --git a/src/components/zk/zkTableView.vue b/src/components/zk/zkTableView.vue new file mode 100644 index 0000000..7abf00e --- /dev/null +++ b/src/components/zk/zkTableView.vue @@ -0,0 +1,276 @@ + + + + + \ No newline at end of file diff --git a/src/main.js b/src/main.js index 55f8729..7adc001 100644 --- a/src/main.js +++ b/src/main.js @@ -1,23 +1,28 @@ import Vue from 'vue' // 引入vue import App from './App.vue' // 引入App.vue -import {initRouter} from './router' // 引入初始化路由方法 +import {initRouter} from './router' // 引入初始化路由方法 import './theme/index.less' // 引入主题样式 less import Antd from 'ant-design-vue' // 引入ant-design-vue 组件库 import Viser from 'viser-vue' // 引入viser-vue 用于图表 // import '@/mock' // 引入mock模拟数据 -import store from './store' // 引入vuex store 实例 +import store from './store' // 引入vuex store 实例 import 'animate.css/source/animate.css' // 引入animate.css 动画库 import Plugins from '@/plugins' // 引入插件 import {initI18n} from '@/utils/i18n' // 引入国际化方法 import bootstrap from '@/bootstrap' // 引入启动引导方法 -import 'moment/locale/zh-cn' // 引入moment 本地化 +import 'moment/locale/zh-cn' // 引入moment 本地化 import VXETable from 'vxe-table' import 'vxe-table/lib/style.css' import VueCropper from 'vue-cropper' import {hiPrintPlugin} from 'vue-plugin-hiprint' - +import application from './application'; +import './application/mk/style/main.css'; + +Vue.prototype.$BASE_URL = process.env.VUE_APP_API_BASE_URL // 注入环境变量VUE_APP_API_BASE_URL + + Vue.use(hiPrintPlugin) - hiPrintPlugin.disAutoConnect(); +hiPrintPlugin.disAutoConnect(); const router = initRouter(store.state.setting.asyncRoutes) // 初始化路由 加载动态路由 const i18n = initI18n('CN', 'US') // 初始化国际化 加载中英文 语言包 @@ -31,14 +36,11 @@ Vue.use(VueCropper) bootstrap({router, store, i18n, message: Vue.prototype.$message}) // 启动引导方法 - -import application from './application'; -import './application/mk/style/main.css'; Vue.use(application); new Vue({ - router, // 注入路由 - store, // 注入vuex store - i18n, // 注入国际化 - render: h => h(App), // 渲染App.vue + router, // 注入路由 + store, // 注入vuex store + i18n, // 注入国际化 + render: h => h(App), // 渲染App.vue }).$mount('#app') // 挂载到#app diff --git a/src/pages/Middle/transport/Custom/BalanceLog/List.vue b/src/pages/Middle/transport/Custom/BalanceLog/List.vue index fa2d840..51c01e1 100644 --- a/src/pages/Middle/transport/Custom/BalanceLog/List.vue +++ b/src/pages/Middle/transport/Custom/BalanceLog/List.vue @@ -196,9 +196,9 @@ export default { // 计算属性 computed: { // 页面描述 - desc() { - return this.$t('pageDesc') - } + // desc() { + // return this.$t('pageDesc') + // } }, // 创建完成 diff --git a/src/pages/Middle/transport/Custom/Custom/List.vue b/src/pages/Middle/transport/Custom/Custom/List.vue index e7c53f5..f16d322 100644 --- a/src/pages/Middle/transport/Custom/Custom/List.vue +++ b/src/pages/Middle/transport/Custom/Custom/List.vue @@ -227,9 +227,9 @@ export default { // 计算属性 computed: { // 页面描述 - desc() { - return this.$t('pageDesc') - } + // desc() { + // return this.$t('pageDesc') + // } }, // 创建完成 diff --git a/src/pages/Middle/transport/DriverWages/DriverWages/List.vue b/src/pages/Middle/transport/DriverWages/DriverWages/List.vue index 49f68c9..3ed8322 100644 --- a/src/pages/Middle/transport/DriverWages/DriverWages/List.vue +++ b/src/pages/Middle/transport/DriverWages/DriverWages/List.vue @@ -218,9 +218,9 @@ export default { // 计算属性 computed: { // 页面描述 - desc() { - return this.$t('pageDesc') - } + // desc() { + // return this.$t('pageDesc') + // } }, // 创建完成 diff --git a/src/pages/Middle/transport/DriverWages/DriverWagesGiornaleLog/List.vue b/src/pages/Middle/transport/DriverWages/DriverWagesGiornaleLog/List.vue index a226d32..e0e322e 100644 --- a/src/pages/Middle/transport/DriverWages/DriverWagesGiornaleLog/List.vue +++ b/src/pages/Middle/transport/DriverWages/DriverWagesGiornaleLog/List.vue @@ -202,9 +202,9 @@ export default { // 计算属性 computed: { // 页面描述 - desc() { - return this.$t('pageDesc') - } + // desc() { + // return this.$t('pageDesc') + // } }, // 创建完成 diff --git a/src/pages/Middle/transport/DriverWages/DriverWagesSurplus/List.vue b/src/pages/Middle/transport/DriverWages/DriverWagesSurplus/List.vue index 1ea5ba8..4ab0c4e 100644 --- a/src/pages/Middle/transport/DriverWages/DriverWagesSurplus/List.vue +++ b/src/pages/Middle/transport/DriverWages/DriverWagesSurplus/List.vue @@ -221,9 +221,9 @@ export default { // 计算属性 computed: { // 页面描述 - desc() { - return this.$t('pageDesc') - } + // desc() { + // return this.$t('pageDesc') + // } }, // 创建完成 diff --git a/src/pages/Middle/transport/Maintenance/Maintenance/List.vue b/src/pages/Middle/transport/Maintenance/Maintenance/List.vue index 45d79e0..f7a0a66 100644 --- a/src/pages/Middle/transport/Maintenance/Maintenance/List.vue +++ b/src/pages/Middle/transport/Maintenance/Maintenance/List.vue @@ -197,9 +197,9 @@ export default { // 计算属性 computed: { // 页面描述 - desc() { - return this.$t('pageDesc') - } + // desc() { + // return this.$t('pageDesc') + // } }, // 创建完成 diff --git a/src/pages/Middle/transport/Maintenance/MaintenanceGiornaleLog/List.vue b/src/pages/Middle/transport/Maintenance/MaintenanceGiornaleLog/List.vue index 1dd8adc..9bbcbdb 100644 --- a/src/pages/Middle/transport/Maintenance/MaintenanceGiornaleLog/List.vue +++ b/src/pages/Middle/transport/Maintenance/MaintenanceGiornaleLog/List.vue @@ -217,9 +217,9 @@ export default { // 计算属性 computed: { // 页面描述 - desc() { - return this.$t('pageDesc') - } + // desc() { + // return this.$t('pageDesc') + // } }, // 创建完成 diff --git a/src/pages/Middle/transport/Maintenance/OtherExpensesLog/List.vue b/src/pages/Middle/transport/Maintenance/OtherExpensesLog/List.vue index 73abb03..5807217 100644 --- a/src/pages/Middle/transport/Maintenance/OtherExpensesLog/List.vue +++ b/src/pages/Middle/transport/Maintenance/OtherExpensesLog/List.vue @@ -216,9 +216,9 @@ export default { // 计算属性 computed: { // 页面描述 - desc() { - return this.$t('pageDesc') - } + // desc() { + // return this.$t('pageDesc') + // } }, // 创建完成 diff --git a/src/pages/Middle/transport/OilConsumption/OilConsumption/List.vue b/src/pages/Middle/transport/OilConsumption/OilConsumption/List.vue index 367c564..0b1d7a4 100644 --- a/src/pages/Middle/transport/OilConsumption/OilConsumption/List.vue +++ b/src/pages/Middle/transport/OilConsumption/OilConsumption/List.vue @@ -206,9 +206,9 @@ export default { // 计算属性 computed: { // 页面描述 - desc() { - return this.$t('pageDesc') - } + // desc() { + // return this.$t('pageDesc') + // } }, // 创建完成 diff --git a/src/pages/Middle/transport/SoilQualityMaterial/SoilQualityMaterial/List.vue b/src/pages/Middle/transport/SoilQualityMaterial/SoilQualityMaterial/List.vue index 8bac4fb..7e970df 100644 --- a/src/pages/Middle/transport/SoilQualityMaterial/SoilQualityMaterial/List.vue +++ b/src/pages/Middle/transport/SoilQualityMaterial/SoilQualityMaterial/List.vue @@ -209,9 +209,9 @@ export default { // 计算属性 computed: { // 页面描述 - desc() { - return this.$t('pageDesc') - } + // desc() { + // return this.$t('pageDesc') + // } }, // 创建完成 diff --git a/src/pages/Middle/transport/SoilQualityMaterial/SoilQualityMaterialAlias/List.vue b/src/pages/Middle/transport/SoilQualityMaterial/SoilQualityMaterialAlias/List.vue index b4aed8e..d053afc 100644 --- a/src/pages/Middle/transport/SoilQualityMaterial/SoilQualityMaterialAlias/List.vue +++ b/src/pages/Middle/transport/SoilQualityMaterial/SoilQualityMaterialAlias/List.vue @@ -208,9 +208,9 @@ export default { // 计算属性 computed: { // 页面描述 - desc() { - return this.$t('pageDesc') - } + // desc() { + // return this.$t('pageDesc') + // } }, // 创建完成 diff --git a/src/pages/Middle/transport/Tire/Tire/List.vue b/src/pages/Middle/transport/Tire/Tire/List.vue index 6fcd1e8..bfe7b38 100644 --- a/src/pages/Middle/transport/Tire/Tire/List.vue +++ b/src/pages/Middle/transport/Tire/Tire/List.vue @@ -216,9 +216,9 @@ export default { // 计算属性 computed: { // 页面描述 - desc() { - return this.$t('pageDesc') - } + // desc() { + // return this.$t('pageDesc') + // } }, // 创建完成 diff --git a/src/pages/Middle/transport/TrainNumber/TrainNumber/Edit.vue b/src/pages/Middle/transport/TrainNumber/TrainNumber/Edit.vue index 706618f..1a7782b 100644 --- a/src/pages/Middle/transport/TrainNumber/TrainNumber/Edit.vue +++ b/src/pages/Middle/transport/TrainNumber/TrainNumber/Edit.vue @@ -134,15 +134,15 @@ export default { custom_id: [ {message: '请输入客户id'} ], - custom_name: [ - {message: '请输入客户名称'} - ], + // custom_name: [ + // {message: '请输入客户名称'} + // ], supplier_id: [ {message: '请输入供应商id'} ], - supplier_name: [ - {message: '请输入客户名称'} - ], + // supplier_name: [ + // {message: '请输入客户名称'} + // ], soil_quality_material_id: [ {message: '请输入物料品名id'} ], @@ -152,6 +152,19 @@ export default { warehousing_soil_quality_material_id: [ {message: '请输入入库物料土质id'} ], + + supplier_outbound_tonnage: [ + {message: '请输入供应商出库吨位'} + ], + customer_warehousing_tonnage: [ + {message: '请输入客户入库吨位'} + ], + driver_salary: [ + {message: '请输入司机工资'} + ], + driver_subsidy: [ + {message: '请输入司机补贴'} + ], outbound_remark: [ {message: '请输入出车备注'} ], @@ -227,18 +240,6 @@ export default { total_price: [ {message: '请输入总价'} ], - supplier_outbound_tonnage: [ - {message: '请输入供应商出库吨位'} - ], - customer_warehousing_tonnage: [ - {message: '请输入客户入库吨位'} - ], - driver_salary: [ - {message: '请输入司机工资'} - ], - driver_subsidy: [ - {message: '请输入司机补贴'} - ], // =============================== 表单校验 自动生成 End =============================== }, diff --git a/src/pages/Middle/transport/TrainNumber/TrainNumber/List.vue b/src/pages/Middle/transport/TrainNumber/TrainNumber/List.vue index cb8ee5a..8401099 100644 --- a/src/pages/Middle/transport/TrainNumber/TrainNumber/List.vue +++ b/src/pages/Middle/transport/TrainNumber/TrainNumber/List.vue @@ -228,9 +228,9 @@ export default { // 计算属性 computed: { // 页面描述 - desc() { - return this.$t('pageDesc') - } + // desc() { + // return this.$t('pageDesc') + // } }, // 创建完成 diff --git a/src/pages/Middle/transport/Truck/Truck/Detail.vue b/src/pages/Middle/transport/Truck/Truck/Detail.vue new file mode 100644 index 0000000..e78fa53 --- /dev/null +++ b/src/pages/Middle/transport/Truck/Truck/Detail.vue @@ -0,0 +1,112 @@ + + + \ No newline at end of file diff --git a/src/pages/Middle/transport/Truck/Truck/Edit.vue b/src/pages/Middle/transport/Truck/Truck/Edit.vue index 24be63d..a096a27 100644 --- a/src/pages/Middle/transport/Truck/Truck/Edit.vue +++ b/src/pages/Middle/transport/Truck/Truck/Edit.vue @@ -1,14 +1,13 @@