ada

build/utils.js

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

config/index.js

@@ -67,7 +67,7 @@ let proxyTable = {
   "/api/v1": {
     target: "http://172.16.33.166:80",
     // target: "http://localhost:8080",
-    // target: "http://192.168.1.107:8080",
+    // target: "http://192.168.1.110:8080",
     ws: true,
     pathRewrite: {
       "^/api/v1": "/api/v1"

src/views/TMS/components/bmsship/addMoistureDetection.vue

@@ -0,0 +1,328 @@
+<template>
+  <!-- 添加二程船水运费1-->
+  <div class="addWagonLoad">
+    <PageTitle>返回</PageTitle>
+    <div class="form-box">
+      <!-- <dil-form :formId="271" v-model="form1" ref="from1"></dil-form> -->
+      <el-form v-model="form">
+        <div class="searchSelect">
+          <span class="text">江船</span>
+          <el-input class="input" v-model="batchName" disabled> </el-input>
+          <el-button class="button" type="primary" @click="ondrawer(5)"
+            >浏览</el-button
+          >
+        </div>
+        <div class="switch">
+          <el-switch v-model="value1" active-text="拼装" inactive-text="不拼装">
+          </el-switch>
+        </div>
+        <div class="searchSelect">
+          <span class="text">单价</span>
+          <el-input
+            class="input"
+            v-model="form.unitPrice"
+            disabled
+            @change="calculate"
+          >
+          </el-input>
+          <el-button class="button" type="primary" @click="ondrawer(6)"
+            >浏览</el-button
+          >
+        </div>
+        <div class="preview-group">
+          <el-form-item label="港口数" v-if="spell == 'true'">
+            <el-input v-model="form.portNum" type="number"></el-input>
+          </el-form-item>
+          <el-form-item label="船数" v-if="noSpell == 'false'">
+            <el-input v-model="form.shipNum" type="number"></el-input>
+          </el-form-item>
+          <el-form-item label="开票日期">
+            <el-date-picker
+              v-model="form.makeTime"
+              type="datetime"
+              placeholder="选择日期"
+            >
+            </el-date-picker>
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+    <!-- 模态框 -->
+    <el-drawer
+      :visible.sync="drawer"
+      :direction="direction"
+      :before-close="handleClose"
+      size="50%"
+    >
+      <el-input
+        placeholder="请输入内容"
+        v-model="input"
+        style="margin-top: 10px; margin-left: 20px; width: 250px"
+        clearable
+      >
+      </el-input>
+      <el-button
+        type="primary"
+        class="btn"
+        @click="onclick(a)"
+        style="margin-bottom: 15px"
+      >
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <div v-show="a == 5">
+        <dilTable
+          v-bind.sync="batchOption"
+          @radio-change="batchChange"
+        ></dilTable>
+      </div>
+      <div v-show="a == 6">
+        <dilTable
+          v-bind.sync="contractPriceOption"
+          @radio-change="priceChange"
+        ></dilTable>
+      </div>
+    </el-drawer>
+    <!-- 底部按钮 -->
+    <div class="button-box">
+      <el-button @click="cancel">取消</el-button>
+      <el-button type="primary" @click="makeSure" :loading="isLoading"
+        >确定</el-button
+      >
+    </div>
+  </div>
+</template>
+
+<script>
+import PageTitle from "@/components/Page/Title";
+import { sjTime } from "@/utils/sharedJsFile";
+import { getCookie } from "@/utils/util.js";
+import { BigNumber } from "bignumber.js";
+export default {
+  components: { PageTitle },
+  data() {
+    return {
+      spell: false,
+      noSpell: "false",
+      value1: false,
+      form: {},
+      portId: null,
+      ports: [],
+      isLoading: false,
+      drawer: false,
+      direction: "rtl",
+      a: 0,
+      input: null,
+      batchId: null,
+      purchaseOrderId: null,
+      batchName: null,
+      cargoPictureUrl: "",
+      batchOption: {
+        requestUrl: "/api/v1/bms/getShipResult?apiId=112",
+        selectionType: "radio",
+        map: []
+      },
+      contractPriceOption: {
+        requestUrl: "/api/v1/rms/selectbmsshipContractPriceList?apiId=500",
+        selectionType: "radio",
+        map: []
+      }
+    };
+  },
+  mounted() {
+    //this.getPorts();
+  },
+  computed: {
+    portNum() {
+      return this.form.portNum;
+    }
+  },
+  watch: {
+    portNum() {
+      console.log(this.form.portNum);
+    },
+    value1() {
+      if (this.value1) {
+        this.spell = "true";
+        this.noSpell = "true";
+      } else {
+        this.spell = "false";
+        this.noSpell = "false";
+      }
+    }
+  },
+  methods: {
+    //右侧选中框
+    ondrawer(num) {
+      this.drawer = true;
+      this.a = num;
+      if (num == 5) {
+        this.batchOption.requestUrl =
+          "/api/v1/bms/getShipResult?apiId=112" + "&i=" + new Date();
+      } else if (num == 6) {
+        this.contractPriceOption.requestUrl =
+          "/api/v1/rms/selectbmsshipContractPriceList?apiId=500" +
+          "&i=" +
+          new Date();
+      }
+      // 清空当前输入框中的数据
+      this.input = "";
+    },
+    handleClose(done) {
+      done();
+    },
+    onclick(a) {
+      if (a == 5) {
+        this.batchOption.requestUrl =
+          "/api/v1/bms/getShipResult?apiId=112&index=" + this.input;
+      } else if (a == 6) {
+        this.contractPriceOption.requestUrl =
+          "/api/v1/rms/selectbmsshipContractPriceList?apiId=500&con=" +
+          this.input;
+      }
+    },
+    //修改选中
+    batchChange(selection) {
+      console.log(selection);
+      this.batchId = selection.batchId;
+      this.purchaseOrderId = selection.purchaseOrderId;
+      this.batchName = selection.materialName + selection.resultForeignShipName;
+    },
+    priceChange(selection) {
+      this.form.unitPriceId = selection.resultId;
+      this.form.unitPrice = selection.unitPrice;
+      this.calculate();
+    },
+    //计算水运费
+    calculate() {
+      console.log(
+        "能否计算水运费：",
+        this.form.realTonnage && this.form.unitPrice
+      );
+      if (this.form.realTonnage && this.form.unitPrice) {
+        let fee = new BigNumber(this.form.realTonnage);
+        this.$set(
+          this.form,
+          "fee",
+          fee.multipliedBy(this.form.unitPrice).toNumber()
+        );
+        console.log(this.form.fee);
+      }
+    },
+    makeSure() {
+      //this.isLoading=true;
+      let map = {
+        batchId: this.batchId,
+
+        purchaseOrderId: this.purchaseOrderId,
+        unitPrice: this.form.unitPrice,
+        unitPriceId: this.form.unitPriceId,
+        shipNum: this.form.shipNum,
+        portNum: this.form.portNum,
+        makeTime: sjTime(this.form.makeTime),
+        feeType: 5,
+        userId: getCookie("userId")
+      };
+      console.log(map);
+      if (
+        map.batchId == null ||
+        map.purchaseOrderId == null ||
+        map.unitPrice == null ||
+        map.unitPriceId == null ||
+        map.makeTime == null
+      ) {
+        this.$message.error("存在空值！");
+        this.isLoading = false;
+      } else {
+        this.axios
+          .post("/api/v1/bms/addwaterStatement", map)
+          .then(res => {
+            if (res.data.code == 200) {
+              this.$message({
+                type: "success",
+                message: "新增成功!"
+              });
+              this.cancel();
+            } else {
+              this.$message.error(res.data.data);
+              this.isLoading = false;
+            }
+          })
+          .then(() => {
+            this.isLoading = false;
+          });
+      }
+    },
+    // 取消
+    cancel() {
+      this.$router.go(-1);
+    },
+    //查询港口id
+    getPorts() {
+      this.axios.post("/api/v1/rms/getPortName?index=").then(res => {
+        if (res.data.code == 200) {
+          this.ports = res.data.data;
+          console.log(this.ports);
+        } else {
+          this.$message.error(res.data.data);
+        }
+      });
+    },
+
+    upCLick(val) {
+      this.num = val;
+    }
+  }
+};
+</script>
+<style lang="scss">
+.searchSelect {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin: 5px;
+  .text {
+    width: 40px;
+  }
+  .input {
+    width: 200px;
+  }
+  .button {
+    margin-left: 6px;
+  }
+}
+.switch {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  margin-top: 20px;
+  margin-bottom: 20px;
+}
+.button-box {
+  display: flex;
+  justify-content: center;
+  margin: 20px;
+  .el-button {
+    width: 80px;
+    margin: 10px;
+  }
+}
+.form-box {
+  display: flex;
+  justify-content: center;
+  .el-form-item {
+    display: flex;
+    justify-content: center;
+    .el-form-item__label {
+      display: flex;
+      align-items: center;
+    }
+    .el-form-item__content {
+      .el-input {
+        .el-input__inner {
+          width: 250px;
+        }
+      }
+    }
+  }
+}
+</style>

src/views/TMS/components/bmsship/addThreeSectionFee.vue

@@ -0,0 +1,439 @@
+<template>
+  <!-- 添加二程船水运费1-->
+  <div class="addWagonLoad">
+    <PageTitle>返回</PageTitle>
+    <div class="form-box">
+      <!-- <dil-form :formId="271" v-model="form1" ref="from1"></dil-form> -->
+      <el-form v-model="form">
+        <div class="searchSelect">
+          <span class="text">批次</span>
+          <el-input class="input" v-model="batchName" disabled> </el-input>
+          <el-button class="button" type="primary" @click="ondrawer(5)"
+            >浏览</el-button
+          >
+        </div>
+        <div
+          class="material"
+          v-for="(item, index) in form.Array"
+          :key="index"
+          style="margin-left:30px"
+        >
+          <el-form :inline="true">
+            <el-form-item label="装船时间">
+              <el-input
+                v-model="item.resultLoadShipDate"
+                placeholder="装船时间"
+                disabled
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="离港时间">
+              <el-input
+                v-model="item.resultOutPortTime"
+                placeholder="离港时间"
+                disabled
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="实装吨位">
+              <el-input
+                v-model="item.resultActualInstallations"
+                placeholder="实装吨位"
+                disabled
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="水运费用">
+              <el-input v-model="item.fee" type="number" disabled></el-input>
+              <el-button type="primary" @click="ondrawer(6, index)"
+                >浏览单价</el-button
+              >
+            </el-form-item>
+          </el-form>
+        </div>
+        <div class="preview-group">
+          <el-form-item label="开票日期">
+            <el-date-picker
+              v-model="form.makeTime"
+              type="datetime"
+              placeholder="选择日期"
+            >
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="上传水运单图片">
+            <el-upload
+              class="upload-demo"
+              style="width: 270px"
+              ref="upload1"
+              accept=".pdf , .jpg, .png, .jpeg, .tif, .gif, .pcx, .tga, .exif, .fpx, .svg , .bmp"
+              action="/api/v1/bms/uploadBmsshipOrder"
+              :before-upload="beforeUpload"
+              :multiple="false"
+              list-type="picture"
+              :show-file-list="false"
+              :on-success="handleAvatarSuccess"
+              :on-error="onError(1)"
+            >
+              <el-input
+                class="shippingCertificate"
+                style="width: 270px; display: flex"
+                placeholder="上传水运单图片(必填项)"
+                v-model="form.image"
+                disabled
+              >
+              </el-input>
+              <el-button
+                size="small"
+                type="primary"
+                style="
+                      width: 115px;
+                      height: 35px;
+                      margin-left: 275px;
+                      margin-top: -35px;
+                      display: flex;
+                      "
+                @click="upCLick(1)"
+              >
+                点击上传附件</el-button
+              >
+            </el-upload>
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+    <!-- 模态框 -->
+    <el-drawer
+      :visible.sync="drawer"
+      :direction="direction"
+      :before-close="handleClose"
+      size="50%"
+    >
+      <el-input
+        placeholder="请输入内容"
+        v-model="input"
+        style="margin-top: 10px; margin-left: 20px; width: 250px"
+        clearable
+      >
+      </el-input>
+      <el-button
+        type="primary"
+        class="btn"
+        @click="onclick(a)"
+        style="margin-bottom: 15px"
+      >
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <div v-show="a == 5">
+        <dilTable
+          v-bind.sync="batchOption"
+          @radio-change="batchChange"
+        ></dilTable>
+      </div>
+      <div v-show="a == 6">
+        <dilTable
+          v-bind.sync="contractPriceOption"
+          @radio-change="priceChange"
+        ></dilTable>
+      </div>
+    </el-drawer>
+    <!-- 底部按钮 -->
+    <div class="button-box">
+      <el-button @click="cancel">取消</el-button>
+      <el-button type="primary" @click="makeSure" :loading="isLoading"
+        >确定</el-button
+      >
+    </div>
+  </div>
+</template>
+
+<script>
+import PageTitle from "@/components/Page/Title";
+import { sjTime } from "@/utils/sharedJsFile";
+import { getCookie } from "@/utils/util.js";
+import { BigNumber } from "bignumber.js";
+export default {
+  components: { PageTitle },
+  data() {
+    return {
+      indexNum: null,
+      form: {},
+      portId: null,
+      ports: [],
+      isLoading: false,
+      drawer: false,
+      direction: "rtl",
+      a: 0,
+      input: null,
+      batchId: null,
+      purchaseOrderId: null,
+      batchName: null,
+      cargoPictureUrl: "",
+      batchOption: {
+        requestUrl: "/api/v1/uc/findBatchHavingLoad?apiId=502",
+        selectionType: "radio",
+        map: []
+      },
+      contractPriceOption: {
+        requestUrl: "/api/v1/rms/selectbmsshipContractPriceList?apiId=500",
+        selectionType: "radio",
+        map: []
+      }
+    };
+  },
+  mounted() {
+    //this.getPorts();
+  },
+  computed: {
+    batch() {
+      return this.batchId;
+    }
+  },
+  watch: {
+    batch() {
+      console.log("无变化l");
+      this.findLoadByBatch();
+    }
+  },
+  methods: {
+    findLoadByBatch() {
+      if (this.batchId != null) {
+        this.axios
+          .post("/api/v1/bms/findLoadByBatch/" + this.batchId)
+          .then(res => {
+            console.log(res.data.data);
+            this.$set(this.form, "Array", res.data.data);
+            // this.form.Array = res.data.data;
+          });
+      }
+    },
+    //右侧选中框
+    ondrawer(num, index) {
+      if (num == 5) {
+        this.batchOption.requestUrl =
+          "/api/v1/uc/findBatchHavingLoad?apiId=502" + "&i=" + new Date();
+      } else if (num == 6) {
+        this.contractPriceOption.requestUrl =
+          "/api/v1/rms/selectbmsshipContractPriceList?apiId=500" +
+          "&i=" +
+          new Date();
+      }
+      this.drawer = true;
+      this.indexNum = index;
+      this.a = num;
+      // 清空当前输入框中的数据
+      this.input = "";
+    },
+    handleClose(done) {
+      done();
+    },
+    onclick(a) {
+      if (a == 5) {
+        this.batchOption.requestUrl =
+          "/api/v1/uc/findBatchHavingLoad?apiId=502&index=" +
+          this.input +
+          "&i=" +
+          new Date();
+      } else if (a == 6) {
+        this.contractPriceOption.requestUrl =
+          "/api/v1/rms/selectbmsshipContractPriceList?apiId=500&con=" +
+          this.input;
+      }
+    },
+    //修改选中
+    batchChange(selection) {
+      console.log(JSON.stringify(selection).length);
+      if (JSON.stringify(selection).length > 2) {
+        this.batchId = selection.batchId;
+        this.purchaseOrderId = selection.purchaseOrderId;
+        this.batchName =
+          selection.materialName + selection.resultForeignShipName;
+      } else {
+        this.batchId = null;
+        this.purchaseOrderId = null;
+        this.batchName = "";
+      }
+    },
+    priceChange(selection) {
+      this.form.Array[this.indexNum].unitPriceId = selection.resultId;
+      this.form.Array[this.indexNum].unitPrice = selection.unitPrice;
+      //   this.form.unitPriceId = selection.resultId;
+      //   this.form.unitPrice = selection.unitPrice;
+      this.calculate();
+    },
+    //计算水运费
+    calculate() {
+      if (
+        this.form.Array[this.indexNum].resultActualInstallations &&
+        this.form.Array[this.indexNum].unitPrice
+      ) {
+        let fee = new BigNumber(
+          this.form.Array[this.indexNum].resultActualInstallations
+        );
+        this.$set(
+          this.form.Array[this.indexNum],
+          "fee",
+          fee.multipliedBy(this.form.Array[this.indexNum].unitPrice).toNumber()
+        );
+      }
+    },
+    makeSure() {
+      let totalFee = this.form.Array.reduce(function(prev, item) {
+        return prev + item.fee;
+      }, 0);
+      let realTonnage = this.form.Array.reduce(function(prev, item) {
+        return prev + item.resultActualInstallations;
+      }, 0);
+      //this.isLoading=true;
+      let map = {
+        batchId: this.batchId,
+        purchaseOrderId: this.purchaseOrderId,
+        unitPrice: this.form.unitPrice,
+        unitPriceId: this.form.unitPriceId,
+        realTonnage: realTonnage,
+        mapList: this.form.Array,
+        fee: totalFee,
+        makeTime: sjTime(this.form.makeTime),
+        image: this.form.image,
+        feeType: 3,
+        userId: getCookie("userId")
+      };
+      console.log(map);
+      //   if (
+      //     map.batchId == null ||
+      //     map.purchaseOrderId == null ||
+      //     map.unitPrice == null ||
+      //     map.unitPriceId == null ||
+      //     map.realTonnage == null ||
+      //     map.fee == null ||
+      //     map.makeTime == null ||
+      //     map.image == null ||
+      //     map.image == ""
+      //   ) {
+      //     this.$message.error("存在空值！");
+      //     this.isLoading = false;
+      //   } else {
+      this.axios
+        .post("/api/v1/bms/addPortHandlingFeeSecond", map)
+        .then(res => {
+          if (res.data.code == 200) {
+            this.$message({
+              type: "success",
+              message: "新增成功!"
+            });
+            this.cancel();
+          } else {
+            this.$message.error(res.data.data);
+          }
+        })
+        .then(() => {
+          this.isLoading = false;
+        });
+      //   }
+    },
+    // 取消
+    cancel() {
+      this.$router.go(-1);
+    },
+    //查询港口id
+    getPorts() {
+      this.axios.post("/api/v1/rms/getPortName?index=").then(res => {
+        if (res.data.code == 200) {
+          this.ports = res.data.data;
+          console.log(this.ports);
+        } else {
+          this.$message.error(res.data.data);
+        }
+      });
+    },
+    beforeUpload(file) {
+      this.upBool = true;
+      const isLt2M = file.size < 1024 * 1024 * 0.5;
+      if (!isLt2M) {
+        this.$message.error("上传文件大小不能超过500kb!");
+      } else {
+        let size = file.size / 1024;
+        let _URL = window.URL || window.webkitURL;
+        let img = new Image();
+        img.src = _URL.createObjectURL(file);
+      }
+      return isLt2M;
+    },
+    onError(err) {
+      if (this.upBool) {
+        if (this.num == 1) {
+          this.form.image = null;
+          this.$message.error("上传失败");
+        }
+      }
+    },
+    handleAvatarSuccess(res, file) {
+      if (res.code) {
+        this.upBool = false;
+        if (this.num == 1) {
+          this.form.image = res.data;
+        }
+        this.$message.success("上传成功");
+      }
+    },
+    upCLick(val) {
+      this.num = val;
+    }
+  }
+};
+</script>
+<style lang="scss">
+.searchSelect {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin: 5px;
+  .text {
+    width: 40px;
+  }
+  .input {
+    width: 200px;
+  }
+  .button {
+    margin-left: 6px;
+  }
+}
+.button-box {
+  display: flex;
+  justify-content: center;
+  margin: 20px;
+  .el-button {
+    width: 80px;
+    margin: 10px;
+  }
+}
+.material {
+  display: flex;
+  justify-content: center;
+  margin-top: 20px;
+  margin-right: 100px;
+  .text {
+    display: inline-block;
+    width: 170px;
+    text-align: right;
+  }
+  .el-input {
+    width: 250px;
+  }
+}
+.form-box {
+  display: flex;
+  justify-content: center;
+  .el-form-item {
+    display: flex;
+    justify-content: center;
+    .el-form-item__label {
+      display: flex;
+      align-items: center;
+    }
+    .el-form-item__content {
+      .el-input {
+        .el-input__inner {
+          width: 250px;
+        }
+      }
+    }
+  }
+}
+</style>

src/views/TMS/components/bmsship/moistureDetection.vue

@@ -0,0 +1,130 @@
+//三程船的水分检测费
+<template>
+  <!-- 二程船水运费 -->
+  <div class="contract_price">
+    <div class="sache">
+      <el-input placeholder="请输入内容" v-model="inputText" clearable>
+      </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <el-button type="primary" class="btn" @click="toInsert">
+        <i class="el-icon-plus"></i>新增
+      </el-button>
+    </div>
+    <div class="table">
+      <dilTable v-bind.sync="options">
+        <el-table-column fixed="right" label="操作" width="100">
+          <template slot-scope="scope">
+            <!-- <el-button type="text" size="small" @click="update(scope)">
+              修改
+            </el-button> -->
+            <el-button type="text" size="mini" @click="deleteOne(scope)">
+              删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </dilTable>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      inputText: "",
+      isShow: false,
+      options: {
+        // first请求数据的地址
+        requestUrl: "/api/v1/bms/selectPortFeeSecondList?apiId=504&feeType=5"
+      }
+    };
+  },
+  methods: {
+    getRequestUrl() {
+      this.options.requestUrl =
+        "/api/v1/bms/selectPortFeeSecondList?apiId=504&feeType=5&i=" +
+        new Date();
+    },
+    //查询
+    onclick() {
+      this.options.requestUrl =
+        "/api/v1/bms/selectPortFeeSecondList?apiId=504&feeType=5&con=" +
+        this.inputText;
+    },
+    //新增
+    toInsert() {
+      this.$router.push("/addMoistureDetection");
+    },
+    // update(scope) {
+    //   console.log(scope.row.resultId);
+    //   this.$router.push("/editTwoSectionFee/" + scope.row.resultId);
+    // },
+    showCarrier(scope) {
+      console.log(scope.row.resultId);
+      this.$router.push("/showTwoSectionFee/" + scope.row.resultId);
+    },
+    deleteOne(scope) {
+      this.$confirm("是否删除", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true
+      })
+        .then(() => {
+          let map = {
+            resultId: scope.row.resultId
+          };
+          this.axios
+            .post(
+              "/api/v1/bms/deletePortHandlingFeeSecond/" + scope.row.resultId
+            )
+            .then(res => {
+              if (res.data.code == 200) {
+                this.$message({
+                  type: "success",
+                  message: "删除成功!"
+                });
+                this.getRequestUrl();
+              } else {
+                this.$message({
+                  message: "删除失败",
+                  type: "warning"
+                });
+              }
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "删除操作已取消!"
+          });
+        });
+    },
+    toPhotoClick(resultId) {
+      this.axios
+        .post("/api/v1/bms/downloadBmsshipOrder?resultId=" + resultId)
+        .then(res => {
+          console.log("res", res.data.data);
+          this.srcList = [];
+          this.src = res.data.data;
+          this.isShow = true;
+          this.srcList.push(res.data.data);
+        });
+    }
+  }
+};
+</script>
+
+<style lang="scss" scode>
+.contract_price {
+  .sache {
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
+  }
+}
+</style>

src/views/TMS/components/bmsship/threeSectionFee.vue

@@ -0,0 +1,146 @@
+<template>
+  <!-- 二程船水运费 -->
+  <div class="contract_price">
+    <div class="sache">
+      <el-input placeholder="请输入内容" v-model="inputText" clearable>
+      </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <el-button type="primary" class="btn" @click="toInsert">
+        <i class="el-icon-plus"></i>新增
+      </el-button>
+    </div>
+    <div class="table">
+      <dilTable v-bind.sync="options">
+        <el-table-column fixed="right" label="操作" width="100">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="update(scope)">
+              修改
+            </el-button>
+            <el-button type="text" size="mini" @click="deleteOne(scope)">
+              删除
+            </el-button>
+            <el-button
+              @click="toPhotoClick(scope.row.resultId)"
+              type="text"
+              size="small"
+            >
+              水运单图片
+            </el-button>
+          </template>
+        </el-table-column>
+      </dilTable>
+    </div>
+    <vxe-modal width="549px" height="731px" v-model="isShow" show-footer>
+      <div class="demo-image__preview">
+        <el-image
+          style=" height:731px;text-align:center"
+          :src="src"
+          :preview-src-list="srcList"
+        >
+        </el-image>
+      </div>
+    </vxe-modal>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      inputText: "",
+      isShow: false,
+      options: {
+        // first请求数据的地址
+        requestUrl: "/api/v1/bms/selectPortFeeSecondList?apiId=501&feeType=3"
+      }
+    };
+  },
+  methods: {
+    getRequestUrl() {
+      this.options.requestUrl =
+        "/api/v1/bms/selectPortFeeSecondList?apiId=501&feeType=3&i=" +
+        new Date();
+    },
+    //查询
+    onclick() {
+      this.options.requestUrl =
+        "/api/v1/bms/selectPortFeeSecondList?apiId=501&feeType=3&con=" +
+        this.inputText;
+    },
+    //新增
+    toInsert() {
+      this.$router.push("/addThreeSectionFee");
+    },
+    update(scope) {
+      console.log(scope.row.resultId);
+      this.$router.push("/editTwoSectionFee/" + scope.row.resultId);
+    },
+    showCarrier(scope) {
+      console.log(scope.row.resultId);
+      this.$router.push("/showTwoSectionFee/" + scope.row.resultId);
+    },
+    deleteOne(scope) {
+      this.$confirm("是否删除", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true
+      })
+        .then(() => {
+          let map = {
+            resultId: scope.row.resultId
+          };
+          this.axios
+            .post(
+              "/api/v1/bms/deletePortHandlingFeeSecond/" + scope.row.resultId
+            )
+            .then(res => {
+              if (res.data.code == 200) {
+                this.$message({
+                  type: "success",
+                  message: "删除成功!"
+                });
+                this.getRequestUrl();
+              } else {
+                this.$message({
+                  message: "删除失败",
+                  type: "warning"
+                });
+              }
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "删除操作已取消!"
+          });
+        });
+    },
+    toPhotoClick(resultId) {
+      this.axios
+        .post("/api/v1/bms/downloadBmsshipOrder?resultId=" + resultId)
+        .then(res => {
+          console.log("res", res.data.data);
+          this.srcList = [];
+          this.src = res.data.data;
+          this.isShow = true;
+          this.srcList.push(res.data.data);
+        });
+    }
+  }
+};
+</script>
+
+<style lang="scss" scode>
+.contract_price {
+  .sache {
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
+  }
+}
+</style>

src/views/TMS/router/index.js

@@ -219,16 +219,19 @@ import editTwoSectionFee from "../components/bmsship/editTwoSectionFee.vue";
 import twoSectionHandleFee from "../components/bmsship/twoSectionHandleFee.vue";
 import addTwoSectionHandleFee from "../components/bmsship/addTwoSectionHandleFee.vue";
 import editTwoSectionHandleFee from "../components/bmsship/editTwoSectionHandleFee.vue";
-import importedTrainFee from "../components/bmstrain/importedTrainFee.vue"
-import addImportedTrainFee from "../components/bmstrain/addImportedTrainFee.vue"
-import editImportedTrainFee from "../components/bmstrain/editImportedTrainFee.vue"
-import domesticTrainFee from "../components/bmstrain/domesticTrainFee.vue"
-import addDomesticTrainFee from "../components/bmstrain/addDomesticTrainFee.vue"
-import editDomesticTrainFee from "../components/bmstrain/editDomesticTrainFee.vue"
+import importedTrainFee from "../components/bmstrain/importedTrainFee.vue";
+import addImportedTrainFee from "../components/bmstrain/addImportedTrainFee.vue";
+import editImportedTrainFee from "../components/bmstrain/editImportedTrainFee.vue";
+import domesticTrainFee from "../components/bmstrain/domesticTrainFee.vue";
+import addDomesticTrainFee from "../components/bmstrain/addDomesticTrainFee.vue";
+import editDomesticTrainFee from "../components/bmstrain/editDomesticTrainFee.vue";
 import threeSectionHandleFee from "../components/bmsship/threeSectionHandleFee.vue";
 import addThreeSectionHandleFee from "../components/bmsship/addThreeSectionHandleFee.vue";
 import editThreeSectionHandleFee from "../components/bmsship/editThreeSectionHandleFee.vue";
-
+import threeSectionFee from "../components/bmsship/threeSectionFee.vue";
+import addThreeSectionFee from "../components/bmsship/addThreeSectionFee.vue";
+import moistureDetection from "../components/bmsship/moistureDetection.vue";
+import addMoistureDetection from "../components/bmsship/addMoistureDetection.vue";
 Vue.use(Router);
 
 const constantRouterMap = [
@@ -1340,19 +1343,20 @@ const constantRouterMap = [
         name: "outBoundWagon",
         meta: { code: "xtpzgl-jggl" },
         component: outBoundWagon
-      }, 
+      },
       {
         path: "twoSectionFee",
         name: "twoSectionFee",
         meta: { code: "xtpzgl-jggl" },
         component: twoSectionFee
-      }, 
+      },
       {
         path: "addTwoSectionFee",
         name: "addTwoSectionFee",
         meta: { code: "xtpzgl-jggl" },
         component: addTwoSectionFee
-      }, {
+      },
+      {
         path: "editTwoSectionFee/:resultId",
         name: "editTwoSectionFee",
         meta: { code: "xtpzgl-jggl" },
@@ -1363,13 +1367,14 @@ const constantRouterMap = [
         name: "twoSectionHandleFee",
         meta: { code: "xtpzgl-jggl" },
         component: twoSectionHandleFee
-      }, 
+      },
       {
         path: "addTwoSectionHandleFee",
         name: "addTwoSectionHandleFee",
         meta: { code: "xtpzgl-jggl" },
         component: addTwoSectionHandleFee
-      }, {
+      },
+      {
         path: "editTwoSectionHandleFee/:resultId",
         name: "editTwoSectionHandleFee",
         meta: { code: "xtpzgl-jggl" },
@@ -1380,13 +1385,14 @@ const constantRouterMap = [
         name: "importedTrainFee",
         meta: { code: "xtpzgl-jggl" },
         component: importedTrainFee
-      }, 
+      },
       {
         path: "addImportedTrainFee",
         name: "addImportedTrainFee",
         meta: { code: "xtpzgl-jggl" },
         component: addImportedTrainFee
-      }, {
+      },
+      {
         path: "editImportedTrainFee/:resultId",
         name: "editImportedTrainFee",
         meta: { code: "xtpzgl-jggl" },
@@ -1397,13 +1403,14 @@ const constantRouterMap = [
         name: "domesticTrainFee",
         meta: { code: "xtpzgl-jggl" },
         component: domesticTrainFee
-      }, 
+      },
       {
         path: "addDomesticTrainFee",
         name: "addDomesticTrainFee",
         meta: { code: "xtpzgl-jggl" },
         component: addDomesticTrainFee
-      }, {
+      },
+      {
         path: "editDomesticTrainFee/:resultId",
         name: "editDomesticTrainFee",
         meta: { code: "xtpzgl-jggl" },
@@ -1414,19 +1421,43 @@ const constantRouterMap = [
         name: "threeSectionHandleFee",
         meta: { code: "xtpzgl-jggl" },
         component: threeSectionHandleFee
-      }, 
+      },
       {
         path: "addThreeSectionHandleFee",
         name: "addThreeSectionHandleFee",
         meta: { code: "xtpzgl-jggl" },
         component: addThreeSectionHandleFee
-      }, {
+      },
+      {
         path: "editThreeSectionHandleFee/:resultId",
         name: "editThreeSectionHandleFee",
         meta: { code: "xtpzgl-jggl" },
         component: editThreeSectionHandleFee
       },
-
+      {
+        path: "threeSectionFee",
+        name: "threeSectionFee",
+        meta: { code: "xtpzgl-jggl" },
+        component: threeSectionFee
+      },
+      {
+        path: "addThreeSectionFee",
+        name: "addThreeSectionFee",
+        meta: { code: "xtpzgl-jggl" },
+        component: addThreeSectionFee
+      },
+      {
+        path: "addMoistureDetection",
+        name: "addMoistureDetection",
+        meta: { code: "xtpzgl-jggl" },
+        component: addMoistureDetection
+      },
+      {
+        path: "moistureDetection",
+        name: "moistureDetection",
+        meta: { code: "xtpzgl-jggl" },
+        component: moistureDetection
+      }
     ]
   }
 ];

src/views/appoint/components/saleContract/saleOrderSteel.vue

@@ -531,7 +531,7 @@ export default {
                 map.steelMeters = e[e1];
               }
               if (e1.includes("物资规格")) {
-                if (e[e1].includes("Φ")) {
+                if ((e[e1] + "").includes("Φ")) {
                   map.materialSpecification = e[e1];
                 } else {
                   map.materialSpecification = "Φ" + e[e1];
@@ -595,9 +595,9 @@ export default {
               }
               if (e1.includes("是否磅重交货")) {
                 if (e[e1] == "是") {
-                  map.isPoundSale = 1;
-                } else if (e[e1] == "否") {
                   map.isPoundSale = 0;
+                } else if (e[e1] == "否") {
+                  map.isPoundSale = 1;
                 } else {
                   throw new Error(
                     `该Excel第--${index +
@@ -658,15 +658,18 @@ export default {
                 this.$message.success("新增销售订单成功!");
                 this.getRequestUrl();
                 this.dialogTableVisible = false;
+                this.tableData = [];
               } else {
                 this.$message.error(res.data.data);
                 this.getRequestUrl();
                 this.dialogTableVisible = false;
+                this.tableData = [];
               }
             })
             .catch(e => {
               this.$message.error("生成错误!");
               this.dialogTableVisible = false;
+              this.tableData = [];
             });
         })
         .catch(() => {