Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/icore-pass

build/utils.js

@@ -19,16 +19,14 @@ const devPathSrc = path.resolve(__dirname, "../../../src"); // node_modules应
 // let devModules = ["index", "statisticalReport", "appoint", "TMS"];
 // let devModules = ["index", "statisticalReport", "TMS", "appoint"];
 
-// let devModules = ["index", "appoint", "statisticalReport"];
+let devModules = ["all"];
+
+// let devModules = ["index", "appoint", "statisticalReport", "WMS","TMS","inward","RMS"];
 
 // let devModules = ["index", "appoint", "statisticalReport", "WMS","TMS"];
 // let devModules = ["index", "inward", "appoint", "queue"];
-
 // 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", "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

@@ -66,8 +66,6 @@ let proxyTable = {
   // 所有数据的请求域名地址
   "/api/v1": {
     target: "http://172.16.33.166:80",
-    // target: "http://localhost:8080",
-    // target: "http://192.168.1.110:8080",
     ws: true,
     pathRewrite: {
       "^/api/v1": "/api/v1"

src/views/RMS/components/addContractPrice.vue

@@ -66,8 +66,8 @@ export default {
   },
   methods: {
     makeSure() {
+      
       this.isLoading=true;
-      console.log(this.form);
       if (this.form.contractNo == null || 
       this.form.contractNo =='' ||
       this.form.unitPrice =='' ||

src/views/RMS/components/contractPrice.vue

@@ -2,7 +2,7 @@
     <!-- 合同单价 -->
   <div class="contract_price">
     <div class="sache">
-      <el-input placeholder="请输入内容" v-model="inputText" clearable>
+      <el-input placeholder="请输入合同号,暂不支持单价查询" v-model="inputText" clearable>
       </el-input>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
@@ -101,7 +101,7 @@ export default {
   .sache {
     padding: 1.25rem 0.375rem;
     .el-input {
-      width: 20%;
+      width: 25%;
       margin-right: 1.25rem;
     }
   }

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

@@ -55,11 +55,10 @@
     </div>
   </div>
 </template>
-
-
 <script>
 import { sjTime } from "@/utils/sharedJsFile";
 import bignumber,{BigNumber} from 'bignumber.js';
+import { XLSX$Utils } from 'xlsx';
 export default {
   data() {
     return {
@@ -170,13 +169,16 @@ export default {
       this.$router.go(0);
     },
     exportExcel(){
+      let excel=this.$refs.excelDom;
+      console.log(XLSX);
+      console.log(XLSX.version);
       if(this.selectionListMap2.length<=0){
          this.$message({
           message: "请先勾选数据!",
           type: "warning"
         });
         return;
-      }
+      };
       //创建工作簿对象
       let wb = XLSX.utils.book_new();
       //数据

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

@@ -47,18 +47,17 @@
       <div class="form_box">
         <el-form>
           <div class="preview-group">
-              <el-form-item label="发货港口:">
-                 <el-select
-                 v-model="portId"
-                 filterable >
-                  <el-option
-                    v-for="port in ports"
-                    :key="port.portId"
-                    :label="port.portName"
-                    :value="port.portId">
-                  </el-option>
-                </el-select>
-              </el-form-item>
+            <el-form-item label="发货港口:">
+              <el-select v-model="portId" filterable>
+                <el-option
+                  v-for="port in ports"
+                  :key="port.portId"
+                  :label="port.portName"
+                  :value="port.portId"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
           </div>
         </el-form>
         <dil-form
@@ -178,7 +177,9 @@
     <!-- 确定和取消 -->
     <div class="button_box">
       <el-button @click="cancel">取消</el-button>
-      <el-button type="primary" @click="makeSure" :loading="isLoading">确定</el-button>
+      <el-button type="primary" @click="makeSure" :loading="isLoading"
+        >确定</el-button
+      >
     </div>
   </div>
 </template>
@@ -191,12 +192,12 @@ export default {
   components: { PageTitle },
   data() {
     return {
-      isLoading:false,
+      isLoading: false,
       a: 1,
       cargoPictureUrl: "",
       shippingCertificate: "",
-      portId:null,
-      ports:[],
+      portId: null,
+      ports: [],
       materialType: "",
       receiver: "",
       input: "",
@@ -232,9 +233,20 @@ export default {
       value6: undefined,
       value7: undefined,
       value8: undefined,
-      batchIds:null,
+      batchIds: null,
+      portName: null,
     };
   },
+  computed: {
+    contactPerson() {
+      return this.form1.resultContactPerson;
+    },
+  },
+  watch: {
+    contactPerson() {
+      this.getPersonInfo();
+    },
+  },
   mounted() {
     // this.$set(this.form1, "requesterGroupId", 1); //委托单位（requesterGroupId）承运单位（carrierId）转移到提货委托
     // this.$set(this.form1, "carrierId", 11);
@@ -242,27 +254,46 @@ export default {
   },
   methods: {
     //查询所有港口
-    getPorts(){
+    getPorts() {
       this.axios.post("/api/v1/rms/getPortName?index=").then((res) => {
-          if (res.data.code == 200) {
-            //赋值
-            this.ports=res.data.data;
-          } else {
-            this.$message({
-              type: "warning",
-              message: res.data.data,
-            });
-          }
+        if (res.data.code == 200) {
+          //赋值
+          this.ports = res.data.data;
+        } else {
+          this.$message({
+            type: "warning",
+            message: res.data.data,
+          });
+        }
+      });
+    },
+
+    getPersonInfo() {
+      this.axios
+        .post(
+          "/api/v1/tms/getNoticeContactNumberByPerson?personName=" +
+            this.form1.resultContactPerson
+        )
+        .then((res) => {
+          // this.$set(this.form1, "resultContactPerson", res.data.data.personName);
+          this.$set(
+            this.form1,
+            "resultTelephoneFax",
+            res.data.data.personPhone
+          );
+          console.log(this.form1);
         });
     },
+
     upCLick(val) {
       this.num = val;
     },
+
     beforeUpload(file) {
       this.upBool = true;
-      const isLt2M = file.size < 1024 * 1024 * 0.5;
+      const isLt2M = file.size < 1024 * 1024 * 1;
       if (!isLt2M) {
-        this.$message.error("上传文件大小不能超过500kb!");
+        this.$message.error("上传文件大小不能超过1MB!");
       } else {
         let size = file.size / 1024;
         let _URL = window.URL || window.webkitURL;
@@ -271,6 +302,7 @@ export default {
       }
       return isLt2M;
     },
+
     onError(err) {
       if (this.upBool) {
         if (this.num == 1) {
@@ -280,6 +312,7 @@ export default {
         }
       }
     },
+
     handleAvatarSuccess(res, file) {
       if (res.code) {
         this.upBool = false;
@@ -301,10 +334,7 @@ export default {
       // 清空当前输入框中的数据
       this.input = "";
     },
-    // currentRadioChange1(selection) {
-    //   (this.second.mapList1 = selection),
-    //     (this.materialName = selection.materialName);
-    // },
+
     currentRadioChange2(selection) {
       (this.second1.mapList2 = selection), (this.cargo = selection.cargoName);
     },
@@ -317,11 +347,14 @@ export default {
     },
     currentRadioChange5(selection) {
       (this.second5.mapList5 = selection),
-        (this.batchIds = selection.foreignShipName+""+selection.materialName);
+        (this.batchIds =
+          selection.foreignShipName + "" + selection.materialName);
     },
+
     onchange(val) {},
+
     onclick(a) {
-    if (a == 2) {
+      if (a == 2) {
         this.second1.requestUrl =
           "/api/v1/tms/selectShippeByName?apiId=215&con=" + this.input;
       } else if (a == 3) {
@@ -331,8 +364,8 @@ export default {
         // console.log("aaaa");
         this.second3.requestUrl =
           "/api/v1/rms/getMaterialTypeList?apiId=376&con=" + this.input;
-      }else if(a==5){
-         this.second5.requestUrl =
+      } else if (a == 5) {
+        this.second5.requestUrl =
           "/api/v1/tms/getBatchIdByForeign?apiId=489&con=" + this.input;
       }
     },
@@ -340,58 +373,49 @@ export default {
     handleClose(done) {
       done();
     },
+
     makeSure() {
-      // if (this.second.mapList1.length == 0) {
-      //   this.$message.warning("请选择物资");
-      //   return;
-      // }
-      // if (this.second1.mapList2.length == 0) {
-      //   this.$message.warning("请选择送达单位");
-      //   return;
-      // }
-      this.isLoading=true;
+      this.isLoading = true;
       if (this.second2.mapList3.length == 0) {
         this.$message.warning("请选择收货人");
-        this.isLoading=false;
+        this.isLoading = false;
         return;
       }
       if (this.second3.mapList4.length == 0) {
         this.$message.warning("请选择物资品类");
-        this.isLoading=false;
+        this.isLoading = false;
         return;
       }
       if (this.second5.mapList5.length == 0) {
         this.$message.warning("请选择批次");
-        this.isLoading=false;
+        this.isLoading = false;
         return;
       }
-
       //判断是否为电话号码
       function isTelePhone() {
         var value2 = map.resultTelephoneFax;
         //验证是否为数字
         var patrn = /^1[3-9]\d{9}$/;
-        // var patrn2 = /^(\d{3,4}-)?\d{7,8}$/;
         if (patrn.exec(value2) == null || value2 == "") {
           return false;
         } else {
           return true;
         }
       }
+
       //电话号码赋值
       var val2 = this.value2;
       let map = {
-        // carrierId: this.form1.carrierId, //委托单位（requesterGroupId）承运单位（carrierId）转移到提货委托
-        // requesterGroupId: this.form1.requesterGroupId,
         noticeCommerceMethod: this.form1.noticeCommerceMethod,
         noticeHandoverMethod: this.form1.noticeHandoverMethod,
         portId: this.portId,
         noticePortConstructionFee: this.form1.noticePortConstructionFee,
         noticeDeliveryTime: sjTime(this.form1.noticeDeliveryTime),
         noticePileFreeDays: this.form1.noticePileFreeDays,
-        batchIds:this.second5.mapList5.batchId,
+        batchIds: this.second5.mapList5.batchId,
         purchaseContractUnitPrice: this.form1.purchaseContractUnitPrice,
         purchaseContractMoisture: this.form1.purchaseContractMoisture,
+        portName: this.portName,
         //微元素含量
         tfeContent: this.form1.tfeContent,
         silicaContent: this.form1.silicaContent,
@@ -405,17 +429,17 @@ export default {
         resultNumberOfLoans: this.form1.resultNumberOfLoans,
         cargoId: this.second1.mapList2.cargoId,
         groupId: this.second2.mapList3.id,
-        inFactoryShipName: this.form1.inFactoryShipName,
-        foreignShipName:  this.second5.mapList5.foreignShipName,
+        foreignShipName: this.second5.mapList5.foreignShipName,
         materialId: this.second5.mapList5.materialId,
         materialTypeId: this.second3.mapList4.materialTypeId,
         isNeedPortDisCharge: this.form1.isNeedPortDisCharge,
         isNeedPortFee: this.form1.isNeedPortFee,
         isNeedBonded: this.form1.isNeedBonded,
         cargoPictureUrl: this.cargoPictureUrl,
+        sulfurcontent: this.form1.sulfurcontent,
         userId: getCookie("userId"),
       };
-      console.log(map);
+
       //判断放货数量是否为数字
       if (
         map.noticeCommerceMethod == null ||
@@ -429,26 +453,22 @@ export default {
         map.silicaContent == null ||
         map.aluminaContent == null ||
         map.phosphorusContent == null ||
-        map.manganeseContent == null ||
         map.resultContactPerson == null ||
         map.resultTelephoneFax == null ||
         map.resultNumberOfLoans == null ||
         map.portId == null ||
         map.groupId == null ||
-        map.inFactoryShipName == null ||
         map.isNeedPortDisCharge == null ||
         map.isNeedPortFee == null ||
         map.isNeedBonded == null
-        // map.foreignShipName==null||
-        // map.materialId==null
       ) {
         this.$message.error("存在空值！");
-        this.isLoading=false;
+        this.isLoading = false;
         return;
       }
       if (!isTelePhone(val2)) {
         this.$message.warning("电话号码或传真格式不正确");
-        this.isLoading=false;
+        this.isLoading = false;
         return;
       }
       if (
@@ -456,7 +476,7 @@ export default {
         !isNumber(map.noticePortConstructionFee)
       ) {
         this.$message.error("港建费金额得为数字");
-        this.isLoading=false;
+        this.isLoading = false;
         return;
       }
       if (
@@ -464,7 +484,7 @@ export default {
         !isNumber(map.purchaseContractMoisture)
       ) {
         this.$message.error("合同水分得为数字");
-        this.isLoading=false;
+        this.isLoading = false;
         return;
       }
       if (
@@ -472,7 +492,7 @@ export default {
         !isNumber(map.noticePortConstructionFee)
       ) {
         this.$message.error("港建费金额得为数字");
-        this.isLoading=false;
+        this.isLoading = false;
         return;
       }
       if (
@@ -480,7 +500,7 @@ export default {
         !isNumber(map.noticePileFreeDays)
       ) {
         this.$message.error("免堆天数得为数字");
-        this.isLoading=false;
+        this.isLoading = false;
         return;
       }
 
@@ -489,12 +509,12 @@ export default {
         !isNumber(map.purchaseContractUnitPrice)
       ) {
         this.$message.error("单价得为数字");
-        this.isLoading=false;
+        this.isLoading = false;
         return;
       }
       if (typeof map.tfeContent != "undefined" && !isNumber(map.tfeContent)) {
         this.$message.error("tfe含量得为数字");
-        this.isLoading=false;
+        this.isLoading = false;
         return;
       }
       if (
@@ -502,7 +522,7 @@ export default {
         !isNumber(map.silicaContent)
       ) {
         this.$message.error("二氧化硅含量得为数字");
-        this.isLoading=false;
+        this.isLoading = false;
         return;
       }
       if (
@@ -510,7 +530,7 @@ export default {
         !isNumber(map.aluminaContent)
       ) {
         this.$message.error("氧化铝含量得为数字");
-        this.isLoading=false;
+        this.isLoading = false;
         return;
       }
       if (
@@ -518,7 +538,7 @@ export default {
         !isNumber(map.phosphorusContent)
       ) {
         this.$message.error("含磷量得为数字");
-        this.isLoading=false;
+        this.isLoading = false;
         return;
       }
       if (
@@ -526,25 +546,28 @@ export default {
         !isNumber(map.resultNumberOfLoans)
       ) {
         this.$message.error("放货数量得为数字");
-        this.isLoading=false;
+        this.isLoading = false;
         return;
       } else
-        this.axios.post("/api/v1/tms/insertDeliveryNotice", map).then((res) => {
-          if (res.data.code == 200) {
-            this.$message({
-              type: "success",
-              message: "新增成功",
-            });
-            this.cancel();
-          } else {
-            this.$message({
-              type: "warning",
-              message: res.data.data,
-            });
-          }
-        }).then(()=>{
-          this.isLoading=false;
-        });
+        this.axios
+          .post("/api/v1/tms/insertDeliveryNotice", map)
+          .then((res) => {
+            if (res.data.code == 200) {
+              this.$message({
+                type: "success",
+                message: "新增成功",
+              });
+              this.cancel();
+            } else {
+              this.$message({
+                type: "warning",
+                message: res.data.data,
+              });
+            }
+          })
+          .then(() => {
+            this.isLoading = false;
+          });
     },
     // 取消
     cancel() {

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

@@ -26,35 +26,88 @@
       <!-- 未下发 -->
       <el-tab-pane label="未下发" name="first">
         <dilTable v-bind.sync="option1" ref="table">
-          <el-table-column fixed="right" align="center" label="操作" width="120">
+          <el-table-column
+            fixed="right"
+            align="center"
+            label="操作"
+            width="120"
+          >
             <template slot-scope="scope">
-              <el-button @click="sendClick(scope.row.noticeId)" type="text" size="small">
+              <el-button
+                @click="sendClick(scope.row.noticeId)"
+                type="text"
+                size="small"
+              >
                 下发
               </el-button>
-              <el-button @click="modifyclick(scope.row.noticeId)" type="text" size="small">
+              <el-button
+                @click="modifyclick(scope.row.noticeId)"
+                type="text"
+                size="small"
+              >
                 修改
               </el-button>
-              <el-button @click="deleteclick(scope.row.noticeId)" type="text" size="small">
+              <el-button
+                @click="deleteclick(scope.row.noticeId)"
+                type="text"
+                size="small"
+              >
                 删除
               </el-button>
-              <el-button @click="toPhotoClick(scope.row.noticeId)" type="text" size="small">
-                货权转移图片</el-button>
+              <el-button
+                @click="toPhotoClick(scope.row.noticeId)"
+                type="text"
+                size="small"
+              >
+                货权转移图片</el-button
+              >
             </template>
           </el-table-column>
         </dilTable>
       </el-tab-pane>
       <!-- 已下发 -->
       <el-tab-pane label="已下发" name="second">
-        <dilTable v-bind.sync="option2"> </dilTable>
+        <dilTable v-bind.sync="option2">
+          <el-table-column
+            fixed="right"
+            align="center"
+            label="操作"
+            width="120"
+          >
+            <template slot-scope="scope">
+              <el-button
+                @click="toPhotoClick(scope.row.noticeId)"
+                type="text"
+                size="small"
+              >
+                货权转移图片</el-button
+              >
+            </template>
+          </el-table-column>
+        </dilTable>
       </el-tab-pane>
     </el-tabs>
-     <vxe-modal width="549px" height="731px" v-model="isShow" show-footer>
+    <vxe-modal width="549px" height="731px" v-model="isShow" show-footer>
       <div class="demo-image__preview">
-        <div>
-          如果预览失败，可以尝试<a style="color:red" :href="src" download="货权转移.pdf">点此下载</a>
+        <div
+          class="href"
+          style="
+            margin-left: 80px;
+            text-align: center;
+            font-family: fangsong;
+            font-weight: 300;
+            font-size:18px;
+          "
+        >
+          如果加载失败,请尝试<a
+            style="color: red"
+            :href="src"
+            download="货权转移.pdf"
+            >点此下载pdf</a
+          >
         </div>
         <el-image
-          style=" height:731px;text-align:center"
+          style="height: 731px; text-align: center"
           :src="src"
           :preview-src-list="srcList"
         >
@@ -70,10 +123,9 @@ export default {
   name: "homeworkPath",
   data() {
     return {
-      srcList:[],
-      isShow:false,
-      src:"",
-      srcUrl:"",
+      srcList: [],
+      isShow: false,
+      src: "",
       startTime: null,
       endTime: null,
       // restaurants: [],
@@ -81,12 +133,12 @@ export default {
       activeName: "first",
       option1: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/tms/getshipDeliveryNoticeList?apiId=69&status=0"
+        requestUrl: "/api/v1/tms/getshipDeliveryNoticeList?apiId=69&status=0",
       },
       option2: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/tms/getshipDeliveryNoticeList?apiId=69&status=1"
-      }
+        requestUrl: "/api/v1/tms/getshipDeliveryNoticeList?apiId=69&status=1",
+      },
     };
   },
   methods: {
@@ -99,45 +151,44 @@ export default {
       if (this.endTime) {
         endTime = sjTime(this.endTime);
       }
-      if(startTime && endTime && startTime < endTime){
-          if (this.activeName == "first") {
+      if (startTime && endTime && startTime < endTime) {
+        if (this.activeName == "first") {
           this.option1.requestUrl =
             "/api/v1/tms/getshipDeliveryNoticeList?apiId=69&status=0&carrierSSOId=" +
             getCookie("userId") +
             "&con=" +
             this.input +
-              "&startTime=" +
-              startTime +
-              "&endTime=" +
-              endTime;  
-          } else{
-              this.option2.requestUrl =
-                "/api/v1/tms/getshipDeliveryNoticeList?apiId=69&status=1&carrierSSOId=" +
-                getCookie("userId") +
-                "&con=" +
-                this.input+
-                "&startTime=" +
-                startTime +
-                "&endTime=" +
-                endTime;  
-          }
-      }else{
+            "&startTime=" +
+            startTime +
+            "&endTime=" +
+            endTime;
+        } else {
+          this.option2.requestUrl =
+            "/api/v1/tms/getshipDeliveryNoticeList?apiId=69&status=1&carrierSSOId=" +
+            getCookie("userId") +
+            "&con=" +
+            this.input +
+            "&startTime=" +
+            startTime +
+            "&endTime=" +
+            endTime;
+        }
+      } else {
         if (this.activeName == "first") {
-            this.option1.requestUrl =
-              "/api/v1/tms/getshipDeliveryNoticeList?apiId=69&status=0&carrierSSOId=" +
-              getCookie("userId") +
-              "&con=" +
-              this.input;  
-        } else{
-            this.option2.requestUrl =
-              "/api/v1/tms/getshipDeliveryNoticeList?apiId=69&status=1&carrierSSOId=" +
-              getCookie("userId") +
-              "&con=" +
-              this.input;
+          this.option1.requestUrl =
+            "/api/v1/tms/getshipDeliveryNoticeList?apiId=69&status=0&carrierSSOId=" +
+            getCookie("userId") +
+            "&con=" +
+            this.input;
+        } else {
+          this.option2.requestUrl =
+            "/api/v1/tms/getshipDeliveryNoticeList?apiId=69&status=1&carrierSSOId=" +
+            getCookie("userId") +
+            "&con=" +
+            this.input;
         }
       }
-      
-     },
+    },
     addClick() {
       this.$router.push("/addDeliveryNotice/");
     },
@@ -150,7 +201,7 @@ export default {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
-        center: true
+        center: true,
       })
         .then(() => {
           this.axios
@@ -158,7 +209,7 @@ export default {
             .then(() => {
               this.$message({
                 type: "success",
-                message: "删除成功!"
+                message: "删除成功!",
               });
               this.option1.requestUrl =
                 "/api/v1/tms/getshipDeliveryNoticeList?apiId=69&status=0&i=" +
@@ -168,17 +219,15 @@ export default {
         .catch(() => {
           this.$message({
             type: "info",
-            message: "取消删除!"
+            message: "取消删除!",
           });
         });
     },
 
-
     toPhotoClick(noticeId) {
       this.axios
         .post("/api/v1/tms/downLoadDeilveryNotice?noticeId=" + noticeId)
-        .then(res => {
-          console.log("res",res.data.data);
+        .then((res) => {
           this.srcList = [];
           this.src = res.data.data;
           this.isShow = true;
@@ -195,7 +244,7 @@ export default {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
-        center: true
+        center: true,
       })
         .then(() => {
           this.axios
@@ -203,7 +252,7 @@ export default {
             .then(() => {
               this.$message({
                 type: "success",
-                message: "下发成功!"
+                message: "下发成功!",
               });
               this.option1.requestUrl =
                 "/api/v1/tms/getshipDeliveryNoticeList?apiId=69&status=0&i=" +
@@ -216,14 +265,14 @@ export default {
         .catch(() => {
           this.$message({
             type: "info",
-            message: "取消下发!"
+            message: "取消下发!",
           });
         });
     },
-    refresh(){
+    refresh() {
       this.$router.go(0);
-    }
-  }
+    },
+  },
 };
 </script>
 <style lang="scss" scoped>