Browse Source

Merge remote-tracking branch 'origin/dev' into dev

shaun-sheep 4 years ago
parent
commit
2c41300d59

+ 2 - 2
package.json

@@ -20,9 +20,9 @@
   },
   "dependencies": {
     "@saga-web/base": "2.1.27",
-    "@saga-web/cad-engine": "2.0.574",
+    "@saga-web/cad-engine": "2.0.577",
     "@saga-web/draw": "2.1.110",
-    "@saga-web/graph": "2.1.131",
+    "@saga-web/graph": "2.1.132",
     "axios": "^0.18.0",
     "echarts": "^4.1.0",
     "el-cascader-multi": "^1.1.8",

+ 2 - 2
src/components/business_space/business/handsontable.vue

@@ -458,11 +458,11 @@
         }
       }
 
-      if (!this.onlyRead && !inputData.Editable) {
+      if (!this.onlyRead && !inputData.editable) {
         this.$message("该信息点的值为自动生成,不可人工维护!");
         return false;
       }
-      if (!this.onlyRead && showTools.InputModeArr.indexOf(inputData.InputMode) == '-1') {
+      if (!this.onlyRead && showTools.inputModeArr.indexOf(inputData.inputMode) == '-1') {
         this.updateInfoPoint = val;
         this.updateInput = tools.dataForKey(this.tableData[row.row], val);
         this.myDialog.update = true;

+ 2 - 2
src/components/ledger/handsontables/assets.vue

@@ -1007,11 +1007,11 @@ export default {
         default:
           break;
       }
-      if (!this.onlyRead && !inputData.Editable) {
+      if (!this.onlyRead && !inputData.editable) {
         this.$message("该信息点的值为自动生成,不可人工维护!");
         return false;
       }
-      if (!this.onlyRead && showTools.InputModeArr.indexOf(inputData.InputMode) == '-1') {
+      if (!this.onlyRead && showTools.inputModeArr.indexOf(inputData.inputMode) == '-1') {
         this.updateInfoPoint = val;
         this.updateInput = tools.dataForKey(this.tableData[row.row], val);
         this.myDialog.update = true;

+ 2 - 2
src/components/ledger/handsontables/device.vue

@@ -1450,13 +1450,13 @@ export default {
         default:
           break;
       }
-      if (!this.onlyRead && !inputData.Editable) {
+      if (!this.onlyRead && !inputData.editable) {
         this.$message("该信息点的值为自动生成,不可人工维护!");
         return false;
       }
       if (
         !this.onlyRead &&
-        showTools.InputModeArr.indexOf(inputData.InputMode) == "-1"
+        showTools.inputModeArr.indexOf(inputData.inputMode) == "-1"
       ) {
         this.updateInfoPoint = val;
         this.updateInput = tools.dataForKey(this.tableData[row.row], val);

+ 2 - 2
src/components/ledger/handsontables/system.vue

@@ -577,11 +577,11 @@ export default {
         default:
           break;
       }
-      if (!this.onlyRead && !inputData.Editable) {
+      if (!this.onlyRead && !inputData.editable) {
         this.$message("该信息点的值为自动生成,不可人工维护!");
         return false;
       }
-      if (!this.onlyRead && showTools.InputModeArr.indexOf(inputData.InputMode) == '-1') {
+      if (!this.onlyRead && showTools.inputModeArr.indexOf(inputData.inputMode) == '-1') {
         this.updateInfoPoint = val;
         this.updateInput = tools.dataForKey(this.tableData[row.row], val);
         this.myDialog.update = true;

+ 2 - 2
src/views/ledger/cenotelist/index.vue

@@ -385,11 +385,11 @@ export default {
         })
         return false
       }
-      if (!this.onlyRead && !inputData.Editable) {
+      if (!this.onlyRead && !inputData.editable) {
         this.$message("该信息点的值为自动生成,不可人工维护!");
         return false;
       }
-      if (!this.onlyRead && showTools.InputModeArr.indexOf(inputData.InputMode) == '-1') {
+      if (!this.onlyRead && showTools.inputModeArr.indexOf(inputData.inputMode) == '-1') {
         this.updateInfoPoint = val;
         this.updateInput = tools.dataForKey(this.tableData[row.row], val);
         this.myDialog.update = true;

+ 2 - 2
src/views/ledger/facility/partsmanage/index.vue

@@ -757,11 +757,11 @@ export default {
         default:
           break;
       }
-      if (!this.onlyRead && !inputData.Editable) {
+      if (!this.onlyRead && !inputData.editable) {
         this.$message("该信息点的值为自动生成,不可人工维护!");
         return false;
       }
-      if (!this.onlyRead && showTools.InputModeArr.indexOf(inputData.inputMode) == '-1') {
+      if (!this.onlyRead && showTools.inputModeArr.indexOf(inputData.inputMode) == '-1') {
         this.updateInfoPoint = val;
         this.updateInput = tools.dataForKey(this.tableData[row.row], val);
         this.myDialog.update = true;

+ 2 - 2
src/views/ledger/rentlist/index.vue

@@ -419,11 +419,11 @@ export default {
         this.$refs.roomCountDrawer.showDrawer(infos)
         return false
       }
-      if (!this.onlyRead && !inputData.Editable) {
+      if (!this.onlyRead && !inputData.editable) {
         this.$message("该信息点的值为自动生成,不可人工维护!");
         return false;
       }
-      if (!this.onlyRead && showTools.InputModeArr.indexOf(inputData.InputMode) == '-1') {
+      if (!this.onlyRead && showTools.inputModeArr.indexOf(inputData.inputMode) == '-1') {
         this.updateInfoPoint = val
         this.updateInput = tools.dataForKey(this.tableData[row.row], val)
         this.myDialog.update = true

+ 2 - 2
src/views/ledger/spacelist/spaceadd/index.vue

@@ -374,11 +374,11 @@ export default {
         default:
           break;
       }
-      if (!this.onlyRead && !inputData.Editable) {
+      if (!this.onlyRead && !inputData.editable) {
         this.$message("该信息点的值为自动生成,不可人工维护!");
         return false;
       }
-      if (!this.onlyRead && showTools.InputModeArr.indexOf(inputData.InputMode) == '-1') {
+      if (!this.onlyRead && showTools.inputModeArr.indexOf(inputData.inputMode) == '-1') {
         this.updateInfoPoint = val;
         this.updateInput = tools.dataForKey(this.tableData[row.row], val);
         this.myDialog.update = true;