Selaa lähdekoodia

1.main页面中加入项目工料机数据到缓存中
2.屏蔽工料机汇总页面中部分提示

olym 7 vuotta sitten
vanhempi
commit
4c01e597b1

+ 1 - 1
web/building_saas/glj/js/composition_spread.js

@@ -131,7 +131,7 @@ CompositionSpread.prototype.getRatioData = function(projectGLJid) {
                 self.specialColumn(response.data);
             } else {
                 self.sheetObj.setData(null);
-                alert('不存在对应数据');
+                console.log('不存在对应数据');
             }
         }
     });

+ 4 - 1
web/building_saas/glj/js/project_glj.js

@@ -53,7 +53,7 @@ function init() {
         dataType: 'json',
         data: {project_id: scUrlUtil.GetQueryString('project')},
         error: function() {
-            alert('数据传输错误');
+            // alert('数据传输错误');
         },
         beforeSend: function() {
 
@@ -76,6 +76,9 @@ function init() {
                 data.constData.ownCompositionTypes : canNotChangeTypeId;
             GLJTypeConst = data.constData.GLJTypeConst !== undefined ? JSON.parse(data.constData.GLJTypeConst) : GLJTypeConst;
 
+            // 存入缓存
+            projectObj.project.projectGLJ.datas = jsonData;
+            console.log(projectObj.project);
             spreadInit();
         }
     });

+ 1 - 0
web/building_saas/main/html/main.html

@@ -445,6 +445,7 @@
     <script type="text/javascript" src="/web/building_saas/main/js/models/bills.js"></script>
     <script type="text/javascript" src="/web/building_saas/main/js/models/ration.js"></script>
     <script type="text/javascript" src="/web/building_saas/main/js/models/glj.js"></script>
+    <script type="text/javascript" src="/web/building_saas/main/js/models/project_glj.js"></script>
     <script type="text/javascript" src="/web/building_saas/main/js/models/fee_rate.js"></script>
     <script type="text/javascript" src="/web/building_saas/main/js/models/ration_glj.js"></script>
     <script type="text/javascript" src="/web/building_saas/main/js/models/ration_coe.js"></script>

+ 2 - 1
web/building_saas/main/js/models/main_consts.js

@@ -11,5 +11,6 @@ const ModuleNames = {
     ration_coe:'ration_coe',
     ration_ass:'ration_ass',
     quantity_detail:'quantity_detail',
-    volume_price: 'volume_price'
+    volume_price: 'volume_price',
+    projectGLJ: 'project_glj'
 };

+ 1 - 0
web/building_saas/main/js/models/project.js

@@ -74,6 +74,7 @@ var PROJECT = {
             this.quantity_detail = quantity_detail.createNew(this);
             this.FeeRate = FeeRate.createNew(this);
             this.VolumePrice = VolumePrice.createNew(this);
+            this.projectGLJ = new projectGLJ(this);
             this.Decimal = {
                 common: {
                     quantity: 3,

+ 39 - 0
web/building_saas/main/js/models/project_glj.js

@@ -0,0 +1,39 @@
+/**
+ * 工料机汇总相关数据
+ *
+ * @author CaiAoLin
+ * @date 2017/9/14
+ * @version
+ */
+function projectGLJ(project) {
+    this.project = project;
+    this.datas = null;
+}
+
+/**
+ * 获取数据类型
+ *
+ * @return {String}
+ */
+projectGLJ.prototype.getSourceType = function() {
+    let sourceType = ModuleNames.projectGLJ;
+    return sourceType;
+};
+
+/**
+ * project中调用
+ *
+ * @return {void}
+ */
+projectGLJ.prototype.createNew =  function() {
+    this.project.registerModule(ModuleNames.projectGLJ, this);
+};
+
+/**
+ * 加载数据
+ *
+ * @return {void}
+ */
+projectGLJ.prototype.loadData = function (datas) {
+    this.datas = datas;
+};