diff --git a/public/config.js b/public/config.js
index eb3980e..945f455 100644
--- a/public/config.js
+++ b/public/config.js
@@ -2,9 +2,15 @@ window.LOAD_Remind = 86400000
window.TIMED_Trigger=86400000
window.YINGDU_Trigger=3000 //硬度检测 轮巡时间
-window.PROCESS_FLOW_CARD_HEAT_METER="http://192.168.169.172:9000/jmreport/view/1154214123878776832"//工艺流程卡地址 热表公用
+window.PROCESS_FLOW_CARD_HEAT_METER="http://192.168.169.172:9000/jmreport/view/1179931264832327680"//工艺流程卡地址 热表公用
+
+window.PROCESS_FLOW_CARD_HEAT_SINTER="http://192.168.169.172:9000/jmreport/view/1179931277666897920"//工艺流程卡地址 烧结
+
+// 车间订单 标签打印 ?wold=20215636716975144988num=12
+window.PROCESS_FLOW_CARD_PRINT="http://192.168.169.172:9000/jmreport/view/11963457061889843202"
+// 车间订单 配套单打印 192.168.169.172:9000/jmreport/view/1196345720432840704?yold=2021505360038002689
+window.PROCESS_FLOW_CARD_PRINT_SUPPORT="http://192.168.169.172:9000/jmreport/view/11963457061889843202"
-window.PROCESS_FLOW_CARD_HEAT_SINTER="http://192.168.169.172:9000/jmreport/view/1154632438942031872"//工艺流程卡地址 烧结
window.SCHEDULING_DASHBOARD = "http://192.168.169.172:8088/SCHEDULING_DASHBOARD" //排产看板地址
window.SCHEDULING_EXCEPTION = "http://192.168.169.172:8088/SCHEDULING_EXCEPTION" //排产异常地址
@@ -14,6 +20,9 @@ window.PROCESS_QUALITY_RECORD = "http://192.168.169.172:9000/jmreport/view/11531
window.WARE_MATERIAL_STOCK = "http://192.168.169.172:9000/jmreport/view/1186917825215324160" //仓管-库存汇总-存料登记卡打印
+
+
+
// 配套单打印 /jmreport/view/1188705683594706944?yoId=2008439579960193026
window.COMPANION = "http://192.168.169.172:9000/jmreport/view/1188705683594706944"
diff --git a/src/api/qualityManagement/remindRedeem/remindRedeem.js b/src/api/qualityManagement/remindRedeem/remindRedeem.js
index 7c408e1..849f634 100644
--- a/src/api/qualityManagement/remindRedeem/remindRedeem.js
+++ b/src/api/qualityManagement/remindRedeem/remindRedeem.js
@@ -50,4 +50,13 @@ export const getPartList = () =>{
url:'/api/blade-desk/dsPart/getPartList',
method:'get'
})
+}
+
+// 子件下拉
+export const getSubPartList = (params) =>{
+ return request({
+ url:'/api/blade-desk/dsPartRelation/getSubParts',
+ method:'get',
+ params
+ })
}
\ No newline at end of file
diff --git a/src/views/basicData/components/addRuleDialog.vue b/src/views/basicData/components/addRuleDialog.vue
index ddf3a7c..a0d841d 100644
--- a/src/views/basicData/components/addRuleDialog.vue
+++ b/src/views/basicData/components/addRuleDialog.vue
@@ -64,13 +64,6 @@
-
-
-
-
-
-
-
@@ -78,10 +71,10 @@
-
+
-
-
+
+
@@ -92,6 +85,13 @@
+
+
+
+
+
+
+
*限制类型
diff --git a/src/views/inboundOutboundManagement/components/addEditDialog.vue b/src/views/inboundOutboundManagement/components/addEditDialog.vue
index a0b9060..17af62e 100644
--- a/src/views/inboundOutboundManagement/components/addEditDialog.vue
+++ b/src/views/inboundOutboundManagement/components/addEditDialog.vue
@@ -238,7 +238,7 @@ export default {
// 切换仓库
changeWarehouse(val){
if(this.tableData.length > 0){
- if(this.tableData.length == 1){
+ if(this.tableData.length == 1 && this.tableData[0].goodsCode){
this.tableData[0].slId = ''
getLocationList({
shId:this.ruleForm.shId,
diff --git a/src/views/inboundOutboundManagement/returnReceiving.vue b/src/views/inboundOutboundManagement/returnReceiving.vue
index 0f82896..4f81c99 100644
--- a/src/views/inboundOutboundManagement/returnReceiving.vue
+++ b/src/views/inboundOutboundManagement/returnReceiving.vue
@@ -22,7 +22,7 @@
- 物料编号：
+ 物料编号：
@@ -113,7 +113,7 @@ export default {
calcHeight: 32,
simplePage: false,
searchShow: true,
- searchMenuSpan: 6,
+ searchMenuSpan: 18,
searchIcon: true,
searchIndex: 3,
tree: false,
diff --git a/src/views/oem/outsourcingAssignmentControl/index.vue b/src/views/oem/outsourcingAssignmentControl/index.vue
index 21caebf..2845b8d 100644
--- a/src/views/oem/outsourcingAssignmentControl/index.vue
+++ b/src/views/oem/outsourcingAssignmentControl/index.vue
@@ -46,10 +46,6 @@
{{ row.proportion ? row.proportion + "%" : "0%" }}
-
-
- 发送审批
-
{
+ symbolSize: (val, params) => {
// 容错：params为空/无name时给默认值
const nodeName = params?.name || '未知节点';
const childCount = params?.children?.length || 0;
const childText = `${childCount}个子件`;
// 计算文本宽度
- const textWidth = Math.max(nodeName.length * 12, childText.length * 12) + 20;
+ const textWidth = Math.max(nodeName.length * 12, childText.length * 12) + 30;
return [Math.max(textWidth, 100), 60]; // 高度设为60px（适配两行文本）
},
@@ -258,9 +261,11 @@ export default {
lineHeight: 20,
color: '#fff',
formatter: params => {
- const childText =params.data.quota>=0?`${params.data.quota}个`:''
+ const childText = params.data.quota >= 0 ? `${params.data.quota}个` : '';
// 去掉模板字符串缩进，用\n换行，避免多余空白
- return `${params.name}${childText ? '\n' + childText : ''}`;
+ return `${params.data.partCode}\n${params.name}${
+ childText ? '\n' + childText : ''
+ }`;
},
},
},
diff --git a/src/views/productionManagement/productionMonitoring/index.vue b/src/views/productionManagement/productionMonitoring/index.vue
index f7df05c..a52f222 100644
--- a/src/views/productionManagement/productionMonitoring/index.vue
+++ b/src/views/productionManagement/productionMonitoring/index.vue
@@ -341,6 +341,7 @@ export default {
sortable: true,
overHidden: true,
width: 150,
+ searchOrder:19,
},
{
label: '批次号',
@@ -349,6 +350,7 @@ export default {
sortable: true,
overHidden: true,
width: 150,
+ searchOrder:18,
},
{
label: '流程卡号',
@@ -357,6 +359,7 @@ export default {
sortable: true,
overHidden: true,
width: 150,
+ searchOrder:20,
},
{
label: '产品型号',
diff --git a/src/views/productionSchedulingPlan/basic/qualityGrade.vue b/src/views/productionSchedulingPlan/basic/qualityGrade.vue
index 1b271cf..623c155 100644
--- a/src/views/productionSchedulingPlan/basic/qualityGrade.vue
+++ b/src/views/productionSchedulingPlan/basic/qualityGrade.vue
@@ -23,7 +23,12 @@
-
+
+ {{scope.row.isThickness == 1 ? '√' : ''}}
+
+
+ {{scope.row.isLocal == 1 ? '√' : ''}}
+
@@ -113,13 +118,13 @@ export default {
sortable: true,
span: 12,
type:'select',
- rules: [
- {
- required: true,
- message: '请选择',
- trigger: 'blur',
- },
- ],
+ // rules: [
+ // {
+ // required: true,
+ // message: '请选择',
+ // trigger: 'blur',
+ // },
+ // ],
dicData:[
{
label:'军品',
@@ -143,13 +148,13 @@ export default {
sortable: true,
span: 12,
type:'select',
- rules: [
- {
- required: true,
- message: '请选择',
- trigger: 'blur',
- },
- ],
+ // rules: [
+ // {
+ // required: true,
+ // message: '请选择',
+ // trigger: 'blur',
+ // },
+ // ],
dicData:[
{
label:'军品',
@@ -165,7 +170,50 @@ export default {
}
]
},
-
+ {
+ label:"局部镀",
+ prop:"isLocal",
+ type:'radio',
+ rules:[
+ {
+ required: true,
+ message: '请选择',
+ trigger: 'blur',
+ },
+ ],
+ dicData:[
+ {
+ label:'是',
+ value:1
+ },
+ {
+ label:'否',
+ value:0
+ }
+ ]
+ },
+ {
+ label:"厚金区固定厚度",
+ prop:"isThickness",
+ type:'radio',
+ dicData:[
+ {
+ label:'是',
+ value:1
+ },
+ {
+ label:'否',
+ value:0
+ }
+ ],
+ rules:[
+ {
+ required: true,
+ message: '请选择',
+ trigger: 'blur',
+ },
+ ],
+ }
],
},
@@ -175,15 +223,20 @@ export default {
methods: {
beforeOpen(done, type) {
if (['edit', 'view'].includes(type)) {
-
+ done();
+ }else if(['add'].includes(type)){
+ this.form.isLocal = 0
+ this.form.isThickness = 0
+ done();
}
- done();
},
rowSave(row, done, loading) {
console.log(row);
let params = {
qualityGrade:row.qualityGrade,
- types:row.type
+ types:row.type,
+ isLocal:row.isLocal,
+ isThickness:row.isThickness
}
addGualityGrade(params).then(
() => {
diff --git a/src/views/qualityManagement/remindRedeem/components/batchAdd.vue b/src/views/qualityManagement/remindRedeem/components/batchAdd.vue
index 0d95457..b15d942 100644
--- a/src/views/qualityManagement/remindRedeem/components/batchAdd.vue
+++ b/src/views/qualityManagement/remindRedeem/components/batchAdd.vue
@@ -80,13 +80,13 @@
-->
-
+
-
+
@@ -175,7 +175,7 @@