触摸报工
This commit is contained in:
parent
b0a7788e11
commit
54fdaccac1
|
|
@ -7,6 +7,7 @@
|
|||
<script>
|
||||
|
||||
|
||||
import XEUtils from 'xe-utils' // 加载xe-utils
|
||||
|
||||
|
||||
export default {
|
||||
|
|
@ -31,11 +32,33 @@ export default {
|
|||
value(){
|
||||
|
||||
const { params } = this
|
||||
|
||||
console.log(params)
|
||||
if(params && params.dataType == "number"){
|
||||
this.valueShow = parseFloat(this.value || 0).toFixed(2);
|
||||
}else if(params && params.dataType == "ref"){
|
||||
}
|
||||
else if(params && params.dataType == "yesorno"){
|
||||
let v = this.value;
|
||||
this.valueShow = v ? "是" :"否";
|
||||
}
|
||||
else if(params && params.dataType == "date"){
|
||||
let v = this.value;
|
||||
if(typeof(v) == "number"){
|
||||
v = new Date(v * 1000);
|
||||
}
|
||||
this.valueShow = XEUtils.toDateString(v, 'yyyy-MM-dd')
|
||||
}
|
||||
else if(params && params.dataType == "datetime"){
|
||||
let v = this.value;
|
||||
if(typeof(v) == "number"){
|
||||
v = new Date(v * 1000);
|
||||
}
|
||||
this.valueShow = XEUtils.toDateString(v, 'yyyy-MM-dd HH:mm:ss')
|
||||
}
|
||||
else if(params && params.dataType == "ref"){
|
||||
this.valueShow = this.value && this.value[1] ? this.value[1] : "";
|
||||
}else if(params && params.dataType == "enum"){
|
||||
}
|
||||
else if(params && params.dataType == "enum"){
|
||||
this.valueShow = '';
|
||||
|
||||
params.options.forEach(item=>{
|
||||
|
|
|
|||
|
|
@ -107,7 +107,7 @@ VXETable.formats.mixin({
|
|||
if(typeof(cellValue) == "number"){
|
||||
cellValue = new Date(cellValue * 1000);
|
||||
}
|
||||
return XEUtils.toDateString(cellValue, 'yyyy-MM-dd HH:ss:mm')
|
||||
return XEUtils.toDateString(cellValue, 'yyyy-MM-dd HH:mm:ss')
|
||||
},
|
||||
formatDate({ cellValue }) { // 日期格式化
|
||||
if(typeof(cellValue) == "number"){
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<a-button type="primary">确定报工</a-button>
|
||||
<a-button type="primary" @click="save" style="margin-top: 10px;">确定报工</a-button>
|
||||
|
||||
</div>
|
||||
</template>
|
||||
|
|
@ -146,11 +146,11 @@ export default {
|
|||
span: 9,
|
||||
children: [
|
||||
{ field: '布产单信息', title: '布产单信息', span: 24, titleColon: false, className: 'formtitle' },
|
||||
{ field: 'production_number', title: '布产单号', span: 24, itemRender: { name: '$MkFormInputShow' } },
|
||||
{ field: '布产部门', title: '布产部门', span: 24, itemRender: { name: '$MkFormInputShow' } },
|
||||
{ field: '布产类型', title: '布产类型', span: 24, itemRender: { name: '$MkFormInputShow' } },
|
||||
{ field: '是否补单', title: '是否补单', span: 24, itemRender: { name: '$MkFormInputShow' } },
|
||||
{ field: '补单原因', title: '补单原因', span: 24, itemRender: { name: '$MkFormInputShow' } },
|
||||
{ field: 'production_number', title: '布产单号', span: 24, itemRender: { name: 'MkFormInputShow' } },
|
||||
{ field: '布产部门', title: '布产部门', span: 24, itemRender: { name: 'MkFormInputShow' } },
|
||||
{ field: '布产类型', title: '布产类型', span: 24, itemRender: { name: 'MkFormInputShow' } },
|
||||
{ field: '是否补单', title: '是否补单', span: 24, itemRender: { name: 'MkFormInputShow' } },
|
||||
{ field: '补单原因', title: '补单原因', span: 24, itemRender: { name: 'MkFormInputShow' } },
|
||||
|
||||
],
|
||||
},
|
||||
|
|
@ -159,8 +159,8 @@ export default {
|
|||
span: 9,
|
||||
children: [
|
||||
{ field: '料品信息', title: '料品信息', span: 24, titleColon: false, className: 'formtitle' },
|
||||
{ field: 'materials_code', title: '料品编号', span: 24, itemRender: { name: '$MkFormInputShow' } },
|
||||
{ field: 'materials_name', title: '料品名称', span: 24, itemRender: { name: '$MkFormInputShow' } },
|
||||
{ field: 'materials_code', title: '料品编号', span: 24, itemRender: { name: 'MkFormInputShow' } },
|
||||
{ field: 'materials_name', title: '料品名称', span: 24, itemRender: { name: 'MkFormInputShow' } },
|
||||
|
||||
],
|
||||
},
|
||||
|
|
@ -182,14 +182,14 @@ export default {
|
|||
span: 24,
|
||||
children: [
|
||||
{ field: '料品信息', title: '随车联信息', span: 24, titleColon: false, className: 'formtitle' },
|
||||
{ field: 'batch_no', title: '随车联号', span: 6, itemRender: { name: '$MkFormInputShow' } },
|
||||
{ field: 'number', title: '数量', span: 6, itemRender: { name: '$MkFormInputShow' } },
|
||||
{ field: 'is_pick', title: '是否领料', span: 6, itemRender: { name: '$MkFormInputShow', props: { dataType: 'yesorno' } } },
|
||||
{ field: 'start_time', title: '开始时间', span: 6, itemRender: { name: '$MkFormInputShow' } },
|
||||
{ field: 'work_type', title: '计工方式', span: 6, itemRender: { name: '$MkFormInputShow' } },
|
||||
{ field: 'car_code', title: '车号', span: 6, itemRender: { name: '$MkFormInputShow' } },
|
||||
{ field: 'pick_time', title: '领料时间', span: 6, itemRender: { name: '$MkFormInputShow' } },
|
||||
{ field: 'status', title: '状态', span: 6, itemRender: { name: '$MkFormInputShow' } },
|
||||
{ field: 'batch_no', title: '随车联号', span: 6, itemRender: { name: 'MkFormInputShow' } },
|
||||
{ field: 'number', title: '数量', span: 6, itemRender: { name: 'MkFormInputShow' } },
|
||||
{ field: 'is_pick', title: '是否领料', span: 6, itemRender: { name: 'MkFormInputShow', props: { params: { dataType: 'yesorno' } } } },
|
||||
{ field: 'start_time', title: '开始时间', span: 6, itemRender: { name: 'MkFormInputShow', props: { params: { dataType: 'datetime' } } } },
|
||||
{ field: 'work_type', title: '计工方式', span: 6, itemRender: { name: 'MkFormInputShow' } },
|
||||
{ field: 'car_code', title: '车号', span: 6, itemRender: { name: 'MkFormInputShow' } },
|
||||
{ field: 'pick_time', title: '领料时间', span: 6, itemRender: { name: 'MkFormInputShow', props: { params: { dataType: 'datetime' } } } },
|
||||
{ field: 'status', title: '状态', span: 6, itemRender: { name: 'MkFormInputShow' } },
|
||||
],
|
||||
},
|
||||
|
||||
|
|
@ -227,10 +227,10 @@ export default {
|
|||
span: 18,
|
||||
children: [
|
||||
|
||||
{ field: 'name', title: '姓名', span: 24, itemRender: { name: '$MkFormInputShow' } },
|
||||
{ field: 'code', title: '工号', span: 24, itemRender: { name: '$MkFormInputShow' } },
|
||||
{ field: 'phone', title: '电话', span: 24, itemRender: { name: '$MkFormInputShow' } },
|
||||
{ field: 'processName', title: '工序', span: 24, itemRender: { name: '$MkFormInputShow' } },
|
||||
{ field: 'name', title: '姓名', span: 24, itemRender: { name: 'MkFormInputShow' } },
|
||||
{ field: 'code', title: '工号', span: 24, itemRender: { name: 'MkFormInputShow' } },
|
||||
{ field: 'phone', title: '电话', span: 24, itemRender: { name: 'MkFormInputShow' } },
|
||||
{ field: 'processName', title: '工序', span: 24, itemRender: { name: 'MkFormInputShow' } },
|
||||
],
|
||||
},
|
||||
|
||||
|
|
@ -250,8 +250,8 @@ export default {
|
|||
},
|
||||
// 表单项
|
||||
items: [
|
||||
{ field: 'name', title: '工序名称', span: 24, itemRender: { name: '$MkFormInputShow' } },
|
||||
{ field: 'code', title: '工序编号', span: 24, itemRender: { name: '$MkFormInputShow' } },
|
||||
{ field: 'name', title: '工序名称', span: 24, itemRender: { name: 'MkFormInputShow' } },
|
||||
{ field: 'code', title: '工序编号', span: 24, itemRender: { name: 'MkFormInputShow' } },
|
||||
|
||||
]
|
||||
},
|
||||
|
|
@ -268,13 +268,44 @@ export default {
|
|||
rules: {
|
||||
},
|
||||
// 表单项
|
||||
items: [
|
||||
{ field: '可报工数量', title: '可报工数量', span: 8, itemRender: { name: '$input', props: { type: 'number' } } },
|
||||
{ field: '随车剩下张数', title: '随车剩下张数', span: 8, itemRender: { name: '$input', props: { type: 'number' } } },
|
||||
items: [
|
||||
{
|
||||
title: '工艺类型', span: 8,
|
||||
field: 'technology_type',
|
||||
itemRender: {
|
||||
name: 'MkFormDataSelector', props: {
|
||||
params: {
|
||||
dataType: "string",
|
||||
valueField: "name",
|
||||
textField: "name",
|
||||
listdataFieldName: 'enum_value',
|
||||
actionParams: getEnumActionParams(settings.enum_ids.工艺类型),
|
||||
dataUrl: `${BASE_URL.BASE_URL}/MesReporting/Get/TouchScreen/v1/mes/reporting/touchScreen/getEnum`
|
||||
}
|
||||
}
|
||||
},
|
||||
},
|
||||
{
|
||||
title: '成型方式', span: 8,
|
||||
field: 'molding_type',
|
||||
itemRender: {
|
||||
name: 'MkFormDataSelector', props: {
|
||||
params: {
|
||||
dataType: "string",
|
||||
valueField: "name",
|
||||
textField: "name",
|
||||
listdataFieldName: 'enum_value',
|
||||
actionParams: getEnumActionParams(settings.enum_ids.成型方式),
|
||||
dataUrl: `${BASE_URL.BASE_URL}/MesReporting/Get/TouchScreen/v1/mes/reporting/touchScreen/getEnum`
|
||||
}
|
||||
}
|
||||
},
|
||||
},
|
||||
|
||||
|
||||
{
|
||||
title: '查坯方式', span: 8,
|
||||
field: '查坯方式',
|
||||
field: 'embryo_type',
|
||||
itemRender: {
|
||||
name: 'MkFormDataSelector', props: {
|
||||
params: {
|
||||
|
|
@ -290,7 +321,7 @@ export default {
|
|||
},
|
||||
{
|
||||
title: '花面', span: 8,
|
||||
field: '花面',
|
||||
field: 'flower_type',
|
||||
itemRender: {
|
||||
name: 'MkFormDataSelector', props: {
|
||||
params: {
|
||||
|
|
@ -303,12 +334,16 @@ export default {
|
|||
}
|
||||
}
|
||||
},
|
||||
},
|
||||
{ field: '合格数量', title: '合格数量', span: 8, itemRender: { name: '$input', props: { type: 'number' } } },
|
||||
{ field: '报损数量', title: '报损数量', span: 8, itemRender: { name: '$input', props: { type: 'number' } } },
|
||||
},
|
||||
{ field: 'loss_number', title: '报损数量', span: 8, itemRender: { name: '$input', props: { type: 'number' } } },
|
||||
{ field: 'loss_staff_name', title: '损耗人员', span: 8, itemRender: { name: '$input', props: { } } },
|
||||
{ field: 'loss_remark', title: '损耗备注', span: 8, itemRender: { name: '$input', props: { } } },
|
||||
|
||||
|
||||
|
||||
{
|
||||
title: '土质', span: 8,
|
||||
field: '土质',
|
||||
field: 'soil_type',
|
||||
itemRender: {
|
||||
name: 'MkFormDataSelector', props: {
|
||||
params: {
|
||||
|
|
@ -322,8 +357,11 @@ export default {
|
|||
}
|
||||
},
|
||||
},
|
||||
{ field: '土质日期', title: '土质日期', span: 8, itemRender: { name: '$input', props: { type: 'date' } } },
|
||||
{ field: 'soil_date', title: '土质日期', span: 8, itemRender: { name: '$input', props: { type: 'date' } } },
|
||||
{ field: 'remark', title: '备注', span: 24, itemRender: { name: '$input', props: { } } },
|
||||
|
||||
|
||||
|
||||
]
|
||||
},
|
||||
|
||||
|
|
@ -453,7 +491,7 @@ export default {
|
|||
let v = JSONbig.parse(inputValue);
|
||||
this.lastScanTime = now;
|
||||
if (v.types == 'staff') {
|
||||
this.loadStaff({id:v.id});
|
||||
this.loadStaff({ id: v.id });
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -480,17 +518,17 @@ export default {
|
|||
},
|
||||
|
||||
loadStaff({ id }) {
|
||||
this.loading = true
|
||||
this.loading = true
|
||||
this.$mk.get({
|
||||
url: `${BASE_URL.BASE_URL}/MesReporting/Get/TouchScreen/v1/mes/reporting/touchScreen/getIdentity/${process.env.VUE_APP_BEID}/${process.env.VUE_APP_PTYID}/${process.env.VUE_APP_COMPANY_ID}/0/${process.env.VUE_APP_APPTOKEN}/${process.env.VUE_APP_COMPANYTOKEN}/${id}`,
|
||||
|
||||
|
||||
useBigInt: true,
|
||||
}).then(a => {
|
||||
this.selectStaff({data:a.data.mes_staff})
|
||||
this.selectStaff({ data: a.data.mes_staff })
|
||||
});
|
||||
},
|
||||
|
||||
selectStaff({data}){
|
||||
selectStaff({ data }) {
|
||||
let data2 = Object.assign({}, data);
|
||||
if (data2.mes_processes) {
|
||||
data2.processName = data2.mes_processes.name;
|
||||
|
|
@ -523,8 +561,88 @@ export default {
|
|||
this.formOptions4.data = data
|
||||
},
|
||||
cellClickEventStaff({ row }) {
|
||||
this.selectStaff({data:row})
|
||||
}
|
||||
this.selectStaff({ data: row })
|
||||
},
|
||||
|
||||
|
||||
save() {
|
||||
|
||||
let postdata = Object.assign({},this.formOptions.data);
|
||||
|
||||
postdata.staff_uid = this.formOptions2.data.id;
|
||||
|
||||
|
||||
postdata.order_id = this.formOptions4.data.order_id;
|
||||
postdata.production_order_id = this.formOptions4.data.production_order_id;
|
||||
postdata.materials_id = this.formOptions4.data.materials_id;
|
||||
postdata.batch_id = this.formOptions4.data.batch_id;
|
||||
postdata.batch_no = this.formOptions4.data.batch_no;
|
||||
postdata.production_plan_id = this.formOptions4.data.production_plan_id;
|
||||
postdata.production_dispatch_id = this.formOptions4.data.production_dispatch_id;
|
||||
postdata.production_type = this.formOptions4.data.production_type;
|
||||
postdata.production_num = this.formOptions4.data.production_num;
|
||||
postdata.production_unit = this.formOptions4.data.production_unit;
|
||||
postdata.production_time = this.formOptions4.data.start_time;
|
||||
postdata.production_is_finish = this.formOptions4.data.is_finish;
|
||||
postdata.reporting_type = this.formOptions4.data.reporting_type;
|
||||
postdata.car_no = this.formOptions4.data.car_no;
|
||||
postdata.materials_code = this.formOptions4.data.materials_code;
|
||||
|
||||
|
||||
|
||||
postdata.stage_id = this.formOptions3.data.sort_id;
|
||||
postdata.step_id = this.formOptions3.data.id;
|
||||
postdata.step_name = this.formOptions3.data.name;
|
||||
|
||||
|
||||
if(postdata.soil_date){
|
||||
postdata.soil_date = parseInt(new Date(postdata.soil_date).getTime() / 1000); // 转换为时间戳
|
||||
}
|
||||
|
||||
postdata.loss_number = parseFloat(postdata.loss_number || 0)
|
||||
|
||||
if(!postdata.staff_uid){
|
||||
this.$mk.error("请先选择员工");
|
||||
return;
|
||||
}
|
||||
|
||||
if(!postdata.production_order_id){
|
||||
this.$mk.error("请先选择随车联");
|
||||
return;
|
||||
}
|
||||
|
||||
if(!postdata.step_id){
|
||||
this.$mk.error("请先选择工序");
|
||||
return;
|
||||
}
|
||||
|
||||
this.$mk.post({
|
||||
url: `${BASE_URL.BASE_URL}/MesReporting/Get/TouchScreen/v1/mes/reporting/touchScreen/create`,
|
||||
loading: "报工中...",
|
||||
data: {
|
||||
"ptyid": parseInt(process.env.VUE_APP_PTYID),
|
||||
"project_token": process.env.VUE_APP_APPTOKEN ,
|
||||
"store_id": 0,
|
||||
"beid": parseInt(process.env.VUE_APP_BEID),
|
||||
"company_token": process.env.VUE_APP_COMPANYTOKEN,
|
||||
"mes_reporting_create_request": postdata,
|
||||
"company_id": parseInt(process.env.VUE_APP_COMPANY_ID)
|
||||
},
|
||||
useBigInt: true,
|
||||
}).then(a => {
|
||||
|
||||
if (a.code == 200) {
|
||||
this.$mk.sccuess("报工成功");
|
||||
} else {
|
||||
|
||||
this.$mk.error(a.msg || a.message);
|
||||
}
|
||||
|
||||
}).catch((a) => {
|
||||
this.loading = false
|
||||
this.$mk.error(a.data.msg);
|
||||
});
|
||||
},
|
||||
|
||||
|
||||
},
|
||||
|
|
|
|||
|
|
@ -8,8 +8,9 @@ var config = {
|
|||
"花面" :"149639114486976512",
|
||||
"土质" :"149639177091158016",
|
||||
"查坯方式" :"149639114486976512",
|
||||
"工艺类型":"149639114486976512",
|
||||
|
||||
},
|
||||
},
|
||||
options_status_staff: [
|
||||
{value:1,label:'入职'},
|
||||
{value:2,label:'离职'}
|
||||
|
|
|
|||
|
|
@ -34,14 +34,18 @@ if (Authorization != null) {
|
|||
console.log(routesConfig)
|
||||
store.commit('account/setRoutesConfig', routesConfig) // 将路由配置信息存入vuex
|
||||
|
||||
let touchRoute = {
|
||||
router: "touch",
|
||||
children:[
|
||||
{router:'TouchMesReporting'}
|
||||
]
|
||||
|
||||
};
|
||||
loadRoutes([touchRoute,routesConfig]) // 加载路由
|
||||
if(process.env.VUE_APP_BEID == 1){
|
||||
let touchRoute = {
|
||||
router: "touch",
|
||||
children:[
|
||||
{router:'TouchMesReporting'}
|
||||
]
|
||||
};
|
||||
loadRoutes([touchRoute,routesConfig]) // 加载路由
|
||||
}else{
|
||||
loadRoutes([routesConfig]) // 加载路由
|
||||
}
|
||||
|
||||
}
|
||||
})
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue