diff --git a/src/views/processManagement/components/processMainte/dsPartBasicInfo.vue b/src/views/processManagement/components/processMainte/dsPartBasicInfo.vue
index 2ad83d4..1f7929a 100644
--- a/src/views/processManagement/components/processMainte/dsPartBasicInfo.vue
+++ b/src/views/processManagement/components/processMainte/dsPartBasicInfo.vue
@@ -117,8 +117,8 @@
>
diff --git a/src/views/processManagement/components/processMainte/processPlanning.vue b/src/views/processManagement/components/processMainte/processPlanning.vue
index c6d50b8..801df68 100644
--- a/src/views/processManagement/components/processMainte/processPlanning.vue
+++ b/src/views/processManagement/components/processMainte/processPlanning.vue
@@ -520,6 +520,7 @@ import {
getStandardList,
} from '@/api/processManagement/taskProcessing';
import { getPqList } from '@/api/qualityManagement/remindRedeem/remindRedeem';
+import { getDictionary } from '@/api/system/dict';
export default {
name: 'CraftIndex',
components: {},
@@ -624,8 +625,11 @@ export default {
projectOptions: [], //检验项目列表
standardList: [], //检验标准列表
filteredList:[],
+ dictionaryData:[],
+
};
},
+
mounted() {
this.getModelList();
this.getDetails();
@@ -635,8 +639,15 @@ export default {
this.getPqList();
this.getProject();
this.getStandardList();
+ this.getDictionary()
},
methods: {
+ // 获取涂色标、涂色带、涂箭头的系数
+ getDictionary(){
+ getDictionary({code:'part_info'}).then(res=>{
+ this.dictionaryData = res.data.data
+ })
+ },
// 获取检验项目名字
projectChange(row,index) {
let selectName = this.projectOptions.find(item => item.id == row.projectCode);
@@ -661,6 +672,25 @@ export default {
processChange(row, index) {
let selectName = this.processSetOption.find(item => item.id == row.processCode);
this.form1.tableData1[index].processName = selectName.name;
+ if(this.form1.tableData1[index].processName.indexOf('涂色标') > -1){
+ console.log(this.partInfoData,this.dictionaryData,'this.partInfoData');
+ // tsbNum 涂色标个数 tsdNum 涂色带个数 涂箭头个数
+ let sum_ = 0
+ if(this.partInfoData.tsbNum){
+ let tsb=this.dictionaryData.find(item => item.dictValue == '涂色标')
+ sum_ += parseInt(this.partInfoData.tsbNum)*tsb.dictKey
+ }
+ if(this.partInfoData.tsdNum){
+ let tsd=this.dictionaryData.find(item => item.dictValue == '涂色带')
+ sum_ += parseInt(this.partInfoData.tsdNum)*tsd.dictKey
+ }
+ if(this.partInfoData.tsjNum){
+ let tsj=this.dictionaryData.find(item => item.dictValue == '涂箭头')
+ sum_ += parseInt(this.partInfoData.tsjNum)*tsj.dictKey
+ }
+ console.log(sum_,'sum_');
+ this.form1.tableData1[index].proHours = sum_
+ }
},
// 获取工艺能力名字
craftChange(row, index) {
diff --git a/src/views/processManagement/components/processMainte/reworkProcessPlanning.vue b/src/views/processManagement/components/processMainte/reworkProcessPlanning.vue
index c12a869..f97fb08 100644
--- a/src/views/processManagement/components/processMainte/reworkProcessPlanning.vue
+++ b/src/views/processManagement/components/processMainte/reworkProcessPlanning.vue
@@ -42,9 +42,10 @@
style="width: 220px; margin-right: 12px"
clearable
filterable
+ :filter-method="handleFilter"
>
{
+ this.dictionaryData = res.data.data
+ })
+ },
// 获取检验项目名字
projectChange(row, index) {
let selectName = this.projectOptions.find(item => item.id == row.projecCode);
@@ -698,6 +709,25 @@ export default {
processChange(row, index) {
let selectName = this.processSetOption.find(item => item.id == row.processInfo.ppsId);
this.form1.tableData1[index].processInfo.ppsName = selectName.name;
+ if(this.form1.tableData1[index].processName.indexOf('涂色标') > -1){
+ console.log(this.partInfoData,this.dictionaryData,'this.partInfoData');
+ // tsbNum 涂色标个数 tsdNum 涂色带个数 涂箭头个数
+ let sum_ = 0
+ if(this.partInfoData.tsbNum){
+ let tsb=this.dictionaryData.find(item => item.dictValue == '涂色标')
+ sum_ += parseInt(this.partInfoData.tsbNum)*tsb.dictKey
+ }
+ if(this.partInfoData.tsdNum){
+ let tsd=this.dictionaryData.find(item => item.dictValue == '涂色带')
+ sum_ += parseInt(this.partInfoData.tsdNum)*tsd.dictKey
+ }
+ if(this.partInfoData.tsjNum){
+ let tsj=this.dictionaryData.find(item => item.dictValue == '涂箭头')
+ sum_ += parseInt(this.partInfoData.tsjNum)*tsj.dictKey
+ }
+ console.log(sum_,'sum_');
+ this.form1.tableData1[index].proHours = sum_
+ }
},
// 获取工艺能力名字
craftChange(row, index) {
@@ -727,6 +757,26 @@ export default {
this.modelOption = res.data.data;
});
},
+ handleFilter(keyword) {
+ // 1. 无关键词时，显示全部数据
+ if (!keyword) {
+ this.filteredList = [...this.originList];
+ return;
+ }
+
+ // 2. 统一转为小写，实现不区分大小写过滤
+ const lowerKeyword = keyword.toLowerCase();
+
+ // 3. 同时匹配两个字段：name 或 pinyin 包含关键词即保留
+ this.filteredList = this.originList.filter(item => {
+ // 字段1：姓名（转小写）
+ const matchName = item.name.toLowerCase().includes(lowerKeyword);
+ // 字段2：拼音（转小写）
+ const matchPinyin = item.modelNameStr.toLowerCase().includes(lowerKeyword);
+ // 只要有一个字段匹配，就保留该选项
+ return matchName || matchPinyin;
+ });
+ },
// 导入模板
modelLevelChange() {
getModelDetailList({ modelId: this.modelLevel }).then(res => {
diff --git a/src/views/processManagement/taskProcessing.vue b/src/views/processManagement/taskProcessing.vue
index 1514d8c..2b07a55 100644
--- a/src/views/processManagement/taskProcessing.vue
+++ b/src/views/processManagement/taskProcessing.vue
@@ -25,12 +25,12 @@
详情
-
+
编制