Merge branch 'ssotest' of https://git.steerinfo.com/XTEMS/xt-ems-front into ssotest

package.json

@@ -16,7 +16,7 @@
   },
   "dependencies": {
     "G6-4.3.11": "npm:@antv/g6@4.3.11",
-    "icore-icp": "1.2.2-at.1.15",
+    "icore-icp": "1.2.2-at.1.16",
     "codemirror": "5.65.5"
   },
   "devDependencies": {

src/views/energyBalance/components/balanceData.vue

@@ -354,7 +354,7 @@
                                 <el-form-item
                                     v-if="scope.row.isSelection"
                                     :prop="'s' + scope.row.seq + '.apportvalue'"
-                                    :rules="tableFormRules.integer"
+                                    :rules="tableFormRules.numbers"
                                 >
                                     <el-input clearable @keydown.native="keyDown" :id="scope.column.id + scope.$index"
                                         style="width: 100%;"
@@ -448,7 +448,27 @@
                             label="实绩产量"
                             width="100px"
                             :show-overflow-tooltip="true"
-                        ></el-table-column> -->
+                        ></el-table-column> -->
+                        <el-table-column
+                         sortable
+                             prop="bz"
+                             label="备注"
+                             width="250px"
+                             :show-overflow-tooltip="true"
+                        ><template slot-scope="scope">
+                             <el-form-item
+                                 v-if="scope.row.isSelection"
+                                 :prop="'s' + scope.row.seq + '.bz'"
+
+                             >
+                                 <el-input clearable
+                                     style="width: 100%;"
+                                     v-model="tableFormDataObj['s' + scope.row.seq].bz"
+                                 ></el-input>
+                             </el-form-item>
+                             <span v-else>{{scope.row.bz}}</span>
+                         </template>
+                        </el-table-column>
                         <el-table-column
                             sortable
                             prop="rectime"
@@ -823,7 +843,8 @@ export default {
                                 updateclock: item.UPTIME,
                                 rav: item.RAV,
                                 ftv: item.FTV != null ? item.FTV : Number(item.APPORTVALUE) - Number(item.RAV),
-                                showno: item.SHOWNO
+                                showno: item.SHOWNO,
+                                bz: item.BZ
                             })
                         }
                         that.tableData = arr;
@@ -961,7 +982,8 @@ export default {
                                 correctvalue: that.tableFormDataObj[obj].correctvalue,
                                 apportvalue: that.tableFormDataObj[obj].apportvalue,
                                 actualvalue: that.tableFormDataObj[obj].actualvalue,
-                                ftv: that.tableFormDataObj[obj].ftv
+                                ftv: that.tableFormDataObj[obj].ftv,
+                                bz: that.tableFormDataObj[obj].bz
                             })
                         }
                         that.loading = true;

src/views/energyBalance/components/balanceData2.vue

@@ -362,7 +362,7 @@
                                 <el-form-item
                                     v-if="scope.row.isSelection"
                                     :prop="'s' + scope.row.seq + '.apportvalue'"
-                                    :rules="tableFormRules.integer"
+                                    :rules="tableFormRules.numbers"
                                 >
                                     <el-input clearable @keydown.native="keyDown" :id="scope.column.id + scope.$index"
                                         style="width: 100%;"