修改销售钢材

build/utils.js

@@ -20,7 +20,8 @@ const devPathSrc = path.resolve(__dirname, "../../../src"); // node_modules应
 // let devModules = ["index", "statisticalReport", "TMS", "appoint"];
 
 // let devModules = ["index", "appoint", "statisticalReport"];
-let devModules = ["index", "appoint", "statisticalReport", "WMS"];
+// let devModules = ["index", "appoint", "statisticalReport", "WMS"];
+let devModules = ["all"];
 
 // let devModules = ['index','appoint','sale','statisticalReport','RMS','TMS','WMS']
 // let devModules = ["index", "ADMINISTRATORS", "RMS"];

config/index.js

@@ -65,9 +65,7 @@ let proxyTable = {
   },
   // 所有数据的请求域名地址
   "/api/v1": {
-    // target: "http://localhost:8080",
-    // target: "http://172.16.33.166:80",
-    target: "http://192.168.1.107:8080",
+    target: "http://172.16.33.166:80",
     // target: "http://192.168.1.106:8080",
     ws: true,
     pathRewrite: {
@@ -75,8 +73,9 @@ let proxyTable = {
     }
   },
   "/views/api/v1": {
-    target: "http://172.16.33.166:80",
+    // target: "http://localhost:8080",
     // target: "http://192.168.1.109:8080",
+    target: "http://172.16.33.166:80",
     ws: true,
     pathRewrite: {
       "^/views/api/v1": "/api/v1"

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>

src/views/TMS/components/importedShip/addShipmentInstructions.vue

@@ -28,7 +28,7 @@
       :visible.sync="drawer"
       :direction="direction"
       :before-close="handleClose"
-      size="35%"
+      size="45%"
     >
       <el-input
         placeholder="请输入内容"

src/views/TMS/components/importedShip/shipLocation.vue

@@ -2,8 +2,7 @@
   <!-- 位置作业页面 -->
   <div class="homeworkPath">
     <div class="top">
-      <el-date-picker v-model="value" type="date" placeholder="选择日期">
-      </el-date-picker>
+      <el-input  class="el-input" placeholder="请输入物资名称和外轮船名" v-model="input" clearable> </el-input>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
@@ -39,7 +38,7 @@
             <template v-if="item.prop == 'shipLocation'">
               <el-input
                 v-model.number="scope.row.shipLocation"
-                style="width: 100px;"
+                style="width: 100px"
                 @blur="onblur(scope)"
               ></el-input>
             </template>
@@ -63,7 +62,7 @@
               <el-date-picker
                 type="date"
                 v-model.number="scope.row.locationRouteTime"
-                style="width: 150px;"
+                style="width: 150px"
                 :clearable="false"
               ></el-date-picker>
             </template>
@@ -95,20 +94,20 @@ export default {
       options: [
         {
           label: "未到闸船舶",
-          value: "未到闸船舶"
+          value: "未到闸船舶",
         },
         {
           label: "等闸船舶",
-          value: "等闸船舶"
+          value: "等闸船舶",
         },
         {
           label: "已过闸船舶",
-          value: "已过闸船舶"
+          value: "已过闸船舶",
         },
         {
           label: "到港待卸船舶",
-          value: "到港待卸船舶"
-        }
+          value: "到港待卸船舶",
+        },
       ],
       value: null,
       // 车辆表格表头
@@ -116,64 +115,65 @@ export default {
         {
           prop: "foreignShipName",
           label: "外轮船名",
-          width: "140"
+          width: "140",
         },
         {
           prop: "materialName",
           label: "物资名称",
-          width: "140"
+          width: "140",
         },
         {
           prop: "capacityName",
           label: "江船船名",
-          width: "140"
+          width: "140",
         },
         {
           prop: "locationRouteTime",
           label: "离港日期",
           width: "200",
-          slot: true
+          slot: true,
         },
         {
           prop: "startPortName",
           label: "起运港",
-          width: "140"
+          width: "140",
         },
         {
           prop: "shipLocation",
           label: "船舶位置",
           width: "130",
-          slot: true
+          slot: true,
         },
         {
           prop: "locationStatus",
           label: "位置状态",
           width: "180",
-          slot: true
+          slot: true,
         },
 
         {
           prop: "arrivePortName",
           label: "到达港",
-          width: "140"
+          width: "140",
         },
         {
           prop: "planWeight",
           label: "计划吨",
-          width: "100"
+          width: "100",
         },
         {
           prop: "realWeight",
           label: "实际吨",
-          width: "100"
+          width: "100",
         },
         {
           prop: "locationMemo",
           label: "备注",
-          width: "140"
-        }
+          width: "140",
+        },
       ],
-      selectionList: []
+      selectionList: [],
+      input:"",
     };
   },
   created() {
@@ -188,49 +188,55 @@ export default {
           "/api/v1/tms/getShipLocationStatus?shipLocation=" +
             scope.row.shipLocation
         )
-        .then(res => {
+        .then((res) => {
           // console.log(res.data.data);
           scope.row.locationStatus = res.data.data.locationStatus;
         });
     },
     initialization() {
-      this.axios.post("/api/v1/tms/getShipLocationList").then(res => {
+      this.axios.post("/api/v1/tms/getShipLocationList").then((res) => {
         if (res.data.code == "200") {
           this.selectionList = res.data.data;
         }
       });
     },
     onclick() {
-      this.value = sjTime(this.value);
-      this.axios
-        .post("/api/v1/tms/getShipLocationList", { dayTime: this.value })
-        .then(res => {
-          if (res.data.code == "200") {
-            this.selectionList = res.data.data;
-          }
-        });
+    
+      this.axios.post("/api/v1/tms/getShipLocationList?con=" + this.input).then((res) => {
+        if (res.data.code == "200") {
+          this.selectionList = res.data.data;
+        }
+      });
     },
     click(row) {
-      this.axios.post("/api/v1/tms/updateShipLocation", row).then(res => {
+      this.axios.post("/api/v1/tms/updateShipLocation", row).then((res) => {
         if (res.data.code == "200") {
           this.$message({
             type: "success",
-            message: "保存成功!"
+            message: "保存成功!",
           });
           this.initialization();
         }
       });
     },
-    refresh(){
+    refresh() {
       this.$router.go(0);
-    }
-  }
+    },
+  },
 };
 </script>
 <style lang="scss">
 .homeworkPath {
   .top {
-    padding: 1.25rem 1.875rem;
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 40rpx;
+    }
+    .btn {
+      width: 5.5%;
+      margin-left: 0.25rem;
+    }
   }
 }
 </style>

src/views/TMS/components/importedShip/updateShipmentInstructions.vue

@@ -5,6 +5,14 @@
     <div class="form">
       <div class="form_box">
         <dil-form :formId="114" v-model="form1" ref="from1"></dil-form>
+        <span> 二程:海港-江港</span>
+        <el-switch
+          v-model="status"
+          active-color="#13ce66"
+          inactive-color="#909399"
+          @change="changeStatus"
+        >
+        </el-switch>
       </div>
     </div>
     <!-- 确定和取消 -->
@@ -23,6 +31,7 @@ export default {
   data() {
     return {
       form1: {},
+      status: false,
     };
   },
   mounted() {
@@ -45,6 +54,11 @@ export default {
     handleCheckedCitiesChange(value) {
       console.log(value);
     },
+    
+    //改变二程状态
+    changeStatus() {
+      console.log(this.status);
+    },
     // 返回
     onClickCancel() {
       this.$router.go(-1);
@@ -58,6 +72,7 @@ export default {
         shipmentInstructionsId: this.$route.params.instructionsId,
         instructionsTotalTonnage: this.form1.instructionsTotalTonnage,
         instructionTime: sjTime(this.form1.instructionTime),
+        statu: this.status,
       };
 
       //判断合计吨位是否为数字
@@ -72,10 +87,10 @@ export default {
         }
       }
       var val = this.value;
-    
+
       if (
         omsshipShipmentInstructions.instructionsTotalTonnage == null ||
-        omsshipShipmentInstructions.instructionTime==null
+        omsshipShipmentInstructions.instructionTime == null
       )
         this.$message.error("存在空值！");
       else if (!isNumber(val)) this.$message.warning("合计吨位请填写数字");

src/views/WMS/components/port_deposit/loadPortStock.vue

@@ -2,20 +2,89 @@
   <!-- 展示万州港港存库库存列表 -->
   <div class="homeworkPath">
     <div class="top">
-      <el-autocomplete
-        popper-class="my-autocomplete"
-        v-model="state"
-        :fetch-suggestions="querySearch"
-        placeholder="请输入内容"
-        @select="handleSelect"
-      >
-      </el-autocomplete>
+      <el-input
+        v-model="input"
+        placeholder="请输入物资名称或者外轮船名"
+        style="width: 260px"
+        clearable
+      ></el-input>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
     </div>
-    <dilTable v-bind.sync="option">
+    <div class="totalNumber" style="margin-left: 1040px">
+      <span
+        style="
+          color: IndianRed;
+          font-family: FANGSONG;
+          font-size: 15px;
+          font-weight: bold;
+        "
+        >万州港合计吨位</span
+      >
+      <el-input
+        v-model="totalNumber"
+        :disabled="true"
+        style="width: 120px"
+      ></el-input>
+      <el-button style="margin-left: 12px" type="primary" @click="exportData()"
+        ><i class="el-icon-download"></i>导出Excel</el-button
+      >
+      <el-button type="primary" @click="refresh">
+        <i class="el-icon-refresh"></i>
+      </el-button>
+    </div>
+    <span
+      class="el-input"
+      style="
+        color: red;
+        margin-left: 45%;
+        font-family: FANGSONG;
+        font-size: 20px;
+        font-weight: bold;
+      "
+      >万州港实时库存详情</span
+    >
+    <!-- <div style="overflow:scroll;height:600px"> -->
+    <dilTable
+      ref="excelDom"
+      v-bind.sync="option"
+      :isHeigth="isHeigth"
+      :shiyHeigth="shiyHeigth"
+      @func="func"
+      :pageSize="pageSize"
+    >
     </dilTable>
+    <!-- </div> -->
+    <div>
+      <span
+        class="el-input"
+        style="
+          color: red;
+          margin-left: 45%;
+          font-family: FANGSONG;
+          font-size: 20px;
+          font-weight: bold;
+        "
+        >万州港当前物资总计库存</span
+      >
+      <el-input
+        v-model="text"
+        placeholder="请输入物资名称"
+        style="width: 260px; margin-bottom: 35px; margin-left: 20px"
+        clearable
+      ></el-input>
+      <el-button type="primary" class="btn" @click="onclick1">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <dilTable
+        v-bind.sync="option2"
+        :isHeigth="isHeigth"
+        :shiyHeigth="shiyHeigth"
+        :pageSize="pageSize"
+      >
+      </dilTable>
+    </div>
   </div>
 </template>
 
@@ -24,37 +93,66 @@ export default {
   name: "homeworkPath",
   data() {
     return {
-      restaurants: [],
+      tableTitle: "万州港港存库物资明细报表",
+      shiyHeigth: 130,
+      isHeigth: true,
+      input: null,
+      text: null,
+      pageSize: 1000,
       state: "",
+      //合计净重
+      totalNumber: 0,
       option: {
         // 表格请求数据的地址
         requestUrl: "/api/v1/wmsh/getLoadPortStockList?apiId=158",
       },
+      option2: {
+        requestUrl: "/api/v1/wmsh/getLoadPortStockByMaterialName?apiId=493",
+      },
     };
   },
-  mounted() {
+  created() {
+    this.option.requestUrl =
+      "/api/v1/wmsh/getLoadPortStockList?apiId=158&i=" + new Date();
   },
   methods: {
-    handleSelect(item) {
-      console.log(item);
+    func(res) {
+      console.log("aaa" + res);
+      var resultActualInstallations = 0;
+      res.list.forEach((e) => {
+        resultActualInstallations = resultActualInstallations + e.gmTonnage;
+      });
+      this.totalNumber = resultActualInstallations.toFixed(2) + " 吨";
     },
+    // 点击查询查看
     onclick() {
-      console.log(1);
+      this.option.requestUrl =
+        "/api/v1/wmsh/getLoadPortStockList?apiId=158&i=" +
+        new Date() +
+        "&con=" +
+        this.input;
+    },
+    onclick1() {
+      this.option2.requestUrl =
+        "/api/v1/wmsh/getLoadPortStockByMaterialName?apiId=493&i=" +
+        new Date() +
+        "&con=" +
+        this.text;
+    },
+    refresh() {
+      this.$router.go(0);
     },
   },
 };
-
 </script>
 <style lang='scss' scoped>
 .homeworkPath {
   .top {
-     padding: 1.25rem 0.375rem;
-     .my-autocomplete{
-       width: 20%;
-       margin-right: 40rpx;
-     }
-   
+    padding: 1.25rem 0.375rem;
+    .my-autocomplete {
+      width: 20%;
+      margin-right: 40rpx;
+    }
   }
- 
 }
 </style>

src/views/appoint/components/ship/attorneytext.vue

@@ -24,7 +24,7 @@
           >
             <tr>
               <td style="width: 100%; font-family: FangSong">
-                {{ item.portAllName }}：
+                {{ item.pickupAllName }}：
               </td>
             </tr>
           </table>
@@ -53,7 +53,7 @@
                   item.purchaseOrderMaterialNum
                 }}
                 湿吨（如遇该轮最后一批提货请清场),物流流向:{{
-                  item.portName
+                  item.portName1
                 }}。望贵公司予以支持为盼。
               </td>
             </tr>