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

Merge branch 'main' of https://git.positivepole.cn/Mes/middle-admin-ant

This commit is contained in:
zxx 2024-05-24 10:27:48 +08:00
parent 0fd0f0644a e997587d3d
commit 7b2bbb9083
16 changed files with 253 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/application/mk/libs/function/form.js
View File

@ -77,7 +77,8 @@ export default {
if (!value) {
data[saveField] = null;
}else{
data[saveField] = parseInt(new Date(value).getTime() / 1000); // 转换为时间戳
let date = value.replace('-','.')
data[saveField] = parseInt(new Date(date).getTime() / 1000); // 转换为时间戳
}
}
else if (rule.dataRule.type == "string") { // 如果是字符串

2
src/components/page/header/PageHeader.vue
View File

@ -1,5 +1,5 @@
<template>
<div :class="['page-header', layout, pageWidth]">
<div :class="['page-header', layout, pageWidth]" v-if="false">
<div class="page-header-wide">
<div class="breadcrumb">
<a-breadcrumb>

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

@ -7,6 +7,7 @@
:default-active-first-option="false"
:show-arrow="false"
:filter-option="false"
:allowClear ="true"
:not-found-content="null"
@search="handleSearch"
@change="handleChange"
@ -88,6 +89,9 @@ export default {
});
},
reset(){
this.value = undefined;
}
},
};
</script>

194
src/pages/Middle/transport/Custom/Custom/Detail.vue
View File

@ -48,10 +48,10 @@
{{ data.remark }}
</a-descriptions-item>
</a-descriptions>
<div class="amount">
<h2>
<div class="amount" style="margin-bottom: 20px;">
<h3>
修改结余
</h2>
</h3>
<li>
<span>操作金额：</span>
<a-input id="inputNumber" style="width: 200px;margin-right: 10px;" prefix="￥" suffix="RMB" v-model="amount"
@ -80,7 +80,35 @@
</div>
</li>
</div>
<div class="tablebox">
<h3>别名管理</h3>
<vxe-table border show-overflow keep-source ref="xTable" :data="soilQualityMaterialAliasList"
@pulldownSelected="onPulldownSelected" @popupSelected="onPopupSelected"
:edit-config="{ trigger: 'click', mode: 'cell', icon: 'vxe-icon-edit', showStatus: false }"
>
<vxe-column width="60">
<template #default="{ row }">
<div style="font-size: 18px;">
<a @click.stop="pageAdd(row)" title="新增" style="margin-right: 5px;">
<a-icon type="plus-circle" />
</a>
<a @click.stop="pageDelete(row)" title="删除">
<a-icon type="delete" />
</a>
</div>
</template>
</vxe-column>
<vxe-column type="seq" width="60"></vxe-column>
<vxe-column field="soil_quality_material" title="物料" :params="editorSoilQualityMaterial" formatter="formatRef" :edit-render="{ name: 'MkGridDataSelector' }"></vxe-column>
<vxe-column field="name" title="别名" :edit-render="{ name: '$input'}"></vxe-column>
<vxe-column field="price" title="单价" :edit-render="{ name: '$input',props: { type: 'number' } }"></vxe-column>
<!-- <vxe-column field="remark" title="备注" :edit-render="{ name: '$input' }"></vxe-column> -->
</vxe-table>
<div class="btns">
<a-button class="btn-add-balance" type="primary" @click="saveSoil">保存</a-button>
</div>
</div>
<a-tabs default-active-key="1" size="large">
<a-tab-pane key="1" tab="销售记录">
<!-- 搜索区 -->
@ -153,6 +181,23 @@ export default {
BalanceLogDelete: `${BASE_URL.BASE_URL}/Custom/v1/balance/log/detele`, // 删除客户结余日志
BalanceLogBatchDelete: `${BASE_URL.BASE_URL}/Custom/v1/balance/log/batchDelete`, // 批量删除客户结余日志
getTradeLIst:`${BASE_URL.BASE_URL}/Custom/v1/custom/trade/list`,
actions: {
SoilQualityMaterialAliasList: `${BASE_URL.BASE_URL}/SoilQualityMaterial/v1/soil/quality/material/alias/list`, // 土质物料别名列表
SoilQualityMaterialAliasBatchHandle: `${BASE_URL.BASE_URL}/SoilQualityMaterial/v1/soil/quality/material/alias/batchHandle`, // 批量处理土质物料别名
},
editorSoilQualityMaterial: {
name: "SoilQualityMaterial",
modelName: "SoilQualityMaterial",
listdataFieldName:'SoilQualityMaterial',
columns: [
{ field: 'name', title: '名称' },
{ field: 'code', title: '编号' }
],
placeholder: "请输入名称或者编号",
searchFieldNames: ['name', 'code'],
textField: 'name',
dataUrl: `${BASE_URL.BASE_URL}/SoilQualityMaterial/v1/soil/quality/material/list`
},
zkSelectData: {
page: 1,
end_time: 0,
@ -212,7 +257,7 @@ export default {
],
//数据区
gridOptions: { // 表格配置
height: '100%', // 表格高度 100% 会自动撑满父容器
height: '400', // 表格高度 100% 会自动撑满父容器
stripe: true, // 启用斑马纹
id: 'datagrid_1', // 表格唯一标识
@ -310,7 +355,8 @@ export default {
align: 'center',
}, // 利润
]
}
},
soilQualityMaterialAliasList: [],
}
pageData.gridOptions = Object.assign({}, this.$mk.config.defaults.gridOptions, pageData.gridOptions); // 合并表格数据
return pageData;
@ -346,6 +392,7 @@ export default {
},
methods: {
initDetailData() {
let that = this;
console.log("this.pageOptions.FieldName:", this.pageOptions.FieldName)
console.log("this.pageOptions.ApiUrl:", this.pageOptions.ApiUrl);
console.log("this.pageOptions.ApiData:", this.pageOptions.ApiData);
@ -372,6 +419,49 @@ export default {
}).catch((a) => {
this.$mk.error(a.msg, "aaa");
});
this.$mk.post({
url: this.actions.SoilQualityMaterialAliasList,
data: {
"search_rules": [
{
"column": "customer_id",
"mode": "=",
"value":this.dataId
}
],
"page": 1,
"limit": 20,
"end_time": 0,
"order_bys": [
],
"start_time": 0
}
}).then(res=>{
console.log(res)
if(res.data.SoilQualityMaterialAlias == null){
that.soilQualityMaterialAliasList =[{
id:null,
soil_quality_material:null,
customer_id:'',
name:'',
price:'',
remark:'',
}]
}else{
res.data.SoilQualityMaterialAlias.forEach(item => {
item.soil_quality_material = [item.soil_quality_material_id,item.soil_quality_material_name]
that.soilQualityMaterialAliasList.push({
id:item.id,
soil_quality_material:item.soil_quality_material,
customer_id:item.customer_id,
name:item.name,
price:item.price,
remark:item.remark,
})
})
}
})
},
addBalance() {
this.addBalanceApi();
@ -426,6 +516,71 @@ export default {
params.start_time = this.start_time; // 开始时间
params.end_time = this.end_time; // 结束时间
return this.$mk.getPagedData({url: this.getTradeLIst, data: params}); // 获取分页数据
},
// 新增
pageAdd(row) {
const $table = this.$refs['xTable']
const record = {
id:null,
soil_quality_material:null,
customer_id:'',
name:'',
price:'',
remark:'',
}
if (row) {
this.soilQualityMaterialAliasList.splice($table.getRowSeq(row), 0, record);
} else {
this.soilQualityMaterialAliasList.push(record)
}
},
pageDelete(row) {
const $table = this.$refs['xTable']
if (this.soilQualityMaterialAliasList.length == 1) {
this.$mk.error("至少保留一行");
return;
}
if (row.id) {
this.deleteList.push({
Status: 'deleted',
id: row.id,
soil_quality_material_id:this.getDataId()
})
}
this.soilQualityMaterialAliasList.splice($table.getRowSeq(row) - 1, 1);
},
onPulldownSelected({ row, name, params }) {
if (name == 'SoilQualityMaterialAlias') {
this.updateToGrid(row, this.soilQualityMaterialAliasList[params.$rowIndex]);
return;
}
setTimeout(() => {
this.$refs.xTable.clearEdit();
}, 50);
},
onPopupSelected({ rows, name, params }) {
console.log(rows, name, params);
for (let i = params.$rowIndex, ri = 0; i < params.$rowIndex + rows.length; i++, ri++) {
if (i == this.detailsData.length) {
let newrow = {};
this.detailsData.push(newrow);
}
let inv = rows[ri];
this.updateToGrid(inv, this.detailsData[i]);
}
setTimeout(() => {
this.$refs.xTable.clearEdit();
}, 50);
},
updateToGrid(inv, row) {
var updateRow = {
};
updateRow.soil_quality_material_id =inv.SoilQualityMaterialAlias[0];
updateRow.soil_quality_material_name =inv.SoilQualityMaterialAlias[1];
Object.assign(row, updateRow);
},
addBalanceApi() {
// 转换 this.amount 为数字
@ -533,6 +688,31 @@ export default {
},
confirm() {
console.log('confirm');
},
saveSoil(){
let insertList = [];
let updateList = [];
let deleteList = this.deleteList;
this.soilQualityMaterialAliasList.forEach(item => {
item.customer_id = this.dataId;
item.price = Number(item.price);
item.soil_quality_material_id = this.$mk.toBigInt(item.soil_quality_material[0]);
if(item.id){
updateList.push(item)
}else if(item.soil_quality_material_id){
insertList.push(item)
}
})
this.$mk.post({
url: this.actions.SoilQualityMaterialAliasBatchHandle,
data: {insertList,updateList,deleteList},
useBigInt: true,
}).then(() => {
this.$mk.success("保存成功"); // 成功回调
}).catch((a) => { // 失败回调
this.$mk.error(a.data.msg); // 显示错误信息
});
}
},
@ -549,8 +729,6 @@ export default {
margin-top: 10px;
.btn-add-balance {}
.btn-reduce-balance {
margin-left: 10px;
}

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

@ -117,7 +117,7 @@ export default {
{field: 'code', title: '编码', span: 2, 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: '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'}}, // 自定义列
{
align: 'right', span: 4, itemRender: { // 按钮列

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

@ -4,10 +4,10 @@
<a-row type="flex">
<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" @reset="onReset">
<template #driver_id="{ }">
<ZkSelectSearch :ListTitle="'请选择司机'" :IsListShowCode="true" :ListUrl="zkSelectSearch2.Search"
<ZkSelectSearch ref="refTruck" :ListTitle="'请选择司机'" :IsListShowCode="true" :ListUrl="zkSelectSearch2.Search"
:ListUrlData="zkSelectSearch2.zkSelectData"
:ListFieldName="zkSelectSearch2.zkSelectDataFieldName"
:BackFieldNames="zkSelectSearch2.zkBackFieldNames" @zkSelectSearch="StaffhandleChange">
@ -422,7 +422,11 @@ export default {
onSearch() {
this.$refs.xGrid.commitProxy('query') // 提交搜索
},
onReset() {
this.searchFormData = {}; // 清空搜索表单数据
this.$refs['refTruck'].reset();
this.$refs.xGrid.commitProxy('query') // 提交搜索
},
// 发放工资
grant(row){
console.log("row",row);

3
src/pages/Middle/transport/DriverWages/DriverWages/Total.vue
View File

@ -27,6 +27,8 @@
<mk-toolbar :isShowLog="false" :isShowSetting="false" :isShowAdd="false" @toolbarClick="toolbarClick"></mk-toolbar>
</a-col>
</a-row>
<vxe-toolbar ref="xToolbar" custom export>
</vxe-toolbar>
<!-- 表格区 -->
<div class="gridPanel">
<vxe-grid ref='xGrid' :export-config="{}" v-bind="gridOptions">
@ -159,7 +161,6 @@
align: 'right', span: 6, itemRender: { // 按钮列
name: '$buttons', children: [{ props: { type: 'submit', content: '搜索', status: 'primary' } }, // 搜索按钮
{ props: { type: 'reset', content: '重置' } },
{ props: { type: 'reset', content: '打印' } }
]
}
}

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

@ -4,9 +4,9 @@
<a-row type="flex">
<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" @reset="onReset">
<template #truck_id="{ }">
<ZkSelectSearch :ListTitle="'请选择车辆'" :IsListShowCode="true" :ListUrl="zkSelectSearch.Search"
<ZkSelectSearch ref="refTruck" :ListTitle="'请选择车辆'" :IsListShowCode="true" :ListUrl="zkSelectSearch.Search"
:ListUrlData="zkSelectSearch.zkSelectData"
:ListFieldName="zkSelectSearch.zkSelectDataFieldName"
:BackFieldNames="zkSelectSearch.zkBackFieldNames" @zkSelectSearch="TruckhandleChange">
@ -395,6 +395,11 @@ export default {
onSearch() {
this.$refs.xGrid.commitProxy('query') // 提交搜索
},
onReset() {
this.searchFormData = {}; // 清空搜索表单数据
this.$refs['refTruck'].reset();
this.$refs.xGrid.commitProxy('query') // 提交搜索
},
// 选择器改变
TruckhandleChange(value) {

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

@ -4,9 +4,9 @@
<a-row type="flex">
<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" @reset="onReset">
<template #truck_id="{ }">
<ZkSelectSearch :ListTitle="'请选择车辆'" :IsListShowCode="true" :ListUrl="zkSelectSearch.Search"
<ZkSelectSearch ref="refTruck" :ListTitle="'请选择车辆'" :IsListShowCode="true" :ListUrl="zkSelectSearch.Search"
:ListUrlData="zkSelectSearch.zkSelectData"
:ListFieldName="zkSelectSearch.zkSelectDataFieldName"
:BackFieldNames="zkSelectSearch.zkBackFieldNames" @zkSelectSearch="TruckhandleChange">
@ -383,7 +383,11 @@ export default {
onSearch() {
this.$refs.xGrid.commitProxy('query') // 提交搜索
},
onReset() {
this.searchFormData = {}; // 清空搜索表单数据
this.$refs['refTruck'].reset();
this.$refs.xGrid.commitProxy('query') // 提交搜索
},
// 选择器改变
TruckhandleChange(value) {

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

@ -4,9 +4,9 @@
<a-row type="flex">
<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" @reset="onReset">
<template #truck_id="{ }">
<ZkSelectSearch :ListTitle="'请选择车辆'" :IsListShowCode="true" :ListUrl="zkSelectSearch.Search"
<ZkSelectSearch ref="refTruck" :ListTitle="'请选择车辆'" :IsListShowCode="true" :ListUrl="zkSelectSearch.Search"
:ListUrlData="zkSelectSearch.zkSelectData"
:ListFieldName="zkSelectSearch.zkSelectDataFieldName"
:BackFieldNames="zkSelectSearch.zkBackFieldNames" @zkSelectSearch="TruckhandleChange">
@ -363,6 +363,11 @@ export default {
onSearch() {
this.$refs.xGrid.commitProxy('query') // 提交搜索
},
onReset() {
this.searchFormData = {}; // 清空搜索表单数据
this.$refs['refTruck'].reset();
this.$refs.xGrid.commitProxy('query') // 提交搜索
},
// 选择器改变
TruckhandleChange(value) {

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

@ -41,7 +41,7 @@
<vxe-column type="seq" width="60"></vxe-column>
<vxe-column field="customer" title="客户" :params="editorCustomer" formatter="formatRef" :edit-render="{ name: 'MkGridDataSelector' }"></vxe-column>
<vxe-column field="name" title="别名" :edit-render="{ name: '$input'}"></vxe-column>
<vxe-column field="price" title="单价" :edit-render="{ name: '$input',props: { type: 'number' } }"></vxe-column>
<vxe-column field="price" title="单价" :edit-render="{ name: '$input',props: { type: 'number'}}"></vxe-column>
<!-- <vxe-column field="remark" title="备注" :edit-render="{ name: '$input' }"></vxe-column> -->
</vxe-table>
@ -392,6 +392,9 @@ export default {
return
}
},
handleInput(e){
console.log(e)
},
// 保存
ok() {
let save = () => {

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

@ -4,9 +4,9 @@
<a-row type="flex">
<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" @reset="onReset">
<template #truck_id="{ }">
<ZkSelectSearch :ListTitle="'请选择车辆'" :IsListShowCode="true" :ListUrl="zkSelectSearch.Search"
<ZkSelectSearch ref="refTruck" :ListTitle="'请选择车辆'" :IsListShowCode="true" :ListUrl="zkSelectSearch.Search"
:ListUrlData="zkSelectSearch.zkSelectData"
:ListFieldName="zkSelectSearch.zkSelectDataFieldName"
:BackFieldNames="zkSelectSearch.zkBackFieldNames" @zkSelectSearch="TruckhandleChange">
@ -418,7 +418,11 @@ export default {
onSearch() {
this.$refs.xGrid.commitProxy('query') // 提交搜索
},
onReset() {
this.searchFormData = {}; // 清空搜索表单数据
this.$refs['refTruck'].reset();
this.$refs.xGrid.commitProxy('query') // 提交搜索
},
// 选择器改变
TruckhandleChange(value) {
this.$data.searchFormData.truck_id = value.id;

2
src/pages/Middle/transport/TrainNumber/TrainNumber/Edit.vue
View File

@ -1118,7 +1118,7 @@ export default {
ok() {
let save = () => {
console.log(this.formOptions.data.return_date)
// this.formOptions.data.outsourcing_driver_phone转换为字符串
this.formOptions.data.outsourcing_driver_phone = String(this.formOptions.data.outsourcing_driver_phone)
// 将日期2018-01-01 转换为时间戵

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

@ -4,16 +4,16 @@
<a-row type="flex">
<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" @reset="onReset">
<template #truck_id="{ }">
<ZkSelectSearch :ListTitle="'请选择车辆'" :IsListShowCode="true" :ListUrl="zkSelectSearch.Search"
<ZkSelectSearch ref="refTruck" :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"
<ZkSelectSearch ref="refDriver" :ListTitle="'请选择司机'" :IsListShowCode="true" :ListUrl="zkSelectSearch2.Search"
:ListUrlData="zkSelectSearch2.zkSelectData"
:ListFieldName="zkSelectSearch2.zkSelectDataFieldName"
:BackFieldNames="zkSelectSearch2.zkBackFieldNames" @zkSelectSearch="StaffhandleChange">
@ -507,20 +507,22 @@ export default {
onSearch() {
this.$refs.xGrid.commitProxy('query') // 提交搜索
},
onReset() {
this.searchFormData = {}; // 清空搜索表单数据
this.$refs['refTruck'].reset();
this.$refs['refDriver'].reset();
this.$refs.xGrid.commitProxy('query') // 提交搜索
},
// 选择器改变
StaffhandleChange(value) {
console.log(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') // 提交搜索
}
},

14
src/pages/Middle/transport/Truck/Truck/TrainNumberList.vue
View File

@ -2,7 +2,7 @@
<div>
<vxe-form :data="searchFormData" :items="searchFormItems" titleColon @submit="onSearch" @reset="onReset">
<template #driver_id="{ }">
<ZkSelectSearch :ListTitle="'请选择司机'" :IsListShowCode="true"
<ZkSelectSearch :ListTitle="'请选择司机'" ref="refTruck" :IsListShowCode="true"
:ListUrl="zkSelectSearch2.Search"
:ListUrlData="zkSelectSearch2.zkSelectData"
:ListFieldName="zkSelectSearch2.zkSelectDataFieldName"
@ -419,15 +419,11 @@ export default {
// console.log(this.$refs.xGrid)
// this.$refs.xGrid.commitProxy('query') // 提交搜索
},
onReset(){
this.start_time = null;
this.end_time = null;
this.searchFormData = {
code: '',
driver_id:'',
}
onReset() {
this.searchFormData = {}; // 清空搜索表单数据
this.$refs['refTruck'].reset();
this.initListData();
}
},
}
}

3
src/pages/Middle/transport/Truck/Truck/zkTableList.vue
View File

@ -19,13 +19,14 @@
</template>
<!-- 表单区操作 -->
<template #operate_item>
<a-button type="primary" status="primary">查询</a-button>
<a-button type="primary" status="primary" @click="initListData">搜索</a-button>
<a-button
@click="() => {
gridOptions.formConfig.data.name = '';
gridOptions.formConfig.data.code = '';
gridOptions.formConfig.data.create_time = 0;
gridOptions.formConfig.data.end_time = 0;
initListData()
}"
>重置
</a-button>