修改

build/utils.js

@@ -19,8 +19,14 @@ const devPathSrc = path.resolve(__dirname, "../../../src"); // node_modules应
 // let devModules = ["index", "statisticalReport", "appoint", "TMS"];
 // let devModules = ["index", "statisticalReport", "TMS", "appoint"];
 
+<<<<<<< HEAD
 let devModules = ["all"];
 // let devModules = ["index","appoint","TMS","WMS","statisticalReport"];
+=======
+
+// let devModules = ["index", "appoint", "statisticalReport"];
+let devModules = ["all"];
+>>>>>>> 983a39765cfc7134e2c16e1e40a744b1fe7e3a0a
 // let devModules = ['index','appoint','sale','statisticalReport','RMS','TMS','WMS']
 // let devModules = ["index", "ADMINISTRATORS", "RMS"];
 // let devModules = ["index", "inward", "statisticalReport"];

package.json

@@ -26,6 +26,7 @@
     "apollo-link-http": "^1.5.14",
     "axios": "^0.26.1",
     "babel-polyfill": "^6.26.0",
+    "bignumber.js": "^9.0.2",
     "crypto": "^1.0.1",
     "echarts": "^4.1.0",
     "el-cascader-multi": "^1.1.8",
@@ -39,6 +40,7 @@
     "jspdf": "^2.5.1",
     "jssha": "^3.2.0",
     "lay-excel": "^1.7.6",
+    "mathjs": "^10.6.4",
     "object-assign": "^4.1.1",
     "qs": "^6.9.3",
     "sass-loader": "^6.0.7",

src/views/TMS/components/domesticMine/entrustMine.vue

@@ -47,12 +47,17 @@
         </dilTable>
       </el-tab-pane>
     </el-tabs>
+    <div class="count" v-show="sum1>0 && activeName == 'second'" style="margin-right:50px;font-size:18px;">
+      <div style="display:flex;flex-direction:row-reverse">标重总吨位：{{sum1}}</div>
+      <div style="display:flex;flex-direction:row-reverse">净重总吨位：{{sum2}}</div>
+    </div>
   </div>
 </template>
 
 
 <script>
 import { sjTime } from "@/utils/sharedJsFile";
+import bignumber,{BigNumber} from 'bignumber.js';
 export default {
   data() {
     return {
@@ -77,6 +82,8 @@ export default {
       startTime: null,
       endTime: null,
       tableTitle: "国产矿计量表",
+      sum1:0.0,
+      sum2:0.0,
     };
   },
   methods: {
@@ -144,9 +151,18 @@ export default {
       this.selectionListMap = selection;
     },
     selectionChange2(selection) {
+      let that=this;
       this.selectionListMap2 = [];
       console.log(selection);
       this.selectionListMap2 = selection;
+      let sum1 = 0;
+      let sum2 = new BigNumber(0);
+      selection.forEach(element => {
+        sum1+=element.resultBillableTonnage;
+        sum2=sum2.plus(element.resultNetWeight);
+      });
+      this.sum1=sum1;
+      this.sum2=sum2.toNumber();
     },
     refresh(){
       this.$router.go(0);

src/views/TMS/components/domesticMine/wagonLoadAdd.vue

@@ -18,8 +18,12 @@
         当前导入数量：{{ tableData.length }}
       </div>
     </div>
-    <div class="table item">
-      <el-table stripe :data="tableData" style="width: 100%" id="domesticTable">
+    <div class="importedTable" style="height:300px;overflow:scroll;">
+      <el-table
+        highlight-current-row
+        :data="tableData"
+        :row-style="{height:'40px'}"
+        id="domesticTable">
         <el-table-column
           type="index"
           width="50"
@@ -104,7 +108,7 @@
         <dil-form :formId="364" v-model="form1" ref="from1"></dil-form>
       </div>
     </div>
-    <div class="button_box">
+    <div class="button_box_domestic">
       <el-button @click="cancel">取消</el-button>
       <el-button type="primary" :loading="isLoading" @click="makeSure"
         >确定</el-button
@@ -674,11 +678,10 @@ export default {
       }
     }
   }
-  .button_box {
+  .button_box_domestic {
     display: flex;
     justify-content: center;
-    margin-top: 30px;
-    margin-bottom: 30px;
+    padding-top: 10px;
   }
   .fromOther .el-input__inner {
     width: 250px;

src/views/TMS/components/domesticMine/wagonLoadMine.vue

@@ -33,12 +33,12 @@
           type="text" size="small"
             >修改</el-button
           >
-          <el-button
+          <!-- <el-button
             type="text"
             size="small"
             @click="deleteclick(scope.row.resultId)"
             >删除</el-button
-          >
+          > -->
         </template>
       </el-table-column>
     </dilTable>

src/views/TMS/components/importedEmergency/addWagonLoadEmergency.vue

@@ -15,11 +15,12 @@
       </el-upload>
       <span >当前导入数量：{{tableData.length}}</span>
     </div>
-    <div class="table item">
+    <div class="importedTable" style="height:300px;overflow:scroll;">
       <el-table
-        stripe
+        highlight-current-row
         :data="tableData"
-        style="width: 100%"
+        :row-style="{height:'40px'}"
+        style="width: 100%,font-size: 20px"
         id="domesticTable">
         <el-table-column
         type="index"
@@ -162,7 +163,7 @@ export default {
       inputText: "",
       sendStationId:2,
       toTheStationId:1,
-      sendStation:"万州港",
+      sendStation:"新区轨道衡",
       toTheStation:"老区轨道衡"
     };
   },
@@ -605,7 +606,7 @@ export default {
   .button-box {
     display: flex;
     justify-content: center;
-    padding-top: 30px;
+    padding-top: 10px;
   }
   .formOther  .el-input__inner{
     width: 250px;

src/views/TMS/components/importedEmergency/entrustEmergency.vue

@@ -39,13 +39,17 @@
         </dilTable>
       </el-tab-pane>
     </el-tabs>
+    <div class="count" v-show="sum1>0 && activeName == 'second'" style="margin-right:50px;font-size:18px;">
+      <div style="display:flex;flex-direction:row-reverse">标重总吨位：{{sum1}}</div>
+      <div style="display:flex;flex-direction:row-reverse">净重总吨位：{{sum2}}</div>
+    </div>
   </div>
 </template>
 
 
 <script>
 import { sjTime } from "@/utils/sharedJsFile";
-
+import bignumber,{BigNumber} from 'bignumber.js';
 export default {
   data() {
     return {
@@ -139,6 +143,14 @@ export default {
       this.selectionListMap2 = [];
       console.log(selection);
       this.selectionListMap2 = selection;
+      let sum1 = 0;
+      let sum2 = new BigNumber(0);
+      selection.forEach(element => {
+        sum1+=element.resultBillableTonnage;
+        sum2=sum2.plus(element.resultNetWeight);
+      });
+      this.sum1=sum1;
+      this.sum2=sum2.toNumber();
     },
     refresh(){
       this.$router.go(0);

src/views/TMS/components/importedEmergency/wagonLoadEmergency.vue

@@ -28,18 +28,17 @@
     <dilTable v-bind.sync="option">
       <el-table-column fixed="right" label="操作" width="100">
         <template slot-scope="scope">
-          <el-button
-            @click="onclick(2, scope.row.resultId)"
-            type="text"
-            size="small"
+           <el-button @click="click(scope.row.resultId)"  
+           :disabled="!scope.row.isEdit"
+          type="text" size="small"
             >修改</el-button
           >
-          <el-button
+          <!-- <el-button
             type="text"
             size="small"
             @click="deleteclick(scope.row.resultId)"
             >删除</el-button
-          >
+          > -->
         </template>
       </el-table-column>
     </dilTable>

src/views/TMS/components/importedMine/addWagonLoad.vue

@@ -15,11 +15,12 @@
       </el-upload>
       <span >当前导入数量：{{tableData.length}}</span>
     </div>
-    <div class="table item">
+    <div class="importedTable" style="height:300px;overflow:scroll;">
       <el-table
-        stripe
+        highlight-current-row
         :data="tableData"
-        style="width: 100%"
+        :row-style="{height:'40px'}"
+        style="width: 100%,font-size: 20px"
         id="domesticTable">
         <el-table-column
         type="index"
@@ -160,7 +161,7 @@ export default {
       a: 1,
       direction: "rtl",
       inputText: "",
-      sendStationId:2,
+      sendStationId:4,
       toTheStationId:1,
       sendStation:"万州港",
       toTheStation:"老区轨道衡"
@@ -605,7 +606,7 @@ export default {
   .button-box {
     display: flex;
     justify-content: center;
-    padding-top: 30px;
+    padding-top: 10px;
   }
   .formOther  .el-input__inner{
     width: 250px;

src/views/TMS/components/importedMine/entrust.vue

@@ -44,17 +44,21 @@
           ref="excelDom"
           v-bind.sync="option2"
           @selection-change="selectionChange2"
-          v-if="activeName == 'second'"
         >
         </dilTable>
       </el-tab-pane>
     </el-tabs>
+    <div class="count" v-show="sum1>0 && activeName == 'second'" style="margin-right:50px;font-size:18px;">
+      <div style="display:flex;flex-direction:row-reverse">标重总吨位：{{sum1}}</div>
+      <div style="display:flex;flex-direction:row-reverse">净重总吨位：{{sum2}}</div>
+    </div>
   </div>
 </template>
 
 
 <script>
 import { sjTime } from "@/utils/sharedJsFile";
+import bignumber,{BigNumber} from 'bignumber.js';
 export default {
   data() {
     return {
@@ -79,6 +83,8 @@ export default {
       startTime: null,
       endTime: null,
       tableTitle: "万州港-达州计量表",
+      sum1:0.0,
+      sum2:0.0,
     };
   },
   methods: {
@@ -148,6 +154,14 @@ export default {
       this.selectionListMap2 = [];
       console.log(selection);
       this.selectionListMap2 = selection;
+      let sum1 = 0;
+      let sum2 = new BigNumber(0);
+      selection.forEach(element => {
+        sum1+=element.resultBillableTonnage;
+        sum2=sum2.plus(element.resultNetWeight);
+      });
+      this.sum1=sum1;
+      this.sum2=sum2.toNumber();
     },
     refresh(){
       this.$router.go(0);

src/views/TMS/components/importedMine/wagonLoad.vue

@@ -29,15 +29,17 @@
     <dilTable v-bind.sync="option">
       <el-table-column fixed="right" label="操作" width="100">
         <template slot-scope="scope">
-          <el-button @click="click(scope.row.resultId)" type="text" size="small"
+          <el-button @click="click(scope.row.resultId)"  
+           :disabled="!scope.row.isEdit"
+          type="text" size="small"
             >修改</el-button
           >
-          <el-button
+          <!-- <el-button
             type="text"
             size="small"
             @click="deleteclick(scope.row.resultId)"
             >删除</el-button
-          >
+          > -->
         </template>
       </el-table-column>
     </dilTable>