修改

build/utils.js

@@ -14,9 +14,9 @@ const devPathSrc = path.resolve(__dirname, '../../../src') // node_modules应用
 //    登录     合同                       首页       内转     排队   资源   销售                       零星物资
 // ['index','appoint'，'configManager','homepage',''inward,'queue','RMS','sale','serviceManager','SporadicManage'
 //       统计报表       组织机构/系统管理 采购  仓储
-//  'statisticalReport','systemConfig','TMS','WMS','workFlow']
+//  'statisticalReport','systemConfig','TMS','WMS','workFlow','ADMINISTRATORS']
 //let devModules = ["index", "statisticalReport", "appoint", "sale"];
-let devModules = ['index', 'statisticalReport']
+let devModules = ['index', 'statisticalReport', 'appoint', 'ADMINISTRATORS']
 
 if (pathSrc.indexOf('node_modules') > -1) {
   devModules = require('../../../cors.js').devModules

config/index.js

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

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 {

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="getNoDetailsStament">查询</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">
@@ -135,7 +135,7 @@
             <el-table-column
               prop="loadingProportion"
               label="装船比例"
-              width="100px"
+              width="70px"
               align="center"
             >
              <template slot-scope="scope">
@@ -152,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
@@ -166,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"
             >
@@ -176,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
@@ -192,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="本月实际开票金额"
               
               align="center"
             >
-            </el-table-column>
+            </el-table-column> -->
             <el-table-column
               prop="operate"
               label="操作"
@@ -234,7 +251,6 @@
             :data="tableData1"
             ref="tableRef1"
             border
-            stripe
             max-height="600px"
             :row-style="{ height: '30px' }"
             :cell-style="{ fontWeight: '700' }"
@@ -278,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="离港日期"
@@ -297,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
@@ -312,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"
@@ -336,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"
@@ -349,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"
             >
@@ -377,6 +404,7 @@
 <script>
 import { getCookie } from "@/utils/util.js";
 import { sjTime } from "@/utils/sharedJsFile";
+import BigNumber, {bigNumber} from "bignumber.js"
 export default {
   data() {
     return {
@@ -397,7 +425,11 @@ export default {
         "resultForeignShipName",
         "materialName",
         "totalEnTonnage",
-        "operate"
+        "operate",
+        "statementTotalAmount",
+        "makeTonnageTotal",
+        "previewTonnage",
+        "previewFee"
       ],
       activeName: "first",
       tableTitle: "结算账单报表",
@@ -416,8 +448,8 @@ export default {
     },
     tableData1: {
       handler(newVal) {
-        console.log("执行一次汇总函数");
-        this.computedTableData(newVal);
+        //console.log("执行一次汇总函数");
+        //this.computedTableData1(newVal);
       },
       deep: true,
       immediate: false
@@ -425,24 +457,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 => {
@@ -459,24 +515,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) => {
@@ -495,7 +569,13 @@ export default {
     handleClick() {
       console.log("我正在进行账单");
     },
-    onClick() {},
+    onClick() {
+      if(this.activeName=='first'){
+        this.getNoDetailsStament();
+      }else if(this.activeName=='second'){
+        this.getDetailsStamented();
+      }
+    },
     //获取未结算账单数据
     getNoDetailsStament() {
       let startTime = null;
@@ -517,7 +597,27 @@ export default {
         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) {
       //每次调用方法初始化
@@ -541,6 +641,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];
@@ -553,7 +676,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,
@@ -601,7 +724,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/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

@@ -59,9 +59,9 @@ export default {
   },
   created() {
     let that = this
-    that.initMap(105.602725, 37.076636)
     this.initData()
     this.initTimer()
+    that.initMap(105.602725, 37.076636)
   },
   mounted() {},
   methods: {

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>