Browse Source

2025/6/20

master
Aoi_Tori 7 months ago
parent
commit
4cdebbcb9a
  1. 18
      src/utils/highlight.js
  2. 28
      src/views/common/filterSearch.vue
  3. 4
      src/views/modules/part/partInformation.vue
  4. 17
      src/views/modules/test/testSoBom/testTable.vue

18
src/utils/highlight.js

@ -6,6 +6,24 @@ export default {
const selects = el.querySelectorAll('.el-select');
const textareas = el.querySelectorAll('textarea');
// function applyHighlight(inputEl) {
// const isModified = inputEl.value !== null && inputEl.value.trim() !== '';
// if (isModified) {
// inputEl.classList.add('highlight');
// } else {
// inputEl.classList.remove('highlight');
// }
// }
//
// inputs.forEach(inputEl => {
// // 初始检查
// applyHighlight(inputEl);
//
// // 监听输入变化
// inputEl.addEventListener('input', function() {
// applyHighlight(inputEl);
// });
// });
// 处理所有的 input 元素
inputs.forEach(inputEl => {

28
src/views/common/filterSearch.vue

@ -406,17 +406,9 @@ export default {
<div v-if="row.dataType === 'S'" style="display: flex; align-items: center;">
<el-select slot="prepend" clearable v-model="row.symbol" style="width: 80px; cursor: pointer;">
<el-option
value="in"
label="属于"
v-if="(row.menuId === '102001' && row.fieldName === 'createBy') ||
(row.menuId === '102004' && row.fieldName === 'createBy') ||
(row.menuId === '107001' && row.fieldName === 'createBy') ||
(row.menuId === '103001' && row.fieldName === 'createBy')"
/>
<el-option value="eq" label="等于" v-else />
<el-option value="ne" label="不等于" v-else />
<el-option value="like" label="LIKE" v-else />
<el-option value="eq" label="等于" />
<el-option value="ne" label="不等于" />
<el-option value="like" label="LIKE" />
</el-select>
<el-input v-model="row.formula" clearable style="margin-left: -1px; flex: 1;" />
</div>
@ -476,17 +468,9 @@ export default {
<div v-if="row.dataType === 'S'" style="display: flex; align-items: center;">
<el-select slot="prepend" clearable v-model="row.symbol" style="width: 80px; cursor: pointer;">
<el-option
value="in"
label="属于"
v-if="(row.menuId === '102001' && row.fieldName === 'createBy') ||
(row.menuId === '102004' && row.fieldName === 'createBy') ||
(row.menuId === '107001' && row.fieldName === 'createBy') ||
(row.menuId === '103001' && row.fieldName === 'createBy')"
/>
<el-option value="eq" label="等于" v-else />
<el-option value="ne" label="不等于" v-else />
<el-option value="like" label="LIKE" v-else />
<el-option value="eq" label="等于"/>
<el-option value="ne" label="不等于"/>
<el-option value="like" label="LIKE"/>
</el-select>
<el-input v-model="row.formula" clearable style="margin-left: -1px; flex: 1;" />
</div>

4
src/views/modules/part/partInformation.vue

@ -128,8 +128,8 @@
更多
</el-link >
<el-dropdown-menu slot="dropdown">
<el-dropdown-item @click.native="jumpBom(scope.row)">产品BOM</el-dropdown-item>
<el-dropdown-item v-if="scope.row.ifHasPeifang === 'Y'" @click.native="jumpPeifang(scope.row)">配方BOM</el-dropdown-item>
<el-dropdown-item v-if="scope.row.ifHasPeifang === 'N'" @click.native="toMenu('BOM', scope.row)">产品BOM</el-dropdown-item>
<el-dropdown-item v-else @click.native="toMenu('BOM', scope.row)">配方BOM</el-dropdown-item>
<el-dropdown-item @click.native="toMenu('Routing', scope.row)">Routing</el-dropdown-item>
<el-dropdown-item v-if="scope.row.temporaryPartFlag === 'Y' && scope.row.status === 'N'" @click.native="toBecomeOfficialPartModal(scope.row)">转正式物料</el-dropdown-item>
</el-dropdown-menu>

17
src/views/modules/test/testSoBom/testTable.vue

@ -447,10 +447,11 @@ export default {
this.testSoBom.unitCost = (data.rows && data.rows.length === 1)?data.rows[0].inventoryValue:0;
this.testSoBom.status = row.status;
this.partDialogFlag = false;
this.queryLoading = false
}else {
this.$message.warning(data.msg);
this.queryLoading = false
}
this.queryLoading = false
}).catch((error)=>{
this.$message.error(error)
this.queryLoading = false
@ -678,13 +679,13 @@ export default {
this.closePartDialog();
}
},
queryLoading(newVal,oldVal){
if (newVal){
setTimeout(()=>{
this.queryLoading = false
},5000)
}
}
// queryLoading(newVal,oldVal){
// if (newVal){
// setTimeout(()=>{
// this.queryLoading = false
// },5000)
// }
// }
}
}

Loading…
Cancel
Save