|
@@ -100,7 +100,6 @@ class GLJListModel extends BaseModel {
|
|
projectGLJCode.push(tmp.code);
|
|
projectGLJCode.push(tmp.code);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
-
|
|
|
|
// 从定额工料机库中获取消耗量
|
|
// 从定额工料机库中获取消耗量
|
|
condition = {
|
|
condition = {
|
|
projectID: projectId,
|
|
projectID: projectId,
|
|
@@ -144,8 +143,11 @@ class GLJListModel extends BaseModel {
|
|
|
|
|
|
// 排序
|
|
// 排序
|
|
gljData.sort(function (a, b) {
|
|
gljData.sort(function (a, b) {
|
|
|
|
+ a.unit_price = a.unit_price === null ? 0 : a.unit_price;
|
|
|
|
+ b.unit_price = b.unit_price === null ? 0 : b.unit_price;
|
|
return a.unit_price.type - b.unit_price.type;
|
|
return a.unit_price.type - b.unit_price.type;
|
|
});
|
|
});
|
|
|
|
+
|
|
} catch (error) {
|
|
} catch (error) {
|
|
console.log("glj_list_model:" + error);
|
|
console.log("glj_list_model:" + error);
|
|
gljData = [];
|
|
gljData = [];
|