修改

config/index.js

@@ -73,7 +73,7 @@ let proxyTable = {
   // 所有数据的请求域名地址
   '/api/v1': {
     target: 'http://172.16.33.166:80',
-    // target: 'http://localhost:8080',
+    //target: 'http://localhost:8080',
     // target: 'http://192.168.1.104:8080',
     ws: true,
     pathRewrite: {

src/components/main.vue

@@ -338,8 +338,8 @@
               style="margin-right: 20px"
               :hidden="badgeshow"
             >
-              <el-button type="text" size="small" @click="goMyTaskPage"
-                > <i class="el-icon-message-solid" style="width:30px;height: 30px;"></i></el-button
+              <el-button type="text" size="small" @click="goMyTaskPage" style="padding:3px"
+                > <i class="el-icon-message-solid" style="font-size: 20px;"></i></el-button
               >
             </el-badge>
             <div

src/views/RMS/components/addPersonnel.vue

@@ -148,6 +148,13 @@ export default {
 
      //确定人员新增
      makeSure() {
+      //验证是否有电话
+      var regex = /^[1][3,4,5,6,7,8,9][0-9]{9}$/
+      if (!regex.test(this.form1.ConcatTelephone)) {
+        this.$message.error('电话号码不符合规则')
+        loading.close()
+        return
+      }
       //初始化用户信息
       let userInfo = {
         orgCode : '',

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

@@ -1,6 +1,6 @@
 <template>
   <!-- 添加二程船水运费1-->
-  <div class="addWagonLoad">
+  <div class="addTwoSectionFee">
     <PageTitle>返回</PageTitle>
     <div class="form-box">
       <!-- <dil-form :formId="271" v-model="form1" ref="from1"></dil-form> -->
@@ -134,11 +134,13 @@ export default {
       batchOption: {
         requestUrl: "/api/v1/uc/getBatchOfNotice?apiId=513",
         selectionType: "radio",
+        maxHeight:400,
         map: [],
       },
       contractPriceOption: {
         requestUrl: "/api/v1/rms/selectbmsshipContractPriceList?apiId=500",
         selectionType: "radio",
+        maxHeight:400,
         map: [],
       }
     };
@@ -189,7 +191,21 @@ export default {
     },
     makeSure() {
       this.isLoading=true;
-      let map={
+      if(!this.batchId ||
+       !this.purchaseOrderId ||
+       !this.form.unitPrice ||
+       !this.form.unitPriceId ||
+       !this.form.makeTime ||
+       !this.form.image
+       ){
+        this.$message.error("存在空值！");
+        this.isLoading=false;
+      }else if(!this.form.realTonnage ||this.form.realTonnage <= 0){
+         this.$message.error("实装吨位大于0！");
+        this.isLoading=false;
+      }
+      else{
+        let map={
         batchId:this.batchId,
         purchaseOrderId:this.purchaseOrderId,
         unitPrice:this.form.unitPrice,
@@ -202,18 +218,6 @@ export default {
         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({
@@ -271,6 +275,7 @@ export default {
         this.upBool = false;
         if (this.num == 1) {
           this.form.image = res.data;
+          this.$forceUpdate();
         }
         this.$message.success("上传成功");
       }
@@ -282,7 +287,8 @@ export default {
 };
 </script>
 <style lang="scss">
-.searchSelect {
+.addTwoSectionFee {
+  .searchSelect {
     display: flex;
     align-items: center;
     justify-content: center;
@@ -325,4 +331,5 @@ export default {
     }
   }
 }
+}
 </style>

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

@@ -9,7 +9,7 @@
       <el-button type="primary" @click="btnclick(0)">
         <i class="el-icon-plus"></i>新增
       </el-button>
-       <el-button type="primary" @click="exportData()"><i class="el-icon-download"></i>导出(Excel)</el-button>
+       <el-button type="primary" @click="exportAllExcel()"><i class="el-icon-download"></i>导出(Excel)</el-button>
     </div>
 
 <el-tabs v-model="activeName">
@@ -163,6 +163,105 @@ export default {
     };
   },
   methods: {
+    exportAllExcel() {
+     if (this.activeName == 'first') {
+       this.tableTitle = '正在启用的运输单价'
+       this.loading = true;
+     this.isKuang = true;
+     if(this.input){
+       this.axios
+               .post(
+                 "/api/v1/ams/getAmsContractTransportPrice1?apiId=109&deleted=0&con=" +this.input+"&i="+new Date()
+               )
+               .then(res => {
+                 console.log(res.data.data)
+                 this.exportAllList = res.data.data.list
+                 this.noSettleDetailsColumn=res.data.data.columnData
+                 this.exportAllReportToExcel(
+                   this.tableTitle,
+                   this.exportAllList,
+                   this.noSettleDetailsColumn
+                 )
+               })
+     }else{
+       this.axios
+               .post(
+                 "/api/v1/ams/getAmsContractTransportPrice1?apiId=109&deleted=0&i="+new Date()
+               )
+               .then(res => {
+                 console.log(res.data.data)
+                 this.exportAllList = res.data.data.list
+                 this.noSettleDetailsColumn=res.data.data.columnData
+                 this.exportAllReportToExcel(
+                   this.tableTitle,
+                   this.exportAllList,
+                   this.noSettleDetailsColumn
+                 )
+               })
+     }
+      }else if (this.activeName == 'second') {
+       this.tableTitle = '历史启用的运输单价'
+       this.loading = true;
+       this.isKuang = true;
+     if(this.input){
+       this.axios
+               .post(
+                 "/api/v1/ams/getAmsContractTransportPrice1?apiId=109&deleted=1&con=" +this.input+"&i="+new Date()
+               )
+               .then(res => {
+                 console.log(res.data.data)
+                 this.exportAllList = res.data.data.list
+                 this.noSettleDetailsColumn=res.data.data.columnData
+                 this.exportAllReportToExcel(
+                   this.tableTitle,
+                   this.exportAllList,
+                   this.noSettleDetailsColumn
+                 )
+               })
+     }else{
+       this.axios
+               .post(
+                 "/api/v1/ams/getAmsContractTransportPrice1?apiId=109&deleted=1&con=" +this.input+"&i="+new Date()
+               )
+               .then(res => {
+                 console.log(res.data.data)
+                 this.exportAllList = res.data.data.list
+                 this.noSettleDetailsColumn=res.data.data.columnData
+                 this.exportAllReportToExcel(
+                   this.tableTitle,
+                   this.exportAllList,
+                   this.noSettleDetailsColumn
+                 )
+               })
+     }
+       } else {
+       }
+       this.loading=false
+     },
+   //导出excel
+   exportAllReportToExcel(tableTitle, dataArr, columnData) {
+     var title = tableTitle
+     let tHeader = []
+     let filterVal = []
+     columnData.forEach(e1 => {
+       if (tHeader.indexOf(e1.label) === -1) {
+         tHeader.push(e1.label)
+       }
+       if (filterVal.indexOf(e1.prop) === -1) {
+         filterVal.push(e1.prop)
+       }
+     })
+     //导出为excel
+     this.downloadLoading = true
+     require.ensure([], () => {
+       const {
+         export_json_to_excel
+       } = require('@/assets/excel/Export2Excel.js') //这里必须使用绝对路径，使用@/+存放export2Excel的路径
+       // let list = this.$refs.excelDom.dataTabel;
+       let data = dataArr.map(v => filterVal.map(j => v[j])) //3.formatJson格式转换
+       export_json_to_excel(tHeader, data, title) // (title)导出的表格名称
+     })
+   },
     func(){
       this.loading = false;
       this.isKuang = false;

src/views/sale/components/dilNotice/carrierNotice.vue

@@ -31,12 +31,14 @@
               type="text"
               size="small"
               @click="updateNotice(scope)"
+              v-if="orgcode!='chengyunshang'"
             >
               修改
             </el-button>
             <el-button
               type="text"
               size="small"
+              v-if="orgcode!='chengyunshang'"
               @click="releaseNotice(scope)"
             >
               发布
@@ -44,6 +46,7 @@
             <el-button
               type="text"
               size="mini"
+              v-if="orgcode!='chengyunshang'"
               @click="deleteNotice(scope)"
             >
               删除
@@ -79,6 +82,7 @@ export default {
       },
       userId:"",
       dialogVisible:false,
+      orgcode:'',
       detailOptions:{
         requestUrl: "/api/v1/ams/getNoticeUser?apiId=520",
         requestQuery:{
@@ -179,9 +183,10 @@ export default {
         });
     },
   },
- /* created() {
+ created() {
     this.userId= getCookie('userId')
-  }*/
+    this.orgcode=getCookie('orgCode')
+  }
 }
 
 </script>

src/views/sale/components/transportFreight/saleTruckSettlement/bmsTruckDetailsOrderNew.vue

@@ -832,6 +832,8 @@ export default {
       centerDialogVisible: false,
       //
       steelMap: {},
+      startTime: new Date(),
+      endTime: new Date(),
       //钢材子表数据
       steelList: [],
       drawer: false,
@@ -876,8 +878,6 @@ export default {
           lable: '车牌号'
         }
       ],
-      startTime: null,
-      endTime: null,
       //合计净重
       totalNumber: 0,
       //合计车数
@@ -1368,7 +1368,7 @@ export default {
       let endPageNum=(this.currentPage)*this.currentPageSize
       if (this.addresText) {
         if (!this.notRoutList.includes('capacityNo')) {
-          await this.axios.post('/api/v1/ams/getAmsContractTransportPriceForDetail?apiId=519&con=' +
+          await this.axios.post('/api/v1/ams/getAmsContractTransportPriceForDetail?con=' +
             this.addresText,this.steelMap).then(
               (res)=>{
                 if(res.data.code){
@@ -1378,10 +1378,8 @@ export default {
               }
             )    
         } else {
-          await this.axios.post('/api/v1/ams/getAmsContractTransportPriceForDetail?apiId=519&con=' +
-            this.addresText +
-            '&userId=' +
-            this.userId,this.steelMap).then(
+          await this.axios.post('/api/v1/ams/getAmsContractTransportPriceForDetail?con=' +
+            this.addresText ,this.steelMap).then(
               (res)=>{
                 if(res.data.code){
                   this.priceAllList=res.data.data
@@ -1392,7 +1390,7 @@ export default {
         }
       } else {
         if (!this.notRoutList.includes('capacityNo')) {
-          await this.axios.post('/api/v1/ams/getAmsContractTransportPriceForDetail?apiId=519&i=' +
+          await this.axios.post('/api/v1/ams/getAmsContractTransportPriceForDetail?i=' +
             new Date(),this.steelMap).then(
               (res)=>{
                 if(res.data.code){
@@ -1402,10 +1400,8 @@ export default {
               }
             )
         } else {
-          await this.axios.post('/api/v1/ams/getAmsContractTransportPriceForDetail?apiId=519&i=' +
-            new Date() +
-            '&userId=' +
-            this.userId,this.steelMap).then(
+          await this.axios.post('/api/v1/ams/getAmsContractTransportPriceForDetail?i=' +
+            new Date() ,this.steelMap).then(
               (res)=>{
                 if(res.data.code){
                   this.priceAllList=res.data.data
@@ -1418,6 +1414,10 @@ export default {
       this.priceList=this.priceAllList.slice(startPageNum,endPageNum)
     },
     async updateDetailsOrderPrice() {
+      if (Object.values(this.steelMap).length == 0) {
+        this.$message.error('请点击需要执行更改操作的行！')
+        return
+      }
       //计算分页尺寸
       let startPageNum=(this.currentPage-1)*this.currentPageSize
       let endPageNum=(this.currentPage)*this.currentPageSize
@@ -1433,7 +1433,7 @@ export default {
           typeof this.steelMap.addressTown != 'undefined' &&
           this.steelMap.addressTown != null
         ) {
-          await this.axios.post('/api/v1/ams/getAmsContractTransportPriceForDetail?apiId=519&i=' +
+          await this.axios.post('/api/v1/ams/getAmsContractTransportPriceForDetail?i=' +
             new Date() +'&con=' +this.steelMap.addressTown,this.steelMap).then(
               (res)=>{
                 if(res.data.code){
@@ -1443,7 +1443,7 @@ export default {
               }
             )  
         } else {
-          await this.axios.post('/api/v1/ams/getAmsContractTransportPriceForDetail?apiId=519&i=' +
+          await this.axios.post('/api/v1/ams/getAmsContractTransportPriceForDetail?i=' +
             new Date(),this.steelMap).then(
               (res)=>{
                 if(res.data.code){
@@ -1454,18 +1454,14 @@ export default {
             )  
         }
       } else {
-        console.log('进入了2')
-        console.log(this.userId)
         if (
           typeof this.steelMap.addressTown != 'undefined' &&
           this.steelMap.addressTown != null
         ) {
-          await this.axios.post('/api/v1/ams/getAmsContractTransportPriceForDetail?apiId=519&i=' +
+          await this.axios.post('/api/v1/ams/getAmsContractTransportPriceForDetail?i=' +
             new Date() +
             '&con=' +
-            this.steelMap.addressTown+
-            '&userId=' +
-            this.userId,this.steelMap).then(
+            this.steelMap.addressTown,this.steelMap).then(
               (res)=>{
                 if(res.data.code){
                   this.priceAllList=res.data.data
@@ -1474,10 +1470,8 @@ export default {
               }
             )
         } else {
-          await this.axios.post('/api/v1/ams/getAmsContractTransportPriceForDetail?apiId=519&i=' +
-            new Date() +
-            '&userId=' +
-            this.userId,this.steelMap).then(
+          await this.axios.post('/api/v1/ams/getAmsContractTransportPriceForDetail?i=' +
+            new Date(),this.steelMap).then(
               (res)=>{
                 if(res.data.code){
                   this.priceAllList=res.data.data
@@ -2996,7 +2990,7 @@ export default {
         consigneeLoginName = getCookie('loginName')
         obj.consigneeLoginName = consigneeLoginName
       }
-      console.log("数据获取")
+      console.log("数据展示")
       console.log(this.screen)
       if (this.screen == '客户') {
         consigneeName = this.input
@@ -3005,6 +2999,7 @@ export default {
       } else if (this.screen == '车牌号') {
         capacityNo = this.input
       } else if (this.screen == '分录ID') {
+        console.log("进入了分录")
         easPrimaryId = this.input
       } else {
         remark = this.input
@@ -3183,6 +3178,7 @@ export default {
       let capacityNo = null
       let remark = null
       let saler = null
+      let easPrimaryId = null
       if (this.startTime && this.endTime) {
         startTime = sjTime(this.startTime)
         endTime = sjTime(this.endTime)
@@ -3205,17 +3201,17 @@ export default {
         carrierName = this.input
       } else if (this.screen == '车牌号') {
         capacityNo = this.input
+      } else if (this.screen == '分录ID') {
+        easPrimaryId = this.input
       } else {
         remark = this.input
       }
       if (this.screen1 == '下单客户') {
         consigneeName = this.input1
-      } else if (this.screen == '承运商') {
+      } else if (this.screen1 == '承运商') {
         carrierName = this.input1
-      } else if (this.screen == '车牌号') {
+      } else if (this.screen1 == '车牌号') {
         capacityNo = this.input1
-      } else {
-        remark = this.input1
       }
       if (getCookie('orgCode') == 'chengyunshang') {
         carrierSsoId = getCookie('userId')
@@ -3242,7 +3238,9 @@ export default {
             '&carrierName=' +
             carrierName +
             '&capacityNo=' +
-            capacityNo,
+            capacityNo+
+            '&easPrimaryId=' +
+            easPrimaryId,
           this.filterMap
         )
         .then(res => {
@@ -3279,7 +3277,9 @@ export default {
             '&carrierName=' +
             carrierName +
             '&capacityNo=' +
-            capacityNo,
+            capacityNo
+            +'&easPrimaryId=' +
+            easPrimaryId,
           this.filterMap
         )
         .then(res => {