Mes
/
middle-admin-ant
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更新

This commit is contained in:
zxx 2024-03-29 11:48:35 +08:00
parent 7b42febc6d
commit 146807f002
14 changed files with 372 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/zk/zkSelectSearch.vue
View File

@ -3,7 +3,7 @@
show-search show-search
:value="value" :value="value"
:placeholder="ListTitle" :placeholder="ListTitle"
style="width: 200px" style="width: 100%"
:default-active-first-option="false" :default-active-first-option="false"
:show-arrow="false" :show-arrow="false"
:filter-option="false" :filter-option="false"

2
src/pages/Middle/transport/Custom/BalanceLog/List.vue
View File

@ -16,7 +16,7 @@
</a-col> </a-col>
<a-col :flex="$mk.config.ui.toolbarFlex"> <a-col :flex="$mk.config.ui.toolbarFlex">
<!-- 工具条 --> <!-- 工具条 -->
<mk-toolbar :isShowAdd="false" @toolbarClick="toolbarClick"></mk-toolbar> <mk-toolbar :isShowLog="false" :isShowSetting="false" :isShowAdd="false" @toolbarClick="toolbarClick"></mk-toolbar>
</a-col> </a-col>
</a-row> </a-row>

23
src/pages/Middle/transport/Custom/Custom/List.vue
View File

@ -16,7 +16,7 @@
</a-col> </a-col>
<a-col :flex="$mk.config.ui.toolbarFlex"> <a-col :flex="$mk.config.ui.toolbarFlex">
<!-- 工具条 --> <!-- 工具条 -->
<mk-toolbar :isShowAdd="true" @toolbarClick="toolbarClick"></mk-toolbar> <mk-toolbar :isShowLog="false" :isShowSetting="false" :isShowAdd="true" @toolbarClick="toolbarClick"></mk-toolbar>
</a-col> </a-col>
</a-row> </a-row>
@ -114,8 +114,8 @@ export default {
], ],
//搜索区 //搜索区
searchFormItems: [ // 子项 searchFormItems: [ // 子项
{field: 'code', title: '编码', span: 4, itemRender: {name: '$input', props: {placeholder: '请输入编码'}}}, {field: 'code', title: '编码', span: 2, itemRender: {name: '$input', props: {placeholder: '请输入编码'}}},
{field: 'name', title: '名称', span: 4, itemRender: {name: '$input', props: {placeholder: '请输入名称'}}}, {field: 'name', title: '名称', span: 3, itemRender: {name: '$input', props: {placeholder: '请输入名称'}}},
{field: 'type', title: '类型', span: 3, itemRender: { name: '$select', props: {options:[{value:'',label:"====全部===="},{value:"0",label:"客户"},{value:"1",label:"供应商"}] } }}, {field: 'type', title: '类型', span: 3, itemRender: { name: '$select', props: {options:[{value:'',label:"====全部===="},{value:"0",label:"客户"},{value:"1",label:"供应商"}] } }},
{field: 'status', title: '状态', span: 3, itemRender: { name: '$select', props: {options:[{value:'',label:"====全部===="},{value:"0",label:"禁用"},{value:"1",label:"启用"}] } }}, {field: 'status', title: '状态', span: 3, itemRender: { name: '$select', props: {options:[{value:'',label:"====全部===="},{value:"0",label:"禁用"},{value:"1",label:"启用"}] } }},
{span: 6, slots: {default: 'date'}}, // 自定义列 {span: 6, slots: {default: 'date'}}, // 自定义列
@ -175,25 +175,25 @@ export default {
// =============================== 表格列 自动生成 Start =============================== // =============================== 表格列 自动生成 Start ===============================
{field: 'code', sortable: true, title: '编码', width: 150}, // 编码 {field: 'code', sortable: true, title: '编码', width: 80}, // 编码
{field: 'name', title: '名称', width: 150}, // 名称 {field: 'name', title: '名称', width: 150}, // 名称
{field: 'type', sortable: true, title: '类型',formatter: this.formatType, width: 120}, // 客户类型 {field: 'type', sortable: true, title: '类型',formatter: this.formatType, width: 100}, // 客户类型
{field: 'industry', sortable: true, title: '行业', width: 120}, // 客户行业 {field: 'industry', sortable: true, title: '行业', width: 120}, // 客户行业
{field: 'contact', title: '联系人', width: 120}, // 客户联系人 {field: 'contact', title: '联系人', width: 120}, // 客户联系人
{field: 'total_balance', sortable: true, title: '总结余(元)', width: 120}, // 总结余 {field: 'total_balance', sortable: true, title: '总结余(元)', width: 120}, // 总结余
{field: 'contact_phone', sortable: true, title: '联系人电话', width: 120}, // 客户联系人电话 {field: 'contact_phone', sortable: true, title: '联系人电话', width: 115}, // 客户联系人电话
{field: 'total_ton', sortable: true, title: '总计交易吨数', width: 150}, // 总计交易吨数 {field: 'total_ton', sortable: true, title: '总计交易吨数', width: 130}, // 总计交易吨数
{field: 'total_count', sortable: true, title: '总计交易次数', width: 150}, // 总计交易次数 {field: 'total_count', sortable: true, title: '总计交易次数', width: 130}, // 总计交易次数
{field: 'last_time', sortable: true, title: '最后交易时间',formatter: 'formatDate', width: 250}, // 最后交易时间 {field: 'last_time', sortable: true, title: '最后交易时间',formatter: 'formatDate', width: 130}, // 最后交易时间
{ {
field: 'create_time', field: 'create_time',
formatter: 'formatDate', formatter: 'formatDate',
width: 250, width: 100,
sortable: true, sortable: true,
title: '创建时间', title: '创建时间',
showHeaderOverflow: true showHeaderOverflow: true
}, // 创建时间 }, // 创建时间
{field: 'total_amount', sortable: true, title: '总交易金额', width: 150}, // 总交易金额 {field: 'total_amount', sortable: true, title: '总交易金额', width: 130}, // 总交易金额
{field: 'remark', sortable: true, title: '备注', width: 250}, // 备注 {field: 'remark', sortable: true, title: '备注', width: 250}, // 备注
{ {
field: 'status', field: 'status',
@ -375,6 +375,7 @@ export default {
onSearch() { onSearch() {
this.$refs.xGrid.commitProxy('query') // 提交搜索 this.$refs.xGrid.commitProxy('query') // 提交搜索
}, },
pageDetail(row){ pageDetail(row){
console.log("list row",row) console.log("list row",row)
if (!row) { // 如果没有选中行 if (!row) { // 如果没有选中行

119
src/pages/Middle/transport/DriverWages/DriverWages/List.vue
View File

@ -5,6 +5,14 @@
<a-col :flex="$mk.config.ui.searchFlex"> <a-col :flex="$mk.config.ui.searchFlex">
<!-- 搜索区 --> <!-- 搜索区 -->
<vxe-form :data="searchFormData" :items="searchFormItems" titleColon @submit="onSearch"> <vxe-form :data="searchFormData" :items="searchFormItems" titleColon @submit="onSearch">
<template #driver_id="{ }">
<ZkSelectSearch :ListTitle="'请选择司机'" :IsListShowCode="true" :ListUrl="zkSelectSearch2.Search"
:ListUrlData="zkSelectSearch2.zkSelectData"
:ListFieldName="zkSelectSearch2.zkSelectDataFieldName"
:BackFieldNames="zkSelectSearch2.zkBackFieldNames" @zkSelectSearch="StaffhandleChange">
</ZkSelectSearch>
</template>
<template #date="{ }"> <template #date="{ }">
<a-form-item label="创建时间" :style="{ display: 'inline-block', width: 120 }"> <a-form-item label="创建时间" :style="{ display: 'inline-block', width: 120 }">
</a-form-item> </a-form-item>
@ -16,7 +24,7 @@
</a-col> </a-col>
<a-col :flex="$mk.config.ui.toolbarFlex"> <a-col :flex="$mk.config.ui.toolbarFlex">
<!-- 工具条 --> <!-- 工具条 -->
<mk-toolbar :isShowAdd="false" @toolbarClick="toolbarClick"></mk-toolbar> <mk-toolbar :isShowLog="false" :isShowSetting="false" :isShowAdd="false" @toolbarClick="toolbarClick"></mk-toolbar>
</a-col> </a-col>
</a-row> </a-row>
@ -29,7 +37,7 @@
</vxe-toolbar> </vxe-toolbar>
<!-- 表格区 --> <!-- 表格区 -->
<div class="gridPanel"> <div class="gridPanel">
<vxe-grid ref='xGrid' v-bind="gridOptions"> <vxe-grid ref='xGrid' :export-config="{}" v-bind="gridOptions">
<!-- =============================== 表格列 自动生成 Start =============================== --> <!-- =============================== 表格列 自动生成 Start =============================== -->
@ -47,7 +55,7 @@
<template #op="{ row }"> <template #op="{ row }">
<div class="oplinks"> <div class="oplinks">
<a-button @click="grant(row)" type="primary">发放工资</a-button> <a-button @click="grant(row)" v-if="row.wages_status === 0" type="primary">发放工资</a-button>
</div> </div>
</template> </template>
@ -60,10 +68,12 @@
<script> <script>
import BASE_URL from '@/services/Middle/transport/DriverWages/api.js'; import BASE_URL from '@/services/Middle/transport/DriverWages/api.js';
import ZkSelectSearch from '@/components/zk/zkSelectSearch.vue';
export default { export default {
name: 'DriverWagesList', name: 'DriverWagesList',
i18n: require('./i18n'), // 国际化 i18n: require('./i18n'), // 国际化
components: { ZkSelectSearch },
props: { props: {
pageMode: { pageMode: {
type: String, type: String,
@ -73,8 +83,45 @@ export default {
data() { data() {
const listFieldName = 'DriverWages'; const listFieldName = 'DriverWages';
const year=[
{label: '2024', value: 2024},
{label: '2025', value: 2025},
{label: '2026', value: 2026},
{label: '2027', value: 2027},
]
const month=[
{label: '1月', value: 1},
{label: '2月', value: 2},
{label: '3月', value: 3},
{label: '4月', value: 4},
{label: '5月', value: 5},
{label: '6月', value: 6},
{label: '7月', value: 7},
{label: '8月', value: 8},
{label: '9月', value: 9},
{label: '10月', value: 10},
{label: '11月', value: 11},
{label: '12月', value: 12},
]
// 页面数据 // 页面数据
var pageData = { // 页面数据变量 var pageData = { // 页面数据变量
zkSelectSearch2: {
Search: `${BASE_URL.BASE_URL}/MesStaff/v1/mes/staff/list`,
zkSelectData: {
page: 1,
limit: 50,
order_bys: [
{
column: "create_time",
order: "desc"
},
],
},
zkSelectDataFieldName: 'MesStaff',
zkBackFieldNames: ['id', 'name', 'code', 'create_time'],
},
keyName: 'id', // 主键字段名 keyName: 'id', // 主键字段名
@ -111,45 +158,28 @@ export default {
start_time: 0, // 开始时间 start_time: 0, // 开始时间
end_time: 0, // 结束时间 end_time: 0, // 结束时间
year:[
{label: '2019', value: 2019},
{label: '2020', value: 2020},
{label: '2021', value: 2021},
{label: '2022', value: 2022},
{label: '2023', value: 2023},
{label: '2024', value: 2024},
{label: '2025', value: 2025},
{label: '2026', value: 2026},
{label: '2027', value: 2027},
],
month:[
{label: '1月', value: 1},
{label: '2月', value: 2},
{label: '3月', value: 3},
{label: '4月', value: 4},
{label: '5月', value: 5},
{label: '6月', value: 6},
{label: '7月', value: 7},
{label: '8月', value: 8},
{label: '9月', value: 9},
{label: '10月', value: 10},
{label: '11月', value: 11},
{label: '12月', value: 12},
],
//搜索区 //搜索区
searchFormData: { searchFormData: {
wages_year: 0, wages_year:'',
wages_month: 0, wages_month: '',
staff_uid: '',
}, },
// 搜索区配置 // 搜索区配置
searchRules: [ searchRules: [
{ key: "wages_year", mode: "=" }, { key: "wages_year", mode: "=" },
{ key: "wages_month", mode: "=" } { key: "wages_month", mode: "=" },
{ key: "staff_uid", mode: "=" }
], ],
//搜索区 //搜索区
searchFormItems: [ // 子项 searchFormItems: [ // 子项
{field: 'wages_year', title: '年份', span: 5, itemRender: {name: '$select',props: { options: this.year }}}, {field: 'wages_year', title: '年份', span: 3, itemRender: {name: '$select',props: { options: year,placeholder: '请选择年份' }}},
{field: 'wages_month', title: '月份', span: 5, itemRender: {name: '$select',props: { options: this.month }}}, {field: 'wages_month', title: '月份', span: 3, itemRender: {name: '$select',props: { options: month,placeholder: '请选择月份' }}},
{
field: 'staff_uid',
title: '司机',
span: 4,
slots: { default: 'driver_id' }
},
{ span: 8, slots: { default: 'date' } }, // 自定义列 { span: 8, slots: { default: 'date' } }, // 自定义列
{ {
align: 'right', span: 4, itemRender: { // 按钮列 align: 'right', span: 4, itemRender: { // 按钮列
@ -162,6 +192,10 @@ export default {
//数据区 //数据区
gridOptions: { // 表格配置 gridOptions: { // 表格配置
export: true,
exportConfig: { // 导出配置
},
height: '100%', // 表格高度 100% 会自动撑满父容器 height: '100%', // 表格高度 100% 会自动撑满父容器
stripe: true, // 启用斑马纹 stripe: true, // 启用斑马纹
id: 'datagrid_1', // 表格唯一标识 id: 'datagrid_1', // 表格唯一标识
@ -293,6 +327,10 @@ export default {
if (mode == "like") { // 如果是模糊搜索 if (mode == "like") { // 如果是模糊搜索
value = "%" + value + "%"; // 如果是模糊搜索就在两边加上% value = "%" + value + "%"; // 如果是模糊搜索就在两边加上%
} }
// 如果value是数字，转换为字符串
if (typeof value == "number") {
value = value.toString();
}
rules.push({ // 添加搜索参数 rules.push({ // 添加搜索参数
column: key, // 字段名 column: key, // 字段名
mode: mode, // 搜索模式 mode: mode, // 搜索模式
@ -401,7 +439,9 @@ export default {
let rows = this.$refs.xGrid.getCheckboxRecords(); // 获取选中行 let rows = this.$refs.xGrid.getCheckboxRecords(); // 获取选中行
let ids = []; // 定义id数组 let ids = []; // 定义id数组
rows.forEach((row) => { // 遍历选中行 rows.forEach((row) => { // 遍历选中行
ids.push(row[this.keyName]); // 将选择行的id添加到id数组 if (row.wages_status === 0) {
ids.push(row[this.keyName]); // 将选择行的id添加到id数组
}
}); });
if (!ids.length) { // 如果没有选中行 if (!ids.length) { // 如果没有选中行
@ -426,7 +466,16 @@ export default {
}); });
} }
}); });
} },
// 选择器改变
StaffhandleChange(value) {
this.$data.searchFormData.staff_uid = value.id;
console.log("this.$data.searchFormData.driver_id:",this.$data.searchFormData.staff_uid);
this.$refs.xGrid.commitProxy('query') // 提交搜索
},
}, },
// 监听属性 // 监听属性
watch: {} watch: {}

2
src/pages/Middle/transport/DriverWages/DriverWagesGiornaleLog/List.vue
View File

@ -16,7 +16,7 @@
</a-col> </a-col>
<a-col :flex="$mk.config.ui.toolbarFlex"> <a-col :flex="$mk.config.ui.toolbarFlex">
<!-- 工具条 --> <!-- 工具条 -->
<mk-toolbar :isShowAdd="false" @toolbarClick="toolbarClick"></mk-toolbar> <mk-toolbar :isShowLog="false" :isShowSetting="false" :isShowAdd="false" @toolbarClick="toolbarClick"></mk-toolbar>
</a-col> </a-col>
</a-row> </a-row>

14
src/pages/Middle/transport/Maintenance/Maintenance/List.vue
View File

@ -16,7 +16,7 @@
</a-col> </a-col>
<a-col :flex="$mk.config.ui.toolbarFlex"> <a-col :flex="$mk.config.ui.toolbarFlex">
<!-- 工具条 --> <!-- 工具条 -->
<mk-toolbar :isShowAdd="true" @toolbarClick="toolbarClick"></mk-toolbar> <mk-toolbar :isShowLog="false" :isShowSetting="false" :isShowAdd="true" @toolbarClick="toolbarClick"></mk-toolbar>
</a-col> </a-col>
</a-row> </a-row>
@ -98,18 +98,18 @@ export default {
//搜索区 //搜索区
searchFormData: { searchFormData: {
title: '', name: '',
desc: '', code: '',
}, },
// 搜索区配置 // 搜索区配置
searchRules: [ searchRules: [
{key: "title", mode: "like"}, {key: "name", mode: "like"},
{key: "desc", mode: "like"} {key: "code", mode: "like"}
], ],
//搜索区 //搜索区
searchFormItems: [ // 子项 searchFormItems: [ // 子项
{field: 'title', title: '标题', span: 5, itemRender: {name: '$input', props: {placeholder: '请输入标题'}}}, {field: 'code', title: '编号', span: 5, itemRender: {name: '$input', props: {placeholder: '请输入编号'}}},
{field: 'desc', title: '描述', span: 5, itemRender: {name: '$input', props: {placeholder: '请输入描述'}}}, {field: 'name', title: '名称', span: 5, itemRender: {name: '$input', props: {placeholder: '请输入名称'}}},
{span: 8, slots: {default: 'date'}}, // 自定义列 {span: 8, slots: {default: 'date'}}, // 自定义列
{ {
align: 'right', span: 4, itemRender: { // 按钮列 align: 'right', span: 4, itemRender: { // 按钮列

44
src/pages/Middle/transport/Maintenance/MaintenanceGiornaleLog/List.vue
View File

@ -5,6 +5,13 @@
<a-col :flex="$mk.config.ui.searchFlex"> <a-col :flex="$mk.config.ui.searchFlex">
<!-- 搜索区 --> <!-- 搜索区 -->
<vxe-form :data="searchFormData" :items="searchFormItems" titleColon @submit="onSearch"> <vxe-form :data="searchFormData" :items="searchFormItems" titleColon @submit="onSearch">
<template #truck_id="{ }">
<ZkSelectSearch :ListTitle="'请选择车辆'" :IsListShowCode="true" :ListUrl="zkSelectSearch.Search"
:ListUrlData="zkSelectSearch.zkSelectData"
:ListFieldName="zkSelectSearch.zkSelectDataFieldName"
:BackFieldNames="zkSelectSearch.zkBackFieldNames" @zkSelectSearch="TruckhandleChange">
</ZkSelectSearch>
</template>
<template #date="{}"> <template #date="{}">
<a-form-item label="创建时间" :style="{ display: 'inline-block', width: 120 }"> <a-form-item label="创建时间" :style="{ display: 'inline-block', width: 120 }">
</a-form-item> </a-form-item>
@ -16,7 +23,7 @@
</a-col> </a-col>
<a-col :flex="$mk.config.ui.toolbarFlex"> <a-col :flex="$mk.config.ui.toolbarFlex">
<!-- 工具条 --> <!-- 工具条 -->
<mk-toolbar :isShowAdd="true" @toolbarClick="toolbarClick"></mk-toolbar> <mk-toolbar :isShowLog="false" :isShowSetting="false" :isShowAdd="true" @toolbarClick="toolbarClick"></mk-toolbar>
</a-col> </a-col>
</a-row> </a-row>
@ -54,10 +61,12 @@
<script> <script>
import BASE_URL from '@/services/Middle/transport/Maintenance/api.js'; import BASE_URL from '@/services/Middle/transport/Maintenance/api.js';
import ZkSelectSearch from '@/components/zk/zkSelectSearch.vue';
export default { export default {
name: 'MaintenanceGiornaleLogList', name: 'MaintenanceGiornaleLogList',
i18n: require('./i18n'), // 国际化 i18n: require('./i18n'), // 国际化
components: { ZkSelectSearch },
props: { props: {
pageMode: { pageMode: {
type: String, type: String,
@ -69,6 +78,21 @@ export default {
const listFieldName = 'MaintenanceGiornaleLog'; const listFieldName = 'MaintenanceGiornaleLog';
// 页面数据 // 页面数据
var pageData = { // 页面数据变量 var pageData = { // 页面数据变量
zkSelectSearch: {
Search: `${BASE_URL.BASE_URL}/Truck/v1/truck/search`,
zkSelectData: {
page: 1,
limit: 50,
order_bys: [
{
column: "create_time",
order: "desc"
},
],
},
zkSelectDataFieldName: 'Truck',
zkBackFieldNames: ['id', 'name', 'code', 'create_time'],
},
keyName: 'id', // 主键字段名 keyName: 'id', // 主键字段名
listFieldName: 'MaintenanceGiornaleLog', listFieldName: 'MaintenanceGiornaleLog',
@ -111,17 +135,25 @@ export default {
//搜索区 //搜索区
searchFormData: { searchFormData: {
title: '', title: '',
truck_id: '',
desc: '', desc: '',
}, },
// 搜索区配置 // 搜索区配置
searchRules: [ searchRules: [
{key: "title", mode: "like"}, {key: "title", mode: "like"},
{ key: "truck_id", mode: "like" },
{key: "desc", mode: "like"} {key: "desc", mode: "like"}
], ],
//搜索区 //搜索区
searchFormItems: [ // 子项 searchFormItems: [ // 子项
{field: 'title', title: '标题', span: 5, itemRender: {name: '$input', props: {placeholder: '请输入标题'}}}, // {field: 'title', title: '标题', span: 5, itemRender: {name: '$input', props: {placeholder: '请输入标题'}}},
{field: 'desc', title: '描述', span: 5, itemRender: {name: '$input', props: {placeholder: '请输入描述'}}}, // {field: 'desc', title: '描述', span: 5, itemRender: {name: '$input', props: {placeholder: '请输入描述'}}},
{
field: 'truck_id',
title: '车辆',
span: 4,
slots: { default: 'truck_id' }
},
{span: 8, slots: {default: 'date'}}, // 自定义列 {span: 8, slots: {default: 'date'}}, // 自定义列
{ {
align: 'right', span: 4, itemRender: { // 按钮列 align: 'right', span: 4, itemRender: { // 按钮列
@ -358,6 +390,12 @@ export default {
this.$refs.xGrid.commitProxy('query') // 提交搜索 this.$refs.xGrid.commitProxy('query') // 提交搜索
}, },
// 选择器改变
TruckhandleChange(value) {
this.$data.searchFormData.truck_id = value.id;
console.log("this.$data.searchFormData.truck_id:",this.$data.searchFormData.truck_id);
this.$refs.xGrid.commitProxy('query') // 提交搜索
}
}, },
// 监听属性 // 监听属性

44
src/pages/Middle/transport/Maintenance/OtherExpensesLog/List.vue
View File

@ -5,6 +5,13 @@
<a-col :flex="$mk.config.ui.searchFlex"> <a-col :flex="$mk.config.ui.searchFlex">
<!-- 搜索区 --> <!-- 搜索区 -->
<vxe-form :data="searchFormData" :items="searchFormItems" titleColon @submit="onSearch"> <vxe-form :data="searchFormData" :items="searchFormItems" titleColon @submit="onSearch">
<template #truck_id="{ }">
<ZkSelectSearch :ListTitle="'请选择车辆'" :IsListShowCode="true" :ListUrl="zkSelectSearch.Search"
:ListUrlData="zkSelectSearch.zkSelectData"
:ListFieldName="zkSelectSearch.zkSelectDataFieldName"
:BackFieldNames="zkSelectSearch.zkBackFieldNames" @zkSelectSearch="TruckhandleChange">
</ZkSelectSearch>
</template>
<template #date="{ }"> <template #date="{ }">
<a-form-item label="创建时间" :style="{ display: 'inline-block', width: 120 }"> <a-form-item label="创建时间" :style="{ display: 'inline-block', width: 120 }">
</a-form-item> </a-form-item>
@ -16,7 +23,7 @@
</a-col> </a-col>
<a-col :flex="$mk.config.ui.toolbarFlex"> <a-col :flex="$mk.config.ui.toolbarFlex">
<!-- 工具条 --> <!-- 工具条 -->
<mk-toolbar :isShowAdd="true" @toolbarClick="toolbarClick"></mk-toolbar> <mk-toolbar :isShowLog="false" :isShowSetting="false" :isShowAdd="true" @toolbarClick="toolbarClick"></mk-toolbar>
</a-col> </a-col>
</a-row> </a-row>
@ -54,10 +61,12 @@
<script> <script>
import BASE_URL from '@/services/Middle/transport/Maintenance/api.js'; import BASE_URL from '@/services/Middle/transport/Maintenance/api.js';
import ZkSelectSearch from '@/components/zk/zkSelectSearch.vue';
export default { export default {
name: 'OtherExpensesLogList', name: 'OtherExpensesLogList',
i18n: require('./i18n'), // 国际化 i18n: require('./i18n'), // 国际化
components: { ZkSelectSearch },
props: { props: {
pageMode: { pageMode: {
type: String, type: String,
@ -69,6 +78,21 @@ export default {
const listFieldName = 'OtherExpensesLog'; const listFieldName = 'OtherExpensesLog';
// 页面数据 // 页面数据
var pageData = { // 页面数据变量 var pageData = { // 页面数据变量
zkSelectSearch: {
Search: `${BASE_URL.BASE_URL}/Truck/v1/truck/search`,
zkSelectData: {
page: 1,
limit: 50,
order_bys: [
{
column: "create_time",
order: "desc"
},
],
},
zkSelectDataFieldName: 'Truck',
zkBackFieldNames: ['id', 'name', 'code', 'create_time'],
},
keyName: 'id', // 主键字段名 keyName: 'id', // 主键字段名
@ -110,17 +134,25 @@ export default {
//搜索区 //搜索区
searchFormData: { searchFormData: {
title: '', title: '',
truck_id: '',
desc: '', desc: '',
}, },
// 搜索区配置 // 搜索区配置
searchRules: [ searchRules: [
{ key: "title", mode: "like" }, { key: "title", mode: "like" },
{ key: "truck_id", mode: "like" },
{ key: "desc", mode: "like" } { key: "desc", mode: "like" }
], ],
//搜索区 //搜索区
searchFormItems: [ // 子项 searchFormItems: [ // 子项
{ field: 'title', title: '标题', span: 5, itemRender: { name: '$input', props: { placeholder: '请输入标题' } } }, // { field: 'title', title: '标题', span: 5, itemRender: { name: '$input', props: { placeholder: '请输入标题' } } },
{ field: 'desc', title: '描述', span: 5, itemRender: { name: '$input', props: { placeholder: '请输入描述' } } }, // { field: 'desc', title: '描述', span: 5, itemRender: { name: '$input', props: { placeholder: '请输入描述' } } },
{
field: 'truck_id',
title: '车辆',
span: 4,
slots: { default: 'truck_id' }
},
{ span: 8, slots: { default: 'date' } }, // 自定义列 { span: 8, slots: { default: 'date' } }, // 自定义列
{ {
align: 'right', span: 4, itemRender: { // 按钮列 align: 'right', span: 4, itemRender: { // 按钮列
@ -348,6 +380,12 @@ export default {
}, },
// 选择器改变
TruckhandleChange(value) {
this.$data.searchFormData.truck_id = value.id;
console.log("this.$data.searchFormData.truck_id:",this.$data.searchFormData.truck_id);
this.$refs.xGrid.commitProxy('query') // 提交搜索
}
}, },
// 监听属性 // 监听属性
watch: {} watch: {}

44
src/pages/Middle/transport/OilConsumption/OilConsumption/List.vue
View File

@ -5,6 +5,13 @@
<a-col :flex="$mk.config.ui.searchFlex"> <a-col :flex="$mk.config.ui.searchFlex">
<!-- 搜索区 --> <!-- 搜索区 -->
<vxe-form :data="searchFormData" :items="searchFormItems" titleColon @submit="onSearch"> <vxe-form :data="searchFormData" :items="searchFormItems" titleColon @submit="onSearch">
<template #truck_id="{ }">
<ZkSelectSearch :ListTitle="'请选择车辆'" :IsListShowCode="true" :ListUrl="zkSelectSearch.Search"
:ListUrlData="zkSelectSearch.zkSelectData"
:ListFieldName="zkSelectSearch.zkSelectDataFieldName"
:BackFieldNames="zkSelectSearch.zkBackFieldNames" @zkSelectSearch="TruckhandleChange">
</ZkSelectSearch>
</template>
<template #date="{}"> <template #date="{}">
<a-form-item label="创建时间" :style="{ display: 'inline-block', width: 120 }"> <a-form-item label="创建时间" :style="{ display: 'inline-block', width: 120 }">
</a-form-item> </a-form-item>
@ -16,7 +23,7 @@
</a-col> </a-col>
<a-col :flex="$mk.config.ui.toolbarFlex"> <a-col :flex="$mk.config.ui.toolbarFlex">
<!-- 工具条 --> <!-- 工具条 -->
<mk-toolbar :isShowAdd="true" @toolbarClick="toolbarClick"></mk-toolbar> <mk-toolbar :isShowLog="false" :isShowSetting="false" :isShowAdd="true" @toolbarClick="toolbarClick"></mk-toolbar>
</a-col> </a-col>
</a-row> </a-row>
@ -54,10 +61,12 @@
<script> <script>
import BASE_URL from '@/services/Middle/transport/OilConsumption/api.js'; import BASE_URL from '@/services/Middle/transport/OilConsumption/api.js';
import ZkSelectSearch from '@/components/zk/zkSelectSearch.vue';
export default { export default {
name: 'OilConsumptionList', name: 'OilConsumptionList',
i18n: require('./i18n'), // 国际化 i18n: require('./i18n'), // 国际化
components: { ZkSelectSearch },
props: { props: {
pageMode: { pageMode: {
type: String, type: String,
@ -69,6 +78,21 @@ export default {
const listFieldName = 'OilConsumption'; const listFieldName = 'OilConsumption';
// 页面数据 // 页面数据
var pageData = { // 页面数据变量 var pageData = { // 页面数据变量
zkSelectSearch: {
Search: `${BASE_URL.BASE_URL}/Truck/v1/truck/search`,
zkSelectData: {
page: 1,
limit: 50,
order_bys: [
{
column: "create_time",
order: "desc"
},
],
},
zkSelectDataFieldName: 'Truck',
zkBackFieldNames: ['id', 'name', 'code', 'create_time'],
},
keyName: 'id', // 主键字段名 keyName: 'id', // 主键字段名
@ -97,17 +121,25 @@ export default {
//搜索区 //搜索区
searchFormData: { searchFormData: {
title: '', title: '',
truck_id: '',
desc: '', desc: '',
}, },
// 搜索区配置 // 搜索区配置
searchRules: [ searchRules: [
{key: "title", mode: "like"}, {key: "title", mode: "like"},
{ key: "truck_id", mode: "like" },
{key: "desc", mode: "like"} {key: "desc", mode: "like"}
], ],
//搜索区 //搜索区
searchFormItems: [ // 子项 searchFormItems: [ // 子项
{field: 'title', title: '标题', span: 5, itemRender: {name: '$input', props: {placeholder: '请输入标题'}}}, // {field: 'title', title: '标题', span: 5, itemRender: {name: '$input', props: {placeholder: '请输入标题'}}},
{field: 'desc', title: '描述', span: 5, itemRender: {name: '$input', props: {placeholder: '请输入描述'}}}, // {field: 'desc', title: '描述', span: 5, itemRender: {name: '$input', props: {placeholder: '请输入描述'}}},
{
field: 'truck_id',
title: '车辆',
span: 4,
slots: { default: 'truck_id' }
},
{span: 8, slots: {default: 'date'}}, // 自定义列 {span: 8, slots: {default: 'date'}}, // 自定义列
{ {
align: 'right', span: 4, itemRender: { // 按钮列 align: 'right', span: 4, itemRender: { // 按钮列
@ -327,6 +359,12 @@ export default {
this.$refs.xGrid.commitProxy('query') // 提交搜索 this.$refs.xGrid.commitProxy('query') // 提交搜索
}, },
// 选择器改变
TruckhandleChange(value) {
this.$data.searchFormData.truck_id = value.id;
console.log("this.$data.searchFormData.truck_id:",this.$data.searchFormData.truck_id);
this.$refs.xGrid.commitProxy('query') // 提交搜索
}
}, },
// 监听属性 // 监听属性

8
src/pages/Middle/transport/SoilQualityMaterial/SoilQualityMaterial/Edit.vue
View File

@ -130,11 +130,11 @@ export default {
items: [ items: [
// =============================== 表单项 自动生成 Start =============================== // =============================== 表单项 自动生成 Start ===============================
{field:'',title:'',span:24,isTitle:true,Htitle:'土质物料信息',itemRender:{}},//分割线 {field:'',title:'',span:24,isTitle:true,Htitle:'土质物料信息',itemRender:{}},//分割线
{field: 'code', title: '编码', span: 12, itemRender: {name: '$input'}}, {field: 'code', title: '编码', span: 6, itemRender: {name: '$input'}},
{field: 'name', title: '品名', span: 12, itemRender: {name: '$input'}}, {field: 'name', title: '品名', span: 6, itemRender: {name: '$input'}},
{field: 'image', title: '图片', span: 24, itemRender: {name: 'MkFormCropper', props: {}}}, {field: 'image', title: '图片', span: 24, itemRender: {name: 'MkFormCropper', props: {}}},
{field: 'description', title: '描述', span: 24, itemRender: {name: '$input'}}, {field: 'description', title: '描述', span: 24, itemRender: {name: '$textarea'}},
{field: 'remark', title: '备注', span: 24, itemRender: {name: '$input'}}, {field: 'remark', title: '备注', span: 24, itemRender: {name: '$textarea'}},
// =============================== 表单项 自动生成 End =============================== // =============================== 表单项 自动生成 End ===============================

2
src/pages/Middle/transport/SoilQualityMaterial/SoilQualityMaterial/List.vue
View File

@ -16,7 +16,7 @@
</a-col> </a-col>
<a-col :flex="$mk.config.ui.toolbarFlex"> <a-col :flex="$mk.config.ui.toolbarFlex">
<!-- 工具条 --> <!-- 工具条 -->
<mk-toolbar :isShowAdd="true" @toolbarClick="toolbarClick"></mk-toolbar> <mk-toolbar :isShowLog="false" :isShowSetting="false" :isShowAdd="true" @toolbarClick="toolbarClick"></mk-toolbar>
</a-col> </a-col>
</a-row> </a-row>

2
src/pages/Middle/transport/SoilQualityMaterial/SoilQualityMaterialAlias/List.vue
View File

@ -16,7 +16,7 @@
</a-col> </a-col>
<a-col :flex="$mk.config.ui.toolbarFlex"> <a-col :flex="$mk.config.ui.toolbarFlex">
<!-- 工具条 --> <!-- 工具条 -->
<mk-toolbar :isShowAdd="true" @toolbarClick="toolbarClick"></mk-toolbar> <mk-toolbar :isShowLog="false" :isShowSetting="false" :isShowAdd="true" @toolbarClick="toolbarClick"></mk-toolbar>
</a-col> </a-col>
</a-row> </a-row>

45
src/pages/Middle/transport/Tire/Tire/List.vue
View File

@ -5,6 +5,13 @@
<a-col :flex="$mk.config.ui.searchFlex"> <a-col :flex="$mk.config.ui.searchFlex">
<!-- 搜索区 --> <!-- 搜索区 -->
<vxe-form :data="searchFormData" :items="searchFormItems" titleColon @submit="onSearch"> <vxe-form :data="searchFormData" :items="searchFormItems" titleColon @submit="onSearch">
<template #truck_id="{ }">
<ZkSelectSearch :ListTitle="'请选择车辆'" :IsListShowCode="true" :ListUrl="zkSelectSearch.Search"
:ListUrlData="zkSelectSearch.zkSelectData"
:ListFieldName="zkSelectSearch.zkSelectDataFieldName"
:BackFieldNames="zkSelectSearch.zkBackFieldNames" @zkSelectSearch="TruckhandleChange">
</ZkSelectSearch>
</template>
<template #date="{}"> <template #date="{}">
<a-form-item label="创建时间" :style="{ display: 'inline-block', width: 120 }"> <a-form-item label="创建时间" :style="{ display: 'inline-block', width: 120 }">
</a-form-item> </a-form-item>
@ -16,7 +23,7 @@
</a-col> </a-col>
<a-col :flex="$mk.config.ui.toolbarFlex"> <a-col :flex="$mk.config.ui.toolbarFlex">
<!-- 工具条 --> <!-- 工具条 -->
<mk-toolbar :isShowAdd="true" @toolbarClick="toolbarClick"></mk-toolbar> <mk-toolbar :isShowLog="false" :isShowSetting="false" :isShowAdd="true" @toolbarClick="toolbarClick"></mk-toolbar>
</a-col> </a-col>
</a-row> </a-row>
@ -56,10 +63,11 @@
<script> <script>
import BASE_URL from '@/services/Middle/transport/Tire/api.js'; import BASE_URL from '@/services/Middle/transport/Tire/api.js';
import ZkSelectSearch from '@/components/zk/zkSelectSearch.vue';
export default { export default {
name: 'TireList', name: 'TireList',
i18n: require('./i18n'), // 国际化 i18n: require('./i18n'), // 国际化
components: { ZkSelectSearch },
props: { props: {
pageMode: { pageMode: {
type: String, type: String,
@ -71,6 +79,21 @@ export default {
const listFieldName = 'Tire'; const listFieldName = 'Tire';
// 页面数据 // 页面数据
var pageData = { // 页面数据变量 var pageData = { // 页面数据变量
zkSelectSearch: {
Search: `${BASE_URL.BASE_URL}/Truck/v1/truck/search`,
zkSelectData: {
page: 1,
limit: 50,
order_bys: [
{
column: "create_time",
order: "desc"
},
],
},
zkSelectDataFieldName: 'Truck',
zkBackFieldNames: ['id', 'name', 'code', 'create_time'],
},
keyName: 'id', // 主键字段名 keyName: 'id', // 主键字段名
@ -101,16 +124,24 @@ export default {
searchFormData: { searchFormData: {
title: '', title: '',
desc: '', desc: '',
truck_id: '',
}, },
// 搜索区配置 // 搜索区配置
searchRules: [ searchRules: [
{key: "title", mode: "like"}, {key: "title", mode: "like"},
{ key: "truck_id", mode: "like" },
{key: "desc", mode: "like"} {key: "desc", mode: "like"}
], ],
//搜索区 //搜索区
searchFormItems: [ // 子项 searchFormItems: [ // 子项
{field: 'title', title: '标题', span: 5, itemRender: {name: '$input', props: {placeholder: '请输入标题'}}}, // {field: 'title', title: '标题', span: 5, itemRender: {name: '$input', props: {placeholder: '请输入标题'}}},
{field: 'desc', title: '描述', span: 5, itemRender: {name: '$input', props: {placeholder: '请输入描述'}}}, // {field: 'desc', title: '描述', span: 5, itemRender: {name: '$input', props: {placeholder: '请输入描述'}}},
{
field: 'truck_id',
title: '车辆',
span: 4,
slots: { default: 'truck_id' }
},
{span: 8, slots: {default: 'date'}}, // 自定义列 {span: 8, slots: {default: 'date'}}, // 自定义列
{ {
align: 'right', span: 4, itemRender: { // 按钮列 align: 'right', span: 4, itemRender: { // 按钮列
@ -347,6 +378,12 @@ export default {
this.$refs.xGrid.commitProxy('query') // 提交搜索 this.$refs.xGrid.commitProxy('query') // 提交搜索
}, },
// 选择器改变
TruckhandleChange(value) {
this.$data.searchFormData.truck_id = value.id;
console.log("this.$data.searchFormData.truck_id:",this.$data.searchFormData.truck_id);
this.$refs.xGrid.commitProxy('query') // 提交搜索
}
}, },
// 监听属性 // 监听属性

106
src/pages/Middle/transport/TrainNumber/TrainNumber/List.vue
View File

@ -5,6 +5,22 @@
<a-col :flex="$mk.config.ui.searchFlex"> <a-col :flex="$mk.config.ui.searchFlex">
<!-- 搜索区 --> <!-- 搜索区 -->
<vxe-form :data="searchFormData" :items="searchFormItems" titleColon @submit="onSearch"> <vxe-form :data="searchFormData" :items="searchFormItems" titleColon @submit="onSearch">
<template #truck_id="{ }">
<ZkSelectSearch :ListTitle="'请选择车辆'" :IsListShowCode="true" :ListUrl="zkSelectSearch.Search"
:ListUrlData="zkSelectSearch.zkSelectData"
:ListFieldName="zkSelectSearch.zkSelectDataFieldName"
:BackFieldNames="zkSelectSearch.zkBackFieldNames" @zkSelectSearch="TruckhandleChange">
</ZkSelectSearch>
</template>
<template #driver_id="{ }">
<ZkSelectSearch :ListTitle="'请选择司机'" :IsListShowCode="true" :ListUrl="zkSelectSearch2.Search"
:ListUrlData="zkSelectSearch2.zkSelectData"
:ListFieldName="zkSelectSearch2.zkSelectDataFieldName"
:BackFieldNames="zkSelectSearch2.zkBackFieldNames" @zkSelectSearch="StaffhandleChange">
</ZkSelectSearch>
</template>
<template #date="{ }"> <template #date="{ }">
<a-form-item label="创建时间" :style="{ display: 'inline-block', width: 120 }"> <a-form-item label="创建时间" :style="{ display: 'inline-block', width: 120 }">
</a-form-item> </a-form-item>
@ -12,11 +28,12 @@
<a-range-picker @change="onDateChange" /> <a-range-picker @change="onDateChange" />
</a-form-item> </a-form-item>
</template> </template>
</vxe-form> </vxe-form>
</a-col> </a-col>
<a-col :flex="$mk.config.ui.toolbarFlex"> <a-col :flex="$mk.config.ui.toolbarFlex">
<!-- 工具条 --> <!-- 工具条 -->
<mk-toolbar :isShowAdd="true" @toolbarClick="toolbarClick"></mk-toolbar> <mk-toolbar :isShowLog="false" :isShowSetting="false" :isShowAdd="true" @toolbarClick="toolbarClick"></mk-toolbar>
</a-col> </a-col>
</a-row> </a-row>
@ -77,7 +94,7 @@
<template #op="{ row }"> <template #op="{ row }">
<div class="oplinks"> <div class="oplinks">
<a @click.stop="pageDetail(row)" title="详情"> <a @click.stop="pageDetail(row)" title="详情">
<a-icon type="file"/> <a-icon type="file" />
</a> </a>
<a @click.stop="pageEdit(row)" title="编辑"> <a @click.stop="pageEdit(row)" title="编辑">
<a-icon type="edit" /> <a-icon type="edit" />
@ -97,10 +114,11 @@
<script> <script>
import BASE_URL from '@/services/Middle/transport/TrainNumber/api.js'; import BASE_URL from '@/services/Middle/transport/TrainNumber/api.js';
import ZkSelectSearch from '@/components/zk/zkSelectSearch.vue';
export default { export default {
name: 'TrainNumberList', name: 'TrainNumberList',
i18n: require('./i18n'), // 国际化 i18n: require('./i18n'), // 国际化
components: { ZkSelectSearch },
props: { props: {
pageMode: { pageMode: {
type: String, type: String,
@ -113,6 +131,41 @@ export default {
// 页面数据 // 页面数据
var pageData = { // 页面数据变量 var pageData = { // 页面数据变量
zkSelectSearch: {
Search: `${BASE_URL.BASE_URL}/Truck/v1/truck/search`,
zkSelectData: {
page: 1,
limit: 50,
order_bys: [
{
column: "create_time",
order: "desc"
},
],
},
zkSelectDataFieldName: 'Truck',
zkBackFieldNames: ['id', 'name', 'code', 'create_time'],
},
zkSelectSearch2: {
Search: `${BASE_URL.BASE_URL}/MesStaff/v1/mes/staff/list`,
zkSelectData: {
page: 1,
limit: 50,
order_bys: [
{
column: "create_time",
order: "desc"
},
],
},
zkSelectDataFieldName: 'MesStaff',
zkBackFieldNames: ['id', 'name', 'code', 'create_time'],
},
keyName: 'id', // 主键字段名 keyName: 'id', // 主键字段名
@ -136,26 +189,39 @@ export default {
//搜索区 //搜索区
searchFormData: { searchFormData: {
title: '', code: '',
desc: '', truck_id: '',
driver_id: '',
}, },
// 搜索区配置 // 搜索区配置
searchRules: [ searchRules: [
{ key: "title", mode: "like" }, { key: "code", mode: "like" },
{ key: "desc", mode: "like" } { key: "truck_id", mode: "like" },
{ key: "driver_id", mode: "like" }
], ],
//搜索区 //搜索区
searchFormItems: [ // 子项 searchFormItems: [ // 子项
{ {
field: 'code', field: 'code',
title: '车次单号', title: '车次单号',
span: 5, span: 4,
itemRender: { name: '$input', props: { placeholder: '请输入车次单号' } } itemRender: { name: '$input', props: { placeholder: '请输入车次单号' } }
}, },
// {field: 'desc', title: '描述', span: 5, itemRender: {name: '$input', props: {placeholder: '请输入描述'}}}, {
field: 'truck_id',
title: '车辆',
span: 4,
slots: { default: 'truck_id' }
},
{
field: 'driver_id',
title: '司机',
span: 4,
slots: { default: 'driver_id' }
},
{ span: 8, slots: { default: 'date' } }, // 自定义列 { span: 8, slots: { default: 'date' } }, // 自定义列
{ {
align: 'right', span: 4, itemRender: { // 按钮列 align: 'left', span: 4, itemRender: { // 按钮列
name: '$buttons', children: [{ props: { type: 'submit', content: '搜索', status: 'primary' } }, // 搜索按钮 name: '$buttons', children: [{ props: { type: 'submit', content: '搜索', status: 'primary' } }, // 搜索按钮
{ props: { type: 'reset', content: '重置' } }] { props: { type: 'reset', content: '重置' } }]
} }
@ -275,7 +341,7 @@ export default {
// =============================== 表格列 自动生成 Start =============================== // =============================== 表格列 自动生成 Start ===============================
{title: '操作', slots: {default: 'op'}, width: 150, fixed: 'right'} { title: '操作', slots: { default: 'op' }, width: 150, fixed: 'right' }
] ]
} }
@ -374,8 +440,8 @@ export default {
this.$openPage("/TrainNumber/TrainNumberCreate"); // 打开页面 this.$openPage("/TrainNumber/TrainNumberCreate"); // 打开页面
} }
}, },
// 详情 // 详情
pageDetail(row) { pageDetail(row) {
if (!row) { // 如果没有选中行 if (!row) { // 如果没有选中行
this.$mk.msg("请选择行"); // 提示 this.$mk.msg("请选择行"); // 提示
return; // 返回 return; // 返回
@ -428,7 +494,21 @@ export default {
this.$refs.xGrid.commitProxy('query') // 提交搜索 this.$refs.xGrid.commitProxy('query') // 提交搜索
}, },
// 选择器改变
StaffhandleChange(value) {
this.$data.searchFormData.driver_id = value.id;
console.log("this.$data.searchFormData.driver_id:",this.$data.searchFormData.driver_id);
this.$refs.xGrid.commitProxy('query') // 提交搜索
},
// 选择器改变
TruckhandleChange(value) {
this.$data.searchFormData.truck_id = value.id;
console.log("this.$data.searchFormData.truck_id:",this.$data.searchFormData.truck_id);
this.$refs.xGrid.commitProxy('query') // 提交搜索
}
}, },
// 监听属性 // 监听属性
watch: {} watch: {}