|
@@ -54,6 +54,7 @@
|
|
|
dictName="记录规则事项类型"
|
|
dictName="记录规则事项类型"
|
|
|
v-model="form.itemType"
|
|
v-model="form.itemType"
|
|
|
@change="itemTypeChange"
|
|
@change="itemTypeChange"
|
|
|
|
|
+ :disabled="reportWorkType == 4"
|
|
|
>
|
|
>
|
|
|
</DictSelection>
|
|
</DictSelection>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
@@ -146,11 +147,11 @@
|
|
|
|
|
|
|
|
<header-title
|
|
<header-title
|
|
|
title="基本信息"
|
|
title="基本信息"
|
|
|
- v-if="form.itemType == 2"
|
|
|
|
|
|
|
+ v-if="form.itemType == 2 && reportWorkType != 4"
|
|
|
style="margin-top: 20px"
|
|
style="margin-top: 20px"
|
|
|
></header-title>
|
|
></header-title>
|
|
|
|
|
|
|
|
- <template v-if="form.itemType == 2">
|
|
|
|
|
|
|
+ <template v-if="form.itemType == 2 && reportWorkType != 4">
|
|
|
<el-row style="margin-bottom: 20px">
|
|
<el-row style="margin-bottom: 20px">
|
|
|
<el-col :span="8">
|
|
<el-col :span="8">
|
|
|
<el-form-item
|
|
<el-form-item
|
|
@@ -218,42 +219,44 @@
|
|
|
<el-row style="margin-bottom: 20px">
|
|
<el-row style="margin-bottom: 20px">
|
|
|
<el-col :span="8">
|
|
<el-col :span="8">
|
|
|
<el-form-item label="执行人" required prop="teamId">
|
|
<el-form-item label="执行人" required prop="teamId">
|
|
|
- <el-select
|
|
|
|
|
- v-model="form.teamId"
|
|
|
|
|
- placeholder="请选择班组"
|
|
|
|
|
- filterable
|
|
|
|
|
- style="width: 120px"
|
|
|
|
|
- @change="checkTeamList(form.teamId)"
|
|
|
|
|
- >
|
|
|
|
|
- <el-option
|
|
|
|
|
- v-for="item in teamList"
|
|
|
|
|
- :label="item.name"
|
|
|
|
|
- :value="item.id"
|
|
|
|
|
- :key="item.id"
|
|
|
|
|
|
|
+ <div style="display: flex">
|
|
|
|
|
+ <el-select
|
|
|
|
|
+ v-model="form.teamId"
|
|
|
|
|
+ placeholder="请选择班组"
|
|
|
|
|
+ filterable
|
|
|
|
|
+ style="width: 120px"
|
|
|
|
|
+ @change="checkTeamList(form.teamId)"
|
|
|
>
|
|
>
|
|
|
- </el-option>
|
|
|
|
|
- </el-select>
|
|
|
|
|
- <el-select
|
|
|
|
|
- v-model="form.executeUsersIds"
|
|
|
|
|
- placeholder="请选择执行人"
|
|
|
|
|
- filterable
|
|
|
|
|
- multiple
|
|
|
|
|
- @change="changeId"
|
|
|
|
|
- style="max-width: 100%"
|
|
|
|
|
- >
|
|
|
|
|
- <div class="checkboxWrapper">
|
|
|
|
|
- <el-checkbox v-model="checked" @change="checkChange">
|
|
|
|
|
- 全选
|
|
|
|
|
- </el-checkbox>
|
|
|
|
|
- </div>
|
|
|
|
|
- <el-option
|
|
|
|
|
- v-for="item in teamUserList"
|
|
|
|
|
- :label="item.name"
|
|
|
|
|
- :value="item.id"
|
|
|
|
|
- :key="item.id"
|
|
|
|
|
|
|
+ <el-option
|
|
|
|
|
+ v-for="item in teamList"
|
|
|
|
|
+ :label="item.name"
|
|
|
|
|
+ :value="item.id"
|
|
|
|
|
+ :key="item.id"
|
|
|
|
|
+ >
|
|
|
|
|
+ </el-option>
|
|
|
|
|
+ </el-select>
|
|
|
|
|
+ <el-select
|
|
|
|
|
+ v-model="form.executeUsersIds"
|
|
|
|
|
+ placeholder="请选择执行人"
|
|
|
|
|
+ filterable
|
|
|
|
|
+ multiple
|
|
|
|
|
+ @change="changeId"
|
|
|
|
|
+ style="max-width: 100%"
|
|
|
>
|
|
>
|
|
|
- </el-option>
|
|
|
|
|
- </el-select>
|
|
|
|
|
|
|
+ <div class="checkboxWrapper">
|
|
|
|
|
+ <el-checkbox v-model="checked" @change="checkChange">
|
|
|
|
|
+ 全选
|
|
|
|
|
+ </el-checkbox>
|
|
|
|
|
+ </div>
|
|
|
|
|
+ <el-option
|
|
|
|
|
+ v-for="item in teamUserList"
|
|
|
|
|
+ :label="item.name"
|
|
|
|
|
+ :value="item.id"
|
|
|
|
|
+ :key="item.id"
|
|
|
|
|
+ >
|
|
|
|
|
+ </el-option>
|
|
|
|
|
+ </el-select>
|
|
|
|
|
+ </div>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
</el-col>
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
<el-col :span="8">
|
|
@@ -343,7 +346,7 @@
|
|
|
<el-row style="margin-bottom: 20px">
|
|
<el-row style="margin-bottom: 20px">
|
|
|
<el-col :span="8">
|
|
<el-col :span="8">
|
|
|
<el-form-item label="生产工单号" prop="workOrderCode">
|
|
<el-form-item label="生产工单号" prop="workOrderCode">
|
|
|
- <el-select
|
|
|
|
|
|
|
+ <!-- <el-select
|
|
|
v-model="form.workOrderCode"
|
|
v-model="form.workOrderCode"
|
|
|
placeholder="请选择生产工单"
|
|
placeholder="请选择生产工单"
|
|
|
style="width: 100%"
|
|
style="width: 100%"
|
|
@@ -360,11 +363,21 @@
|
|
|
:value="item.code"
|
|
:value="item.code"
|
|
|
>
|
|
>
|
|
|
</el-option>
|
|
</el-option>
|
|
|
- </el-select>
|
|
|
|
|
|
|
+ </el-select> -->
|
|
|
|
|
+ <el-input
|
|
|
|
|
+ v-model="form.workOrderCode"
|
|
|
|
|
+ placeholder="请选择生产工单"
|
|
|
|
|
+ @click.native="openWorkOrderDialog"
|
|
|
|
|
+ readonly
|
|
|
|
|
+ />
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
</el-col>
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
<el-col :span="8">
|
|
|
- <el-form-item label="工序名称" prop="produceTaskId">
|
|
|
|
|
|
|
+ <el-form-item
|
|
|
|
|
+ v-if="reportWorkType != 4"
|
|
|
|
|
+ label="工序名称"
|
|
|
|
|
+ prop="produceTaskId"
|
|
|
|
|
+ >
|
|
|
<el-select
|
|
<el-select
|
|
|
v-model="form.produceTaskId"
|
|
v-model="form.produceTaskId"
|
|
|
placeholder="请选择工序"
|
|
placeholder="请选择工序"
|
|
@@ -394,8 +407,12 @@
|
|
|
<el-col :span="8">
|
|
<el-col :span="8">
|
|
|
<el-form-item
|
|
<el-form-item
|
|
|
label="产品编码"
|
|
label="产品编码"
|
|
|
- :required="form.recordRulesClassify != '4'"
|
|
|
|
|
- :prop="form.recordRulesClassify != '4' ? 'productCode' : ''"
|
|
|
|
|
|
|
+ :required="form.recordRulesClassify != '4' && reportWorkType != 4"
|
|
|
|
|
+ :prop="
|
|
|
|
|
+ form.recordRulesClassify != '4' && reportWorkType != 4
|
|
|
|
|
+ ? 'productCode'
|
|
|
|
|
+ : ''
|
|
|
|
|
+ "
|
|
|
>
|
|
>
|
|
|
<el-input
|
|
<el-input
|
|
|
v-model="form.productCode"
|
|
v-model="form.productCode"
|
|
@@ -412,8 +429,12 @@
|
|
|
<el-col :span="8">
|
|
<el-col :span="8">
|
|
|
<el-form-item
|
|
<el-form-item
|
|
|
label="产品名称"
|
|
label="产品名称"
|
|
|
- :required="form.recordRulesClassify != '4'"
|
|
|
|
|
- :prop="form.recordRulesClassify != '4' ? 'productName' : ''"
|
|
|
|
|
|
|
+ :required="form.recordRulesClassify != '4' && reportWorkType != 4"
|
|
|
|
|
+ :prop="
|
|
|
|
|
+ form.recordRulesClassify != '4' && reportWorkType != 4
|
|
|
|
|
+ ? 'productName'
|
|
|
|
|
+ : ''
|
|
|
|
|
+ "
|
|
|
>
|
|
>
|
|
|
<el-input
|
|
<el-input
|
|
|
v-model="form.productName"
|
|
v-model="form.productName"
|
|
@@ -459,7 +480,11 @@
|
|
|
<el-col :span="8">
|
|
<el-col :span="8">
|
|
|
<el-form-item
|
|
<el-form-item
|
|
|
label="要求生产数量"
|
|
label="要求生产数量"
|
|
|
- :prop="form.recordRulesClassify != '4' ? 'formingNum' : ''"
|
|
|
|
|
|
|
+ :prop="
|
|
|
|
|
+ form.recordRulesClassify != '4' && reportWorkType != 4
|
|
|
|
|
+ ? 'formingNum'
|
|
|
|
|
+ : ''
|
|
|
|
|
+ "
|
|
|
>
|
|
>
|
|
|
<el-input
|
|
<el-input
|
|
|
v-model.number="form.formingNum"
|
|
v-model.number="form.formingNum"
|
|
@@ -499,16 +524,7 @@
|
|
|
style="margin-top: 20px"
|
|
style="margin-top: 20px"
|
|
|
></header-title>
|
|
></header-title>
|
|
|
|
|
|
|
|
- <template
|
|
|
|
|
- v-if="
|
|
|
|
|
- form.itemType == 2 &&
|
|
|
|
|
- form.recordRulesClassify == 10 &&
|
|
|
|
|
- form.workOrderId &&
|
|
|
|
|
- form.produceTaskId &&
|
|
|
|
|
- form.ruleId &&
|
|
|
|
|
- form.produceRoutingId
|
|
|
|
|
- "
|
|
|
|
|
- >
|
|
|
|
|
|
|
+ <template v-if="form.itemType == 2 && form.reportWorkType == 4">
|
|
|
<el-tabs v-model="statisticsType" type="card">
|
|
<el-tabs v-model="statisticsType" type="card">
|
|
|
<el-tab-pane
|
|
<el-tab-pane
|
|
|
v-for="i in statisticsTypeList"
|
|
v-for="i in statisticsTypeList"
|
|
@@ -522,15 +538,16 @@
|
|
|
ref="statisticsRef"
|
|
ref="statisticsRef"
|
|
|
:details.sync="form.details"
|
|
:details.sync="form.details"
|
|
|
:statisticsType="statisticsType"
|
|
:statisticsType="statisticsType"
|
|
|
- :produceTaskId="form.produceTaskId"
|
|
|
|
|
- :workOrderId="form.workOrderId"
|
|
|
|
|
- :routingId="form.produceRoutingId"
|
|
|
|
|
|
|
+ :workOrderId="workOrderInfo ? workOrderInfo.id : ''"
|
|
|
|
|
+ :routingId="workOrderInfo ? workOrderInfo.produceRoutingId : ''"
|
|
|
|
|
+ :bomCategoryId="workOrderInfo ? workOrderInfo.bomCategoryId : ''"
|
|
|
:ruleId="form.ruleId"
|
|
:ruleId="form.ruleId"
|
|
|
|
|
+ :rulesDetailList="rulesDetailList"
|
|
|
></statistics>
|
|
></statistics>
|
|
|
</template>
|
|
</template>
|
|
|
|
|
|
|
|
<ele-pro-table
|
|
<ele-pro-table
|
|
|
- v-if="form.itemType == 2 && form.recordRulesClassify != 10"
|
|
|
|
|
|
|
+ v-if="form.itemType == 2 && reportWorkType != 4"
|
|
|
v-loading="loading"
|
|
v-loading="loading"
|
|
|
ref="table"
|
|
ref="table"
|
|
|
row-key="id"
|
|
row-key="id"
|
|
@@ -715,6 +732,13 @@
|
|
|
></SelectUser>
|
|
></SelectUser>
|
|
|
|
|
|
|
|
<toolModal ref="toolModalRef" @chooseModal="chooseModal" />
|
|
<toolModal ref="toolModalRef" @chooseModal="chooseModal" />
|
|
|
|
|
+
|
|
|
|
|
+ <!-- 选择生产工单 -->
|
|
|
|
|
+ <selectWorkOrder
|
|
|
|
|
+ ref="selectWorkOrderRef"
|
|
|
|
|
+ @confirm="selectWorkOrderConfirm"
|
|
|
|
|
+ :multiple="false"
|
|
|
|
|
+ ></selectWorkOrder>
|
|
|
</ele-modal>
|
|
</ele-modal>
|
|
|
</template>
|
|
</template>
|
|
|
|
|
|
|
@@ -749,7 +773,8 @@
|
|
|
import { getFactoryarea } from '@/api/aps/index';
|
|
import { getFactoryarea } from '@/api/aps/index';
|
|
|
import { getTeam } from '@/api/produce/job.js';
|
|
import { getTeam } from '@/api/produce/job.js';
|
|
|
import material from '@/views/produce/components/prenatalExamination/material.vue';
|
|
import material from '@/views/produce/components/prenatalExamination/material.vue';
|
|
|
- import statistics from '@/views/produce/components/prenatalExamination/statistics.vue';
|
|
|
|
|
|
|
+ import statistics from './statistics.vue';
|
|
|
|
|
+ import selectWorkOrder from '@/views/checklistManagement/components/selectWorkOrder.vue';
|
|
|
|
|
|
|
|
export default {
|
|
export default {
|
|
|
name: 'editModal',
|
|
name: 'editModal',
|
|
@@ -768,10 +793,11 @@
|
|
|
bpmDetail,
|
|
bpmDetail,
|
|
|
bpmTask,
|
|
bpmTask,
|
|
|
material,
|
|
material,
|
|
|
- statistics
|
|
|
|
|
|
|
+ statistics,
|
|
|
|
|
+ selectWorkOrder
|
|
|
},
|
|
},
|
|
|
props: {
|
|
props: {
|
|
|
- // 1-产前准备,2-过程监测,3-产后检查
|
|
|
|
|
|
|
+ // 1-产前准备,2-过程监测,3-产后检查 4-生产统计
|
|
|
reportWorkType: {
|
|
reportWorkType: {
|
|
|
type: Number,
|
|
type: Number,
|
|
|
default: 1
|
|
default: 1
|
|
@@ -1032,7 +1058,8 @@
|
|
|
{ label: '成品统计', value: '1' },
|
|
{ label: '成品统计', value: '1' },
|
|
|
{ label: '物料统计', value: '2' },
|
|
{ label: '物料统计', value: '2' },
|
|
|
{ label: '工序统计', value: '3' }
|
|
{ label: '工序统计', value: '3' }
|
|
|
- ]
|
|
|
|
|
|
|
+ ],
|
|
|
|
|
+ rulesDetailList: []
|
|
|
};
|
|
};
|
|
|
},
|
|
},
|
|
|
computed: {
|
|
computed: {
|
|
@@ -1146,6 +1173,9 @@
|
|
|
this.getWorkOrderById(this.form.workOrderId);
|
|
this.getWorkOrderById(this.form.workOrderId);
|
|
|
this.getDetias();
|
|
this.getDetias();
|
|
|
}
|
|
}
|
|
|
|
|
+ if (data.ruleId) {
|
|
|
|
|
+ this.getRulesDetiasList(data.ruleId);
|
|
|
|
|
+ }
|
|
|
} else if (type == 'detail') {
|
|
} else if (type == 'detail') {
|
|
|
this.title = `${this.reportWorkTypeName}事项`;
|
|
this.title = `${this.reportWorkTypeName}事项`;
|
|
|
this.form.workOrderId = data.workOrderId;
|
|
this.form.workOrderId = data.workOrderId;
|
|
@@ -1156,6 +1186,9 @@
|
|
|
this.getWorkOrderById(this.form.workOrderId);
|
|
this.getWorkOrderById(this.form.workOrderId);
|
|
|
this.getDetias();
|
|
this.getDetias();
|
|
|
}
|
|
}
|
|
|
|
|
+ if (data.ruleId) {
|
|
|
|
|
+ this.getRulesDetiasList(data.ruleId);
|
|
|
|
|
+ }
|
|
|
} else {
|
|
} else {
|
|
|
}
|
|
}
|
|
|
this.visible = true;
|
|
this.visible = true;
|
|
@@ -1214,9 +1247,34 @@
|
|
|
toolNames: i.tools.map((i) => i.toolName).join(',')
|
|
toolNames: i.tools.map((i) => i.toolName).join(',')
|
|
|
};
|
|
};
|
|
|
});
|
|
});
|
|
|
|
|
+ this.rulesDetailList = JSON.parse(JSON.stringify(this.form.details));
|
|
|
console.log('this.form.details', this.form.details);
|
|
console.log('this.form.details', this.form.details);
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|
|
|
|
|
+ // 查询规则详情
|
|
|
|
|
+ async getRulesDetiasList(ruleId) {
|
|
|
|
|
+ if (ruleId) {
|
|
|
|
|
+ const { list } = await recordRulesDetailPage({
|
|
|
|
|
+ pageNum: 1,
|
|
|
|
|
+ size: 999,
|
|
|
|
|
+ rulesId: ruleId
|
|
|
|
|
+ });
|
|
|
|
|
+ this.rulesDetailList = list.map((i) => {
|
|
|
|
|
+ return {
|
|
|
|
|
+ ...i,
|
|
|
|
|
+ id: null,
|
|
|
|
|
+ checkResult: null,
|
|
|
|
|
+ checkStatus: null,
|
|
|
|
|
+ checkStatusDesc: i.defaultValue || '',
|
|
|
|
|
+ errorMsg: '',
|
|
|
|
|
+ checkUsers: [],
|
|
|
|
|
+ paramValue: i.paramValue,
|
|
|
|
|
+ toolNames: i.tools.map((i) => i.toolName).join(',')
|
|
|
|
|
+ };
|
|
|
|
|
+ });
|
|
|
|
|
+ console.log('this.rulesDetailList', this.rulesDetailList);
|
|
|
|
|
+ }
|
|
|
|
|
+ },
|
|
|
// 关闭时清理表单
|
|
// 关闭时清理表单
|
|
|
handleClose() {
|
|
handleClose() {
|
|
|
this.form = JSON.parse(JSON.stringify(this.formBaseData));
|
|
this.form = JSON.parse(JSON.stringify(this.formBaseData));
|
|
@@ -1298,45 +1356,10 @@
|
|
|
console.log('生产工单', list);
|
|
console.log('生产工单', list);
|
|
|
this.workOrderList = list;
|
|
this.workOrderList = list;
|
|
|
},
|
|
},
|
|
|
- // 选择生产工单
|
|
|
|
|
- workOrderCodeChange(code) {
|
|
|
|
|
- console.log('code', code);
|
|
|
|
|
- if (code) {
|
|
|
|
|
- const workOrder = this.workOrderList.find((i) => i.code == code);
|
|
|
|
|
- console.log('workOrder', workOrder);
|
|
|
|
|
- this.workOrderInfo = workOrder;
|
|
|
|
|
- this.form.workOrderId = workOrder.id;
|
|
|
|
|
- // 赋值产品信息
|
|
|
|
|
- this.form.productCode = workOrder.productCode;
|
|
|
|
|
- this.form.productModel = workOrder.productModel;
|
|
|
|
|
- this.form.productName = workOrder.productName;
|
|
|
|
|
- this.form.batchNo = workOrder.batchNo;
|
|
|
|
|
- this.form.specification = workOrder.specification;
|
|
|
|
|
- this.form.formingNum = workOrder.formingNum;
|
|
|
|
|
- this.form.brandNo = workOrder.brandNo;
|
|
|
|
|
- this.form.produceRoutingId = workOrder.produceRoutingId;
|
|
|
|
|
- this.getProductTaskList(workOrder.id);
|
|
|
|
|
- } else {
|
|
|
|
|
- this.workOrderInfo = null;
|
|
|
|
|
- this.form.workOrderId = null;
|
|
|
|
|
- // 赋值产品信息
|
|
|
|
|
- this.form.productCode = null;
|
|
|
|
|
- this.form.productModel = null;
|
|
|
|
|
- this.form.productName = '';
|
|
|
|
|
- this.form.batchNo = '';
|
|
|
|
|
- this.form.specification = null;
|
|
|
|
|
- this.form.formingNum = null;
|
|
|
|
|
- this.form.brandNo = '';
|
|
|
|
|
- this.form.produceRoutingId = '';
|
|
|
|
|
-
|
|
|
|
|
- this.produceTaskList = [];
|
|
|
|
|
- }
|
|
|
|
|
- this.form.produceTaskId = null;
|
|
|
|
|
- this.form.produceTaskName = '';
|
|
|
|
|
- this.form.produceTaskInstanceId = '';
|
|
|
|
|
- },
|
|
|
|
|
// 获取工序列表
|
|
// 获取工序列表
|
|
|
async getProductTaskList(id) {
|
|
async getProductTaskList(id) {
|
|
|
|
|
+ // 生产统计不关联工序
|
|
|
|
|
+ if (this.reportWorkType == 4) return;
|
|
|
const data = await getTaskInstanceList(id);
|
|
const data = await getTaskInstanceList(id);
|
|
|
console.log('data 工序列表', data);
|
|
console.log('data 工序列表', data);
|
|
|
this.produceTaskList = data.filter(
|
|
this.produceTaskList = data.filter(
|
|
@@ -1357,18 +1380,6 @@
|
|
|
this.form.produceTaskInstanceId = prodceTask.taskId;
|
|
this.form.produceTaskInstanceId = prodceTask.taskId;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- if (this.form.ruleId) {
|
|
|
|
|
- // 清空记录规则
|
|
|
|
|
- this.form.ruleId = null;
|
|
|
|
|
- this.form.ruleName = null;
|
|
|
|
|
- this.form.recordRulesClassify = null;
|
|
|
|
|
- this.form.recordRulesExecuteMethodId = null;
|
|
|
|
|
- this.form.recordRulesExecuteMethodName = null;
|
|
|
|
|
- this.$message.warning(
|
|
|
|
|
- '工序变更,已清空已选择的记录规则,请选择工序下的记录规则'
|
|
|
|
|
- );
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
// 查询物料信息
|
|
// 查询物料信息
|
|
|
this.getListByWorkOrderId();
|
|
this.getListByWorkOrderId();
|
|
|
},
|
|
},
|
|
@@ -1409,12 +1420,6 @@
|
|
|
|
|
|
|
|
try {
|
|
try {
|
|
|
if (this.form.itemType == 2) {
|
|
if (this.form.itemType == 2) {
|
|
|
- // 验证产出物数量;
|
|
|
|
|
- const valid = this.$refs.materialRef.validateOutputQuantities();
|
|
|
|
|
- if (!valid) {
|
|
|
|
|
- return;
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
// 记录规则保存
|
|
// 记录规则保存
|
|
|
return this.releaseRulesSaveOrSubmit('save');
|
|
return this.releaseRulesSaveOrSubmit('save');
|
|
|
}
|
|
}
|
|
@@ -1437,12 +1442,12 @@
|
|
|
},
|
|
},
|
|
|
// 记录规则保存或者 一键报工
|
|
// 记录规则保存或者 一键报工
|
|
|
async releaseRulesSaveOrSubmit(type) {
|
|
async releaseRulesSaveOrSubmit(type) {
|
|
|
- if (this.form.executeUsersIds.length == 0) {
|
|
|
|
|
|
|
+ if (this.form.executeUsersIds.length == 0 && this.reportWorkType != 4) {
|
|
|
this.$message.warning('请选择执行人!');
|
|
this.$message.warning('请选择执行人!');
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- if (this.form.duration <= 0) {
|
|
|
|
|
|
|
+ if (this.form.duration <= 0 && this.reportWorkType != 4) {
|
|
|
this.$message.warning('工时必须大于0!');
|
|
this.$message.warning('工时必须大于0!');
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|
|
@@ -1451,7 +1456,7 @@
|
|
|
if (
|
|
if (
|
|
|
type.includes('submit') &&
|
|
type.includes('submit') &&
|
|
|
this.form.recordRulesClassify != '4' &&
|
|
this.form.recordRulesClassify != '4' &&
|
|
|
- this.form.recordRulesClassify != '10'
|
|
|
|
|
|
|
+ this.reportWorkType != 4
|
|
|
) {
|
|
) {
|
|
|
// 验证检查项目
|
|
// 验证检查项目
|
|
|
const detailRequired = this.form.details.some((i) => {
|
|
const detailRequired = this.form.details.some((i) => {
|
|
@@ -1487,9 +1492,11 @@
|
|
|
|
|
|
|
|
const body = JSON.parse(JSON.stringify(this.form));
|
|
const body = JSON.parse(JSON.stringify(this.form));
|
|
|
|
|
|
|
|
- // 工时小时转毫秒
|
|
|
|
|
- body.duration = Number(body.duration);
|
|
|
|
|
- body.duration = body.duration * 60 * 60 * 1000;
|
|
|
|
|
|
|
+ if (body.duration) {
|
|
|
|
|
+ // 工时小时转毫秒
|
|
|
|
|
+ body.duration = Number(body.duration);
|
|
|
|
|
+ body.duration = body.duration * 60 * 60 * 1000;
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
this.butLoading = true;
|
|
this.butLoading = true;
|
|
|
console.log('body', body);
|
|
console.log('body', body);
|
|
@@ -1785,6 +1792,34 @@
|
|
|
});
|
|
});
|
|
|
|
|
|
|
|
console.log('row', row);
|
|
console.log('row', row);
|
|
|
|
|
+ },
|
|
|
|
|
+ // 打开选择工单弹窗
|
|
|
|
|
+ openWorkOrderDialog() {
|
|
|
|
|
+ this.$refs.selectWorkOrderRef.open();
|
|
|
|
|
+ },
|
|
|
|
|
+ selectWorkOrderConfirm(workOrder) {
|
|
|
|
|
+ console.log('workOrder', workOrder);
|
|
|
|
|
+ this.workOrderInfo = workOrder;
|
|
|
|
|
+ this.form.workOrderId = workOrder.id;
|
|
|
|
|
+ this.form.workOrderCode = workOrder.code;
|
|
|
|
|
+ // 赋值产品信息
|
|
|
|
|
+ this.form.productCode = workOrder.productCode;
|
|
|
|
|
+ this.form.productModel = workOrder.productModel;
|
|
|
|
|
+ this.form.productName = workOrder.productName;
|
|
|
|
|
+ this.form.batchNo = workOrder.batchNo;
|
|
|
|
|
+ this.form.specification = workOrder.specification;
|
|
|
|
|
+ this.form.formingNum = workOrder.formingNum;
|
|
|
|
|
+ this.form.brandNo = workOrder.brandNo;
|
|
|
|
|
+ this.form.produceRoutingId = workOrder.produceRoutingId;
|
|
|
|
|
+ this.getProductTaskList(workOrder.id);
|
|
|
|
|
+ this.form.produceTaskId = null;
|
|
|
|
|
+ this.form.produceTaskName = '';
|
|
|
|
|
+ this.form.produceTaskInstanceId = '';
|
|
|
|
|
+
|
|
|
|
|
+ this.$nextTick(() => {
|
|
|
|
|
+ // 工单变化构建物料和工序数据
|
|
|
|
|
+ this.$refs.statisticsRef.rebuildMaterialAndProcessData();
|
|
|
|
|
+ });
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
};
|
|
};
|