diff --git a/ruoyi-ui/src/views/factory/factory/index.vue b/ruoyi-ui/src/views/factory/factory/index.vue
index 39dc70b..950b89e 100644
--- a/ruoyi-ui/src/views/factory/factory/index.vue
+++ b/ruoyi-ui/src/views/factory/factory/index.vue
@@ -69,19 +69,20 @@
-
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -318,7 +319,6 @@ export default {
},
created() {
this.getList();
- this.getMaterialType();
},
methods: {
/** 查询车间管理列表 */
@@ -389,6 +389,7 @@ export default {
this.open = true;
this.title = "添加车间管理";
this.isDis = false;
+ this.getMaterialType();
},
/** 修改按钮操作 */
handleUpdate(row) {
@@ -400,6 +401,7 @@ export default {
this.open = true;
this.title = "修改车间管理";
this.isDis = true;
+ this.getMaterialType();
});
},
/** 提交按钮 */
@@ -484,6 +486,10 @@ export default {
var YsRatio = this.form.factoryYsRatio?parseFloat(this.form.factoryYsRatio):0;
this.form.factoryTotalRatio = (RgRatio+WjRatio+FlRatio+DfRatio+TrqRatio+YsRatio).toFixed(3)
+ },
+ /** 序号 */
+ rowFactoryIndex({ row, rowIndex }) {
+ row.index = rowIndex + 1;
}
}
};
diff --git a/ruoyi-ui/src/views/material/material/index.vue b/ruoyi-ui/src/views/material/material/index.vue
index 6af022b..d19a525 100644
--- a/ruoyi-ui/src/views/material/material/index.vue
+++ b/ruoyi-ui/src/views/material/material/index.vue
@@ -290,8 +290,6 @@ export default {
},
created() {
this.getList();
- this.getClMaterials();
- this.getMaterialType();
},
computed:{
@@ -326,13 +324,13 @@ export default {
getMaterialType(){
listMaterialType(this.queryParams).then(response => {
this.cTypeList = response.cTypeList;
-
+/*
let obj = {};
this.cTypeList.forEach(item => {
let key = item.typeNo;
obj[key] = item.typeName;
})
- this.cTypeMap = obj;
+ this.cTypeMap = obj;*/
});
},
@@ -374,6 +372,8 @@ export default {
this.reset();
this.open = true;
this.title = "添加物料管理";
+ this.getClMaterials();
+ this.getMaterialType();
},
/** 修改按钮操作 */
handleUpdate(row) {
@@ -384,6 +384,8 @@ export default {
this.cMaterialCostList = response.data.cmaterialCostList;
this.open = true;
this.title = "修改物料管理";
+ this.getClMaterials();
+ this.getMaterialType();
this.sumPriceTotal()
});
},
diff --git a/ruoyi-ui/src/views/materialType/materialType/index.vue b/ruoyi-ui/src/views/materialType/materialType/index.vue
index 271c982..8a45016 100644
--- a/ruoyi-ui/src/views/materialType/materialType/index.vue
+++ b/ruoyi-ui/src/views/materialType/materialType/index.vue
@@ -71,6 +71,7 @@
+