+
+
+
-
-
-
@@ -342,7 +342,7 @@ export default {
{key: 4, label: `计量设备类型`, visible: true},
{key: 5, label: `计算方式`, visible: true},
{key: 6, label: `比率`, visible: true},
- {key: 7, label: `备注`, visible: true},
+ {key: 7, label: `备注`, visible: false},
{key: 8, label: `启用标识`, visible: false},
{key: 9, label: `创建人`, visible: false},
{key: 10, label: `创建时间`, visible: false},
@@ -436,7 +436,7 @@ export default {
monitorStatus: 0,
monitorType: 1,
formulaMode: 0,
- proportion: null,
+ proportion: 1,
remark: null,
isFlag: 0,
createdBy: null,
diff --git a/src/views/base/orderInfo/index.vue b/src/views/base/orderInfo/index.vue
index 62b658a..1184a29 100644
--- a/src/views/base/orderInfo/index.vue
+++ b/src/views/base/orderInfo/index.vue
@@ -2,7 +2,7 @@
-
+
@@ -25,6 +26,7 @@
placeholder="请输入物料编号"
clearable
@keyup.enter.native="handleQuery"
+ style="width: 150px;"
/>
@@ -33,10 +35,11 @@
placeholder="请输入物料名称"
clearable
@keyup.enter.native="handleQuery"
+ style="width: 150px;"
/>
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
搜索
重置
@@ -248,6 +254,16 @@
+
+
+
+
+
@@ -260,15 +276,15 @@
-
-
-
+
+
+
-
-
-
+
+
+
-
+
-
-
+
+
@@ -259,7 +259,7 @@ export default {
delete node.children;
}
return {
- id: node.workUnitCode,
+ id: node.objId,
label: node.workUnitName,
children: node.children
};
@@ -269,7 +269,7 @@ export default {
listWorkUnit().then(response => {
this.workUnitOptions = [];
const data = { workUnitCode: 0, workUnitName: '顶级节点', children: [] };
- data.children = this.handleTree(response.data, "workUnitCode", "parentId");
+ data.children = this.handleTree(response.data, "objId", "parentId");
this.workUnitOptions.push(data);
});
},
@@ -311,8 +311,8 @@ export default {
handleAdd(row) {
this.reset();
this.getTreeselect();
- if (row != null && row.workUnitCode) {
- this.form.parentId = row.workUnitCode;
+ if (row != null && row.objId) {
+ this.form.parentId = row.objId;
} else {
this.form.parentId = 0;
}
diff --git a/src/views/report/DayDnb/index.vue b/src/views/report/DayDnb/index.vue
index 4e98c3c..383690d 100644
--- a/src/views/report/DayDnb/index.vue
+++ b/src/views/report/DayDnb/index.vue
@@ -27,166 +27,170 @@