Merge remote-tracking branch 'origin/master'

build/utils.js

@@ -15,7 +15,7 @@ const devPathSrc = path.resolve(__dirname, '../../../src') // node_modules应用
 // ['index','appoint'，'configManager','homepage',''inward,'queue','RMS','sale','serviceManager','SporadicManage'
 //       统计报表       组织机构/系统管理 采购  仓储
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow']
-//let devModules = ["index", "statisticalReport", "appoint", "sale"];
+//let devModules = ["index", "statisticalReport", "appoint", "sale","AMS","TMS",'queue','WMS'];
 let devModules = ['all']
 
 if (pathSrc.indexOf('node_modules') > -1) {

config/index.js

@@ -33,6 +33,13 @@ let proxyTable = {
       '^/icore.icp.web/pass/auth/login': ''
     }
   },
+  '/icore-api/v1': {
+    target: 'http://172.16.33.166:8088/api/v1/truckTms', // target: "http://localhost:8080", // target: "http://192.168.1.109:8080",
+    ws: true,
+    pathRewrite: {
+      '^/icore-api/v1': ''
+    }
+  },
   '/icore-api': {
     target: 'http://172.16.33.166:9001',
     changeOrigin: true,
@@ -66,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.101:8080",
     ws: true,
     pathRewrite: {

package.json

@@ -34,7 +34,7 @@
     "file-saver": "^1.3.8",
     "graphql": "^14.1.1",
     "graphql-tag": "^2.10.1",
-    "icore-sdk": "1.0.1-alpha.65",
+    "icore-sdk": "1.0.1-alpha.66",
     "json-schema-editor-vue": "1.2.5",
     "json2xml": "^0.1.3",
     "jspdf": "^2.5.1",

src/components/DilCommonUI/packages/table/src/table.vue

@@ -9,6 +9,7 @@
       :border="border"
       :cell-class-name="cellClassName"
       :height="height"
+      :max-height="maxHeight"
       :highlight-current-row="highlightCurrentRow"
       style="width:100%"
       @sort-change="sortChange"
@@ -181,6 +182,9 @@ export default {
     stripe: {
       default: true
     },
+    height:{
+      default:null
+    },
     // Table 的高度，默认为自动高度。
     // 如果 height 为 number 类型，单位 px；
     // 如果 height 为 string 类型，则这个高度会设置为 Table 的 style.height 的值，Table 的高度会受控于外部样式。

src/components/main.vue

@@ -335,12 +335,13 @@
               :max="99"
               class="item"
               style="margin-right: 20px"
+              :hidden="badgeshow"
             >
               <el-button type="text" size="small" @click="goMyTaskPage"
                 >待办任务</el-button
               >
             </el-badge>
-            <div class="Web_Notice" v-show="socketshow">
+            <div class="Web_Notice" v-show="socketshow" style="z-index: 1 ; overflow-y: scroll">
               <div class="workspace_row-grid_mytask">
                 <div
                   class="workspace_message"
@@ -360,6 +361,8 @@
                   <div class="workspace_message-from">
                     来自: {{ item.insertusername }}
                   </div>
+                  <div style="height: 20px"></div>
+                  <el-divider></el-divider>
                 </div>
                 <div class="workspace_replace_item"></div>
               </div>
@@ -656,6 +659,30 @@
       </div>
     </el-dialog>
 
+    <!--通知弹窗-->
+    <el-dialog
+      :visible.sync="centerDialogVisible"
+    >
+      <div style="margin-left: 300px;font-size: 20px">
+        <h1>{{noticedata1.noticetitle}}</h1>
+      </div>
+      <div style="height: 10px"></div>
+      <div style="margin-left: 30px">
+        <i class="el-icon-document"></i>{{noticedata1.noticecontent}}
+      </div>
+      <el-divider></el-divider>
+      <div style="margin-left: 30px">
+        <i class="el-icon-user-solid"></i>
+        {{noticedata1.insertusername}}
+      </div>
+      <el-divider></el-divider>
+      <div style="margin-left: 30px">
+        <i></i>{{noticedata1.inserttime}}
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="makeSure">确 定</el-button>
+      </span>
+    </el-dialog>
     <!--通知-->
     <!--    <div class="Web_Notice">
       <span class="margin_R10">
@@ -737,6 +764,8 @@ export default {
       }
     }
     return {
+      centerDialogVisible:false,
+      badgeshow: '',
       dutyName: '',
       regular: '', // 密码策略校验正则表达式
       regularType: '',
@@ -911,11 +940,19 @@ export default {
       taskAllNum: '', //任务数目
       socketshow: false, //通知框的显示
       orgcodezs: '', //cookie中的orgcode
-      noticedata: [] //通知的数据
+      userId: '',//cookie中的userId
+      noticedata:[],
+      noticedata1: {
+        noticeTitle:'ceshi',
+        noticecontent:'ceshi',
+        insertusername:'ceshi',
+        inserttime:'ceshi'
+      }
     }
   },
   created() {
     this.orgcodezs = getCookie('orgCode')
+    this.userId = getCookie('userId')
     this.current_theme = window.top.localStorage.getItem('current_theme')
       ? window.top.localStorage.getItem('current_theme')
       : 'deepBlue_theme'
@@ -1116,6 +1153,14 @@ export default {
     that.getOrgDutyList()
   },
   methods: {
+    //弹框删除
+    makeSure(){
+      this.noticedata1=[] ;
+      this.centerDialogVisible=false;
+      this.badgeshow=true;
+      this.axios.post("/api/v1/ams/updateNoticeStatus",
+        {userId:this.userId})
+    },
     // 判断是否为公司其他平台模块且处于开发模式
     isDev(url) {
       let isDevModule = false
@@ -2584,28 +2629,55 @@ export default {
     },
     updatecss() {
       this.socketshow = true
-      let height = document.body.clientHeight - 125
-      this.$nextTick(() => {
+      //let height = document.body.clientHeight - 125
+      /*this.$nextTick(() => {
         $('.Web_Notice')[0].style.height = height + 'px;'
-      })
+      })*/
     },
     leave() {
       this.socketshow = false
     },
     getinformation() {
-      console.log('获取到的orgCode----------------' + this.orgcodezs)
+      console.log('获取到的userId----------------' + this.userId)
       this.axios
-        .post('/api/v1/ams/getNotice', { orgcodezs: this.orgcodezs })
+        .post('/api/v1/ams/getNotice',
+          { userId: this.userId})
         .then(res => {
           this.noticedata = res.data.data
           this.taskAllNum = res.data.data[0].taskAllNum
           console.log(this.noticedata)
           console.log(this.taskAllNum)
+          if (this.taskAllNum !=null){
+            if (this.taskAllNum==0){
+              console.log("进入了标记为0")
+              this.badgeshow=true
+            }else{
+              console.log("进入了标记不为0")
+              this.badgeshow=false
+            }
+          }else {
+            console.log("进入了标记值为null的值")
+            this.taskAllNum=null
+          }
+
         })
     },
     // 查看待办任务详情
     seeTaskContent(item) {
-      this.$refs.defaultpage.seeTaskContent(item)
+      console.log("点击后的事件")
+      console.log(item)
+      let data={
+        noticetitle:item.noticetitle,
+        noticecontent:item.noticecontent,
+        insertusername:item.insertusername,
+        inserttime:item.inserttime
+      }
+      this.noticedata1=data
+      this.centerDialogVisible=true;
+      console.log(this.noticedata1)
+      console.log(this.centerDialogVisible)
+      console.log(this.noticedata1.noticetitle)
+      //this.$refs.defaultpage.seeTaskContent(item)
       // // this.dialogVisible = true;
       // this.itemTask = item;
     }
@@ -2616,9 +2688,10 @@ export default {
 
 <style lang="less" scoped>
 .Web_Notice {
-  width: 300px;
+  width: 500px;
   position: absolute;
-  left: -100px;
+  left: -150px;
+  height: 500px;
   background-color: #f1f6fd;
 }
 /deep/ .privilegeArea {
@@ -2741,7 +2814,12 @@ export default {
   }
   ::-webkit-scrollbar-thumb {
     //滚动条颜色和圆角
-    background-color: #dbd9d9;
+    background-color: #dfe0e0;
+    border-radius: 3px;
+  }
+  ::-webkit-scrollbar-track-piece {
+    // border: 2px solid #000;
+    background-color: #f2f6f8;
     border-radius: 3px;
   }
 }

src/views/ADMINISTRATORS/components/ADMINISTRATORS1.vue

@@ -326,20 +326,58 @@
               </div>
             </div>
           </el-tab-pane>
+          <el-tab-pane label="副产品或焦炭超重允许出厂" name="seventh">
+            <div class="admin2">
+              <div class="carrier from">
+                <el-form
+                  :inline="true"
+                  class="demo-form-inline"
+                  label-width="80px"
+                >
+                  <el-form-item label="车牌号:">
+                    <el-autocomplete
+                      class="inline-input"
+                      v-model="capacityName"
+                      :fetch-suggestions="querySearchCapacity"
+                      placeholder="车牌号"
+                      :trigger-on-focus="false"
+                      @select="handleSelectCapacity"
+                    >
+                      <template slot-scope="{ item }">
+                        <div class="name">{{ item.capacityNumber }}</div>
+                      </template>
+                    </el-autocomplete>
+                  </el-form-item>
+                </el-form>
+              </div>
+              <div class="poundNo from">
+                <span class="text">运输订单号:</span>
+                <el-input v-model="orderNumber" disabled></el-input>
+              </div>
+              <div class="button_box">
+                <el-button
+                  type="primary"
+                  @click="updateCanwork"
+                  :disabled="disabled"
+                  >确认</el-button
+                >
+              </div>
+            </div>
+          </el-tab-pane>
         </el-tabs>
       </div>
     </template>
   </div>
 </template>
 <script>
-import { toDateString, toDateNo } from "../app.js";
+import { toDateString, toDateNo } from '../app.js'
 export default {
   data() {
     return {
       orderNumber: null,
       first: true,
       second: true,
-      activeName: "first",
+      activeName: 'first',
       capacityName: null,
       stateCapacity: null,
       materialList: [],
@@ -364,127 +402,130 @@ export default {
       gatePostList: [],
       enFactoryGatepost: null,
       gatePostId: null
-    };
+    }
   },
   created() {
-    this.value1 = new Date();
-    this.value2 = new Date();
+    this.value1 = new Date()
+    this.value2 = new Date()
   },
   mounted() {
-    this.information();
+    this.information()
   },
   methods: {
+    updateCanwork() {
+      console.log(this.capacityName)
+    },
     onchangeGatepost(value) {
-      console.log(value);
+      console.log(value)
       this.gatePostList.forEach(e => {
         if (e.gatepostName == value) {
-          this.gatePostId = e.gatePostId;
+          this.gatePostId = e.gatePostId
         }
-      });
+      })
     },
     enFactoryResultByPDA() {
       let map = {
-        orderNumber: this.orderNumber + " ",
+        orderNumber: this.orderNumber + ' ',
         gatepostId: this.gatePostId
-      };
-      this.axios.post("");
+      }
+      this.axios.post('')
     },
     allowEnfactoryClick() {},
     queueClick() {
       this.axios
-        .post("/api/v1/qms/addQueueResult?vno=" + this.capacityName + "_")
+        .post('/api/v1/qms/addQueueResult?vno=' + this.capacityName + '_')
         .then(res => {
           if (res.data.code == 200) {
-            this.$message.success("操作成功");
-            this.$router.go(0);
+            this.$message.success('操作成功')
+            this.$router.go(0)
           }
-        });
+        })
     },
     deleteMoreResult() {
-      console.log(this.orderNumber);
+      console.log(this.orderNumber)
       this.axios
-        .post("/api/v1/bp/deleteErrorResult?orderNumber=" + this.orderNumber)
+        .post('/api/v1/bp/deleteErrorResult?orderNumber=' + this.orderNumber)
         .then(res => {
-          if (res.data.code == "200") {
-            this.$message.success("删除成功");
+          if (res.data.code == '200') {
+            this.$message.success('删除成功')
           }
-        });
+        })
     },
     updateLineSqe() {
       let map = {
         orderId: this.orderId,
         orderLineSqe: this.lineQuence
-      };
-      this.axios.post("/api/v1/uc/updateLineSqe", map).then(res => {
-        console.log(res.data);
-        if (res.data.code == "200") {
-          this.$message.success("修改路段顺序号成功");
-          this.$router.go(0);
+      }
+      this.axios.post('/api/v1/uc/updateLineSqe', map).then(res => {
+        console.log(res.data)
+        if (res.data.code == '200') {
+          this.$message.success('修改路段顺序号成功')
+          this.$router.go(0)
         }
-      });
+      })
     },
     oninput() {},
     onchange() {
       if (this.switchValue) {
-        this.first = true;
-        this.second = true;
+        this.first = true
+        this.second = true
       } else {
-        this.second = false;
+        this.second = false
       }
     },
     onchange1() {
-      console.log(this.truckCalFirst);
+      console.log(this.truckCalFirst)
       this.truckCalFirstList.forEach(e => {
         if (this.truckCalFirst == e.value) {
-          this.truckCalFirstNum = e.label;
+          this.truckCalFirstNum = e.label
         }
-      });
+      })
     },
     onchange2() {
       this.truckCalSecondList.forEach(e => {
         if (this.truckCalSecond == e.value) {
-          this.truckCalSecondNum = e.label;
+          this.truckCalSecondNum = e.label
         }
-      });
+      })
     },
     //运力弹出层
     handleSelectCapacity(item) {
-      this.capacityId = item.capacityId;
-      this.capacityName = item.capacityNumber;
+      this.capacityId = item.capacityId
+      this.capacityName = item.capacityNumber
       this.axios
-        .get("/api/v1/uc/getOrderNumber?capacityId=" + this.capacityId)
+        .get('/api/v1/uc/getOrderNumber?capacityId=' + this.capacityId)
         .then(res => {
-          if (res.data.code == "200") {
-            this.orderId = res.data.data.orderId;
-            this.orderNumber = res.data.data.orderNumber;
+          if (res.data.code == '200') {
+            this.orderId = res.data.data.orderId
+            this.orderNumber = res.data.data.orderNumber
             this.axios
-              .get("/api/v1/uc/getMaterialIdByOrderId?orderId=" + this.orderId)
+              .get('/api/v1/uc/getMaterialIdByOrderId?orderId=' + this.orderId)
               .then(res => {
-                if (res.data.code == "200") {
-                  this.materialList = res.data.data;
+                if (res.data.code == '200') {
+                  this.materialList = res.data.data
                 }
-              });
+              })
           }
-        });
+        })
     },
     //以下是运力边输边查搜索
     querySearchCapacity(queryString, cb) {
       if (queryString.length < 3) {
-        return;
+        return
       }
       this.axios
-        .get("/api/v1/uc/getCapacityNumber?index=" + queryString)
+        .get('/api/v1/uc/getCapacityNumber?index=' + queryString)
         .then(res => {
-          if (res.data.code == "200") {
-            var restaurantsCarrier = res.data.data;
-            console.log(restaurantsCarrier, "restaurantsCarrier");
+          if (res.data.code == '200') {
+            var restaurantsCarrier = res.data.data
+            console.log(restaurantsCarrier, 'restaurantsCarrier')
             var results = queryString
               ? restaurantsCarrier.filter(this.createFilterCarrier(queryString))
-              : restaurantsCarrier;
+              : restaurantsCarrier
             // 调用 callback 返回建议列表的数据
-            cb(results);
+            cb(results)
           }
-        });
+        })
     },
     createFilterCarrier(queryString) {
       return restaurantsCarrier => {
@@ -492,22 +533,22 @@ export default {
           restaurantsCarrier.capacityNumber
             .toLowerCase()
             .indexOf(queryString.toLowerCase()) > -1
-        );
-      };
+        )
+      }
     },
     //以上是承运商边输边查搜索
     information() {
-      this.axios.get("/api/v1/uc/getAllCalculateMes").then(res => {
-        this.truckCalFirstList = res.data;
-        this.truckCalSecondList = res.data;
-      });
-      this.axios.get("/api/v1/uc/getAllGatepost").then(res => {
-        console.log(res);
-        this.gatePostList = res.data;
-      });
+      this.axios.get('/api/v1/uc/getAllCalculateMes').then(res => {
+        this.truckCalFirstList = res.data
+        this.truckCalSecondList = res.data
+      })
+      this.axios.get('/api/v1/uc/getAllGatepost').then(res => {
+        console.log(res)
+        this.gatePostList = res.data
+      })
     },
     onClickConfirm() {
-      this.poundNo = "jlbl" + toDateNo(new Date());
+      this.poundNo = 'jlbl' + toDateNo(new Date())
       if (this.switchValue) {
         if (
           this.orderNumber == null ||
@@ -519,8 +560,8 @@ export default {
           this.value2 == null ||
           this.materialId == null
         ) {
-          this.$message.warning("请填写所有值!!!");
-          return;
+          this.$message.warning('请填写所有值!!!')
+          return
         }
       } else {
         if (
@@ -530,63 +571,63 @@ export default {
           this.value1 == null ||
           this.materialId == null
         ) {
-          this.$message.warning("请填写所有值!!!");
-          return;
+          this.$message.warning('请填写所有值!!!')
+          return
         }
       }
       let mapFirst = {
         orderNumber: this.orderNumber,
         resultTareCalculateNumber: this.truckCalFirstNum,
-        resultTareWeight: this.firstWeight + "",
+        resultTareWeight: this.firstWeight + '',
         resultTareWeightTime: toDateString(this.value1),
         resultPoundNo: this.poundNo,
-        materialId: this.materialId + ""
-      };
+        materialId: this.materialId + ''
+      }
       //如果首次大于二次，那么是先毛后皮，首次放在毛重上面，二次放在皮重上面
       if (this.firstWeight >= this.secondWeight) {
         var mapSecond = {
           orderNumber: this.orderNumber,
           resultTareCalculateNumber: this.truckCalSecondNum,
           resultCrossCalculateNumber: this.truckCalFirstNum,
-          resultTareWeight: this.secondWeight + "",
-          resultCrossWeight: this.firstWeight + "",
+          resultTareWeight: this.secondWeight + '',
+          resultCrossWeight: this.firstWeight + '',
           resultNetWeight:
-            Math.abs(this.firstWeight - this.secondWeight).toFixed(2) + "",
+            Math.abs(this.firstWeight - this.secondWeight).toFixed(2) + '',
           resultTareWeightTime: toDateString(this.value2),
           resultCrossWeightTime: toDateString(this.value1),
           resultPoundNo: this.poundNo,
-          materialId: this.materialId + ""
-        };
+          materialId: this.materialId + ''
+        }
       } else {
         //如果首次小于二次，那么是先皮后毛，首次放在皮重上面，二次放在毛重上面
         var mapSecond = {
           orderNumber: this.orderNumber,
           resultTareCalculateNumber: this.truckCalFirstNum,
           resultCrossCalculateNumber: this.truckCalSecondNum,
-          resultTareWeight: this.firstWeight + "",
-          resultCrossWeight: this.secondWeight + "",
+          resultTareWeight: this.firstWeight + '',
+          resultCrossWeight: this.secondWeight + '',
           resultNetWeight:
-            Math.abs(this.secondWeight - this.firstWeight).toFixed(2) + "",
+            Math.abs(this.secondWeight - this.firstWeight).toFixed(2) + '',
           resultTareWeightTime: toDateString(this.value1),
           resultCrossWeightTime: toDateString(this.value2),
           resultPoundNo: this.poundNo,
-          materialId: this.materialId + ""
-        };
+          materialId: this.materialId + ''
+        }
       }
-      var arr = [];
+      var arr = []
       if (this.switchValue) {
-        arr.push(mapSecond);
+        arr.push(mapSecond)
       } else {
-        arr.push(mapFirst);
+        arr.push(mapFirst)
       }
-      this.axios.post("/api/v1/uc/recordingWeightResult", arr).then(res => {
-        this.$message.success("补录计量实绩成功");
-        this.$router.go(0);
-      });
+      this.axios.post('/api/v1/uc/recordingWeightResult', arr).then(res => {
+        this.$message.success('补录计量实绩成功')
+        this.$router.go(0)
+      })
     },
     onClickCancel() {}
   }
-};
+}
 </script>
 <style lang="scss">
 .admin {

src/views/RMS/components/addContractPrice.vue

@@ -13,7 +13,7 @@
                 <el-input v-model="form.unitPrice" type="number"></el-input>
             </el-form-item>
             <el-form-item label="港口">
-              <el-select v-model="form.portId" filterable>
+              <el-select v-model="form.portId" filterable multiple>
                 <el-option
                   v-for="port in ports"
                   :key="port.portId"
@@ -56,7 +56,7 @@ export default {
   data() {
     return {
       form: {
-        portId:null,
+        portId:[],
         contractNo:null,
         unitPrice:null,
         startTime:null,
@@ -123,9 +123,10 @@ export default {
         }).then(()=>{
           let copy=this.$route.query;
           console.log("copy:",copy);
+          //如果有值，则复制新增
           if(copy){
             if(copy.portId){
-              copy.portId=copy.portId * 1;
+              copy.portId=[copy.portId * 1];
             }
             this.$set(this,"form",copy);
           }

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

@@ -7,7 +7,7 @@
           <el-input v-model="shipName" placeholder="请输入船名"></el-input>
         </el-form-item>
         <el-form-item>
-          <span class="demonstration">结算日期</span>
+          <span class="demonstration">离港日期</span>
           <el-date-picker
             v-model="startTime"
             type="date"
@@ -25,14 +25,14 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-button @click="onClick">查询</el-button>
+          <el-button @click="onClick" type="primary" icon="el-icon-search">查询</el-button>
         </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="exportAllReportToExcel"
             ><i class="el-icon-download"></i>Excel</el-button
           >
         </el-form-item>
-        <el-form-item>
+        <!-- <el-form-item>
           <span class="totalWillTonage">合计已预开票吨位</span>
           <el-input
             v-model="totalWillTonageedValue"
@@ -63,7 +63,7 @@
             disabled
             style="width:80px"
           ></el-input>
-        </el-form-item>
+        </el-form-item> -->
       </el-form>
     </div>
     <div class="main">
@@ -73,8 +73,8 @@
             :data="tableData"
             ref="tableRef"
             border
-            stripe
-            style="width: 100%; margin-top: 20px"
+            style="width: 100%; margin-top: 0px"
+            fit
             max-height="500px"
             :row-style="{ height: '30px' }"
             :cell-style="{ fontWeight: '700' }"
@@ -135,9 +135,12 @@
             <el-table-column
               prop="loadingProportion"
               label="装船比例"
-              width="100px"
+              width="70px"
               align="center"
             >
+             <template slot-scope="scope">
+                {{(scope.row.loadingProportion*100).toFixed(2)}}%
+              </template>
             </el-table-column>
             <el-table-column
               prop="realTonnage"
@@ -149,11 +152,11 @@
             <el-table-column
               prop="totalEnTonnage"
               label="到厂湿吨"
-              width="100px"
+              width="120px"
               align="center"
             >
               <template slot-scope="scope">
-                <el-input v-model="scope.row.totalEnTonnage"></el-input>
+                <el-input type="number" v-model="scope.row.totalEnTonnage"></el-input>
               </template>
             </el-table-column>
             <el-table-column
@@ -163,9 +166,26 @@
               align="center"
             >
             </el-table-column>
+            <el-table-column
+              prop="inspectionFees"
+              label="水分检测费"
+              width="120px"
+              align="center"
+            >
+              <template slot-scope="scope">
+                  <el-input type="number" v-model="scope.row.inspectionFees"></el-input>
+              </template>
+            </el-table-column>
+             <el-table-column
+              prop="statementTotalAmount"
+              label="总计开票金额"
+              width="100px"
+              align="center"
+            >
+            </el-table-column>
             <el-table-column
               prop="fee"
-              label="金额(元)"
+              label="水运费"
               width="100px"
               align="center"
             >
@@ -173,11 +193,11 @@
             <el-table-column
               prop="previewTonnage"
               label="已预开票吨位"
-              width="100px"
+              width="120px"
               align="center"
             >
               <template slot-scope="scope">
-                <el-input v-model="scope.row.previewTonnage"></el-input>
+                <el-input type="number" v-model="scope.row.previewTonnage"></el-input>
               </template>
             </el-table-column>
             <el-table-column
@@ -189,25 +209,25 @@
             </el-table-column>
             <el-table-column
               prop="makeTonnage"
-              label="本次实际开票吨位"
+              label="实际开票吨位"
               width="100px"
               align="center"
             >
             </el-table-column>
             <el-table-column
               prop="actuallyMoney"
-              label="本次实际开票金额"
+              label="实际开票金额"
               width="100px"
               align="center"
             >
             </el-table-column>
-            <el-table-column
+            <!-- <el-table-column
               prop="feeMake"
               label="本月实际开票金额"
-              width="100px"
+              
               align="center"
             >
-            </el-table-column>
+            </el-table-column> -->
             <el-table-column
               prop="operate"
               label="操作"
@@ -231,7 +251,6 @@
             :data="tableData1"
             ref="tableRef1"
             border
-            stripe
             max-height="600px"
             :row-style="{ height: '30px' }"
             :cell-style="{ fontWeight: '700' }"
@@ -275,6 +294,20 @@
               align="center"
             >
             </el-table-column>
+            <el-table-column
+              prop="statementTotalAmount"
+              label="开票总金额"
+              width="100px"
+              align="center"
+            >
+            </el-table-column>
+             <el-table-column
+              prop="makeTonnageTotal"
+              label="开票总吨位"
+              width="100px"
+              align="center"
+            >
+            </el-table-column>
             <el-table-column
               prop="resultOutPortTime"
               label="离港日期"
@@ -294,6 +327,16 @@
               label="装船比例"
               width="100px"
               align="center"
+            >
+              <template slot-scope="scope">
+                {{(scope.row.loadingProportion*100).toFixed(2)}}%
+              </template>
+            </el-table-column>
+              <el-table-column
+              prop="inspectionFees"
+              label="水分检测费"
+              width="100px"
+              align="center"
             >
             </el-table-column>
             <el-table-column
@@ -309,9 +352,6 @@
               width="100px"
               align="center"
             >
-              <template slot-scope="scope">
-                <el-input v-model="scope.row.totalEnTonnage"></el-input>
-              </template>
             </el-table-column>
             <el-table-column
               prop="unitPrice"
@@ -333,9 +373,6 @@
               width="100px"
               align="center"
             >
-              <template slot-scope="scope">
-                <el-input v-model="scope.row.willTonanged"></el-input>
-              </template>
             </el-table-column>
             <el-table-column
               prop="previewFee"
@@ -346,21 +383,14 @@
             </el-table-column>
             <el-table-column
               prop="makeTonnage"
-              label="本次实际开票吨位"
-              width="100px"
-              align="center"
-            >
-            </el-table-column>
-            <el-table-column
-              prop="actuallyMoney"
-              label="本次实际开票金额"
+              label="实际开票吨位"
               width="100px"
               align="center"
             >
             </el-table-column>
             <el-table-column
               prop="feeMake"
-              label="本月实际开票金额"
+              label="实际开票金额"
               width="100px"
               align="center"
             >
@@ -373,6 +403,8 @@
 </template>
 <script>
 import { getCookie } from "@/utils/util.js";
+import { sjTime } from "@/utils/sharedJsFile";
+import BigNumber, {bigNumber} from "bignumber.js"
 export default {
   data() {
     return {
@@ -393,7 +425,9 @@ export default {
         "resultForeignShipName",
         "materialName",
         "totalEnTonnage",
-        "operate"
+        "operate",
+        "statementTotalAmount",
+        "makeTonnageTotal"
       ],
       activeName: "first",
       tableTitle: "结算账单报表",
@@ -412,8 +446,8 @@ export default {
     },
     tableData1: {
       handler(newVal) {
-        console.log("执行一次汇总函数");
-        this.computedTableData(newVal);
+        //console.log("执行一次汇总函数");
+        //this.computedTableData1(newVal);
       },
       deep: true,
       immediate: false
@@ -421,24 +455,48 @@ export default {
   },
   methods: {
     //结算
-    settlement(row) {},
+    settlement(row) {
+      console.log("row:",row);
+      //遍历tableData,找出相同批次的行数
+      let arr = this.tableData.filter(e => {
+        return e.batchId == row.batchId && e.noticeTime==row.noticeTime;
+      });
+      let map = {
+        list: arr,
+        statementType: 3,
+        totalEnTonnage: row.totalEnTonnage,
+        statementTotalAmount: row.statementTotalAmount,
+        userID: getCookie("userId"),
+        statementStatus:1
+      };
+      console.log("map:",map);
+      this.axios
+        .post("/api/v1/bms/addShipFeeStatement", map)
+        .then(res => {
+          if (res.data.code == "200") {
+            this.getNoDetailsStament();
+            this.$message.success("保存成功");
+          }
+        })
+        .catch(() => {
+          this.$message.error("保存失败");
+        });
+    },
     //保存
     operate(row) {
-      console.log(row);
+      console.log("row:",row);
       //遍历tableData,找出相同批次的行数
       let arr = this.tableData.filter(e => {
-        return e.batchId == row.batchId;
+        return e.batchId == row.batchId && e.noticeTime==row.noticeTime;
       });
-      let stateMentTotalAmount = this.tableData.reduce((pre, item) => {
-        return pre + item.fee;
-      }, 0);
       let map = {
         list: arr,
         statementType: 3,
         totalEnTonnage: row.totalEnTonnage,
-        stateMentTotalAmount: stateMentTotalAmount,
+        statementTotalAmount: row.statementTotalAmount,
         userID: getCookie("userId")
       };
+      console.log("map:",map);
       this.axios
         .post("/api/v1/bms/addShipFeeStatement", map)
         .then(res => {
@@ -455,24 +513,42 @@ export default {
     computedTableData(data) {
       data.forEach((item, index) => {
         if (index == 0) {
-        } else if (item.batchId == data[index - 1].batchId) {
+        } else if (item.batchId == data[index - 1].batchId && item.noticeTime == data[index - 1].noticeTime) {
           item.totalEnTonnage = data[index - 1].totalEnTonnage;
         }
         //预开金额
         item.previewFee = (item.unitPrice * item.previewTonnage).toFixed(2);
-        //金额
-        item.fee = (item.realTonnage * item.unitPrice).toFixed(2);
         //结算吨位
         item.realTonnage = (
           item.totalEnTonnage * item.loadingProportion
         ).toFixed(2);
+         //金额
+        item.fee = (item.realTonnage * item.unitPrice).toFixed(2);
         //开票吨位
         item.makeTonnage = (item.realTonnage - item.previewTonnage).toFixed(2);
         //实际开票金额
-        item.actuallyMoney = (item.makeTonnage * item.unitPrice).toFixed(2);
+        item.actuallyMoney = (item.makeTonnage * item.unitPrice-item.inspectionFees).toFixed(2);
       });
+      this.computedTotal(data);
       this.getSpanArr(this.tableData);
     },
+    //遍历，汇总
+    computedTotal(data){
+      data.forEach((item, index) => {
+        let arr = data.filter(e => {
+          return e.batchId == item.batchId && e.noticeTime==item.noticeTime;
+        });
+        let inspectionFees=arr.reduce((pre, item1) => {
+          console.log("parseFloat(item1.inspectionFees).toFixed(2)",parseFloat(item1.inspectionFees).toFixed(2));
+          if(item1.inspectionFees)
+            return pre.plus(new BigNumber(item1.inspectionFees));
+          else
+            return pre.plus(0.0);
+        }, new BigNumber(0.0));
+        console.log("inspectionFees:",inspectionFees.toNumber());
+        item.statementTotalAmount=((item.totalEnTonnage-item.previewTonnage)*item.unitPrice-inspectionFees.toNumber()).toFixed(2);
+      });
+    },
     //根据表格据汇总顶部展示
     getTotalArr(data) {
       this.totalWillTonageedValue = data.reduce((pre, item) => {
@@ -491,16 +567,55 @@ export default {
     handleClick() {
       console.log("我正在进行账单");
     },
-    onClick() {},
+    onClick() {
+      if(this.activeName=='first'){
+        this.getNoDetailsStament();
+      }else if(this.activeName=='second'){
+        this.getDetailsStamented();
+      }
+    },
     //获取未结算账单数据
     getNoDetailsStament() {
-      this.axios.post("/api/v1/bms/getShipFeeStatement").then(res => {
+      let startTime = null;
+      let endTime = null;
+      let map={con:this.shipName};
+      if (this.startTime) {
+        startTime = sjTime(this.startTime);
+      }
+      if (this.endTime) {
+        endTime = sjTime(this.endTime);
+      }
+      if(startTime && endTime && startTime < endTime){
+          map.startTime=startTime;
+          map.endTime=endTime;
+      }
+      this.axios.post("/api/v1/bms/getShipFeeStatement",map).then(res => {
         console.log(res.data.data);
         this.tableData = res.data.data;
         this.computedTableData(this.tableData);
       });
     },
-    getDetailsStamented() {},
+    //已结算账单数据
+    getDetailsStamented() {
+       let startTime = null;
+      let endTime = null;
+      let map={con:this.shipName};
+      if (this.startTime) {
+        startTime = sjTime(this.startTime);
+      }
+      if (this.endTime) {
+        endTime = sjTime(this.endTime);
+      }
+      if(startTime && endTime && startTime < endTime){
+          map.startTime=startTime;
+          map.endTime=endTime;
+      }
+      this.axios.post("/api/v1/bms/getShipFeeStatemented",map).then(res => {
+        console.log(res.data.data);
+        this.tableData1 = res.data.data;
+        this.getSpanArr1(this.tableData1);
+      });
+    },
     //合并表格数据
     getSpanArr(data) {
       //每次调用方法初始化
@@ -524,6 +639,29 @@ export default {
         }
       }
     },
+    //合并表格数据
+    getSpanArr1(data) {
+      //每次调用方法初始化
+      this.spanArr1 = [];
+      for (var i = 0; i < data.length; i++) {
+        if (i === 0) {
+          this.spanArr1.push(1);
+          data[i].group = i;
+          this.pos = 0;
+        } else {
+          // 判断当前元素与上一个元素是否相同
+          if (data[i].statementId === data[i - 1].statementId) {
+            this.spanArr1[this.pos] += 1;
+            data[i].group = data[i - 1].group;
+            this.spanArr1.push(0);
+          } else {
+            this.spanArr1.push(1);
+            this.pos = i;
+            data[i].group = data[i - 1].group + 1;
+          }
+        }
+      }
+    },
     objectSpanMethod({ row, column, rowIndex, columnIndex }) {
       if (this.mergeList.includes(column.property)) {
         const _row = this.spanArr[rowIndex];
@@ -536,7 +674,7 @@ export default {
     },
     objectSpanMethod1({ row, column, rowIndex, columnIndex }) {
       if (this.mergeList.includes(column.property)) {
-        const _row = this.spanArr[rowIndex];
+        const _row = this.spanArr1[rowIndex];
         const _col = _row > 0 ? 1 : 0;
         return {
           rowspan: _row,
@@ -584,7 +722,7 @@ export default {
     }
   },
   mounted() {
-    this.getNoDetailsStament();
+    //this.getNoDetailsStament();
     this.getDetailsStamented();
   }
 };

src/views/WMS/components/steel/steel_real.vue

@@ -4,14 +4,14 @@
     	<div class="sache">
         <el-input placeholder="请输入内容" v-model="inputText" clearable>
         </el-input>
-        <el-select v-model="warehouseId" placeholder="请选择仓库" style="width: auto;">
+        <el-select v-model="warehouseId" placeholder="一棒库" style="width: auto;">
           <el-option label="不选择仓库" value="0"></el-option>
           <el-option label="一棒库" value="1"></el-option>
           <el-option label="二棒库" value="2"></el-option>
           <el-option label="高线库" value="3"></el-option>
           <el-option label="配送库" value="4"></el-option>
         </el-select>
-        <el-select v-model="time" placeholder="请选择月份" style="width: auto;">
+        <el-select v-model="time" placeholder="一个月" style="width: auto;">
           <el-option label="不选择月份" value="0"></el-option>
           <el-option label="一个月" value="1"></el-option>
           <el-option label="半个月" value="2"></el-option>
@@ -21,8 +21,8 @@
           <i class="el-icon-search"></i>查询
         </el-button>
 		</div>
-    <dilTable v-bind.sync="option" @func="func" :rowClassName="rowClassName">
-
+    <dilTable v-bind.sync="option" :height="500" @func="func" :rowClassName="rowClassName"
+    style="height: 300px">
     </dilTable>
     <!-- <dilTable v-bind.sync="options" >
 
@@ -47,10 +47,10 @@ export default {
     };
   },
   mounted(){
-    
+
   },
   created(){
-    
+
   },
   methods:{
     rowClassName({row, rowIndex}) {
@@ -65,7 +65,7 @@ export default {
         console.log(e.status)
         if(e.status == 0){
           // 表示这个物资已经达到库龄预警
-          
+
         }
         // console.log(this.mapList)
       });
@@ -80,7 +80,10 @@ export default {
   },
 };
 </script>
-<style lang="scss" scode>
+<style lang="scss" scode>
+.tableHeight{
+  height: 300px;
+}
 .steel_real{
   .sache{
     padding: 1.25rem 0.375rem;
@@ -99,4 +102,4 @@ export default {
     }
   }
 }
-</style>
+</style>

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

@@ -889,6 +889,10 @@ export default {
         {
           values1: 'hnht',
           label1: '海南瀚途贸易有限公司'
+        },
+        {
+          values1: 'cdxc',
+          label1: '成都兴城道成物流有限公司'
         }
       ],
       values1: 'dzgt',

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

@@ -841,6 +841,10 @@ export default {
         {
           values1: "hnht",
           label1: "海南瀚途贸易有限公司"
+        },
+        {
+          values1: 'cdxc',
+          label1: '成都兴城道成物流有限公司'
         }
       ],
       values1: "dzgt",

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

@@ -273,7 +273,8 @@ export default {
         '四川省达州钢铁集团有限责任公司',
         '四川达钢商贸有限公司',
         '江西久隆贸易有限公司',
-        '海南瀚途贸易有限公司'
+        '海南瀚途贸易有限公司',
+        '成都兴城道成物流有限公司'
       ],
       option: {
         // 表格请求数据的地址

src/views/inward/components/inwardSettlement/detailOrder.vue

@@ -86,54 +86,58 @@
         <el-tab-pane label="已结算" name="second">
           <dilTable v-bind.sync="options2" @func="func2"> </dilTable>
         </el-tab-pane>
-        <!-- <el-tab-pane label="未生成详单" name="third">
+        <el-tab-pane
+          label="未生成详单"
+          name="third"
+          v-if="loginName == 'admin02'"
+        >
           <dilTable v-bind.sync="options3" @func="func3"> </dilTable>
-        </el-tab-pane> -->
+        </el-tab-pane>
       </el-tabs>
     </div>
   </div>
 </template>
 
 <script>
-import { getCookie } from "@/utils/util.js";
-import { sjTime } from "@/utils/sharedJsFile";
+import { getCookie } from '@/utils/util.js'
+import { sjTime } from '@/utils/sharedJsFile'
 export default {
   data() {
     return {
       options: [
         {
-          value: "用车单位",
-          label: "用车单位"
+          value: '用车单位',
+          label: '用车单位'
         },
         {
-          value: "货物名称",
-          label: "货物名称"
+          value: '货物名称',
+          label: '货物名称'
         },
         {
-          value: "车牌号",
-          label: "车牌号"
+          value: '车牌号',
+          label: '车牌号'
         },
         {
-          value: "承运起止范围",
-          label: "承运起止范围"
+          value: '承运起止范围',
+          label: '承运起止范围'
         }
       ],
       optionsF: [
         {
-          value: "用车单位",
-          label: "用车单位"
+          value: '用车单位',
+          label: '用车单位'
         },
         {
-          value: "货物名称",
-          label: "货物名称"
+          value: '货物名称',
+          label: '货物名称'
         },
         {
-          value: "车牌号",
-          label: "车牌号"
+          value: '车牌号',
+          label: '车牌号'
         },
         {
-          value: "承运起止范围",
-          label: "承运起止范围"
+          value: '承运起止范围',
+          label: '承运起止范围'
         }
       ],
       screen: null,
@@ -150,20 +154,20 @@ export default {
       selectLineLoading: false,
       input: null,
       input1: null,
-      activeName: "first",
+      activeName: 'first',
       ssoId: null,
       //详单Id
       detailsId: null,
       options1: {
         // first请求数据的地址
-        requestUrl: ""
+        requestUrl: ''
       },
       options2: {
         // second请求数据的地址
-        requestUrl: ""
+        requestUrl: ''
       },
       options3: {
-        requestUrl: ""
+        requestUrl: ''
       },
       //是否打开修改详单地址弹出框
       dialogFormVisible: false,
@@ -179,437 +183,442 @@ export default {
       priceId: null,
       //运输单价的表格
       Address: {
-        requestUrl: "/api/v1/ams/getAddressDeliveryAddress?apiId=255",
-        selectionType: "radio"
+        requestUrl: '/api/v1/ams/getAddressDeliveryAddress?apiId=255',
+        selectionType: 'radio'
       },
       // addressText:null,
       //缓存当前选中的运输单价
       priceMap: {},
-      formLabelWidth: "125px",
-      tableTitle: "内转计重详单",
+      formLabelWidth: '125px',
+      tableTitle: '内转计重详单',
       exportAllList: [],
       noSettleDetailsColumn: [],
       settleDetailsColumn: [],
       noDetailsColumn: [],
       orderList1: [],
       orderList2: [],
-      orderList3: []
-    };
+      orderList3: [],
+      loginName: ''
+    }
   },
   created() {
-    this.options1GetRequestUrl();
-    this.options2GetRequestUrl();
-    this.options3GetRequestUrl();
+    this.loginName = this.loginNames()
+    this.options1GetRequestUrl()
+    this.options2GetRequestUrl()
+    this.options3GetRequestUrl()
   },
   methods: {
+    loginNames() {
+      return getCookie('loginName')
+    },
     handClick() {
-      if (this.activeName == "first") {
-        this.options1GetRequestUrl();
-      } else if (this.activeName == "second") {
-        this.options2GetRequestUrl();
+      if (this.activeName == 'first') {
+        this.options1GetRequestUrl()
+      } else if (this.activeName == 'second') {
+        this.options2GetRequestUrl()
       } else {
-        this.options3GetRequestUrl();
+        this.options3GetRequestUrl()
       }
     },
     func(res) {
-      console.log(res);
-      this.noSettleDetailsColumn = res.columnData;
-      var totalWeight = 0;
-      var totalAllMoney = 0;
+      console.log(res)
+      this.noSettleDetailsColumn = res.columnData
+      var totalWeight = 0
+      var totalAllMoney = 0
       res.list.forEach(e => {
-        totalWeight = totalWeight + e.resultNetWeight;
-        totalAllMoney = totalAllMoney + e.detailsAmount;
-      });
-      this.totalNetWeight = totalWeight.toFixed(2) + "t";
-      this.totalMoney = totalAllMoney.toFixed(2) + "元";
-      this.orderList1 = [];
+        totalWeight = totalWeight + e.resultNetWeight
+        totalAllMoney = totalAllMoney + e.detailsAmount
+      })
+      this.totalNetWeight = totalWeight.toFixed(2) + 't'
+      this.totalMoney = totalAllMoney.toFixed(2) + '元'
+      this.orderList1 = []
       res.list.forEach(e => {
         let map = {
           orderLineSeq: e.orderLineSeq,
           orderId: e.orderId
-        };
-        this.orderList1.push(map);
-      });
+        }
+        this.orderList1.push(map)
+      })
     },
     func2(res) {
-      this.settleDetailsColumn = res.columnData;
+      this.settleDetailsColumn = res.columnData
     },
     func3(res) {
-      console.log(res.list);
-      console.log("res");
-      this.orderList3 = [];
+      console.log(res.list)
+      console.log('res')
+      this.orderList3 = []
       res.list.forEach(e => {
         let map = {
           orderLineSeq: e.orderLineSeq,
           orderId: e.orderId
-        };
-        this.orderList3.push(map);
-      });
-      this.noDetailsColumn = res.columnData;
+        }
+        this.orderList3.push(map)
+      })
+      this.noDetailsColumn = res.columnData
     },
     newSettle() {
-      console.log(this.orderList);
-      let orderList = [];
-      if (this.activeName == "third") {
-        orderList = this.orderList3;
+      console.log(this.orderList)
+      let orderList = []
+      if (this.activeName == 'third') {
+        orderList = this.orderList3
       } else {
-        orderList = this.orderList1;
+        orderList = this.orderList1
       }
       this.axios
-        .post("/api/v1/bms/newInwardSettle", { orderIds: orderList })
+        .post('/api/v1/bms/newInwardSettle', { orderIds: orderList })
         .then(res => {
-          console.log(res);
-          this.$message.success("生成成功");
-          this.options3GetRequestUrl();
-        });
+          console.log(res)
+          this.$message.success('生成成功')
+          this.options3GetRequestUrl()
+        })
     },
     exportAllExcel() {
-      let startTime = null;
-      let endTime = null;
-      let orgCode = null;
-      let materialTypeNames = null;
-      let transRangeValues = null;
-      let shipperNames = null;
-      let capacityNo = null;
-      let carrierSsoId = null;
+      let startTime = null
+      let endTime = null
+      let orgCode = null
+      let materialTypeNames = null
+      let transRangeValues = null
+      let shipperNames = null
+      let capacityNo = null
+      let carrierSsoId = null
       if (this.startTime && this.endTime) {
-        startTime = sjTime(this.startTime);
-        endTime = sjTime(this.endTime);
+        startTime = sjTime(this.startTime)
+        endTime = sjTime(this.endTime)
       }
-      if (getCookie("orgCode") == "chengyunshang") {
-        carrierSsoId = getCookie("userId");
+      if (getCookie('orgCode') == 'chengyunshang') {
+        carrierSsoId = getCookie('userId')
       }
       if (
-        getCookie("orgCode") == "dagangadmin" ||
-        getCookie("orgCode") == "zidonghuabu" ||
-        getCookie("orgCode") == "wuliuchuyunzhongxin"
+        getCookie('orgCode') == 'dagangadmin' ||
+        getCookie('orgCode') == 'zidonghuabu' ||
+        getCookie('orgCode') == 'wuliuchuyunzhongxin'
       ) {
-        orgCode = null;
+        orgCode = null
       } else {
-        orgCode = getCookie("orgCode");
+        orgCode = getCookie('orgCode')
       }
-      if (this.screen == "车牌号") {
-        capacityNo = this.input;
+      if (this.screen == '车牌号') {
+        capacityNo = this.input
       }
-      if (this.screen == "承运起止范围") {
-        transRangeValues = this.input;
+      if (this.screen == '承运起止范围') {
+        transRangeValues = this.input
       }
-      if (this.screen == "货物名称") {
-        materialTypeNames = this.input;
+      if (this.screen == '货物名称') {
+        materialTypeNames = this.input
       }
-      if (this.screen == "用车单位") {
-        shipperNames = this.input;
+      if (this.screen == '用车单位') {
+        shipperNames = this.input
       }
-      if (this.screen1 == "车牌号") {
-        capacityNo = this.input1;
+      if (this.screen1 == '车牌号') {
+        capacityNo = this.input1
       }
-      if (this.screen1 == "承运起止范围") {
-        transRangeValues = this.input1;
+      if (this.screen1 == '承运起止范围') {
+        transRangeValues = this.input1
       }
-      if (this.screen1 == "货物名称") {
-        materialTypeNames = this.input1;
+      if (this.screen1 == '货物名称') {
+        materialTypeNames = this.input1
       }
-      if (this.screen1 == "用车单位") {
-        shipperNames = this.input1;
+      if (this.screen1 == '用车单位') {
+        shipperNames = this.input1
       }
-      if (this.activeName == "first") {
-        this.tableTitle = "未结算计费详单";
+      if (this.activeName == 'first') {
+        this.tableTitle = '未结算计费详单'
         this.axios
           .post(
-            "/api/v1/bms/getInwardWeightDetailsOrder?apiId=461&orderType=11&detailStatus=0" +
-              "&startTime=" +
+            '/api/v1/bms/getInwardWeightDetailsOrder?apiId=461&orderType=11&detailStatus=0' +
+              '&startTime=' +
               startTime +
-              "&endTime=" +
+              '&endTime=' +
               endTime +
-              "&shipperNames=" +
+              '&shipperNames=' +
               shipperNames +
-              "&materialTypeNames=" +
+              '&materialTypeNames=' +
               materialTypeNames +
-              "&transRangeValues=" +
+              '&transRangeValues=' +
               transRangeValues +
-              "&capacityNo=" +
+              '&capacityNo=' +
               capacityNo +
-              "&i" +
+              '&i' +
               new Date() +
-              "&isPage=yes"
+              '&isPage=yes'
           )
           .then(res => {
-            console.log(res.data.data);
-            this.exportAllList = res.data.data;
+            console.log(res.data.data)
+            this.exportAllList = res.data.data
             this.exportAllReportToExcel(
               this.tableTitle,
               this.exportAllList,
               this.noSettleDetailsColumn
-            );
-          });
-      } else if (this.activeName == "second") {
-        this.tableTitle = "已结算计费详单";
+            )
+          })
+      } else if (this.activeName == 'second') {
+        this.tableTitle = '已结算计费详单'
         this.axios
           .post(
-            "/api/v1/bms/getInwardWeightDetailsOrder?apiId=461&orderType=11&detailStatus=1" +
-              "&startTime=" +
+            '/api/v1/bms/getInwardWeightDetailsOrder?apiId=461&orderType=11&detailStatus=1' +
+              '&startTime=' +
               startTime +
-              "&endTime=" +
+              '&endTime=' +
               endTime +
-              "&shipperNames=" +
+              '&shipperNames=' +
               shipperNames +
-              "&materialTypeNames=" +
+              '&materialTypeNames=' +
               materialTypeNames +
-              "&transRangeValues=" +
+              '&transRangeValues=' +
               transRangeValues +
-              "&capacityNo=" +
+              '&capacityNo=' +
               capacityNo +
-              "&i" +
+              '&i' +
               new Date() +
-              "&isPage=yes" +
-              "&userId=" +
+              '&isPage=yes' +
+              '&userId=' +
               orgCode
           )
           .then(res => {
-            this.exportAllList = res.data.data;
+            this.exportAllList = res.data.data
             this.exportAllReportToExcel(
               this.tableTitle,
               this.exportAllList,
               this.settleDetailsColumn
-            );
-          });
-      } else if (this.activeName == "third") {
-        this.tableTitle = "未生成计费详单数据";
+            )
+          })
+      } else if (this.activeName == 'third') {
+        this.tableTitle = '未生成计费详单数据'
         this.axios
           .post(
-            "/api/v1/bms/getNoInwardDetails?apiId=490" +
-              "&startTime=" +
+            '/api/v1/bms/getNoInwardDetails?apiId=490' +
+              '&startTime=' +
               startTime +
-              "&endTime=" +
+              '&endTime=' +
               endTime +
-              "&shipperNames=" +
+              '&shipperNames=' +
               shipperNames +
-              "&materialTypeNames=" +
+              '&materialTypeNames=' +
               materialTypeNames +
-              "&transRangeValues=" +
+              '&transRangeValues=' +
               transRangeValues +
-              "&capacityNo=" +
+              '&capacityNo=' +
               capacityNo +
-              "&i" +
+              '&i' +
               new Date() +
-              "&userId=" +
+              '&userId=' +
               orgCode +
-              "&isPage=yes"
+              '&isPage=yes'
           )
           .then(res => {
-            this.exportAllList = res.data.data;
+            this.exportAllList = res.data.data
             this.exportAllReportToExcel(
               this.tableTitle,
               this.exportAllList,
               this.noDetailsColumn
-            );
-          });
+            )
+          })
       }
     },
     //导出excel
     exportAllReportToExcel(tableTitle, dataArr, columnData) {
-      var title = tableTitle;
-      let tHeader = [];
-      let filterVal = [];
+      var title = tableTitle
+      let tHeader = []
+      let filterVal = []
       columnData.forEach(e1 => {
         if (tHeader.indexOf(e1.label) === -1) {
-          tHeader.push(e1.label);
+          tHeader.push(e1.label)
         }
         if (filterVal.indexOf(e1.prop) === -1) {
-          filterVal.push(e1.prop);
+          filterVal.push(e1.prop)
         }
-      });
+      })
       //导出为excel
-      this.downloadLoading = true;
+      this.downloadLoading = true
       require.ensure([], () => {
         const {
           export_json_to_excel
-        } = require("@/assets/excel/Export2Excel.js"); //这里必须使用绝对路径，使用@/+存放export2Excel的路径
+        } = 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)导出的表格名称
-      });
+        let data = dataArr.map(v => filterVal.map(j => v[j])) //3.formatJson格式转换
+        export_json_to_excel(tHeader, data, title) // (title)导出的表格名称
+      })
     },
     //未结算数据
     options1GetRequestUrl() {
-      if (getCookie("orgCode") == "chengyunshang") {
-        this.ssoId = getCookie("userId");
+      if (getCookie('orgCode') == 'chengyunshang') {
+        this.ssoId = getCookie('userId')
         this.options1.requestUrl =
-          "/api/v1/bms/getInwardWeightDetailsOrder?apiId=461&orderType=11&detailStatus=0&carrierSsoId=" +
-          getCookie("userId") +
-          "&startTime=null&endTime=null&i=" +
-          new Date();
+          '/api/v1/bms/getInwardWeightDetailsOrder?apiId=461&orderType=11&detailStatus=0&carrierSsoId=' +
+          getCookie('userId') +
+          '&startTime=null&endTime=null&i=' +
+          new Date()
       } else if (
-        getCookie("orgCode") == "dagangadmin" ||
-        getCookie("orgCode") == "zidonghuabu" ||
-        getCookie("orgCode") == "wuliuchuyunzhongxin"
+        getCookie('orgCode') == 'dagangadmin' ||
+        getCookie('orgCode') == 'zidonghuabu' ||
+        getCookie('orgCode') == 'wuliuchuyunzhongxin'
       ) {
         this.options1.requestUrl =
-          "/api/v1/bms/getInwardWeightDetailsOrder?apiId=461&orderType=11&detailStatus=0&startTime=null&endTime=null&i=" +
-          new Date();
+          '/api/v1/bms/getInwardWeightDetailsOrder?apiId=461&orderType=11&detailStatus=0&startTime=null&endTime=null&i=' +
+          new Date()
       } else {
         this.options1.requestUrl =
-          "/api/v1/bms/getInwardWeightDetailsOrder?apiId=461&orderType=11&detailStatus=0&userId=" +
-          getCookie("orgCode") +
-          "&startTime=null&endTime=null&i=" +
-          new Date();
+          '/api/v1/bms/getInwardWeightDetailsOrder?apiId=461&orderType=11&detailStatus=0&userId=' +
+          getCookie('orgCode') +
+          '&startTime=null&endTime=null&i=' +
+          new Date()
       }
     },
     //已结算数据
     options2GetRequestUrl() {
-      if (getCookie("orgCode") == "chengyunshang") {
-        this.ssoId = getCookie("userId");
+      if (getCookie('orgCode') == 'chengyunshang') {
+        this.ssoId = getCookie('userId')
         this.options2.requestUrl =
-          "/api/v1/bms/getInwardWeightDetailsOrder?apiId=461&orderType=11&detailStatus=1&carrierSsoId=" +
-          getCookie("userId") +
-          "&startTime=null&endTime=null&i=" +
-          new Date();
+          '/api/v1/bms/getInwardWeightDetailsOrder?apiId=461&orderType=11&detailStatus=1&carrierSsoId=' +
+          getCookie('userId') +
+          '&startTime=null&endTime=null&i=' +
+          new Date()
       } else if (
-        getCookie("orgCode") == "dagangadmin" ||
-        getCookie("orgCode") == "zidonghuabu" ||
-        getCookie("orgCode") == "wuliuchuyunzhongxin"
+        getCookie('orgCode') == 'dagangadmin' ||
+        getCookie('orgCode') == 'zidonghuabu' ||
+        getCookie('orgCode') == 'wuliuchuyunzhongxin'
       ) {
         this.options2.requestUrl =
-          "/api/v1/bms/getInwardWeightDetailsOrder?apiId=461&orderType=11&detailStatus=1" +
-          "&startTime=null&endTime=null&i=" +
-          new Date();
+          '/api/v1/bms/getInwardWeightDetailsOrder?apiId=461&orderType=11&detailStatus=1' +
+          '&startTime=null&endTime=null&i=' +
+          new Date()
       } else {
         this.options2.requestUrl =
-          "/api/v1/bms/getInwardWeightDetailsOrder?apiId=461&orderType=11&detailStatus=1&userId=" +
-          getCookie("orgCode") +
-          "&startTime=null&endTime=null&i=" +
-          new Date();
+          '/api/v1/bms/getInwardWeightDetailsOrder?apiId=461&orderType=11&detailStatus=1&userId=' +
+          getCookie('orgCode') +
+          '&startTime=null&endTime=null&i=' +
+          new Date()
       }
     },
     options3GetRequestUrl() {
       this.options3.requestUrl =
-        "/api/v1/bms/getNoInwardDetails?apiId=490&i=" + new Date();
+        '/api/v1/bms/getNoInwardDetails?apiId=490&i=' + new Date()
     },
     toInsert() {
-      this.$router.push("/insertCheckInventory");
+      this.$router.push('/insertCheckInventory')
     },
     onclick() {
-      let startTime = null;
-      let endTime = null;
-      let orgCode = null;
-      let materialTypeNames = null;
-      let transRangeValues = null;
-      let shipperNames = null;
-      let capacityNo = null;
-      let carrierSsoId = null;
+      let startTime = null
+      let endTime = null
+      let orgCode = null
+      let materialTypeNames = null
+      let transRangeValues = null
+      let shipperNames = null
+      let capacityNo = null
+      let carrierSsoId = null
       if (this.startTime && this.endTime) {
-        startTime = sjTime(this.startTime);
-        endTime = sjTime(this.endTime);
+        startTime = sjTime(this.startTime)
+        endTime = sjTime(this.endTime)
       }
-      if (getCookie("orgCode") == "chengyunshang") {
-        carrierSsoId = getCookie("userId");
+      if (getCookie('orgCode') == 'chengyunshang') {
+        carrierSsoId = getCookie('userId')
       }
       if (
-        getCookie("orgCode") == "dagangadmin" ||
-        getCookie("orgCode") == "zidonghuabu" ||
-        getCookie("orgCode") == "wuliuchuyunzhongxin"
+        getCookie('orgCode') == 'dagangadmin' ||
+        getCookie('orgCode') == 'zidonghuabu' ||
+        getCookie('orgCode') == 'wuliuchuyunzhongxin'
       ) {
-        orgCode = null;
+        orgCode = null
       } else {
-        orgCode = getCookie("orgCode");
+        orgCode = getCookie('orgCode')
       }
-      if (this.screen == "车牌号") {
-        capacityNo = this.input;
+      if (this.screen == '车牌号') {
+        capacityNo = this.input
       }
-      if (this.screen == "承运起止范围") {
-        transRangeValues = this.input;
+      if (this.screen == '承运起止范围') {
+        transRangeValues = this.input
       }
-      if (this.screen == "货物名称") {
-        materialTypeNames = this.input;
+      if (this.screen == '货物名称') {
+        materialTypeNames = this.input
       }
-      if (this.screen == "用车单位") {
-        shipperNames = this.input;
+      if (this.screen == '用车单位') {
+        shipperNames = this.input
       }
-      if (this.screen1 == "车牌号") {
-        capacityNo = this.input1;
+      if (this.screen1 == '车牌号') {
+        capacityNo = this.input1
       }
-      if (this.screen1 == "承运起止范围") {
-        transRangeValues = this.input1;
+      if (this.screen1 == '承运起止范围') {
+        transRangeValues = this.input1
       }
-      if (this.screen1 == "货物名称") {
-        materialTypeNames = this.input1;
+      if (this.screen1 == '货物名称') {
+        materialTypeNames = this.input1
       }
-      if (this.screen1 == "用车单位") {
-        shipperNames = this.input1;
+      if (this.screen1 == '用车单位') {
+        shipperNames = this.input1
       }
-      if (this.activeName == "first") {
+      if (this.activeName == 'first') {
         this.options1.requestUrl =
-          "/api/v1/bms/getInwardWeightDetailsOrder?apiId=461&orderType=11&detailStatus=0" +
-          "&startTime=" +
+          '/api/v1/bms/getInwardWeightDetailsOrder?apiId=461&orderType=11&detailStatus=0' +
+          '&startTime=' +
           startTime +
-          "&endTime=" +
+          '&endTime=' +
           endTime +
-          "&shipperNames=" +
+          '&shipperNames=' +
           shipperNames +
-          "&materialTypeNames=" +
+          '&materialTypeNames=' +
           materialTypeNames +
-          "&transRangeValues=" +
+          '&transRangeValues=' +
           transRangeValues +
-          "&capacityNo=" +
+          '&capacityNo=' +
           capacityNo +
-          "&i" +
+          '&i' +
           new Date() +
-          "&userId=" +
-          orgCode;
+          '&userId=' +
+          orgCode
       }
-      if (this.activeName == "second") {
+      if (this.activeName == 'second') {
         this.options2.requestUrl =
-          "/api/v1/bms/getInwardWeightDetailsOrder?apiId=461&orderType=11&detailStatus=1" +
-          "&startTime=" +
+          '/api/v1/bms/getInwardWeightDetailsOrder?apiId=461&orderType=11&detailStatus=1' +
+          '&startTime=' +
           startTime +
-          "&endTime=" +
+          '&endTime=' +
           endTime +
-          "&shipperNames=" +
+          '&shipperNames=' +
           shipperNames +
-          "&materialTypeNames=" +
+          '&materialTypeNames=' +
           materialTypeNames +
-          "&transRangeValues=" +
+          '&transRangeValues=' +
           transRangeValues +
-          "&capacityNo=" +
+          '&capacityNo=' +
           capacityNo +
-          "&i" +
+          '&i' +
           new Date() +
-          "&userId=" +
-          orgCode;
+          '&userId=' +
+          orgCode
       }
-      if (this.activeName == "third") {
+      if (this.activeName == 'third') {
         this.options3.requestUrl =
-          "/api/v1/bms/getNoInwardDetails?apiId=490" +
-          "&startTime=" +
+          '/api/v1/bms/getNoInwardDetails?apiId=490' +
+          '&startTime=' +
           startTime +
-          "&endTime=" +
+          '&endTime=' +
           endTime +
-          "&shipperNames=" +
+          '&shipperNames=' +
           shipperNames +
-          "&materialTypeNames=" +
+          '&materialTypeNames=' +
           materialTypeNames +
-          "&transRangeValues=" +
+          '&transRangeValues=' +
           transRangeValues +
-          "&capacityNo=" +
+          '&capacityNo=' +
           capacityNo +
-          "&i" +
+          '&i' +
           new Date() +
-          "&userId=" +
-          orgCode;
+          '&userId=' +
+          orgCode
       }
     },
     //运输订单点击浏览的事件
     select() {
-      this.addressDrawer = true;
+      this.addressDrawer = true
     },
     //运输单价模态窗口的框计算
     selectAddressClick() {
       this.Price.requestUrl =
-        "/api/v1/ams/getAddressDeliveryAddress?apiId=255&con=" +
-        this.addressText;
+        '/api/v1/ams/getAddressDeliveryAddress?apiId=255&con=' +
+        this.addressText
     }
   }
-};
+}
 </script>
 
 <style lang="scss" scoped>

src/views/inward/components/truckAppoint/addRequirement2.vue

@@ -4,7 +4,7 @@
     <page-title>新增需求</page-title>
     <div>
       <!-- 用车单位 -->
-      <div class="requireUnit form">
+      <div class="requireUnit for">
         <el-form :inline="true" class="demo-form-inline" label-width="80px">
           <el-form-item label="用车单位">
             <el-autocomplete

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

@@ -1,11 +1,12 @@
 
 <template>
-  <!-- 添加公告信息 -->
-  <div class="addWagonLoad">
+  <!-- 添加公告信息 class="addWagonLoad" -->
+  <div>
     <PageTitle>返回</PageTitle>
 
-    <div class="form-box" style="margin-right: 10rem">
-      <dil-form :formId="369" v-model="form1" ref="from1"></dil-form>
+    <div class="form-box" style="margin-right: 10rem;width: 1200px">
+      <dil-form :formId="391" v-model="form1" ref="from1">
+      </dil-form>
     </div>
 
     <div class="button-box">
@@ -16,17 +17,36 @@
 </template>
 
 <script>
+import { getCookie } from '@/utils/util.js'
 import PageTitle from "@/components/Page/Title";
 export default {
   components: { PageTitle },
   data() {
     return {
-      form1: {},
+      form1: {
+        permission:"承运商"
+      },
       value: undefined,
+      userId:""
     };
   },
-  mounted() {},
+  mounted() {
+    this.userId = getCookie('userId')
+    /*console.log("新增")
+    console.log(this.userId)
+    //this.form1.insertTime=new Date()*/
+    this.$set(this.form1, 'insertTime',new Date())
+    this.information()
+  },
   methods: {
+    async information(){
+      await this.axios.post("/api/v1/ams/queryName/"+this.userId)
+      .then((res=>{
+        console.log(res)
+        let userName=res.data.data
+        this.$set(this.form1, 'insertUsername',userName)
+      }))
+    },
     makeSure() {
       console.log(this.form1);
       let DilNotice = {
@@ -52,7 +72,6 @@ export default {
 };
 </script>
 <style lang='scss' scoped>
-.form-box,
 .from {
   display: flex;
   align-items: center;
@@ -60,6 +79,18 @@ export default {
   margin-top: 5px;
   margin-bottom: 20px;
 }
+.form-box{
+  .el-form{
+    margin-top: 100px;
+    margin-left: 200px;
+    .preview-group{
+      .el-form-item{
+        width: 600px;
+        height: 60px;
+      }
+    }
+  }
+}
 .button-box{
   display: flex;
   text-align: center;

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

@@ -15,17 +15,35 @@
 </template>
 
 <script>
+import { getCookie } from '@/utils/util.js'
 import PageTitle from "@/components/Page/Title";
 export default {
   components: { PageTitle },
   data() {
     return {
-      form1: {},
+      form1: {
+        permission:"销售商"
+      },
       value: undefined,
     };
   },
-  mounted() {},
+  mounted() {
+    this.userId = getCookie('userId')
+    /*console.log("新增")
+    console.log(this.userId)
+    //this.form1.insertTime=new Date()*/
+    this.$set(this.form1, 'insertTime',new Date())
+    this.information()
+  },
   methods: {
+    async information(){
+      await this.axios.post("/api/v1/ams/queryName/"+this.userId)
+        .then((res=>{
+          console.log(res)
+          let userName=res.data.data
+          this.$set(this.form1, 'insertUsername',userName)
+        }))
+    },
     makeSure() {
       console.log(this.form1);
       let DilNotice = {
@@ -51,7 +69,6 @@ export default {
 };
 </script>
 <style lang='scss' scoped>
-.form-box,
 .from {
   display: flex;
   align-items: center;
@@ -67,4 +84,16 @@ export default {
   margin-top: 0.3125rem;
   margin-bottom: 1.25rem;
 }
+.form-box{
+  .el-form{
+    margin-top: 100px;
+    margin-left: 200px;
+    .preview-group{
+      .el-form-item{
+        width: 600px;
+        height: 60px;
+      }
+    }
+  }
+}
 </style>

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

@@ -15,17 +15,35 @@
 </template>
 
 <script>
+import { getCookie } from '@/utils/util.js'
 import PageTitle from "@/components/Page/Title";
 export default {
   components: { PageTitle },
   data() {
     return {
-      form1: {},
+      form1: {
+        permission:"收货客户"
+      },
       value: undefined,
     };
   },
-  mounted() {},
+  mounted() {
+    this.userId = getCookie('userId')
+    /*console.log("新增")
+    console.log(this.userId)
+    //this.form1.insertTime=new Date()*/
+    this.$set(this.form1, 'insertTime',new Date())
+    this.information()
+  },
   methods: {
+    async information(){
+      await this.axios.post("/api/v1/ams/queryName/"+this.userId)
+        .then((res=>{
+          console.log(res)
+          let userName=res.data.data
+          this.$set(this.form1, 'insertUsername',userName)
+        }))
+    },
     makeSure() {
       console.log(this.form1);
       let DilNotice = {
@@ -51,7 +69,6 @@ export default {
 };
 </script>
 <style lang='scss' scoped>
-.form-box,
 .from {
   display: flex;
   align-items: center;
@@ -67,5 +84,17 @@ export default {
   margin-top: 0.3125rem;
   margin-bottom: 1.25rem;
 }
+.form-box{
+  .el-form{
+    margin-top: 100px;
+    margin-left: 200px;
+    .preview-group{
+      .el-form-item{
+        width: 600px;
+        height: 60px;
+      }
+    }
+  }
+}
 </style>
 

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

@@ -18,7 +18,7 @@
 
     <div class="table">
       <dilTable v-bind.sync="options">
-        <el-table-column fixed="right" label="操作" width="120" header-align="center">
+        <el-table-column fixed="right" label="操作" width="150" header-align="center">
           <template slot-scope="scope">
             <el-button
               type="text"
@@ -34,6 +34,13 @@
             >
               修改
             </el-button>
+            <el-button
+              type="text"
+              size="small"
+              @click="releaseNotice(scope)"
+            >
+              发布
+            </el-button>
             <el-button
               type="text"
               size="mini"
@@ -52,6 +59,7 @@
 
 
 <script>
+import { getCookie } from '@/utils/util.js'
 export default {
   name:"homeworkPath",
   data(){
@@ -62,6 +70,7 @@ export default {
         // first请求数据的地址
         requestUrl: "/api/v1/ams/getCarrierNoticeList?apiId=414",
       },
+      userId:""
     }
   },
   methods:{
@@ -69,6 +78,28 @@ export default {
       this.options.requestUrl = "/api/v1/ams/getCarrierNoticeList?apiId=414&con="+this.textInput;
     },
 
+    //发布
+    releaseNotice(scope){
+      console.log("发布")
+      console.log(scope.row)
+      let dilNotice={
+        noticeTitle:scope.row.noticeTitle,
+        noticeContent:scope.row.noticeContent,
+        insertUsername:scope.row.insertUsername,
+        insertTime:scope.row.insertTime,
+        noticeId:scope.row.noticeId,
+        permission:scope.row.permission
+      }
+      this.axios.post("/api/v1/ams/releaseNotice",dilNotice).
+        then((res)=>{
+          if (res.data.code=="200"){
+            this.$message.success("发布成功")
+          }else {
+            this.$message.error("发布失败")
+          }
+        }
+      )
+    },
 
 
     CarrierNotice() {
@@ -78,7 +109,6 @@ export default {
     /*新增通知*/
     toInsert() {
       this.$router.push("/addNotice");
-
     },
 
     /*通知详情*/
@@ -130,7 +160,9 @@ export default {
         });
     },
   },
-
+ /* created() {
+    this.userId= getCookie('userId')
+  }*/
 }
 
 </script>

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

@@ -18,7 +18,7 @@
 
     <div class="table">
       <dilTable v-bind.sync="options">
-        <el-table-column fixed="right" label="操作" width="120" header-align="center">
+        <el-table-column fixed="right" label="操作" width="150" header-align="center">
           <template slot-scope="scope">
             <el-button
               type="text"
@@ -34,6 +34,13 @@
             >
               修改
             </el-button>
+            <el-button
+              type="text"
+              size="small"
+              @click="releaseNotice(scope)"
+            >
+              发布
+            </el-button>
             <el-button
               type="text"
               size="mini"
@@ -69,7 +76,28 @@ export default {
       this.options.requestUrl = "/api/v1/ams/getClientNoticeList?apiId=414&con="+this.textInput;
     },
 
-
+    //发布
+    releaseNotice(scope){
+      console.log("发布")
+      console.log(scope.row)
+      let dilNotice={
+        noticeTitle:scope.row.noticeTitle,
+        noticeContent:scope.row.noticeContent,
+        insertUsername:scope.row.insertUsername,
+        insertTime:scope.row.insertTime,
+        noticeId:scope.row.noticeId,
+        permission:scope.row.permission
+      }
+      this.axios.post("/api/v1/ams/releaseNotice",dilNotice).
+      then((res)=>{
+          if (res.data.code=="200"){
+            this.$message.success("发布成功")
+          }else {
+            this.$message.error("发布失败")
+          }
+        }
+      )
+    },
 
     CarrierNotice() {
       this.$router.push("/addNotice");

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

@@ -2,10 +2,11 @@
   <!-- 修改通知信息 -->
   <div id="contractDetails">
     <page-title>编辑</page-title>
-    <div class="main">
+<!--    <div class="main">
       <span class="text">通知信息</span>
-    </div>
-    <div class="contractTitle">
+    </div>-->
+    <!--class="contractTitle"-->
+    <div>
       <div class="form-box">
         <div class="form-one">
           <dil-form :formId="369" v-model="form1"></dil-form>
@@ -26,17 +27,20 @@
 <script>
 
 
-
+import { getCookie } from '@/utils/util.js'
 import PageTitle from "@/components/Page/Title";
 export default {
   components: { PageTitle },
   data() {
     return {
       form1: {},
+      userId:''
     };
   },
 
   mounted() {
+    let userId=getCookie('userId');
+    console.log("修改页面"+userId)
     console.log(this.$route)
     this.information();
   },
@@ -70,7 +74,9 @@ export default {
         insertTime:this.form1.insertTime,
         insertUsername:this.form1.insertUsername,
         noticeContent:this.form1.noticeContent,
-
+        permission:this.form1.permission,
+        noticeTitle:this.form1.noticeTitle,
+        userId:this.userId
       };
       this.axios
         .post(
@@ -87,7 +93,17 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-.form-box,
+.form-box{
+    .el-form{
+      margin-top: 100px;
+      .preview-group{
+        width: 500px;
+        .el-form-item{
+          height: 60px;
+        }
+      }
+    }
+}
 .from {
   display: flex;
   align-items: center;

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

@@ -5,7 +5,7 @@
       <PageTitle>返回</PageTitle>
     </div>
 <!--//详细内容展示部分-->
-    <div class="form-box" style="margin-right: 10rem;text-fill-color: #111111;-webkit-input-placeholder:111111FF"  >
+    <div class="form-box" style="margin-right: 10rem;margin-top: 30px;text-fill-color: #111111;-webkit-input-placeholder:111111FF"  >
       <dil-form :formId="369" v-model="form1" ref="from1" autosize></dil-form>
     </div>
   </div>
@@ -72,7 +72,6 @@ export default {
   height:200px !important;
 
 }
-.form-box,
 .from {
   display: flex;
   align-items: center;

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

@@ -1,4 +1,4 @@
-//公告管理
+//公告管理(销售)
 <template>
   <div class="notice">
     <div class="sache">
@@ -19,7 +19,7 @@
 
     <div class="table">
       <dilTable v-bind.sync="options">
-        <el-table-column fixed="right" label="操作" width="120" header-align="center">
+        <el-table-column fixed="right" label="操作" width="150" header-align="center">
           <template slot-scope="scope">
             <el-button
               type="text"
@@ -35,6 +35,13 @@
             >
               修改
             </el-button>
+            <el-button
+              type="text"
+              size="small"
+              @click="releaseNotice(scope)"
+            >
+              发布
+            </el-button>
             <el-button
               type="text"
               size="mini"
@@ -64,13 +71,39 @@ export default {
         requestUrl: "/api/v1/ams/getMarketingNoticeList?apiId=414",
       },
     }
+  },
+  created() {
+
   },
   methods:{
     onclick(){
-      this.options.requestUrl = "/api/v1/ams/getCarrierNoticeList?apiId=414&con="+this.textInput;
+      this.options.requestUrl = "/api/v1/ams/getMarketingNoticeList?apiId=414&con="+this.textInput;
     },
+    getNotice(){
 
-
+    },
+    //发布
+    releaseNotice(scope){
+      let dilNotice={
+        noticeTitle:scope.row.noticeTitle,
+        noticeContent:scope.row.noticeContent,
+        insertUsername:scope.row.insertUsername,
+        insertTime:scope.row.insertTime,
+        noticeId:scope.row.noticeId,
+        permission:scope.row.permission
+      }
+      console.log("发布")
+      console.log(dilNotice)
+      this.axios.post("/api/v1/ams/releaseNotice",dilNotice).
+      then((res)=>{
+          if (res.data.code=="200"){
+            this.$message.success("发布成功")
+          }else {
+            this.$message.error("发布失败")
+          }
+        }
+      )
+    },
 
     CarrierNotice() {
       this.$router.push("/addNotice");

src/views/statisticalReport/components/salesLogisticsStatistics/currentLocation.vue

@@ -0,0 +1,427 @@
+<template>
+  <div class="container">
+    <!-- 实时路径 -->
+    <div class="btnx">
+      <el-button type="primary" class="" @click="openInfo"
+        >打开信息窗体</el-button
+      >
+      <el-button type="primary" class="" @click="closeinfo"
+        >关闭信息窗口</el-button
+      >
+    </div>
+    <div id="amap-container"></div>
+  </div>
+</template>
+<script>
+import { shallowRef } from '@vue/reactivity'
+import { lazyAMapApiLoaderInstance } from 'vue-amap'
+import Slider from './slider.vue'
+Vue.use(Slider)
+import Vue from 'vue'
+var infoWindow
+export default {
+  name: 'currentLocation',
+  props: {
+    carNumber: ''
+  },
+  setup() {
+    const map = shallowRef(null)
+    return {
+      map
+    }
+  },
+  watch: {
+    speedVal: {
+      deep: true,
+      handler(val, oldVal) {
+        let that = this
+        if (that.pathNavigator != null) {
+          that.pathNavigator.setSpeed(100 * val)
+        }
+      }
+    }
+  },
+  data() {
+    return {
+      //查询车牌号
+      //开始时间和结束时间
+      startTime: '',
+      endTime: '',
+      //地图组件
+      map: null,
+      path: [],
+      pointmarker: null,
+      //定时器
+      timer: null,
+      //是否关闭信息窗体
+      infoClose: false
+    }
+  },
+  created() {
+    let that = this
+    that.initMap(105.602725, 37.076636)
+  },
+  mounted() {
+    this.initData()
+    this.initTimer()
+  },
+  methods: {
+    //初始化数据
+    initData() {
+      let that = this
+      let regExp = /(^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领A-Z]{1}[A-Z]{1}[A-Z0-9]{4}[A-Z0-9挂学警港澳]{1}$)/
+      if (that.carNumber == '') {
+        this.$message.error('车牌号不能为空！')
+        //清除旧的定时器
+        clearTimeout(this.timer)
+        return
+      } else if (!regExp.test(that.carNumber)) {
+        this.$message.error('请输入正确的车牌号！')
+        //清除旧的定时器
+        clearTimeout(this.timer)
+        return
+      }
+      that.axios
+        .get('/api/v1/otms/getCurrentLocation?capcityNumber=' + that.carNumber)
+        .then(res => {
+          console.log(res.data.data)
+          if (res.data.data == '-1') {
+            this.$message.error('运输订单未关闭,自提车辆无权查看!')
+          } else if (res.data.data.status != '1006') {
+            that.map.setCenter([
+              res.data.data.result.lon,
+              res.data.data.result.lat
+            ])
+            //画车
+            that.initMarkes(
+              45,
+              60,
+              require('@/assets/img/car1.png'),
+              res.data.data.result.lon,
+              res.data.data.result.lat,
+              '现在所在位置'
+            )
+            //给路径加点
+            let point = new AMap.LngLat(
+              res.data.data.result.lon,
+              res.data.data.result.lat
+            )
+            if (
+              that.path.length <= 0 ||
+              !that.path[that.path.length - 1].equals(point)
+            ) {
+              that.path.push(point)
+            }
+            console.log(that.path)
+            //初始化轨迹
+            that.initPolyline()
+            //显示窗体
+            if (this.infoClose == false) {
+              that.initCustomMarkes(
+                that.carNumber,
+                res.data.data.result.adr,
+                res.data.data.result.lon,
+                res.data.data.result.lat
+              )
+            }
+            this.lon = res.data.data.result.lon
+            this.lat = res.data.data.result.lat
+          } else {
+            this.$message.error('车辆暂时无GPS')
+            //清除定时器
+            clearTimeout(this.timer)
+          }
+        })
+    },
+
+    //初始化地图
+    initMap(lon, lat) {
+      lazyAMapApiLoaderInstance.load().then(() => {
+        let that = this
+        that.map = new AMap.Map('amap-container', {
+          //设置地图容器id
+          viewMode: '2D', //是否为2D地图模式
+          zoom: 18, //初始化地图级别
+          center: [lon, lat] //初始化地图中心点位置105.602725,37.076636
+        })
+      })
+    },
+
+    //创建简单的标记
+    initMarkes(weight, height, image, lon, lat, title) {
+      let that = this
+      //图标标记点
+      let pointicon = new AMap.Icon({
+        size: new AMap.Size(weight, height), // 图标尺寸
+        image: image, // Icon的图像
+        imageOffset: new AMap.Pixel(2, 10), // 图像相对展示区域的偏移量，适于雪碧图等
+        imageSize: new AMap.Size(weight, height) // 根据所设置的大小拉伸或压缩图片
+      })
+      // 创建一个 Marker 实例：
+      var pointmarker = new AMap.Marker({
+        position: new AMap.LngLat(lon, lat), // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+        icon: pointicon,
+        title: title
+      })
+      // 将创建的点标记添加到已有的地图实例：
+      that.pointmarker = pointmarker
+      that.map.add(pointmarker)
+    },
+    initPoint(weight, height, image, lon, lat, title) {
+      let that = this
+      //图标标记点
+      let pointicon = new AMap.Icon({
+        //size: new AMap.Size(weight, height), // 图标尺寸
+        image: image, // Icon的图像
+        imageOffset: new AMap.Pixel(0, 10), // 图像相对展示区域的偏移量，适于雪碧图等
+        imageSize: new AMap.Size(weight, height) // 根据所设置的大小拉伸或压缩图片
+      })
+      // 创建一个 Marker 实例：
+      var pointmarker = new AMap.Marker({
+        position: new AMap.LngLat(lon, lat), // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+        icon: pointicon,
+        title: title,
+        label: {
+          direction: 'top',
+          content: title,
+          offset: new AMap.Pixel(-2, 10)
+        }
+      })
+      // 将创建的点标记添加到已有的地图实例：
+      that.pointmarker = pointmarker
+      that.map.add(pointmarker)
+    },
+    //初始化轨迹
+    initPolyline() {
+      let that = this
+      // 创建一个 Polyline 实例：
+      var polyline = new AMap.BezierCurve({
+        path: that.path,
+        borderWeight: 2, // 线条宽度，默认为 1
+        strokeColor: '#18BFA6', // 线条颜色
+        lineJoin: 'round' // 折线拐点连接处样式
+      })
+      // 将创建的线路添加到已有的线路中去：
+      that.map.add(polyline)
+    },
+    //时间格式转换
+    formatDate(date, fmt) {
+      if (/(y+)/.test(fmt)) {
+        fmt = fmt.replace(
+          RegExp.$1,
+          (date.getFullYear() + '').substr(4 - RegExp.$1.length)
+        )
+      }
+      let o = {
+        'M+': date.getMonth() + 1,
+        'd+': date.getDate(),
+        'h+': date.getHours(),
+        'm+': date.getMinutes(),
+        's+': date.getSeconds()
+      }
+      for (let k in o) {
+        if (new RegExp(`(${k})`).test(fmt)) {
+          let str = o[k] + ''
+          fmt = fmt.replace(
+            RegExp.$1,
+            RegExp.$1.length === 1 ? str : ('00' + str).substr(str.length)
+          )
+        }
+      }
+      return fmt
+    },
+    //定时取得当前位置并加入轨迹中去，点击查询时触发，同时清除path和旧的定时器
+    initTimer() {
+      let that = this
+      //清除旧的定时器
+      clearTimeout(this.timer)
+      that.startTime = that.formatDate(new Date(), 'yyyy年MM月dd日 hh:mm:ss')
+      that.endTime = that.formatDate(new Date(), 'yyyy年MM月dd日 hh:mm:ss')
+      console.log(that.startTime + '至' + that.endTime)
+      //清除path
+      that.path = []
+      //清除所有覆盖物
+      // that.map.clearMap()
+      //设置所有的门岗和汽车衡
+      that.setPoints()
+      //设置定时器
+      that.timer = setInterval(() => {
+        //清除之前车的图标
+        that.map.remove(that.pointmarker)
+        that.initData()
+        that.endTime = that.formatDate(new Date(), 'yyyy年MM月dd日 hh:mm:ss')
+      }, 5000)
+    },
+    //初始化厂内标记点
+    setPoints() {
+      //请求所有汽车衡和门岗
+      let that = this
+      that.axios.get('/api/v1/otms/mapvertexs/findSelections').then(res => {
+        console.log(res.data.data)
+        if (res.data.data) {
+          res.data.data.forEach(vertex => {
+            that.initPoint(
+              20,
+              25,
+              require('@/assets/img/map_site.png'),
+              vertex.longitude,
+              vertex.latitude,
+              vertex.addressName
+            )
+          })
+        }
+      })
+    },
+    //初始化窗体
+    initCustomMarkes(title, details, lon, lat) {
+      let that = this
+      //自定义窗体内容
+      var content = [
+        "<div  style='top:1px;width: 180px; background-color:rgba(22, 160, 133, 1);' ><font color='white'>" +
+          title +
+          '</font>',
+        "<div style='background-color:rgba(22, 160, 133, 1);'><font color='white'>" +
+          details +
+          '<br>' +
+          '时间范围：' +
+          that.startTime +
+          '至' +
+          that.endTime +
+          '<br>' +
+          '</font></div></div>'
+      ]
+      // 创建 infoWindow 实例
+      infoWindow = new AMap.InfoWindow({
+        content: content.join('<br>'), //传入 dom 对象，或者 html 字符串
+        offset: new AMap.Pixel(0, -20) //修改信息差窗体偏移
+      })
+      // 打开信息窗体
+      infoWindow.open(that.map, [lon, lat])
+    },
+    // 关闭信息窗口
+    closeinfo() {
+      this.infoClose = true
+      infoWindow.close()
+    },
+    openInfo() {
+      console.log(this.lon)
+      console.log(this.lat)
+      this.infoClose = false
+      infoWindow.open(this.map, [this.lon, this.lat])
+    }
+  }
+}
+</script>
+<style>
+.inputStyle {
+  position: absolute;
+  width: 200px;
+  left: 50px;
+}
+
+.controller {
+  width: 100%;
+  height: 70px;
+  background: white;
+  position: absolute;
+  z-index: 99;
+  top: 0;
+  left: 0;
+}
+.in_transit_information {
+  width: 320px;
+  float: left;
+  height: 40px;
+}
+
+.container {
+  width: 100%;
+  height: 100%;
+}
+span.item_details2 {
+  position: relative;
+  top: 20px;
+}
+.date_picker_style {
+  position: relative;
+  left: 50px;
+}
+.item_details {
+  position: relative;
+  top: 5px;
+  height: 0px;
+  left: 0px;
+}
+#amap-container {
+  position: relative;
+  width: 100%;
+  height: 100%;
+  overflow: hidden;
+  margin: 0;
+  font-family: '微软雅黑';
+}
+
+/* 进度条 */
+.mySlider {
+  width: 150px;
+  height: 20px;
+  display: inline-block;
+  position: relative;
+  left: 32px;
+}
+/* 进度条 */
+.mySlider2 {
+  width: 400px;
+  height: 20px;
+  display: inline-block;
+  position: relative;
+  left: 32px;
+}
+.play {
+  position: relative;
+  left: 28px;
+}
+.quickly {
+  float: right;
+  position: relative;
+  left: -20px;
+  top: 10px;
+}
+.pause {
+  position: relative;
+  left: 28px;
+}
+.passed-time {
+  position: relative;
+  left: 5px;
+}
+.end-time {
+  position: relative;
+  left: 5px;
+}
+.map-times {
+  position: relative;
+  width: 40px;
+}
+.searchstyle {
+  position: relative;
+  left: 45px;
+}
+.map-control {
+  float: left;
+  width: 270px;
+}
+.driving_information {
+  height: 40px;
+  width: 240px;
+  float: left;
+}
+</style>
+<style lang="scss" scoped>
+.btnx {
+  z-index: 1000;
+  position: fixed;
+  bottom: 10px;
+  right: 10px;
+}
+</style>

src/views/statisticalReport/components/salesLogisticsStatistics/mapTest.vue

@@ -1,43 +1,6 @@
 <template>
   <div class="container">
-    <div id="amap-container">
-      <el-row style="margin-left:250px">
-        <el-button type="primary" @click="slow">慢速</el-button>
-        <el-button type="success" @click="middle">中速</el-button>
-        <el-button type="danger" @click="fast">快速</el-button>
-        <el-button type="success" @click="addIndex" plain>快进</el-button>
-        <el-button type="danger" @click="stop" plain>暂停</el-button>
-        <el-button type="success" @click="play" plain>开始</el-button>
-        <el-select
-          style="width:100px"
-          @change="changeParkingTime"
-          v-model="parkingTime"
-          placeholder="停车"
-        >
-          <el-option
-            v-for="item in parkingOptions"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          >
-          </el-option>
-        </el-select>
-        <el-select
-          style="width:100px"
-          @change="changeLeaveTime"
-          v-model="leaveTime"
-          placeholder="离线"
-        >
-          <el-option
-            v-for="item in parkingOptions"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          >
-          </el-option>
-        </el-select>
-      </el-row>
-    </div>
+    <div id="amap-container"></div>
     <div class="mapcontroller">
       <div class="in_transit_information">
         <label class="item_details">起点:{{ startPointName }}</label>
@@ -88,6 +51,42 @@
         </div>
       </div>
     </div>
+    <el-row>
+      <el-button type="primary" @click="slow">慢速</el-button>
+      <el-button type="success" @click="middle">中速</el-button>
+      <el-button type="danger" @click="fast">快速</el-button>
+      <el-button type="success" @click="addIndex" plain>快进</el-button>
+      <el-button type="danger" @click="stop" plain>暂停</el-button>
+      <el-button type="success" @click="play" plain>开始</el-button>
+      <el-select
+        style="width:100px"
+        @change="changeParkingTime"
+        v-model="parkingTime"
+        placeholder="停车"
+      >
+        <el-option
+          v-for="item in parkingOptions"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+        >
+        </el-option>
+      </el-select>
+      <el-select
+        style="width:100px"
+        @change="changeLeaveTime"
+        v-model="leaveTime"
+        placeholder="离线"
+      >
+        <el-option
+          v-for="item in parkingOptions"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+        >
+        </el-option>
+      </el-select>
+    </el-row>
     <div class="btnx">
       <el-button type="primary" class="" @click="openInfo"
         >打开信息窗体</el-button

src/views/statisticalReport/components/salesLogisticsStatistics/saleSteelAllReport.vue

@@ -301,9 +301,6 @@
           label="送货单打印状态"
           align="center"
         >
-          <template slot-scope="scope">
-            <span v-show="scope.row.isPrintDelivery == 1">已打印</span>
-          </template>
         </el-table-column>
         <el-table-column prop="saler" label="业务员" align="center">
         </el-table-column>

src/views/statisticalReport/components/salesLogisticsStatistics/saleSteelReports.vue

@@ -9,7 +9,7 @@
             placeholder="请选择需筛选的内容"
             clearable
             @change="changeScreen"
-            style="width:120px"
+            style="width:100px"
           >
             <el-option
               v-for="item in options"
@@ -20,7 +20,7 @@
             </el-option>
           </el-select>
           <el-input
-            style="width:180px"
+            style="width:170px"
             v-model="input"
             placeholder="请输入查询条件"
             clearable
@@ -31,7 +31,7 @@
             v-model="screen1"
             placeholder="请选择需筛选的内容"
             clearable
-            style="width:120px"
+            style="width:100px"
           >
             <el-option
               v-for="item in options1"
@@ -42,7 +42,7 @@
             </el-option>
           </el-select>
           <el-input
-            style="width:180px"
+            style="width:170px"
             v-model="input1"
             placeholder="请输入查询条件"
             clearable
@@ -56,7 +56,7 @@
             v-model="startTime"
             type="date"
             placeholder="选择日期"
-            style="width:180px"
+            style="width:150px"
           >
           </el-date-picker>
           <span>至</span>
@@ -64,7 +64,7 @@
             v-model="endTime"
             type="date"
             placeholder="选择日期"
-            style="width:180px"
+            style="width:150px"
           >
           </el-date-picker>
           <el-button type="primary" class="btn" @click="onclick">
@@ -73,7 +73,7 @@
         </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="exportAllReportToExcel"
-            ><i class="el-icon-download"></i>Excel</el-button
+            >下载Excel</el-button
           >
         </el-form-item>
         <el-form-item>
@@ -81,6 +81,17 @@
             <i class="el-icon-refresh"></i>
           </el-button>
         </el-form-item>
+        <el-form-item v-if="isShowOperate">
+          <el-button type="primary" @click="checkTrans()"
+            ><i class="el-icon-truck"></i>轨迹</el-button
+          >
+          <el-button type="primary" @click="operation()"
+            ><i class="el-icon-edit"></i>更改</el-button
+          >
+          <el-button type="primary" @click="checkPoint()"
+            ><i class="el-icon-map-location"></i>实时路径</el-button
+          >
+        </el-form-item>
         <el-form-item>
           <span style="margin-left: 1rem;font-size:16px">车数/件数：</span>
           <span style="font-size:16px"
@@ -98,9 +109,12 @@
         style="width: 100%; margin-top: 20px"
         :max-height="maxHeight"
         :height="maxHeight"
-        :row-style="{ height: '30' }"
-        :cell-style="{ fontWeight: '500' }"
+        :row-class-name="tableRowClassName"
         @cell-click="cellClik"
+        @cell-mouse-enter="cellMouse"
+        @cell-mouse-leave="cellLeave"
+        @row-click="rowClick"
+        :cell-style="cellStyle"
       >
         <el-table-column
           width="50"
@@ -113,7 +127,7 @@
         <el-table-column
           prop="orderTime"
           label="订单日期"
-          width="120px"
+          width="110px"
           align="center"
           show-overflow-tooltip
         >
@@ -130,7 +144,7 @@
           prop="carrierName"
           label="承运商"
           align="center"
-          width="100px"
+          width="60px"
           show-overflow-tooltip
         >
         </el-table-column>
@@ -139,7 +153,7 @@
           column-key="capacityNo"
           label="车牌号"
           align="center"
-          width="140px"
+          width="90px"
           show-overflow-tooltip
         >
         </el-table-column>
@@ -164,7 +178,7 @@
           prop="materialNum"
           label="物资件数"
           align="center"
-          width="100px"
+          width="50px"
         >
         </el-table-column>
         <el-table-column
@@ -181,17 +195,13 @@
           show-overflow-tooltip
         >
         </el-table-column>
-        <el-table-column prop="grossWeight" label="毛重" show-overflow-tooltip>
-        </el-table-column>
         <el-table-column
-          prop="grossWeightTime"
-          label="毛重时间"
+          prop="entryGateTime"
+          label="进厂时间"
           width="130px"
           show-overflow-tooltip
         >
         </el-table-column>
-        <el-table-column prop="tareWeight" label="皮重" show-overflow-tooltip>
-        </el-table-column>
         <el-table-column
           prop="tareWeightTime"
           label="皮重时间"
@@ -199,22 +209,34 @@
           show-overflow-tooltip
         >
         </el-table-column>
-        <el-table-column prop="netWeight" label="净重" show-overflow-tooltip>
+        <el-table-column prop="tareWeight" label="皮重" show-overflow-tooltip>
         </el-table-column>
         <el-table-column
-          prop="entryGateTime"
-          label="进厂时间"
+          prop="loadTime"
+          label="装货时间"
           width="130px"
           show-overflow-tooltip
         >
         </el-table-column>
         <el-table-column
-          prop="loadTime"
-          label="装货时间"
+          prop="grossWeightTime"
+          label="毛重时间"
           width="130px"
           show-overflow-tooltip
         >
         </el-table-column>
+        <el-table-column prop="grossWeight" label="毛重" show-overflow-tooltip>
+        </el-table-column>
+        <el-table-column prop="netWeight" label="净重" show-overflow-tooltip>
+        </el-table-column>
+        <el-table-column
+          prop="isPrintDelivery"
+          label="送货单打印"
+          align="center"
+          width="100px"
+          show-overflow-tooltip
+        >
+        </el-table-column>
         <el-table-column
           prop="outGateTime"
           label="出厂时间"
@@ -252,14 +274,6 @@
           show-overflow-tooltip
         >
         </el-table-column>
-        <el-table-column
-          prop="isPrintDelivery"
-          label="送货单打印状态"
-          align="center"
-          width="120px"
-          show-overflow-tooltip
-        >
-        </el-table-column>
         <el-table-column
           prop="saler"
           label="业务员"
@@ -307,28 +321,6 @@
           show-overflow-tooltip
         >
         </el-table-column>
-        <el-table-column
-          prop="operation"
-          label="操作"
-          width="100px"
-          fixed="right"
-          align="center"
-        >
-          <template slot-scope="scope">
-            <el-button
-              type="text"
-              @click="checkTrans(scope.row)"
-              v-if="scope.row.outGateTime != null"
-              >轨迹</el-button
-            >
-            <el-button
-              type="text"
-              @click="operation(scope.row)"
-              v-if="scope.row.carStatus != 2"
-              >编辑</el-button
-            >
-          </template>
-        </el-table-column>
       </el-table>
     </div>
     <div>
@@ -660,10 +652,7 @@
           </el-table>
         </div>
         <span slot="footer" class="dialog-footer">
-          <el-button @click="centerDialogVisible = false">取 消</el-button>
-          <el-button type="primary" @click="centerDialogVisible = false"
-            >确 定</el-button
-          >
+          <el-button @click="centerDialogVisible = false">返 回</el-button>
         </span>
         <div>
           <vxe-modal
@@ -672,6 +661,7 @@
             v-model="isShow"
             show-footer
             class="vxeModal"
+            title="抵达上传照片"
           >
             <div class="demo-image__preview">
               <el-image style=" height:731px;text-align:center;" :src="src">
@@ -681,7 +671,13 @@
               </el-image>
             </div>
           </vxe-modal>
-          <vxe-modal width="549px" height="731px" v-model="isShow2" show-footer>
+          <vxe-modal
+            width="549px"
+            height="731px"
+            v-model="isShow2"
+            show-footer
+            title="签收上传照片"
+          >
             <div
               class="demo-image__preview"
               v-for="(item, index) in srcList2"
@@ -699,12 +695,30 @@
       </el-dialog>
     </div>
     <div style="height: 100%">
-      <vxe-modal width="1237" height="731" v-model="value7" show-zoom resize>
+      <vxe-modal
+        width="1237"
+        height="731"
+        v-model="value7"
+        show-zoom
+        resize
+        title="轨迹查询"
+      >
         <template #default>
           <PathView v-bind.sync="pathOption"></PathView>
         </template>
       </vxe-modal>
     </div>
+    <div style="height:100%">
+      <vxe-modal
+        width="1237"
+        height="731"
+        v-model="value8"
+        show-zoom
+        resize
+        title="实时路径"
+        ><currentLocation :carNumber="carNumber"></currentLocation
+      ></vxe-modal>
+    </div>
   </div>
 </template>
 
@@ -712,13 +726,15 @@
 import { sjTime, isVehicleNumber } from '@/utils/sharedJsFile'
 import { getCookie } from '@/utils/util.js'
 import PathView from './mapTest.vue'
+import currentLocation from './currentLocation.vue'
 export default {
   components: {
-    PathView
+    PathView,
+    currentLocation
   },
   data() {
     return {
-      consigneeFiltList: [],
+      carNumber: '',
       //弹出框
       centerDialogVisible: false,
       //根据车序号查询的值
@@ -771,6 +787,7 @@ export default {
       tableData: [],
       spanArr: [],
       pos: 0,
+      //需要合并列的名称
       mergeList: [
         '序号',
         '整车操作',
@@ -789,11 +806,10 @@ export default {
         '下单客户',
         '收货地址',
         '业务员',
-        '送货单打印状态',
+        '送货单打印',
         '收货客户电话',
         '金蝶分录ID',
         '是否自提',
-        '操作',
         '订单日期'
       ],
       //钢材多拼车辆线路ID
@@ -843,32 +859,97 @@ export default {
       isShow2: false,
       input1: '',
       maxHeight: window.innerHeight - 140,
+      //轨迹窗口
       value7: false,
+      //实时路径窗口
+      value8: false,
       pathOption: {
         orderNumber: '',
         capacityNumber: '',
         startPointName: '',
         endPointName: ''
-      }
+      },
+      saleSteelKey: false,
+      tableRowIndex: '',
+      isRowClick: 0,
+      orgCodeList: [
+        'wuliuyunshubu',
+        'dagangadmin',
+        'shichangxinxibu',
+        'xiaoshouyewuyuan',
+        'zidonghuabu'
+      ],
+      isShowOperate: false
     }
   },
   created() {
+    if (this.orgCodeList.includes(getCookie('orgCode'))) {
+      this.isShowOperate = true
+    }
     this.getSteelReport()
   },
   mounted() {
-    window.onresize = () => {
-      return (() => {
-        this.maxHeight = window.innerHeight - 140
-      })()
-    }
+    this.$nextTick(() => {
+      window.onresize = () => {
+        return (() => {
+          this.maxHeight = window.innerHeight - 150
+        })()
+      }
+    })
   },
   activated() {
-    this.maxHeight = window.innerHeight - 140
+    this.maxHeight = window.innerHeight - 150
   },
   computed: {},
   methods: {
+    cellStyle({ row, column, rowIndex, columnIndex }) {
+      if (
+        column.property == 'arrivalAddress' ||
+        column.property == 'receiptAddress'
+      ) {
+        return 'color : blue'
+      }
+    },
+    rowClick(row, column, event) {
+      this.steelMap = {}
+      this.tableRowIndex = row.group
+      this.isRowClick = 1
+      this.steelMap = row
+    },
+    tableRowClassName({ row, rowIndex }) {
+      if (row.group == this.tableRowIndex && this.tableRowIndex !== '') {
+        return 'warning-row'
+      }
+    },
+    cellMouse(row, column, cell, event) {
+      if (this.isRowClick == 0) {
+        this.tableRowIndex = row.group
+      }
+    },
+    cellLeave(row, column, cell, event) {
+      if (this.isRowClick == 0) {
+        this.tableRowIndex = ''
+      }
+    },
+    // reset() {
+    //   var that = this
+    //   that.$nextTick(() => {
+    //     that.saleSteelKey = !that.saleSteelKey
+    //   })
+    // },
     checkTrans(row) {
-      console.log(row)
+      this.isRowClick = 0
+      if (Object.values(this.steelMap).length == 0) {
+        this.$message.error('请点击需要执行更改操作的行！')
+        return
+      }
+      if (typeof row === 'undefined') {
+        row = this.steelMap
+      }
+      if (row.outGateTime == null) {
+        this.$message.error('该车还未出厂,暂无轨迹')
+        return
+      }
       let that = this
       that.axios
         .post('/api/v1/otms/fullPath?orderNumber=' + row.orderNo)
@@ -888,13 +969,14 @@ export default {
         })
     },
     cellClik(row, column, cell, event) {
+      console.log(row)
       if (column.property == 'arrivalAddress') {
         if (row.orderNo && row.arrivalAddress) {
           this.toPhotoClick(row.orderNo, 1)
         }
       }
       if (column.property == 'receiptAddress') {
-        if (row.orderNo && row.arrivalAddress) {
+        if (row.orderNo && row.receiptAddress) {
           this.receipctPhotoClick(row.orderNo, 1)
         }
       }
@@ -910,12 +992,16 @@ export default {
     },
     //筛选
     //筛选客户
-    filterConsignee(value, row, column) {
-      return row.consigneeName === value
-    },
     //点击操作弹出框
     operation(row) {
-      // debugger
+      this.isRowClick = 0
+      if (Object.values(this.steelMap).length == 0) {
+        this.$message.error('请点击需要执行更改操作的行！')
+        return
+      }
+      if (typeof row === 'undefined') {
+        row = this.steelMap
+      }
       this.axios
         .post(
           '/api/v1/tms/getSteelReportDetailsBySmId?saleOrderMaterialId=' +
@@ -945,6 +1031,16 @@ export default {
           this.srcList.push(res.data.data)
         })
     },
+    //查看实时路径
+    checkPoint() {
+      if (this.input || this.input1 || this.steelMap.capacityNo) {
+        this.carNumber = this.input || this.input1 || this.steelMap.capacityNo
+        console.log(this.carNumber)
+        this.value8 = true
+      } else {
+        this.$message.error('请输入或者点击有车牌号的行查询车牌号的实时路径')
+      }
+    },
     //查看签收图
     receipctPhotoClick(orderNo, num) {
       this.axios
@@ -1211,7 +1307,7 @@ export default {
             }
           })
           .catch(() => {
-            this.$message.error('派车失败,请联系管理员')
+            this.$message.error(res.data.data)
             this.operation(this.steelMap)
             this.getSteelReport()
             loading.close()
@@ -1667,6 +1763,7 @@ export default {
     },
     //查询，输入查询条件
     onclick() {
+      this.isRowClick = 0
       const loading = this.$loading({
         lock: true,
         text: '正在获取数据',
@@ -1702,9 +1799,9 @@ export default {
       }
       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
@@ -1742,6 +1839,7 @@ export default {
     },
     //获取钢材统计报表
     getSteelReport() {
+      this.isRowClick = 0
       let startTime = null
       let endTime = null
       let carrierSsoId = null
@@ -1825,7 +1923,7 @@ export default {
     margin-top: 20px;
     ::-webkit-scrollbar {
       // width: 20px;
-      height: 30px;
+      height: 20px;
       background-color: transparent;
     }
   }