Skip to content

W
weiqiao-vue
Commit a3067df6 by 金民
Options

Merge remote-tracking branch 'origin/hongshun' into hongshun

parents 0cc7187d ca063ce4
Showing with 56 additions and 72 deletions
xjrsoft-vue3/src/api/chaiche/ccbg/model/CcbgModel.ts
...@@ -4,25 +4,25 @@ import { BasicPageParams, BasicFetchResult } from '/@/api/model/baseModel'; ...@@ -4,25 +4,25 @@ import { BasicPageParams, BasicFetchResult } from '/@/api/model/baseModel';
* @description: MesCheliangBg分页参数 模型 * @description: MesCheliangBg分页参数 模型
*/ */
export interface MesCheliangBgPageParams extends BasicPageParams { export interface MesCheliangBgPageParams extends BasicPageParams {
banzu: string;
cphm: string; cphm: string;
clys: string; clys: string;
gzjssj: string;
gzr: string; gzr: string;
gzkssj: string;
cllx: string; cllx: string;
wlzt: string; clls: string;
gzxm: string; gzxm: string;
clppxh: string; gzjssj: string;
gzkssj: string; wlzt: string;
clppxh: string;
} }
/** /**
...@@ -56,8 +56,6 @@ export interface MesCheliangBgPageModel { ...@@ -56,8 +56,6 @@ export interface MesCheliangBgPageModel {
gzsc: string; gzsc: string;
wlzt: string; wlzt: string;
banzu: string;
} }
/** /**
......
xjrsoft-vue3/src/views/chaiche/ccbg/components/CcbgModal.vue
...@@ -135,3 +135,4 @@ ...@@ -135,3 +135,4 @@
</script> </script>
\ No newline at end of file
xjrsoft-vue3/src/views/chaiche/ccbg/components/workflowPermission.ts
...@@ -23,22 +23,6 @@ export const permissionList = [ ...@@ -23,22 +23,6 @@ export const permissionList = [
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '班组',
fieldId: 'banzu',
isSubTable: false,
showChildren: true,
type: 'radio',
key: 'fdb254d1c2dc4370a1905ffd85148370',
children: [],
options: {},
},
{
required: false,
view: true,
edit: true,
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '车牌号码', fieldName: '车牌号码',
fieldId: 'cphm', fieldId: 'cphm',
isSubTable: false, isSubTable: false,
...@@ -72,12 +56,12 @@ export const permissionList = [ ...@@ -72,12 +56,12 @@ export const permissionList = [
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '工作结束时间', fieldName: '工作人',
fieldId: 'gzjssj', fieldId: 'gzr',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'date', type: 'user',
key: 'a349e957579e47cb90727cdfa8c9d21f', key: '21906e99fb08459ea4318c04707797ca',
children: [], children: [],
options: {}, options: {},
defaultValue: '', defaultValue: '',
...@@ -89,12 +73,12 @@ export const permissionList = [ ...@@ -89,12 +73,12 @@ export const permissionList = [
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '车辆id', fieldName: '工作开始时间',
fieldId: 'cheliangId', fieldId: 'gzkssj',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'input', type: 'date',
key: 'e1221f5840d7486588dd2c1e086af59d', key: '4da55e5ac2c04a2dacd2cd58470b6820',
children: [], children: [],
options: {}, options: {},
defaultValue: '', defaultValue: '',
...@@ -106,12 +90,12 @@ export const permissionList = [ ...@@ -106,12 +90,12 @@ export const permissionList = [
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '工作人', fieldName: '车辆id',
fieldId: 'gzr', fieldId: 'cheliangId',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'user', type: 'input',
key: '21906e99fb08459ea4318c04707797ca', key: 'e1221f5840d7486588dd2c1e086af59d',
children: [], children: [],
options: {}, options: {},
defaultValue: '', defaultValue: '',
...@@ -156,15 +140,14 @@ export const permissionList = [ ...@@ -156,15 +140,14 @@ export const permissionList = [
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '磅单数量', fieldName: '工作项目',
fieldId: 'bdsl', fieldId: 'gzxm',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'number', type: 'associate-popup',
key: '5bd116e5f35344cb8780f747370cee8d', key: '0d265387754f487886c4b77058fd49a0',
children: [], children: [],
options: {}, options: {},
defaultValue: '',
}, },
{ {
required: false, required: false,
...@@ -173,12 +156,12 @@ export const permissionList = [ ...@@ -173,12 +156,12 @@ export const permissionList = [
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '工作时长(h)', fieldName: '工作结束时间',
fieldId: 'gzsc', fieldId: 'gzjssj',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'number', type: 'date',
key: 'ae4a15e58ffe4710b337560f7d3b0703', key: 'a349e957579e47cb90727cdfa8c9d21f',
children: [], children: [],
options: {}, options: {},
defaultValue: '', defaultValue: '',
...@@ -206,14 +189,15 @@ export const permissionList = [ ...@@ -206,14 +189,15 @@ export const permissionList = [
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '工作项目', fieldName: '车辆重量(kg)',
fieldId: 'gzxm', fieldId: 'clzl',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'associate-popup', type: 'number',
key: '0d265387754f487886c4b77058fd49a0', key: '059de967d74b44bba170351aff279c63',
children: [], children: [],
options: {}, options: {},
defaultValue: '',
}, },
{ {
required: false, required: false,
...@@ -222,12 +206,12 @@ export const permissionList = [ ...@@ -222,12 +206,12 @@ export const permissionList = [
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '车辆重量(kg)', fieldName: '车辆品牌型号',
fieldId: 'clzl', fieldId: 'clppxh',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'number', type: 'input',
key: '059de967d74b44bba170351aff279c63', key: '45b440505abc47e2a61e9a0a459c67b2',
children: [], children: [],
options: {}, options: {},
defaultValue: '', defaultValue: '',
...@@ -239,12 +223,12 @@ export const permissionList = [ ...@@ -239,12 +223,12 @@ export const permissionList = [
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '车辆品牌型号', fieldName: '磅单数量',
fieldId: 'clppxh', fieldId: 'bdsl',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'input', type: 'number',
key: '45b440505abc47e2a61e9a0a459c67b2', key: '5bd116e5f35344cb8780f747370cee8d',
children: [], children: [],
options: {}, options: {},
defaultValue: '', defaultValue: '',
...@@ -256,12 +240,12 @@ export const permissionList = [ ...@@ -256,12 +240,12 @@ export const permissionList = [
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '工作开始时间', fieldName: '工作时长(h)',
fieldId: 'gzkssj', fieldId: 'gzsc',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'date', type: 'number',
key: '4da55e5ac2c04a2dacd2cd58470b6820', key: 'ae4a15e58ffe4710b337560f7d3b0703',
children: [], children: [],
options: {}, options: {},
defaultValue: '', defaultValue: '',
......
xjrsoft-vue3/src/views/chaiche/ccbg/index.vue
...@@ -82,9 +82,9 @@ ...@@ -82,9 +82,9 @@
import { useModal } from '/@/components/Modal'; import { useModal } from '/@/components/Modal';
import CcbgModal from './components/CcbgModal.vue'; import CcbgModal from './components/CcbgModal.vue';
import InWarehouse from './components/InWarehouse.vue'; import InWarehouse from './components/InWarehouse.vue';
...@@ -163,11 +163,11 @@ ...@@ -163,11 +163,11 @@
const selectedKeys = ref<string[]>([]); const selectedKeys = ref<string[]>([]);
const selectedRowsData = ref<any[]>([]); const selectedRowsData = ref<any[]>([]);
const [registerModal, { openModal }] = useModal(); const [registerModal, { openModal }] = useModal();
...@@ -182,8 +182,8 @@ ...@@ -182,8 +182,8 @@
formConfig: { formConfig: {
labelWidth: 100, labelWidth: 100,
schemas: searchFormSchema, schemas: searchFormSchema,
fieldMapToTime: [['gzjssj', ['gzjssjStart', 'gzjssjEnd'], 'YYYY-MM-DD HH:mm:ss ', true], fieldMapToTime: [['gzkssj', ['gzkssjStart', 'gzkssjEnd'], 'YYYY-MM-DD HH:mm:ss ', true],
['gzkssj', ['gzkssjStart', 'gzkssjEnd'], 'YYYY-MM-DD HH:mm:ss ', true],], ['gzjssj', ['gzjssjStart', 'gzjssjEnd'], 'YYYY-MM-DD HH:mm:ss ', true],],
showResetButton: false, showResetButton: false,
}, },
bordered:false, bordered:false,
...@@ -324,7 +324,7 @@ ...@@ -324,7 +324,7 @@
function handleInWarehouseCancel() { function handleInWarehouseCancel() {
showInWarehouse.value = false; showInWarehouse.value = false;
} }
function handleView(record: Recordable) { function handleView(record: Recordable) {
let info={ let info={
isView: true, isView: true,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment